functionalscript 0.0.271 → 0.0.272

package/commonjs/path/index.js

@@ -18,24 +18,31 @@ const module_ = require("../module")
 /** @type {(path: string) => readonly string[]} */
 const split = path => path.split('/')
 
-/** @type {(s: undefined|list.List<string>) => (items: string) => undefined|list.List<string>} */
+/** @typedef {readonly[list.List<string>] | undefined} OptionList */
+
+/** @type {(s: OptionList) => (items: string) => OptionList} */
 const normItemsOp = prior => item => {
     if (prior === undefined) { return undefined }
+    const priorList = prior[0]
     switch (item) {
         case '': case '.': { return prior }
         case '..': {
-            const result = list.next(prior)
+            const result = list.next(priorList)
             if (result === undefined) { return undefined }
-            return result.tail
+            return [result.tail]
         }
         default: {
-            return list.nonEmpty(item)(prior)
+            return [list.nonEmpty(item)(priorList)]
         }
     }
 }
 
-/** @type {(items: list.List<string>) => list.List<string>|undefined} */
-const normItems = compose(list.reduce(normItemsOp)([]))(option.map(list.reverse))
+/** @type {(items: list.List<string>) => OptionList} */
+const normItems = items => {
+    const result = list.reduce(normItemsOp)([undefined])(items)
+    if (result === undefined) { return result }
+    return [list.reverse(result[0])]
+}
 
 /** @type {(local: string) => (path: string) => LocalPath|undefined} */
 const parseLocal = local => {
@@ -55,7 +62,7 @@ const parseLocal = local => {
         return {
             external,
             dir: path[path.length - 1] === '/',
-            items: list.toArray(n)
+            items: list.toArray(n[0])
         }
     }
     return f
@@ -116,7 +123,13 @@ const parse = packageId => dependencies => local => path => {
     return parseGlobal(dependencies)(dir)(items)
 }
 
-/** @typedef {readonly[string, string] | undefined} Result */
+/**
+ * @typedef {{
+ *  readonly package: string
+ *  readonly file: string
+ *  readonly source: string
+ * }| undefined} Result
+ */
 
 /**
  * @type {(packageGet: package_.Get) =>
@@ -133,10 +146,10 @@ const parseAndFind = packageGet => packageId => local => path => {
     if (p === undefined) { return undefined }
     const pack = packageGet(p.packageId)
     if (pack === undefined) { return undefined }
-    /** @type {(fileId: string) => Result } */
-    const tryFile = fileId => {
-        const source = pack.file(fileId)
-        return source === undefined ? undefined : [fileId, source]
+    /** @type {(file: string) => Result } */
+    const tryFile = file => {
+        const source = pack.file(file)
+        return source === undefined ? undefined : { package: p.packageId, file, source }
     }
     const file = p.items.join('/')
     const indexJs = list.join('/')(list.concat(p.items)(['index.js']))

package/commonjs/path/test.js

@@ -1,7 +1,10 @@
 const _ = require('.')
+const { todo } = require('../../dev')
 const json = require('../../json')
 const { identity } = require('../../types/function')
+const object = require('../../types/object')
 const { at } = require('../../types/object')
+const package_ = require('../package')
 
 /** @type {(g: json.Unknown|undefined) => string} */
 const stringify = g => {
@@ -51,15 +54,101 @@ const stringify = g => {
     if (_.parseGlobal(d => at(d)({ b: 'x' }))(false)(['d']) !== undefined) { throw 'error' }
     {
         const result = stringify(_.parseGlobal(d => at(d)({ b: 'x' }))(false)(['b']))
-        if (result !== '["x",""]') { throw result }
+        if (result !== '{"packageId":"x","items":[],"dir":false}') { throw result }
     }
     if (_.parseGlobal(d => at(d)({ 'b/r': 'x' }))(false)(['b']) !== undefined) { throw 'error' }
     {
         const result = stringify(_.parseGlobal(d => at(d)({ 'b/r': 'x' }))(false)(['b', 'r']))
-        if (result !== '["x",""]') { throw result }
+        if (result !== '{"packageId":"x","items":[],"dir":false}') { throw result }
     }
     {
         const result = stringify(_.parseGlobal(d => at(d)({ 'b/r': 'x' }))(false)(['b', 'r', 'd', 't']))
-        if (result !== '["x","d/t"]') { throw result }
+        if (result !== '{"packageId":"x","items":["d","t"],"dir":false}') { throw result }
     }
+    {
+        const result = stringify(_.parseGlobal(d => at(d)({ 'b/r': 'x' }))(true)(['b', 'r', 'd', 't']))
+        if (result !== '{"packageId":"x","items":["d","t"],"dir":true}') { throw result }
+    }
+}
+
+{
+    /** @type {object.Map<package_.Package>} */
+    const packages = {
+        '': {
+            dependency: () => todo(),
+            file: path => at(path)({ 'a/c': 'return "a/c"' }),
+        }
+    }
+    const result = stringify(_.parseAndFind(p => at(p)(packages))('')('a/b')('../c'))
+    if (result !== '{"package":"","file":"a/c","source":"return \\"a/c\\""}') { throw result }
 }
+
+{
+    /** @type {object.Map<package_.Package>} */
+    const packages = {
+        '': {
+            dependency: x => {
+                const path = `node_modules/${x}`
+                return at(path)(packages) !== undefined ? path : undefined
+            },
+            file: todo
+        },
+        'node_modules/z': {
+            dependency: () => todo(),
+            file: path => at(path)({ 'a/c/index.js': 'return "a/c"' }),
+        }
+    }
+    const result = stringify(_.parseAndFind(p => at(p)(packages))('')('a/b')('z/a/c'))
+    if (result !== '{"package":"node_modules/z","file":"a/c/index.js","source":"return \\"a/c\\""}') { throw result }
+}
+
+{
+    /** @type {object.Map<package_.Package>} */
+    const packages = {
+        '': {
+            dependency: x => {
+                const path = `node_modules/${x}`
+                return at(path)(packages) !== undefined ? path : undefined
+            },
+            file: todo
+        },
+        'node_modules/z/a': {
+            dependency: () => todo(),
+            file: path => at(path)({
+                'c/index.js': 'return "c/index.js"',
+                'c.js': 'return "c.js"'
+            }),
+        }
+    }
+    {
+        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('a/b')('z/a/c'))
+        if (result !== '{"package":"node_modules/z/a","file":"c.js","source":"return \\"c.js\\""}') { throw result }
+    }
+    {
+        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('a/b')('z/a/c/'))
+        if (result !== '{"package":"node_modules/z/a","file":"c/index.js","source":"return \\"c/index.js\\""}') { throw result }
+    }
+}
+
+{
+    /** @type {object.Map<package_.Package>} */
+    const packages = {
+        '': {
+            dependency: x => {
+                const path = `node_modules/${x}`
+                return at(path)(packages) !== undefined ? path : undefined
+            },
+            file: todo
+        },
+        'node_modules/z/a/c': {
+            dependency: () => todo(),
+            file: path => at(path)({
+                '': 'throw',
+                '.js': 'throw',
+                'index.js': 'return "a/c"'
+            }),
+        }
+    }
+    const result = stringify(_.parseAndFind(p => at(p)(packages))('')('a/b')('z/a/c'))
+    if (result !== '{"package":"node_modules/z/a/c","file":"index.js","source":"return \\"a/c\\""}') { throw result }
+}

package/package.json

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

package/test.js

@@ -7,6 +7,7 @@ require('./types/object/test')
 require('./io/commonjs/test')
 require('./commonjs/package/dependencies/test')
 require('./commonjs/package/test')
+require('./commonjs/path/test')
 
 /** @type {() => never} */
 const assert = () => { throw 'assert' }
@@ -100,12 +101,12 @@ const assert_if = c => { if (c) { throw 'assert_if' } }
     //const c = o['__defineGetter__']
     //const c = o['__defineSetter__']
     //const c = o['__lookupGetter__']
-    //const c = o['__lookupSetter__'] 
-    //const c = o['hasOwnProperty']   
+    //const c = o['__lookupSetter__']
+    //const c = o['hasOwnProperty']
     //const c = o['isPrototypeOf']
     //const c = o['propertyIsEnumerable']
     //const c = o['toString']
-    const c = o['valueOf']    
+    const c = o['valueOf']
     //console.log(c)
 }
 

package/types/list/test.js

@@ -329,7 +329,7 @@ const stress = () => {
     }
 }
 
-stress()
+// stress()
 
 module.exports = {