functionalscript 0.0.272 → 0.0.274

package/commonjs/package/index.js

@@ -1,12 +1,12 @@
 const json = require('../../json')
 const dependencies = require('./dependencies')
 
-/** 
+/**
  * @typedef {{
  *  readonly name: string
  *  readonly version: string
  *  readonly dependencies?: dependencies.DependenciesJson
- * }} PackageJson 
+ * }} PackageJson
  */
 
 /** @type {(j: json.Unknown) => j is PackageJson} */

package/commonjs/path/index.js

@@ -46,22 +46,22 @@ const normItems = items => {
 
 /** @type {(local: string) => (path: string) => LocalPath|undefined} */
 const parseLocal = local => {
-    /** @type {(path: string) => readonly[boolean, list.List<string>]} */
+    /** @type {(path: string) => readonly[boolean, boolean, list.List<string>]} */
     const fSeq = path => {
         const pathSeq = split(path)
-        switch (list.first(undefined)(pathSeq)) {
-            case '.': case '..': { return [false, list.flat([split(local), pathSeq])] }
-            default: { return [true, pathSeq] }
-        }
+        const dir = [undefined, '', '.', '..'].includes(pathSeq[pathSeq.length - 1])
+        return /** @type {readonly (string|undefined)[]} */(['.', '..']).includes(list.first(undefined)(pathSeq)) ?
+            [false, dir, list.flat([split(local), pathSeq])] :
+            [true, dir, pathSeq]
     }
     /** @type {(path: string) => LocalPath|undefined} */
     const f = path => {
-        const [external, items] = fSeq(path)
+        const [external, dir, items] = fSeq(path)
         const n = normItems(items)
         if (n === undefined) { return undefined }
         return {
             external,
-            dir: path[path.length - 1] === '/',
+            dir,
             items: list.toArray(n[0])
         }
     }

package/commonjs/path/test.js

@@ -30,7 +30,7 @@ const stringify = g => {
 
 {
     const result = _.parseLocal('a')('')
-    if (stringify(result) !== '{"external":true,"dir":false,"items":[]}') { throw result }
+    if (stringify(result) !== '{"external":true,"dir":true,"items":[]}') { throw result }
 }
 
 {
@@ -48,6 +48,11 @@ const stringify = g => {
     if (stringify(result) !== '{"external":true,"dir":false,"items":["a","c"]}') { throw result }
 }
 
+{
+    const result = _.parseLocal('')('./x/..')
+    if (stringify(result) !== '{"external":false,"dir":true,"items":[]}') { throw result }
+}
+
 {
     if (_.parseGlobal(() => undefined)(false)(['a', 'b']) !== undefined) { throw 'error' }
     if (_.parseGlobal(() => undefined)(false)(['b']) !== undefined) { throw 'error' }
@@ -91,15 +96,45 @@ const stringify = g => {
                 const path = `node_modules/${x}`
                 return at(path)(packages) !== undefined ? path : undefined
             },
-            file: todo
+            file: path => at(path)({
+                'index.js': 'return "index.js"',
+                'x/index.js': 'return "x/index.js"',
+                'x.js': 'return "x.js"',
+            })
         },
         '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 }
+    {
+        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 }
+    }
+    {
+        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('a/b')('../..'))
+        if (result !== '{"package":"","file":"index.js","source":"return \\"index.js\\""}') { throw result }
+    }
+    {
+        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('')('./x'))
+        if (result !== '{"package":"","file":"x.js","source":"return \\"x.js\\""}') { throw result }
+    }
+    {
+        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('')('./x.js'))
+        if (result !== '{"package":"","file":"x.js","source":"return \\"x.js\\""}') { throw result }
+    }
+    {
+        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('')('./x/'))
+        if (result !== '{"package":"","file":"x/index.js","source":"return \\"x/index.js\\""}') { throw result }
+    }
+    {
+        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('x/a')('../'))
+        if (result !== '{"package":"","file":"x/index.js","source":"return \\"x/index.js\\""}') { throw result }
+    }
+    {
+        const result = stringify(_.parseAndFind(p => at(p)(packages))('')('x/a')('..'))
+        if (result !== '{"package":"","file":"x/index.js","source":"return \\"x/index.js\\""}') { throw result }
+    }
 }
 
 {

package/package.json

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

package/types/list/test.js

@@ -58,6 +58,11 @@ const stringify = sequence => json.stringify(sort)(_.toArray(sequence))
     if (result !== '[]') { throw result }
 }
 
+{
+    const result = _.find(undefined)(x => x % 2 === 0)([1, 3, 5, 7])
+    if (result !== undefined) { throw result }
+}
+
 {
     const result = _.find(undefined)(x => x % 2 === 0)([1, 2, 3, 4])
     if (result !== 2) { throw result }
@@ -119,6 +124,11 @@ const stringify = sequence => json.stringify(sort)(_.toArray(sequence))
     if (result !== '') { throw result }
 }
 
+{
+    const result = _.join(' ')(['hello', 'world', '!'])
+    if (result !== 'hello world !') { throw result }
+}
+
 {
     const result = stringify(_.entries([]))
     if (result !== '[]') { throw result }