functionalscript 0.0.320 → 0.0.324

package/commonjs/build/test.js

@@ -14,40 +14,54 @@ const compileMap = {
             if (r1[0] === 'error') { throw r1 }
             const [r2, m2] = require_('./a/')(m1);
             if (r2[0] === 'error') { throw r2 }
-            return [['ok', ':index.js'], m2]
+            const [r3, m3] = require_('x/r')(m2);
+            if (r3[0] === 'error') { throw r3 }
+            return [['ok', ':index.js'], m3]
         }],
     ':b.js': [
         'ok',
-        () => m0 => {
-            return [['ok', ':b.js'], m0]
-        }],
+        () => m0 => [['ok', ':b.js'], m0]],
     ':a/index.js': [
         'ok',
-        () => m0 => {
-            return [['ok', ':a/index.js'], m0]
-        }]
+        () => m0 => [['ok', ':a/index.js'], m0]],
+    'x:r.js': [
+        'ok',
+        () => m0 => [['ok', 'x:r.js'], m0]],
 }
 
 /** @type {function_.Compile} */
 const compile = source => compileMap[source] ?? ['error', 'invalid source']
 
-/** @type {{ readonly [k in string]?: { readonly [k in string]?: string } }} */
+/** @typedef {{ readonly [k in string]?: string }} StringMap */
+
+/** @type {{ readonly [k in string]?: { readonly dependencies: StringMap, files: StringMap }}} */
 const packageMap = {
     '': {
-        'index.js': ':index.js',
-        'b.js': ':b.js',
-        'a/index.js': ':a/index.js',
-    }
+        dependencies: {
+            'x': '/node_modules/x'
+        },
+        files: {
+            'index.js': ':index.js',
+            'b.js': ':b.js',
+            'a/index.js': ':a/index.js',
+        }
+    },
+    '/node_modules/x': {
+        dependencies: {},
+        files: {
+            'r.js': 'x:r.js'
+        }
+    },
 }
 
 /** @type {package_.Get} */
 const packageGet = packageId => {
     const p = packageMap[packageId]
-    if (p === undefined) { return undefined }
-    return {
-        dependency: () => undefined,
-        file: file => p[file]
-    }
+    return p === undefined ? undefined :
+        {
+            dependency: dependency => p.dependencies[dependency],
+            file: file => p.files[file]
+        }
 }
 
 const getOrBuild = _.getOrBuild
@@ -58,7 +72,7 @@ const getOrBuild = _.getOrBuild
 {
     const [r] = getOrBuild({ package: '', path: ['index.js'] })(undefined)
     if (JSON.stringify(r) !==
-        '["ok",{"exports":":index.js","requireMap":{"./a/":"/a/index.js","./b":"/b.js"}}]'
+        '["ok",{"exports":":index.js","requireMap":{"./a/":"/a/index.js","./b":"/b.js","x/r":"/node_modules/x/r.js"}}]'
     ) {
         throw r
     }

package/package.json

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