functionalscript 0.0.484 → 0.0.486

package/com/types/module.f.cjs

@@ -62,10 +62,7 @@ const filterParam = filter(isParam)
 const paramList = compose(entries)(filterParam)
 
 /** @type {<T>(v: T) => (f: (type: Type) => T) => (fa: FieldArray) => T} */
-const result = v => f => fa => {
-    const type = fa._
-    return type === undefined ? v : f(type)
-}
+const result = v => f => fa => '_' in fa ? f(fa._) : v
 
 module.exports = {
     /** @readonly */

package/commonjs/module.f.cjs

@@ -1,10 +1,10 @@
-/** @typedef {(packageName: string) => PackageMap|Package|undefined} PackageMap */
+/** @typedef {(packageName: string) => PackageMap|Package|null} PackageMap */
 
 /**
  * @typedef {readonly[
  *  string,
  *  PackageMap,
- *  (fileName: string) => string|undefined
+ *  (fileName: string) => string|null
  * ]} Package
  */
 

package/fsc/test.f.cjs

@@ -1,6 +1,5 @@
 const _ = require('./module.f.cjs')
 const { one } = require('../text/ascii/module.f.cjs')
-const { get } = require('../types/range_map/module.f.cjs')
 const { stringify } = require('../json/module.f.cjs')
 const s = stringify(i => i)
 

package/package.json

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

package/text/ascii/module.f.cjs

@@ -3,7 +3,7 @@ const _range = require('../../types/range/module.f.cjs')
 /** @type {(s: string) => (i: number) => number} */
 const at = s => i => {
     const r = s.codePointAt(i)
-    if (r === undefined) { throw s }
+    if (r === void 0) { throw s }
     return r
 }
 

package/text/utf16/module.f.cjs

@@ -82,7 +82,7 @@ const stringToList = s => {
     /** @type {(i: number) => list.Result<number>} */
     const at = i => {
         const first = s.charCodeAt(i)
-        return isNaN(first) ? undefined : { first, tail: () => at(i + 1) }
+        return isNaN(first) ? empty : { first, tail: () => at(i + 1) }
     }
     return at(0)
 }

package/types/array/module.f.cjs

@@ -84,35 +84,38 @@ const uncheckTail = a => a.slice(1)
 /** @type {<T>(_: readonly T[]) => readonly T[]} */
 const uncheckHead = a => a.slice(0, -1)
 
-/** @type {<T>(_: readonly T[]) => T|undefined} */
-const first = a => a[0]
+/** @type {<T>(a: T|undefined) => T|null} */
+const undefinedToNull = a => a === void 0 ? null : a
 
-/** @type {<T>(_: readonly T[]) => T|undefined} */
-const last = a => a[a.length - 1]
+/** @type {<T>(_: readonly T[]) => T|null} */
+const first = a => undefinedToNull(a[0])
 
-/** @type {<T>(_: readonly T[]) => readonly T[] | undefined} */
-const tail = a => a.length === 0 ? undefined : uncheckTail(a)
+/** @type {<T>(_: readonly T[]) => T|null} */
+const last = a => undefinedToNull(a[a.length - 1])
 
-/** @type {<T>(_: readonly T[]) => readonly[T, readonly T[]]|undefined} */
+/** @type {<T>(_: readonly T[]) => readonly T[] | null} */
+const tail = a => a.length === 0 ? null : uncheckTail(a)
+
+/** @type {<T>(_: readonly T[]) => readonly[T, readonly T[]]|null} */
 const splitFirst = a => {
     /** @typedef {typeof a[0]} T*/
     /** @type {(_: T) => readonly[T, readonly T[]]} */
     const split = first => [first, uncheckTail(a)]
-    return map(split)(a[0])
+    return undefinedToNull(map(split)(a[0]))
 }
 
-/** @type {<T>(_: readonly T[]) => readonly T[]|undefined} */
-const head = a => a.length === 0 ? undefined : uncheckHead(a)
+/** @type {<T>(_: readonly T[]) => readonly T[]|null} */
+const head = a => a.length === 0 ? null : uncheckHead(a)
 
-/** @type {<T>(_: readonly T[]) => readonly[readonly T[], T]|undefined} */
+/** @type {<T>(_: readonly T[]) => readonly[readonly T[], T]|null} */
 const splitLast = a => {
     const lastA = last(a)
-    if (lastA === undefined) { return undefined }
+    if (lastA === null) { return null }
     return [uncheckHead(a), lastA]
 }
 
-/** @type {(index: number) => <T>(a: readonly T[]) => readonly[T]|undefined} */
-const at = index => a => index < a.length ? [a[index]] : undefined
+/** @type {(index: number) => <T>(a: readonly T[]) => readonly[T]|null} */
+const at = index => a => index < a.length ? [a[index]] : null
 
 module.exports = {
     /** @readonly */

package/types/array/test.f.cjs

@@ -2,8 +2,7 @@ const _ = require('./module.f.cjs')
 const json = require('../../json/module.f.cjs')
 const { sort } = require('../object/module.f.cjs')
 
-/** @type {(a: readonly json.Unknown[]) => string} */
-const stringify = a => json.stringify(sort)(a)
+const stringify = json.stringify(sort)
 
 module.exports = {
     stringify: () => {
@@ -13,13 +12,13 @@ module.exports = {
     at: [
         () => {
             const result = _.at(2)([1, 20, 300])
-            if (result === undefined) { throw result }
+            if (result === null) { throw result }
             if (result[0] !== 300) { throw result }
         },
 
         () => {
             const result = _.at(3)([1, 20, 300])
-            if (result !== undefined) { throw result }
+            if (result !== null) { throw result }
         }
     ],
     first: [
@@ -29,7 +28,7 @@ module.exports = {
         },
         () => {
             const result = _.first([])
-            if (result !== undefined) { throw result }
+            if (result !== null) { throw result }
         }
     ],
     last: [
@@ -39,54 +38,51 @@ module.exports = {
         },
         () => {
             const result = _.last([])
-            if (result !== undefined) { throw result }
+            if (result !== null) { throw result }
         }
     ],
     head: [
         () => {
             const result = _.head([1, 20, 300])
-            if (result === undefined) { throw result }
+            if (result === null) { throw result }
             const str = stringify(result)
             if (str !== '[1,20]') { throw str }
         },
         () => {
             const result = _.head([])
-            if (result !== undefined) { throw result }
+            if (result !== null) { throw result }
         }
     ],
     tail: [
         () => {
             const result = _.tail([1, 20, 300])
-            if (result === undefined) { throw result }
             const str = stringify(result)
             if (str !== '[20,300]') { throw str }
         },
         () => {
             const result = _.tail([])
-            if (result !== undefined) { throw result }
+            if (result !== null) { throw result }
         }
     ],
 
     splitFirst: [
         () => {
             const result = _.splitFirst([1, 20, 300])
-            if (result === undefined) { throw result }
             const str = stringify(result)
             if (str !== '[1,[20,300]]') { throw str }
         },
         () => {
             const result = _.splitFirst([])
-            if (result !== undefined) { throw result }
+            if (result !== null) { throw result }
         },
         () => {
             const result = _.splitLast([1, 20, 300])
-            if (result === undefined) { throw result }
             const str = stringify(result)
             if (str !== '[[1,20],300]') { throw str }
         },
         () => {
             const result = _.splitLast([])
-            if (result !== undefined) { throw result }
+            if (result !== null) { throw result }
         }
     ]
 }

package/types/list/module.f.cjs

@@ -23,9 +23,11 @@ const {
  * } NotLazy
  */
 
+/** @typedef {undefined} Empty */
+
 /**
  * @template T
- * @typedef {undefined | NonEmpty<T>} Result
+ * @typedef {Empty | NonEmpty<T>} Result
  */
 
 /**
@@ -36,7 +38,6 @@ const {
 /**
  * @template T
  * @typedef {{
- *  readonly isConcat?: undefined
  *  readonly first: T
  *  readonly tail: List<T>
  * }} NonEmpty
@@ -45,7 +46,6 @@ const {
 /**
  * @template T
  * @typedef {{
- *  readonly isConcat: true
  *  readonly a: List<T>
  *  readonly b: List<T>
  * }} Concat
@@ -78,7 +78,7 @@ const next = list => {
 
         if (a instanceof Array) {
             a = fromArray(a)
-        } else if (a?.isConcat) {
+        } else if (a !== undefined && 'a' in a) {
             [a, b] = [a.a, concat(a.b)(b)]
             continue
         }