[qa] Some tests for import/export.

corwin-of-amber · corwin-of-amber · commit d7bb0fd8e0ef · 2020-08-17T18:08:37.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,12 @@
 **/*.pyc
 *.ls.js
+.*.swp
 .DS_Store
 node_modules
 app.db
 /src/browse-sqlite.html
 /src/old
 /dist
 /.cache
-/build
+/build
+/tests/**/build
diff --git a/index.html b/index.html
@@ -3,7 +3,10 @@
 <head>
     <meta charset="utf-8">
     <script src="kremlin://src/build/testbed.ts"></script>
-    <script>var k = require('./plug').default.watch({window, main: 'index.html'});</script>
+    <script>
+    var k = require('./plug').default.watch({window,
+        main: ['index.html', 'src/plug.ts', 'src/cli.ts']});
+    </script>
 </head>
 <body>
   
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "acorn-walk": "^7.2.0",
     "chokidar": "^3.4.1",
     "coffeescript": "^2.5.1",
-    "commander": "^3.0.2",
+    "commander": "^6.0.0",
     "find-up": "^4.1.0",
     "glob": "^7.1.6",
     "jison": "^0.4.18",
diff --git a/src/build/testbed.ts b/src/build/testbed.ts
@@ -20,15 +20,19 @@ function testbed() {
     var projects: {[name: string]: ProjectDefinition} = {
         kremlin: {
             wd: '.',
-            main: ['index.kremlin.html', 'src/plug.ts', 'src/cli.ts']
+            main: ['index.html', 'src/plug.ts', 'src/cli.ts']
         },
         author: {
             wd: '/Users/corwin/var/workspace/Web.Author',
             main: 'src/hub.ls'
+        },
+        'tests/import-export': {
+            wd: 'tests/import-export',
+            main: 'index.js'
         }
     };
 
-    var proj = ProjectDefinition.normalize(projects['kremlin']);
+    var proj = ProjectDefinition.normalize(projects['tests/import-export']);
 
     var targets = [].concat(...proj.main.map(t => t.input));
 
diff --git a/src/plug.ts b/src/plug.ts
@@ -22,7 +22,7 @@ class Kremlin {
     }
 
     prepare(proj: ProjectDefinition = this.proj || {}) {
-        var b = new Builder(proj);
+        var b = new Builder(proj, this.builder && this.builder.env);
         this.proj = b.proj;
         b.env.report = new ReportToConsole(this.console);
         this.builder = b;
@@ -111,7 +111,8 @@ class Kremlin {
     _ignoreFuncs: ((filename: string) => boolean)[] = [
         (filename) => filename.split(path.sep).some(
             (x) => x[0] == '.' || x == 'node_modules' || x == 'bower_components'),
-        (filename) => !!/^\d+$/.exec(filename)
+        (filename) => !!/^\d+$/.exec(filename),
+        (filename) => this.proj && filename.startsWith(this.proj.buildDir)
     ];
 }
 
diff --git a/tests/import-export/export-decl.js b/tests/import-export/export-decl.js
@@ -0,0 +1,6 @@
+
+if (! Array.isArray) {
+    throw new Error();
+}
+
+export const isArray = Array.isArray;
diff --git a/tests/import-export/export-default.js b/tests/import-export/export-default.js
@@ -0,0 +1,11 @@
+import { writeFileSync, readFileSync } from 'fs';
+
+class DefExport { }
+
+export default {
+    instance: new DefExport(),
+    directives: {
+        writeFileSync,
+        read: readFileSync
+    }
+}
diff --git a/tests/import-export/export-from.js b/tests/import-export/export-from.js
@@ -0,0 +1 @@
+export {default} from './export-default';
diff --git a/tests/import-export/index.js b/tests/import-export/index.js
@@ -0,0 +1,3 @@
+import './export-from';
+
+import './export-decl';

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export {default} from './export-default';`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import './export-from';`
	`2`	`+`
	`3`	`+import './export-decl';`