functionalscript 0.0.481 → 0.0.482

package/commonjs/build/module.f.cjs

@@ -3,13 +3,13 @@ const module_ = require('../module/module.f.cjs')
 const { idToString, dir } = module_
 const function_ = require('../module/function/module.f.cjs')
 const map = require('../../types/map/module.f.cjs')
-const { setReplace } = map
+const { empty: mapEmpty, setReplace } = map
 const object = require('../../types/object/module.f.cjs')
 const { fromMap } = object
 const path = require('../path/module.f.cjs')
 const { parseAndFind } = path
 const stringSet = require('../../types/string_set/module.f.cjs')
-const { set: setSet, contains: setContains } = stringSet
+const { set: setSet, contains: setContains, empty: stringSetEmpty } = stringSet
 
 /**
  * @template M
@@ -73,7 +73,7 @@ const getOrBuild = compile => packageGet => moduleMapInterface =>  {
             const [kind, result] = compile(source)
             if (kind === 'error') { return error(['compilation error', result])(moduleMap) }
             // build
-            const [[state, value], [requireMap, moduleMap2]] = result(require_)([undefined, moduleMap])
+            const [[state, value], [requireMap, moduleMap2]] = result(require_)([mapEmpty, moduleMap])
             const x = state === 'error' ?
                 error(['runtime error', value]) :
                 set(['ok', { exports: value, requireMap: fromMap(requireMap) }])
@@ -93,7 +93,7 @@ const getOrBuild = compile => packageGet => moduleMapInterface =>  {
         if (p === null) { return notFound(moduleMap) }
         // check file
         const source = p.file(moduleId.path.join('/'))
-        return (source === null ? notFound : build(undefined)(moduleId)(source))(moduleMap)
+        return (source === null ? notFound : build(stringSetEmpty)(moduleId)(source))(moduleMap)
     }
     return f
 }

package/commonjs/build/test.f.cjs

@@ -71,7 +71,7 @@ const getOrBuild = _.getOrBuild
     (/** @type {module_.MapInterface<map.Map<module_.State>>} */(map))
 
 module.exports = () => {
-    let [r, m] = getOrBuild({ package: '', path: ['index.js'] })(undefined)
+    let [r, m] = getOrBuild({ package: '', path: ['index.js'] })(map.empty)
     {
         const x = JSON.stringify(r)
         if (x !==

package/commonjs/package/dependencies/module.f.cjs

@@ -8,14 +8,14 @@ const { entries } = Object
 
 /** @typedef {{readonly[k in string]: string}} DependencyMapJson */
 
-/** @typedef {DependencyMapJson|undefined} DependenciesJson */
+/** @typedef {DependencyMapJson|null} DependenciesJson */
 
 /** @type {(entry: json.Entry) => boolean} */
 const isDependencyJson = ([, v]) => typeof v === 'string'
 
-/** @type {(j: json.Unknown|undefined) => j is DependenciesJson} */
+/** @type {(j: json.Unknown) => j is DependenciesJson} */
 const isDependenciesJson = j => {
-    if (j === undefined) { return true }
+    if (j === null) { return true }
     if (!isObject(j)) { return false }
     return every(map(isDependencyJson)(entries(j)))
 }

package/commonjs/package/dependencies/test.f.cjs

@@ -1,8 +1,7 @@
 const _ = require('./module.f.cjs')
 
 module.exports = () => {
-    if (!_.isDependenciesJson(undefined)) { throw 'error' }
-    if (_.isDependenciesJson(null)) { throw 'error' }
+    if (!_.isDependenciesJson(null)) { throw 'error' }
     if (!_.isDependenciesJson({})) { throw 'error' }
     if (!_.isDependenciesJson({'a':'b'})) { throw 'error' }
     if (_.isDependenciesJson({ 'a': 12 })) { throw 'error' }

package/commonjs/package/module.f.cjs

@@ -2,6 +2,7 @@ const json = require('../../json/module.f.cjs')
 const { isObject } = json
 const dependencies = require('./dependencies/module.f.cjs')
 const { isDependenciesJson } = dependencies
+const { at } = require('../../types/object/module.f.cjs')
 
 /**
  * @typedef {{
@@ -16,7 +17,7 @@ const isPackageJson = j => {
     if (!isObject(j)) { return false }
     if (typeof j.name !== 'string') { return false }
     if (typeof j.version !== 'string') { return false }
-    if (!isDependenciesJson(j.dependencies)) { return false }
+    if (!isDependenciesJson(at('dependencies')(j))) { return false }
     return true
 }
 

package/commonjs/path/test.f.cjs

@@ -9,11 +9,8 @@ const package_ = require('../package/module.f.cjs')
 /** @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 => {
-    if (g === undefined) { throw g }
-    return json.stringify(identity)(g)
-}
+/** @type {(g: json.Unknown) => string} */
+const stringify = json.stringify(identity)
 
 module.exports = {
     0: () => {

package/dev/module.mjs

@@ -121,7 +121,7 @@ export const loadModuleMap = async () => {
             const pathStr = path.join('/')
             {
                 const module = d[pathStr]
-                if (module !== undefined) {
+                if (module !== void 0) {
                     return [pathStr, module]
                 }
             }

package/doc/LANGUAGE.md

@@ -226,7 +226,7 @@ const iterable = list => ({
         let i = list
         while (true) {
             const r = next(i)
-            if (r === undefined) { return }
+            if (r === null) { return }
             yield r.first
             i = r.tail
         }

package/fsm/module.f.cjs

@@ -1,5 +1,5 @@
 const list = require('../types/list/module.f.cjs')
-const { equal, isEmpty, fold, toArray, scan, foldScan } = list
+const { equal, isEmpty, fold, toArray, scan, foldScan, empty: emptyList } = list
 const byteSet = require('../types/byte_set/module.f.cjs')
 const { toRangeMap, union: byteSetUnion, one, empty } = byteSet
 const sortedSet = require('../types/sorted_set/module.f.cjs')
@@ -66,7 +66,7 @@ const scanFetch = scan(fetchOp)
 const addEntry = grammar => set => dfa => {
     const s = stringifyIdentity(set)
     if (s in dfa) { return dfa }
-    const setMap = fold(foldOp(set))(undefined)(grammar)
+    const setMap = fold(foldOp(set))(emptyList)(grammar)
     const stringMap = toArray(scanStringify(setMap))
     const newDfa = { ...dfa, [s]: stringMap }
     const newStates = scanFetch(setMap)

package/package.json

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

package/types/btree/module.f.cjs

@@ -30,6 +30,8 @@ const nodeValues = node => () => {
 const values = map(nodeValues)
 
 module.exports = {
+    /** @readonly */
+    empty: undefined,
     /** @readonly */
     find: require('./find/module.f.cjs'),
     /** @readonly */

package/types/string_set/module.f.cjs

@@ -6,6 +6,7 @@ const {
     set: { set: btreeSet },
     /** @type {(s: StringSet) => list.List<string>} */
     values,
+    empty,
 } = btree
 const { cmp } = require("../string/module.f.cjs")
 const list = require('../list/module.f.cjs')
@@ -29,6 +30,8 @@ const fromValues = fold(set)(undefined)
 const remove = compose(cmp)(btreeRemove)
 
 module.exports = {
+    /** @readonly */
+    empty,
     /** @readonly */
     contains,
     /** @readonly */