functionalscript 0.0.318 → 0.0.319

package/commonjs/build/index.js

@@ -37,7 +37,7 @@ const getOrBuild = compile => packageGet => moduleMapInterface =>  {
     /** @typedef {typeof moduleMapInterface extends module_.MapInterface<infer M> ? M : never} M */
     /** @type {(moduleId: module_.Id) => function_.Require<[map.Map<string>, M]>} */
     const req = moduleId => p => prior => {
-        const r = path.parseAndFind(packageGet)(moduleId.package)(moduleId.path.join('/'))(p)
+        const r = path.parseAndFind(packageGet)(moduleId)(p)
         if (r === undefined) { return [['error', 'file not found'], prior] }
         const requireMap = map.set(p)(module_.idToString(moduleId))(prior[0])
         r

package/commonjs/path/index.js

@@ -132,16 +132,15 @@ const parse = packageId => dependencies => local => path => {
 
 /**
  * @type {(packageGet: package_.Get) =>
- *  (packageId: string) =>
- *  (local: string) =>
+ *  (moduleId: module_.Id) =>
  *  (path: string) =>
  *  Result
  * }
  */
-const parseAndFind = packageGet => packageId => local => path => {
-    const currentPack = packageGet(packageId)
+const parseAndFind = packageGet => moduleId => path => {
+    const currentPack = packageGet(moduleId.package)
     if (currentPack === undefined) { return undefined }
-    const p = parse(packageId)(currentPack.dependency)(local)(path)
+    const p = parse(moduleId.package)(currentPack.dependency)(moduleId.path.join('/'))(path)
     if (p === undefined) { return undefined }
     const pack = packageGet(p.package)
     if (pack === undefined) { return undefined }

package/commonjs/path/test.js

@@ -84,7 +84,7 @@ const stringify = g => {
             file: path => at(path)({ 'a/c': 'return "a/c"' }),
         }
     }
-    const result = stringify(_.parseAndFind(p => at(p)(packages))('')('a/b')('../c'))
+    const result = stringify(_.parseAndFind(p => at(p)(packages))({ package: '', path: ['a', 'b']})('../c'))
     if (result !== '{"id":{"package":"","path":["a","c"]},"source":"return \\"a/c\\""}') { throw result }
 }
 
@@ -108,33 +108,33 @@ const stringify = g => {
         }
     }
     {
-        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('a/b')('z/a/c'))
+        const result = stringify(_.parseAndFind(p => at(p)(packages))({ package: '', path: ['a', 'b']})('z/a/c'))
         if (result !== '{"id":{"package":"node_modules/z","path":["a","c","index.js"]},"source":"return \\"a/c\\""}') {
             throw result
         }
     }
     {
-        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('a/b')('../..'))
+        const result = stringify(_.parseAndFind(p => at(p)(packages))({ package: '', path: ['a', 'b']})('../..'))
         if (result !== '{"id":{"package":"","path":["index.js"]},"source":"return \\"index.js\\""}') { throw result }
     }
     {
-        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('')('./x'))
+        const result = stringify(_.parseAndFind(p => at(p)(packages))({ package: '', path: []})('./x'))
         if (result !== '{"id":{"package":"","path":["x.js"]},"source":"return \\"x.js\\""}') { throw result }
     }
     {
-        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('')('./x.js'))
+        const result = stringify(_.parseAndFind(p => at(p)(packages))({ package: '', path: []})('./x.js'))
         if (result !== '{"id":{"package":"","path":["x.js"]},"source":"return \\"x.js\\""}') { throw result }
     }
     {
-        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('')('./x/'))
+        const result = stringify(_.parseAndFind(p => at(p)(packages))({ package: '', path: []})('./x/'))
         if (result !== '{"id":{"package":"","path":["x","index.js"]},"source":"return \\"x/index.js\\""}') { throw result }
     }
     {
-        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('x/a')('../'))
+        const result = stringify(_.parseAndFind(p => at(p)(packages))({ package: '', path: ['x', 'a']})('../'))
         if (result !== '{"id":{"package":"","path":["x","index.js"]},"source":"return \\"x/index.js\\""}') { throw result }
     }
     {
-        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('x/a')('..'))
+        const result = stringify(_.parseAndFind(p => at(p)(packages))({ package: '', path: ['x', 'a']})('..'))
         if (result !== '{"id":{"package":"","path":["x","index.js"]},"source":"return \\"x/index.js\\""}') { throw result }
     }
 }
@@ -158,11 +158,11 @@ const stringify = g => {
         }
     }
     {
-        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('a/b')('z/a/c'))
+        const result = stringify(_.parseAndFind(p => at(p)(packages))({ package: '', path: ['a', 'b']})('z/a/c'))
         if (result !== '{"id":{"package":"node_modules/z/a","path":["c.js"]},"source":"return \\"c.js\\""}') { throw result }
     }
     {
-        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('a/b')('z/a/c/'))
+        const result = stringify(_.parseAndFind(p => at(p)(packages))({ package: '', path: ['a', 'b']})('z/a/c/'))
         if (result !== '{"id":{"package":"node_modules/z/a","path":["c","index.js"]},"source":"return \\"c/index.js\\""}') { throw result }
     }
 }
@@ -186,6 +186,6 @@ const stringify = g => {
             }),
         }
     }
-    const result = stringify(_.parseAndFind(p => at(p)(packages))('')('a/b')('z/a/c'))
+    const result = stringify(_.parseAndFind(p => at(p)(packages))({package: '', path: ['a', 'b']})('z/a/c'))
     if (result !== '{"id":{"package":"node_modules/z/a/c","path":["index.js"]},"source":"return \\"a/c\\""}') { throw result }
 }

package/package.json

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