functionalscript 0.0.321 → 0.0.325

package/commonjs/build/test.js

@@ -10,13 +10,13 @@ const compileMap = {
     ':index.js': [
         'ok',
         require_ => m0 => {
-            const [r1, m1] = require_('./b')(m0);
-            if (r1[0] === 'error') { throw r1 }
-            const [r2, m2] = require_('./a/')(m1);
-            if (r2[0] === 'error') { throw r2 }
-            const [r3, m3] = require_('x/r')(m2);
-            if (r3[0] === 'error') { throw r3 }
-            return [['ok', ':index.js'], m3]
+            let [r, m] = require_('./b')(m0);
+            if (r[0] === 'error') { throw r }
+            [r, m] = require_('./a/')(m);
+            if (r[0] === 'error') { throw r }
+            [r, m] = require_('x/r')(m);
+            if (r[0] === 'error') { throw r }
+            return [['ok', ':index.js'], m]
         }],
     ':b.js': [
         'ok',
@@ -32,11 +32,13 @@ const compileMap = {
 /** @type {function_.Compile} */
 const compile = source => compileMap[source] ?? ['error', 'invalid source']
 
-/** @type {{ readonly [k in string]?: { readonly dependencies: { readonly [k in string]?: string }, files:{ readonly [k in string]?: string } }}} */
+/** @typedef {{ readonly [k in string]?: string }} StringMap */
+
+/** @type {{ readonly [k in string]?: { readonly dependencies: StringMap, files: StringMap }}} */
 const packageMap = {
     '': {
         dependencies: {
-            'x': 'x'
+            'x': '/node_modules/x'
         },
         files: {
             'index.js': ':index.js',
@@ -44,7 +46,7 @@ const packageMap = {
             'a/index.js': ':a/index.js',
         }
     },
-    'x': {
+    '/node_modules/x': {
         dependencies: {},
         files: {
             'r.js': 'x:r.js'
@@ -55,11 +57,11 @@ const packageMap = {
 /** @type {package_.Get} */
 const packageGet = packageId => {
     const p = packageMap[packageId]
-    if (p === undefined) { return undefined }
-    return {
-        dependency: dependency => p.dependencies[dependency],
-        file: file => p.files[file]
-    }
+    return p === undefined ? undefined :
+        {
+            dependency: dependency => p.dependencies[dependency],
+            file: file => p.files[file]
+        }
 }
 
 const getOrBuild = _.getOrBuild
@@ -68,9 +70,21 @@ const getOrBuild = _.getOrBuild
     (/** @type {module_.MapInterface<map.Map<module_.State>>} */(map))
 
 {
-    const [r] = getOrBuild({ package: '', path: ['index.js'] })(undefined)
+    let [r, m] = getOrBuild({ package: '', path: ['index.js'] })(undefined)
+    if (JSON.stringify(r) !==
+        '["ok",{"exports":":index.js","requireMap":{"./a/":"/a/index.js","./b":"/b.js","x/r":"/node_modules/x/r.js"}}]'
+    ) {
+        throw r
+    }
+    [r, m] = getOrBuild({ package: '', path: ['b.js'] })(m)
+    if (JSON.stringify(r) !==
+        '["ok",{"exports":":b.js","requireMap":{}}]'
+    ) {
+        throw r
+    }
+    [r, m] = getOrBuild({ package: '', path: ['c.js']})(m)
     if (JSON.stringify(r) !==
-        '["ok",{"exports":":index.js","requireMap":{"./a/":"/a/index.js","./b":"/b.js","x/r":"x/r.js"}}]'
+        '["error",["file not found"]]'
     ) {
         throw r
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.321",
+  "version": "0.0.325",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "index.js",
   "scripts": {