functionalscript 0.0.480 → 0.0.481

package/commonjs/build/module.f.cjs

@@ -90,10 +90,10 @@ const getOrBuild = compile => packageGet => moduleMapInterface =>  {
         }
         // check package
         const p = packageGet(moduleId.package)
-        if (p === undefined) { return notFound(moduleMap) }
+        if (p === null) { return notFound(moduleMap) }
         // check file
         const source = p.file(moduleId.path.join('/'))
-        return (source === undefined ? notFound : build(undefined)(moduleId)(source))(moduleMap)
+        return (source === null ? notFound : build(undefined)(moduleId)(source))(moduleMap)
     }
     return f
 }

package/commonjs/build/test.f.cjs

@@ -4,6 +4,7 @@ const module_ = require('../module/module.f.cjs')
 const function_ = require('../module/function/module.f.cjs')
 const result = require('../../types/result/module.f.cjs')
 const package_ = require('../package/module.f.cjs')
+const { at } = require('../../types/object/module.f.cjs')
 
 /** @type {{ readonly [k in string]?: result.Result<function_.Function_, unknown> }} */
 const compileMap = {
@@ -32,9 +33,9 @@ const compileMap = {
 /** @type {function_.Compile} */
 const compile = source => compileMap[source] ?? ['error', 'invalid source']
 
-/** @typedef {{ readonly [k in string]?: string }} StringMap */
+/** @typedef {{ readonly [k in string]: string }} StringMap */
 
-/** @type {{ readonly [k in string]?: { readonly dependencies: StringMap, files: StringMap }}} */
+/** @type {{ readonly [k in string]: { readonly dependencies: StringMap, readonly files: StringMap }}} */
 const packageMap = {
     '': {
         dependencies: {
@@ -56,11 +57,11 @@ const packageMap = {
 
 /** @type {package_.Get} */
 const packageGet = packageId => {
-    const p = packageMap[packageId]
-    return p === undefined ? undefined :
+    const p = at(packageId)(packageMap)
+    return p === null ? null :
         {
-            dependency: dependency => p.dependencies[dependency],
-            file: file => p.files[file]
+            dependency: dependency => at(dependency)(p.dependencies),
+            file: file => at(file)(p.files),
         }
 }
 

package/commonjs/package/module.f.cjs

@@ -22,14 +22,14 @@ const isPackageJson = j => {
 
 /**
  * @typedef {{
- *  readonly dependency: (localPackageId: string) => string | undefined
- *  readonly file: (localFileId: string) => string | undefined
+ *  readonly dependency: (localPackageId: string) => string | null
+ *  readonly file: (localFileId: string) => string | null
  * }} Package
  */
 
 /**
  * @note Current package has an empty string '' as a packageId.
- * @typedef {(packageId: string) => Package | undefined} Get
+ * @typedef {(packageId: string) => Package | null} Get
  */
 
 module.exports = {

package/commonjs/path/module.f.cjs

@@ -80,10 +80,10 @@ const variants = prior => () => {
     return { first: n, tail: variants(n) }
 }
 
-/** @type {(d: (local: string) => string|undefined) => (p: IdPath) => IdPath|undefined} */
+/** @type {(d: (local: string) => string|null) => (p: IdPath) => IdPath|undefined} */
 const mapDependency = d => ([external, internal]) => {
     const id = d(external)
-    return id === undefined ? undefined : [id, internal]
+    return id === null ? undefined : [id, internal]
 }
 
 /**
@@ -95,10 +95,10 @@ const mapDependency = d => ([external, internal]) => {
  */
 
 /**
- * @type {(d: (local: string) => string|undefined) =>
+ * @type {(d: (local: string) => string|null) =>
  *  (dir: boolean) =>
  *  (items: list.List<string>) =>
- *  Path|undefined}
+ *  Path|null}
  */
 const parseGlobal = dependencies =>
 {
@@ -106,23 +106,23 @@ const parseGlobal = dependencies =>
     return dir => items => {
         const v = variants([null, items])
         const r = firstNull(fMap(v))
-        if (r === null) { return undefined }
+        if (r === null) { return null }
         return { package: r[0], items: toArray(r[1]), dir }
     }
 }
 
 /**
  * @type {(packageId: string) =>
- *  (dependencies: (local: string) => string|undefined) =>
+ *  (dependencies: (local: string) => string|null) =>
  *  (local: string) =>
  *  (path: string) =>
- *  Path|undefined }
+ *  Path|null }
  */
 const parse = packageId => dependencies => {
     const pg = parseGlobal(dependencies)
     return local => path => {
         const parsed = parseLocal(local)(path)
-        if (parsed === null) { return undefined }
+        if (parsed === null) { return null }
         const {external, dir, items } = parsed
         if (!external) { return { package: packageId, items, dir } }
         return pg(dir)(items)
@@ -147,15 +147,15 @@ const parse = packageId => dependencies => {
  */
 const parseAndFind = packageGet => moduleId => path => {
     const currentPack = packageGet(moduleId.package)
-    if (currentPack === undefined) { return null }
+    if (currentPack === null) { return null }
     const p = parse(moduleId.package)(currentPack.dependency)(moduleId.path.join('/'))(path)
-    if (p === undefined) { return null }
+    if (p === null) { return null }
     const pack = packageGet(p.package)
-    if (pack === undefined) { return null }
+    if (pack === null) { return null }
     /** @type {(file: string) => FoundResult | undefined } */
     const tryFile = file => {
         const source = pack.file(file)
-        return source === undefined ? undefined : { id: { package: p.package, path: file.split('/') }, source }
+        return source === null ? undefined : { id: { package: p.package, path: file.split('/') }, source }
     }
     const file = p.items.join('/')
     const indexJs = join('/')(concat(p.items)(['index.js']))

package/commonjs/path/test.f.cjs

@@ -6,11 +6,8 @@ const object = require('../../types/object/module.f.cjs')
 const { at } = require('../../types/object/module.f.cjs')
 const package_ = require('../package/module.f.cjs')
 
-/** @type {<T>(o: object.Map<T>) => (s: string) => T|undefined} */
-const i = o => s => {
-    const r = at(s)(o)
-    return r === null ? undefined : r
-}
+/** @type {<T>(o: object.Map<T>) => (s: string) => T|null} */
+const i = o => s => at(s)(o)
 
 /** @type {(g: json.Unknown|undefined) => string} */
 const stringify = g => {
@@ -51,27 +48,27 @@ module.exports = {
         const result = _.parseLocal('')('./x/..')
         if (stringify(result) !== '{"external":false,"dir":true,"items":[]}') { throw result }
     },
-    8: () => {
-        if (_.parseGlobal(() => undefined)(false)(['a', 'b']) !== undefined) { throw 'error' }
-        if (_.parseGlobal(() => undefined)(false)(['b']) !== undefined) { throw 'error' }
-        if (_.parseGlobal(i({ b: 'x' }))(false)(['d']) !== undefined) { throw 'error' }
-        {
+    8: {
+        0: () => { if (_.parseGlobal(() => null)(false)(['a', 'b']) !== null) { throw 'error' } },
+        1: () => { if (_.parseGlobal(() => null)(false)(['b']) !== null) { throw 'error' } },
+        2: () => { if (_.parseGlobal(i({ b: 'x' }))(false)(['d']) !== null) { throw 'error' } },
+        3: () => {
             const result = stringify(_.parseGlobal(i({ b: 'x' }))(false)(['b']))
             if (result !== '{"package":"x","items":[],"dir":false}') { throw result }
-        }
-        if (_.parseGlobal(i({ 'b/r': 'x' }))(false)(['b']) !== undefined) { throw 'error' }
-        {
+        },
+        4: () => { if (_.parseGlobal(i({ 'b/r': 'x' }))(false)(['b']) !== null) { throw 'error' } },
+        5: () => {
             const result = stringify(_.parseGlobal(i({ 'b/r': 'x' }))(false)(['b', 'r']))
             if (result !== '{"package":"x","items":[],"dir":false}') { throw result }
-        }
-        {
+        },
+        6: () => {
             const result = stringify(_.parseGlobal(i({ 'b/r': 'x' }))(false)(['b', 'r', 'd', 't']))
             if (result !== '{"package":"x","items":["d","t"],"dir":false}') { throw result }
-        }
-        {
+        },
+        7: () => {
             const result = stringify(_.parseGlobal(i({ 'b/r': 'x' }))(true)(['b', 'r', 'd', 't']))
             if (result !== '{"package":"x","items":["d","t"],"dir":true}') { throw result }
-        }
+        },
     },
     9: () => {
         /** @type {object.Map<package_.Package>} */
@@ -90,7 +87,7 @@ module.exports = {
             '': {
                 dependency: x => {
                     const path = `node_modules/${x}`
-                    return at(path)(packages) !== undefined ? path : undefined
+                    return at(path)(packages) !== null ? path : null
                 },
                 file: i({
                     'index.js': 'return "index.js"',
@@ -140,7 +137,7 @@ module.exports = {
             '': {
                 dependency: x => {
                     const path = `node_modules/${x}`
-                    return at(path)(packages) !== null ? path : undefined
+                    return at(path)(packages) !== null ? path : null
                 },
                 file: todo
             },
@@ -167,7 +164,7 @@ module.exports = {
             '': {
                 dependency: x => {
                     const path = `node_modules/${x}`
-                    return at(path)(packages) !== null ? path : undefined
+                    return at(path)(packages) !== null ? path : null
                 },
                 file: todo
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.480",
+  "version": "0.0.481",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {