functionalscript 0.0.592 → 0.1.594

package/fsm/{module.f.cjs → module.f.mjs}

@@ -1,68 +1,72 @@
-const list = require('../types/list/module.f.cjs')
+import list, * as List from '../types/list/module.f.mjs'
 const { equal, isEmpty, fold, toArray, scan, foldScan, empty: emptyList } = list
-const byteSet = require('../types/byte_set/module.f.cjs')
+import byteSet, * as byteSetT from '../types/byte_set/module.f.mjs'
 const { toRangeMap, union: byteSetUnion, one, empty } = byteSet
-const sortedSet = require('../types/sorted_set/module.f.cjs')
+import sortedSet, * as SortedSet from '../types/sorted_set/module.f.mjs'
 const { intersect, union: sortedSetUnion } = sortedSet
-const rangeMap = require('../types/range_map/module.f.cjs')
+import rangeMap, * as RM from '../types/range_map/module.f.mjs'
 const { merge } = rangeMap
-const { unsafeCmp } = require('../types/function/compare/module.f.cjs')
-const operator = require("../types/function/operator/module.f.cjs")
+import cmp from '../types/function/compare/module.f.mjs'
+const { unsafeCmp } = cmp
+import operator, * as Operator from '../types/function/operator/module.f.mjs'
 const { strictEqual } = operator
-const { stringify } = require('../json/module.f.cjs')
-const { identity } = require('../types/function/module.f.cjs')
-const { stringToList } = require('../text/utf16/module.f.cjs')
+import j from '../json/module.f.mjs'
+const { stringify } = j
+import f from '../types/function/module.f.mjs'
+const { identity } = f
+import utf16 from '../text/utf16/module.f.mjs'
+const { stringToList } = utf16
 
-/** @typedef {readonly[string, byteSet.ByteSet, string]} Rule */
+/** @typedef {readonly[string, byteSetT.ByteSet, string]} Rule */
 
-/** @typedef {list.List<Rule>} Grammar */
+/** @typedef {List.List<Rule>} Grammar */
 
 /**
  * @typedef {{
- *  readonly[state in string]: rangeMap.RangeMapArray<string>
+ *  readonly[state in string]: RM.RangeMapArray<string>
  * }} Dfa
  */
 
 const stringifyIdentity = stringify(identity)
 
-/** @type {(s: string) => byteSet.ByteSet} */
+/** @type {(s: string) => byteSetT.ByteSet} */
 const toRange = s => {
     const [b, e] = toArray(stringToList(s))
     return byteSet.range([b, e])
 }
 
-/** @type {operator.Fold<number, byteSet.ByteSet>} */
+/** @type {Operator.Fold<number, byteSetT.ByteSet>} */
 const toUnionOp = i => bs => byteSetUnion(bs)(one(i))
 
-/** @type {(s: string) => byteSet.ByteSet} */
+/** @type {(s: string) => byteSetT.ByteSet} */
 const toUnion = s => {
     const codePoints = stringToList(s)
     return fold(toUnionOp)(empty)(codePoints)
 }
 
-/** @type {rangeMap.Operators<sortedSet.SortedSet<string>>} */
+/** @type {RM.Operators<SortedSet.SortedSet<string>>} */
 const mergeOp = { union: sortedSetUnion(unsafeCmp), equal: equal(strictEqual) }
 
-/** @type {(s: string) => (set: sortedSet.SortedSet<string>) => boolean} */
+/** @type {(s: string) => (set: SortedSet.SortedSet<string>) => boolean} */
 const hasState = s => set => !isEmpty(intersect(unsafeCmp)([s])(set))
 
-/** @type {(set: sortedSet.SortedSet<string>) => operator.Fold<Rule, rangeMap.RangeMap<sortedSet.SortedSet<string>>>} */
+/** @type {(set: SortedSet.SortedSet<string>) => Operator.Fold<Rule, RM.RangeMap<SortedSet.SortedSet<string>>>} */
 const foldOp = set => ([ruleIn, bs, ruleOut]) => rm => {
     if (hasState(ruleIn)(set)) { return merge(mergeOp)(rm)(toRangeMap(bs)(ruleOut)) }
     return rm
 }
 
-/** @type {operator.Scan<rangeMap.Entry<sortedSet.SortedSet<string>>, rangeMap.Entry<string>>} */
+/** @type {Operator.Scan<RM.Entry<SortedSet.SortedSet<string>>, RM.Entry<string>>} */
 const stringifyOp = ([sortedSet, max]) => [[stringifyIdentity(sortedSet), max], stringifyOp]
 
 const scanStringify = scan(stringifyOp)
 
-/** @type {operator.Scan<rangeMap.Entry<sortedSet.SortedSet<string>>, sortedSet.SortedSet<string>>} */
+/** @type {Operator.Scan<RM.Entry<SortedSet.SortedSet<string>>, SortedSet.SortedSet<string>>} */
 const fetchOp = ([item, _]) => [item, fetchOp]
 
 const scanFetch = scan(fetchOp)
 
-/** @type {(grammar: Grammar) => operator.Fold<sortedSet.SortedSet<string>, Dfa>} */
+/** @type {(grammar: Grammar) => Operator.Fold<SortedSet.SortedSet<string>, Dfa>} */
 const addEntry = grammar => set => dfa => {
     const s = stringifyIdentity(set)
     if (s in dfa) { return dfa }
@@ -87,13 +91,13 @@ const dfa = grammar => addEntry(grammar)(initialState)({})
 
 const get = rangeMap.get(emptyStateStringify)
 
-/** @type {(dfa: Dfa) => operator.Fold<number, string>} */
+/** @type {(dfa: Dfa) => Operator.Fold<number, string>} */
 const runOp = dfa => input => s => get(input)(dfa[s])
 
-/** @type {(dfa: Dfa) => (input: list.List<number>) => list.List<string>} */
+/** @type {(dfa: Dfa) => (input: List.List<number>) => List.List<string>} */
 const run = dfa => input => foldScan(runOp(dfa))(initialStateStringify)(input)
 
-module.exports = {
+export default {
     /** @readonly */
     dfa,
     /** @readonly */

package/fsm/{test.f.cjs → test.f.mjs}

@@ -1,10 +1,14 @@
-const _ = require('./module.f.cjs')
-const byteSet = require('../types/byte_set/module.f.cjs')
-const { sort, fromEntries } = require('../types/object/module.f.cjs')
-const json = require('../json/module.f.cjs')
-const { identity } = require('../types/function/module.f.cjs')
-const { toArray } = require('../types/list/module.f.cjs')
-const { stringToList } = require('../text/utf16/module.f.cjs')
+import _, * as T from './module.f.mjs'
+import byteSet from '../types/byte_set/module.f.mjs'
+import o from '../types/object/module.f.mjs'
+const { sort, fromEntries } = o
+import json from '../json/module.f.mjs'
+import f from '../types/function/module.f.mjs'
+const { identity } = f
+import list from '../types/list/module.f.mjs'
+const { toArray } = list
+import utf16 from '../text/utf16/module.f.mjs'
+const { stringToList } = utf16
 
 const stringifyIdentity = json.stringify(identity)
 
@@ -18,7 +22,7 @@ const buildDfa = () => {
     const idNext = byteSet.union(idBegin)(digit)
     const dot = _.toUnion('.')
 
-    /** @type {_.Grammar} */
+    /** @type {T.Grammar} */
     const grammar = [
         ['', digit, 'int'],
         ['int', digit, 'int'],
@@ -33,7 +37,7 @@ const buildDfa = () => {
     return _.dfa(grammar)
 }
 
-module.exports = {
+export default {
     dfa: () => {
         const dfa = buildDfa()
         const entries = Object.entries(dfa)

package/html/{module.f.cjs → module.f.mjs}

@@ -1,9 +1,12 @@
-const list = require('../types/list/module.f.cjs')
+import list, * as List from '../types/list/module.f.mjs'
 const { map, flatMap, flat, concat: listConcat } = list
-const { concat: stringConcat } = require('../types/string/module.f.cjs')
-const object = require('../types/object/module.f.cjs')
-const { compose } = require('../types/function/module.f.cjs')
-const { stringToList } = require('../text/utf16/module.f.cjs')
+import s from '../types/string/module.f.mjs'
+const { concat: stringConcat } = s
+import object, * as O from '../types/object/module.f.mjs'
+import f from '../types/function/module.f.mjs'
+const { compose } = f
+import utf16 from '../text/utf16/module.f.mjs'
+const { stringToList } = utf16
 const { fromCharCode } = String
 const { entries } = Object
 
@@ -46,7 +49,7 @@ const isVoid = tag => voidTagList.includes(tag)
  * }} Attributes
  */
 
-/** @typedef {list.List<Node>} Nodes */
+/** @typedef {List.List<Node>} Nodes */
 
 /** @typedef {Element | string} Node */
 
@@ -67,32 +70,32 @@ const escapeCharCode = code => {
 
 const escape = compose(stringToList)(map(escapeCharCode))
 
-/** @type {(n: Node) => list.List<string>} */
+/** @type {(n: Node) => List.List<string>} */
 const node = n => typeof n === 'string' ? escape(n) : element(n)
 
 const nodes = flatMap(node)
 
-/** @type {(a: object.Entry<string>) => list.List<string>} */
+/** @type {(a: O.Entry<string>) => List.List<string>} */
 const attribute = ([name, value]) => flat([[' ', name, '="'], escape(value), ['"']])
 
-/** @type {(a: Attributes) => list.List<string>} */
+/** @type {(a: Attributes) => List.List<string>} */
 const attributes = compose(entries)(flatMap(attribute))
 
 const open = (/** @type {Element2A} */[tag, a]) => flat([[`<`, tag], attributes(a), [`>`]])
 
 const close = (/** @type {string}*/tag) => ['</', tag, '>']
 
-/** @type {(_: Element3) => list.List<string>} */
+/** @type {(_: Element3) => List.List<string>} */
 const element3 = ([tag, a, ns]) =>
     flat([open([tag, a]), nodes(ns), close(tag)])
 
-/** @type {(_: Element2A) => list.List<string>} */
+/** @type {(_: Element2A) => List.List<string>} */
 const element2a = e => {
     const [tag] = e
     return flat([open(e), isVoid(tag) ? [] : close(tag)])
 }
 
-/** @type {(element: Element) => list.List<string>} */
+/** @type {(element: Element) => List.List<string>} */
 const element = e => {
     switch (e.length) {
         case 1: { return element2a([e[0], {}]) }
@@ -112,7 +115,7 @@ const html = compose(element)(listConcat(['<!DOCTYPE html>']))
 
 const htmlToString = compose(html)(stringConcat)
 
-module.exports = {
+export default {
     /** @readonly */
     element,
     /** @readonly */

package/html/{test.f.cjs → test.f.mjs}

@@ -1,6 +1,6 @@
-const _ = require('./module.f.cjs')
+import _, * as T from './module.f.mjs'
 
-module.exports = {
+export default {
     empty: () => {
         const r = _.htmlToString(['html', []])
         if (r !== '<!DOCTYPE html><html></html>') { throw r }
@@ -14,19 +14,19 @@ module.exports = {
         if (r !== '<!DOCTYPE html><area>') { throw r }
     },
     some: () => {
-        /** @type {_.Element} */
+        /** @type {T.Element} */
         const x = ['div', {}, ['<div>&amp;</div>', ['a', { href: 'hello"' }, []]]]
         const s = _.htmlToString(x)
         if (s !== '<!DOCTYPE html><div>&lt;div&gt;&amp;amp;&lt;/div&gt;<a href="hello&quot;"></a></div>') { throw s }
     },
     some2: () => {
-        /** @type {_.Element} */
+        /** @type {T.Element} */
         const x = ['div', ['<div>&amp;</div>', ['a', { href: 'hello"' }, []]]]
         const s = _.htmlToString(x)
         if (s !== '<!DOCTYPE html><div>&lt;div&gt;&amp;amp;&lt;/div&gt;<a href="hello&quot;"></a></div>') { throw s }
     },
     someVoid: () => {
-        /** @type {_.Element} */
+        /** @type {T.Element} */
         const x = ['div', [['br', {id: '5'}], '<div>&amp;</div>', ['a', { href: 'hello"' }, []]]]
         const s = _.htmlToString(x)
         if (s !== '<!DOCTYPE html><div><br id="5">&lt;div&gt;&amp;amp;&lt;/div&gt;<a href="hello&quot;"></a></div>') { throw s }

package/index.f.mjs

@@ -1,39 +1,47 @@
 // Generated file.
-import com from './com/module.f.cjs'
-import commonjs from './commonjs/module.f.cjs'
-import dev from './dev/module.f.cjs'
-import djs from './djs/module.f.cjs'
-import fsc from './fsc/module.f.cjs'
-import fsm from './fsm/module.f.cjs'
-import html from './html/module.f.cjs'
-import js$tokenizer from './js/tokenizer/module.f.cjs'
-import json from './json/module.f.cjs'
-import nodejs from './nodejs/module.f.cjs'
-import prime_field from './prime_field/module.f.cjs'
-import secp from './secp/module.f.cjs'
-import sha2 from './sha2/module.f.cjs'
-import text from './text/module.f.cjs'
-import types$array from './types/array/module.f.cjs'
-import types$bigfloat from './types/bigfloat/module.f.cjs'
-import types$bigint from './types/bigint/module.f.cjs'
-import types$btree from './types/btree/module.f.cjs'
-import types$byte_set from './types/byte_set/module.f.cjs'
-import types$function from './types/function/module.f.cjs'
-import types$list from './types/list/module.f.cjs'
-import types$map from './types/map/module.f.cjs'
-import types$nibble_set from './types/nibble_set/module.f.cjs'
-import types$nullable from './types/nullable/module.f.cjs'
-import types$number from './types/number/module.f.cjs'
-import types$object from './types/object/module.f.cjs'
-import types$range from './types/range/module.f.cjs'
-import types$range_map from './types/range_map/module.f.cjs'
-import types$result from './types/result/module.f.cjs'
-import types$sorted_list from './types/sorted_list/module.f.cjs'
-import types$sorted_set from './types/sorted_set/module.f.cjs'
-import types$string from './types/string/module.f.cjs'
-import types$string_set from './types/string_set/module.f.cjs'
+import com$cpp from './com/cpp/module.f.mjs'
+import com$cs from './com/cs/module.f.mjs'
+import com$rust from './com/rust/module.f.mjs'
+import com$types from './com/types/module.f.mjs'
+import commonjs from './commonjs/module.f.mjs'
+import dev from './dev/module.f.mjs'
+import djs from './djs/module.f.mjs'
+import fsc from './fsc/module.f.mjs'
+import fsm from './fsm/module.f.mjs'
+import html from './html/module.f.mjs'
+import js$tokenizer from './js/tokenizer/module.f.mjs'
+import json from './json/module.f.mjs'
+import nodejs$version from './nodejs/version/module.f.mjs'
+import prime_field from './prime_field/module.f.mjs'
+import secp from './secp/module.f.mjs'
+import sha2 from './sha2/module.f.mjs'
+import text from './text/module.f.mjs'
+import types$array from './types/array/module.f.mjs'
+import types$bigfloat from './types/bigfloat/module.f.mjs'
+import types$bigint from './types/bigint/module.f.mjs'
+import types$btree from './types/btree/module.f.mjs'
+import types$byte_set from './types/byte_set/module.f.mjs'
+import types$function from './types/function/module.f.mjs'
+import types$list from './types/list/module.f.mjs'
+import types$map from './types/map/module.f.mjs'
+import types$nibble_set from './types/nibble_set/module.f.mjs'
+import types$nullable from './types/nullable/module.f.mjs'
+import types$number from './types/number/module.f.mjs'
+import types$object from './types/object/module.f.mjs'
+import types$range from './types/range/module.f.mjs'
+import types$range_map from './types/range_map/module.f.mjs'
+import types$result from './types/result/module.f.mjs'
+import types$sorted_list from './types/sorted_list/module.f.mjs'
+import types$sorted_set from './types/sorted_set/module.f.mjs'
+import types$string from './types/string/module.f.mjs'
+import types$string_set from './types/string_set/module.f.mjs'
 export default {
-  com: com,
+  com: {
+    cpp: com$cpp,
+    cs: com$cs,
+    rust: com$rust,
+    types: com$types,
+  },
   commonjs: commonjs,
   dev: dev,
   djs: djs,
@@ -44,7 +52,9 @@ export default {
     tokenizer: js$tokenizer,
   },
   json: json,
-  nodejs: nodejs,
+  nodejs: {
+    version: nodejs$version,
+  },
   prime_field: prime_field,
   secp: secp,
   sha2: sha2,

package/issues/README.md

@@ -3,3 +3,18 @@
 1. [X] [test-debug](./test-debug.md).
 2. [ ] [esm](./esm.md)
 3. [ ] [publish](publish.md)
+4. [ ] fix index generation by including sub modules `{ ...m, add: mAdd, remove: mRemove}`.
+5. [ ] Conventions:
+    ```js
+    import list, * as List from 'list.mjs'
+    // list is for objects.
+    // List is for types and should be ignored by FJS or errored if used in code.
+    ```
+6. [ ] PoC: Replace `while` with recursive generators
+7. Two sets of property filters:
+   - usage `.b`:
+     - `constructor`
+     - ...
+   - call `.b()`:
+     - `push`
+     - ...