functionalscript 0.0.485 → 0.0.487

package/com/rust/module.f.cjs

@@ -51,22 +51,26 @@ const this_ = ['this: &Object']
 const rustType = n => `pub type ${n} = nanocom::${n}<Interface>;`
 
 /**
- * @typedef {{
- *  readonly where?: readonly string[]
- *  readonly content: text.Block
- * }} WhereContent
+ * @template T
+ * @typedef {T|{}} OptionalProperty
+ */
+
+/** @typedef {{readonly where: readonly string[]}} Where */
+
+/**
+ * @typedef {OptionalProperty<Where> & {readonly content: text.Block}} WhereContent
  */
 
 /** @type {(h: string) => (wh: WhereContent) => text.Block} */
-const whereContent = h => ({ where, content }) => {
-    const w = isEmpty(where) ? [`${h} {`] : [
+const whereContent = h => wh => {
+    const w = 'where' in wh ? [
         h,
         `where`,
-        mapComma(where),
+        mapComma(wh.where),
         '{'
-    ]
+    ]: [`${h} {`]
     const x = [
-        content,
+        wh.content,
         '}',
     ]
     return flat([w, x])

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.485",
+  "version": "0.0.487",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {

package/types/array/module.f.cjs

@@ -85,7 +85,7 @@ const uncheckTail = a => a.slice(1)
 const uncheckHead = a => a.slice(0, -1)
 
 /** @type {<T>(a: T|undefined) => T|null} */
-const undefinedToNull = a => a === undefined ? null : a
+const undefinedToNull = a => a === void 0 ? null : a
 
 /** @type {<T>(_: readonly T[]) => T|null} */
 const first = a => undefinedToNull(a[0])

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
         }