functionalscript 0.0.539 → 0.0.541

package/{fjson → djs}/README.md

@@ -1,30 +1,30 @@
-# FJSON, FJS Object Notation
-
-- additional types: bigint
-
-## Rules
-
-- can serialize/deserialize without reading source code
-  - no function serialization/deserialization
-
-## Next steps
-
-- [ ] rename `fjson` to `djs` (data javascript), File extensions: `.d.cjs`, `.d.mjs`, `.d.js`.
-- [x] use JS tokenizer 
-- [x] identifiers `{a:5}`
-- [x] big int
-- [ ] `module.exports = ...`
-- [ ] constants `const a = [3];module.exports = { a: a, b: a }`. Serialization `const _0=[3];module.exports={a:_0,b:_0}`
-- [ ] import `const a = require('c.d.cjs');module.exports = { a: a, b: a}`
-- [ ] ES6 import `import a from 'c.d.mjs';export default { a: a, b: a}`
-- [ ] short form `const a = 5;module.exports = { a }`
-
-Optional, for fun, syntax sugar:
-
-- [ ] comments. Ignore them. Not an error.
-- [ ] double/single quote strings
-
-## Decidable Language
-  
-- [ ] using operator and functions `const a = 2+2+Math.abs(5); module.exports = { a: a };`
-- [ ] decidable functions `const f = a => b => a + b; module.exports = f(1)(2)`?
+# DJS, Data JS or DataScript
+
+- additional types: bigint
+
+## Rules
+
+- can serialize/deserialize without reading source code
+  - no function serialization/deserialization
+
+## Next steps
+
+- [ ] rename `fjson` to `djs` (data javascript), File extensions: `.d.cjs`, `.d.mjs`, `.d.js`.
+- [x] use JS tokenizer 
+- [x] identifiers `{a:5}`
+- [x] big int
+- [ ] `module.exports = ...`
+- [ ] constants `const a = [3];module.exports = { a: a, b: a }`. Serialization `const _0=[3];module.exports={a:_0,b:_0}`
+- [ ] import `const a = require('c.d.cjs');module.exports = { a: a, b: a}`
+- [ ] ES6 import `import a from 'c.d.mjs';export default { a: a, b: a}`
+- [ ] short form `const a = 5;module.exports = { a }`
+
+Optional, for fun, syntax sugar:
+
+- [ ] comments. Ignore them. Not an error.
+- [ ] double/single quote strings
+
+## Decidable Language
+  
+- [ ] using operator and functions `const a = 2+2+Math.abs(5); module.exports = { a: a };`
+- [ ] decidable functions `const f = a => b => a + b; module.exports = f(1)(2)`?

package/{fjson → djs}/parser/module.f.cjs

@@ -5,13 +5,13 @@ const operator = require('../../types/function/operator/module.f.cjs')
 const tokenizer = require('../tokenizer/module.f.cjs')
 const map = require('../../types/map/module.f.cjs')
 const { setReplace } = map
-const fjson = require('../module.f.cjs')
+const djs = require('../module.f.cjs')
 const { fromMap } = require('../../types/object/module.f.cjs')
 
 /**
  * @typedef {{
 * readonly kind: 'object'
-* readonly values: map.Map<fjson.Unknown>
+* readonly values: map.Map<djs.Unknown>
 * readonly key: string
 * }} JsonObject
 * */
@@ -19,7 +19,7 @@ const { fromMap } = require('../../types/object/module.f.cjs')
 /**
  * @typedef {{
 * readonly kind: 'array'
-* readonly values: list.List<fjson.Unknown>
+* readonly values: list.List<djs.Unknown>
 * }} JsonArray
 * */
 
@@ -50,7 +50,7 @@ const { fromMap } = require('../../types/object/module.f.cjs')
 /**
  * @typedef {{
 *  readonly status: 'result'
-*  readonly value: fjson.Unknown
+*  readonly value: djs.Unknown
 * }} StateResult
 */
 
@@ -67,10 +67,10 @@ const { fromMap } = require('../../types/object/module.f.cjs')
 * StateParse |
 * StateResult |
 * StateError
-* } FjsonState
+* } DjsState
 */
 
-/** @type {(token: tokenizer.FjsonToken) => (state: StateModule) => FjsonState}} */
+/** @type {(token: tokenizer.DjsToken) => (state: StateModule) => DjsState}} */
 const parseModuleOp = token => state => {
     switch(state.stage)
     {
@@ -101,32 +101,32 @@ const parseModuleOp = token => state => {
 /** @type {(obj: JsonObject) => (key: string) => JsonObject} */
 const addKeyToObject = obj => key => ({ kind: 'object', values: obj.values, key: key })
 
-/** @type {(obj: JsonObject) => (value: fjson.Unknown) => JsonObject} */
+/** @type {(obj: JsonObject) => (value: djs.Unknown) => JsonObject} */
 const addValueToObject = obj => value => ({ kind: 'object', values: setReplace(obj.key)(value)(obj.values), key: '' })
 
-/** @type {(array: JsonArray) => (value: fjson.Unknown) => JsonArray} */
+/** @type {(array: JsonArray) => (value: djs.Unknown) => JsonArray} */
 const addToArray = array => value => ({ kind: 'array', values: list.concat(array.values)([value]) })
 
-/** @type {(state: StateParse) => (key: string) => FjsonState} */
+/** @type {(state: StateParse) => (key: string) => DjsState} */
 const pushKey = state => value => {
     if (state.top?.kind === 'object') { return { status: '{k', top: addKeyToObject(state.top)(value), stack: state.stack } }
     return { status: 'error', message: 'error' }
 }
 
-/** @type {(state: StateParse) => (value: fjson.Unknown) => FjsonState} */
+/** @type {(state: StateParse) => (value: djs.Unknown) => DjsState} */
 const pushValue = state => value => {
     if (state.top === null) { return { status: 'result', value: value } }
     if (state.top.kind === 'array') { return { status: '[v', top: addToArray(state.top)(value), stack: state.stack } }
     return { status: '{v', top: addValueToObject(state.top)(value), stack: state.stack }
 }
 
-/** @type {(state: StateParse) => FjsonState} */
+/** @type {(state: StateParse) => DjsState} */
 const startArray = state => {
     const newStack = state.top === null ? null : { first: state.top, tail: state.stack }
     return { status: '[', top: { kind: 'array', values: null }, stack: newStack }
 }
 
-/** @type {(state: StateParse) => FjsonState} */
+/** @type {(state: StateParse) => DjsState} */
 const endArray = state => {
     const array = state.top !== null ? toArray(state.top.values) : null
     /** @type {StateParse} */
@@ -134,13 +134,13 @@ const endArray = state => {
     return pushValue(newState)(array)
 }
 
-/** @type {(state: StateParse) => FjsonState} */
+/** @type {(state: StateParse) => DjsState} */
 const startObject = state => {
     const newStack = state.top === null ? null : { first: state.top, tail: state.stack }
     return { status: '{', top: { kind: 'object', values: null, key: '' }, stack: newStack }
 }
 
-/** @type {(state: StateParse) => FjsonState} */
+/** @type {(state: StateParse) => DjsState} */
 const endObject = state => {
     const obj = state.top?.kind === 'object' ? fromMap(state.top.values) : null
     /** @type {StateParse} */
@@ -148,7 +148,7 @@ const endObject = state => {
     return pushValue(newState)(obj)
 }
 
-/** @type {(token: tokenizer.FjsonToken) => fjson.Unknown} */
+/** @type {(token: tokenizer.DjsToken) => djs.Unknown} */
 const tokenToValue = token => {
     switch (token.kind) {
         case 'null': return null
@@ -161,7 +161,7 @@ const tokenToValue = token => {
     }
 }
 
-/** @type {(token: tokenizer.FjsonToken) => boolean} */
+/** @type {(token: tokenizer.DjsToken) => boolean} */
 const isValueToken = token => {
     switch (token.kind) {
         case 'null':
@@ -174,7 +174,7 @@ const isValueToken = token => {
     }
 }
 
-/** @type {(token: tokenizer.FjsonToken) => (state: StateParse) => FjsonState}} */
+/** @type {(token: tokenizer.DjsToken) => (state: StateParse) => DjsState}} */
 const parseValueOp = token => state => {
     if (isValueToken(token)) { return pushValue(state)(tokenToValue(token)) }
     if (token.kind === '[') { return startArray(state) }
@@ -183,7 +183,7 @@ const parseValueOp = token => state => {
     return { status: 'error', message: 'unexpected token' }
 }
 
-/** @type {(token: tokenizer.FjsonToken) => (state: StateParse) => FjsonState}} */
+/** @type {(token: tokenizer.DjsToken) => (state: StateParse) => DjsState}} */
 const parseArrayStartOp = token => state => {
     if (isValueToken(token)) { return pushValue(state)(tokenToValue(token)) }
     if (token.kind === '[') { return startArray(state) }
@@ -193,7 +193,7 @@ const parseArrayStartOp = token => state => {
     return { status: 'error', message: 'unexpected token' }
 }
 
-/** @type {(token: tokenizer.FjsonToken) => (state: StateParse) => FjsonState}} */
+/** @type {(token: tokenizer.DjsToken) => (state: StateParse) => DjsState}} */
 const parseArrayValueOp = token => state => {
     if (token.kind === ']') { return endArray(state) }
     if (token.kind === ',') { return { status: '[,', top: state.top, stack: state.stack } }
@@ -201,7 +201,7 @@ const parseArrayValueOp = token => state => {
     return { status: 'error', message: 'unexpected token' }
 }
 
-/** @type {(token: tokenizer.FjsonToken) => (state: StateParse) => FjsonState}} */
+/** @type {(token: tokenizer.DjsToken) => (state: StateParse) => DjsState}} */
 const parseObjectStartOp = token => state => {
     if (token.kind === 'string') { return pushKey(state)(token.value) }
     if (token.kind === '}') { return endObject(state) }
@@ -209,14 +209,14 @@ const parseObjectStartOp = token => state => {
     return { status: 'error', message: 'unexpected token' }
 }
 
-/** @type {(token: tokenizer.FjsonToken) => (state: StateParse) => FjsonState}} */
+/** @type {(token: tokenizer.DjsToken) => (state: StateParse) => DjsState}} */
 const parseObjectKeyOp = token => state => {
     if (token.kind === ':') { return { status: '{:', top: state.top, stack: state.stack } }
     if (token.kind === 'ws') { return state }
     return { status: 'error', message: 'unexpected token' }
 }
 
-/** @type {(token: tokenizer.FjsonToken) => (state: StateParse) => FjsonState}} */
+/** @type {(token: tokenizer.DjsToken) => (state: StateParse) => DjsState}} */
 const parseObjectColonOp = token => state => {
     if (isValueToken(token)) { return pushValue(state)(tokenToValue(token)) }
     if (token.kind === '[') { return startArray(state) }
@@ -225,7 +225,7 @@ const parseObjectColonOp = token => state => {
     return { status: 'error', message: 'unexpected token' }
 }
 
-/** @type {(token: tokenizer.FjsonToken) => (state: StateParse) => FjsonState}} */
+/** @type {(token: tokenizer.DjsToken) => (state: StateParse) => DjsState}} */
 const parseObjectNextOp = token => state => {
     if (token.kind === '}') { return endObject(state) }
     if (token.kind === ',') { return { status: '{,', top: state.top, stack: state.stack } }
@@ -233,14 +233,14 @@ const parseObjectNextOp = token => state => {
     return { status: 'error', message: 'unexpected token' }
 }
 
-/** @type {(token: tokenizer.FjsonToken) => (state: StateParse) => FjsonState}} */
+/** @type {(token: tokenizer.DjsToken) => (state: StateParse) => DjsState}} */
 const parseObjectCommaOp = token => state => {
     if (token.kind === 'string') { return pushKey(state)(token.value) }
     if (token.kind === 'ws') { return state }
     return { status: 'error', message: 'unexpected token' }
 }
 
-/** @type {operator.Fold<tokenizer.FjsonToken, FjsonState>} */
+/** @type {operator.Fold<tokenizer.DjsToken, DjsState>} */
 const foldOp = token => state => {
     switch (state.status) {
         case 'module': return parseModuleOp(token)(state)
@@ -258,7 +258,7 @@ const foldOp = token => state => {
     }
 }
 
-/** @type {(tokenList: list.List<tokenizer.FjsonToken>) => result.Result<fjson.Unknown, string>} */
+/** @type {(tokenList: list.List<tokenizer.DjsToken>) => result.Result<djs.Unknown, string>} */
 const parse = tokenList => {
     const state = fold(foldOp)({ status: 'module', stage: 'module' })(tokenList)
     switch (state.status) {

package/{fjson → djs}/parser/test.f.cjs

@@ -1,14 +1,14 @@
 const parser = require('./module.f.cjs')
 const tokenizer = require('../tokenizer/module.f.cjs')
 const { toArray } = require('../../types/list/module.f.cjs')
-const fjson = require('../module.f.cjs')
+const djs = require('../module.f.cjs')
 const { sort } = require('../../types/object/module.f.cjs')
 const encoding = require('../../text/utf16/module.f.cjs');
 
-/** @type {(s: string) => readonly tokenizer.FjsonToken[]} */
+/** @type {(s: string) => readonly tokenizer.DjsToken[]} */
 const tokenizeString = s => toArray(tokenizer.tokenize(encoding.stringToList(s)))
 
-const stringify = fjson.stringify(sort)
+const stringify = djs.stringify(sort)
 
 module.exports = {
     valid: [

package/{fjson → djs}/test.f.cjs

@@ -1,28 +1,28 @@
 const json = require('../json/module.f.cjs')
 const { sort } = require('../types/object/module.f.cjs')
 const { identity } = require('../types/function/module.f.cjs')
-const fjson= require('./module.f.cjs')
+const djs= require('./module.f.cjs')
 
 module.exports = {
     stringify: [
         {
             sort: () => {
                 const r = json.setProperty("Hello")(['a'])({})
-                const x = fjson.stringify(sort)(r)
+                const x = djs.stringify(sort)(r)
                 if (x !== '{"a":"Hello"}') { throw x }
             },
             identity: () => {
-                const x = fjson.stringify(identity)(json.setProperty("Hello")(['a'])({}))
+                const x = djs.stringify(identity)(json.setProperty("Hello")(['a'])({}))
                 if (x !== '{"a":"Hello"}') { throw x }
             },
         },
         {
             sort: () => {
-                const x = fjson.stringify(sort)(json.setProperty("Hello")(['a'])({ c: [], b: 12 }))
+                const x = djs.stringify(sort)(json.setProperty("Hello")(['a'])({ c: [], b: 12 }))
                 if (x !== '{"a":"Hello","b":12,"c":[]}') { throw x }
             },
             identity: () => {
-                const x = fjson.stringify(identity)(json.setProperty("Hello")(['a'])({ c: [], b: 12 }))
+                const x = djs.stringify(identity)(json.setProperty("Hello")(['a'])({ c: [], b: 12 }))
                 if (x !== '{"c":[],"b":12,"a":"Hello"}') { throw x }
             },
         },
@@ -30,34 +30,34 @@ module.exports = {
             sort: () => {
                 const _0 = { a: { y: [24] }, c: [], b: 12 }
                 const _1 = json.setProperty("Hello")(['a', 'x'])(_0)
-                const _2 = fjson.stringify(sort)(_1)
+                const _2 = djs.stringify(sort)(_1)
                 if (_2 !== '{"a":{"x":"Hello","y":[24]},"b":12,"c":[]}') { throw _2 }
             },
             identity: () => {
                 const _0 = { a: { y: [24] }, c: [], b: 12 }
                 const _1 = json.setProperty("Hello")(['a', 'x'])(_0)
-                const _2 = fjson.stringify(identity)(_1)
+                const _2 = djs.stringify(identity)(_1)
                 if (_2 !== '{"a":{"y":[24],"x":"Hello"},"c":[],"b":12}') { throw _2 }
             }
         },
         {
             stringify: () => {
                 const bi = 1234567890n
-                const result = fjson.stringify(sort)(bi)
+                const result = djs.stringify(sort)(bi)
                 if (result !== '1234567890n') { throw result }
             }
         },
         {
             stringify: () => {
                 const arr = [0n, 1, 2n]
-                const result = fjson.stringify(sort)(arr)
+                const result = djs.stringify(sort)(arr)
                 if (result !== '[0n,1,2n]') { throw result }
             }
         },
         {
             stringify: () => {
                 const obj = {"a": 0n, "b": 1, "c": 2n}
-                const result = fjson.stringify(sort)(obj)
+                const result = djs.stringify(sort)(obj)
                 if (result !== '{"a":0n,"b":1,"c":2n}') { throw result }
             }
         }

package/{fjson → djs}/tokenizer/module.f.cjs

@@ -14,7 +14,7 @@ const jsTokenizer = require('../../js/tokenizer/module.f.cjs')
 * jsTokenizer.IdToken |
 * jsTokenizer.BigIntToken |
 * jsTokenizer.WhitespaceToken
-* } FjsonToken
+* } DjsToken
 */
 
 /**
@@ -29,7 +29,7 @@ const jsTokenizer = require('../../js/tokenizer/module.f.cjs')
 * } ScanInput
 */
 
-/** @type {(input: jsTokenizer.JsToken) => list.List<FjsonToken>} */
+/** @type {(input: jsTokenizer.JsToken) => list.List<DjsToken>} */
 const mapToken = input =>
 {
     switch(input.kind)
@@ -55,7 +55,7 @@ const mapToken = input =>
     }
 }
 
-/** @type {(input: ScanInput) => readonly [list.List<FjsonToken>, ScanState]} */
+/** @type {(input: ScanInput) => readonly [list.List<DjsToken>, ScanState]} */
 const parseDefaultState = input =>
 {
     if (input === null) return [empty, { kind: 'def'}]
@@ -66,7 +66,7 @@ const parseDefaultState = input =>
     }
 }
 
-/** @type {(input: ScanInput) => readonly [list.List<FjsonToken>, ScanState]} */
+/** @type {(input: ScanInput) => readonly [list.List<DjsToken>, ScanState]} */
 const parseMinusState = input =>
 {
     if (input === null) return [[{ kind: 'error', message: 'invalid token' }], { kind: 'def'}]
@@ -79,7 +79,7 @@ const parseMinusState = input =>
     }
 }
 
-/** @type {operator.StateScan<ScanInput, ScanState, list.List<FjsonToken>>} */
+/** @type {operator.StateScan<ScanInput, ScanState, list.List<DjsToken>>} */
 const scanToken = state => input => {
     switch(state.kind)
     {
@@ -88,7 +88,7 @@ const scanToken = state => input => {
     }
 }
 
-/** @type {(input: list.List<number>) => list.List<FjsonToken>} */
+/** @type {(input: list.List<number>) => list.List<DjsToken>} */
 const tokenize = input =>
 {
     /** @type {list.List<ScanInput>} */

package/{fjson → djs}/tokenizer/test.f.cjs

@@ -1,16 +1,16 @@
 const tokenizer = require('./module.f.cjs')
 const { toArray, countdown } = require('../../types/list/module.f.cjs')
-const fjson = require('../../fjson/module.f.cjs')
+const djs = require('../../djs/module.f.cjs')
 const { sort } = require('../../types/object/module.f.cjs')
 const encoding = require('../../text/utf16/module.f.cjs');
 
-/** @type {(s: string) => readonly tokenizer.FjsonToken[]} */
+/** @type {(s: string) => readonly tokenizer.DjsToken[]} */
 const tokenizeString = s => toArray(tokenizer.tokenize(encoding.stringToList(s)))
 
-const stringify = fjson.stringify(sort)
+const stringify = djs.stringify(sort)
 
 module.exports = {
-    fjson: [
+    djs: [
         () => {
             const result = tokenizeString('')
             if (result.length !== 0) { throw result }

package/js/tokenizer/test.f.cjs

@@ -1,16 +1,16 @@
 const tokenizer = require('./module.f.cjs')
 const { toArray, countdown } = require('../../types/list/module.f.cjs')
-const fjson = require('../../fjson/module.f.cjs')
+const djs = require('../../djs/module.f.cjs')
 const { sort } = require('../../types/object/module.f.cjs')
 const encoding = require('../../text/utf16/module.f.cjs');
 
 /** @type {(s: string) => readonly tokenizer.JsToken[]} */
 const tokenizeString = s => toArray(tokenizer.tokenize(encoding.stringToList(s)))
 
-const stringify = fjson.stringify(sort)
+const stringify = djs.stringify(sort)
 
 module.exports = {
-    fjson: [
+    djs: [
         () => {
             const result = tokenizeString('')
             if (result.length !== 0) { throw result }

package/json/tokenizer/test.f.cjs

@@ -1,13 +1,13 @@
 const tokenizer = require('./module.f.cjs')
 const { toArray, countdown } = require('../../types/list/module.f.cjs')
-const fjson = require('../../fjson/module.f.cjs')
+const djs = require('../../djs/module.f.cjs')
 const { sort } = require('../../types/object/module.f.cjs')
 const encoding = require('../../text/utf16/module.f.cjs');
 
 /** @type {(s: string) => readonly tokenizer.JsonToken[]} */
 const tokenizeString = s => toArray(tokenizer.tokenize(encoding.stringToList(s)))
 
-const stringify = fjson.stringify(sort)
+const stringify = djs.stringify(sort)
 
 module.exports = {
     json: [

package/package.json

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

package/sha2/module.f.cjs

@@ -129,7 +129,8 @@ const compress = ([a0, b0, c0, d0, e0, f0, g0, h0]) => data => {
     let g = g0
     let h = h0
 
-    for (let i = 0; i < 4; ++i) {
+    let i = 0;
+    while (true) {
         const ki = k[i]
         for (let j = 0; j < 16; ++j) {
             const t1 = h + bigSigma1(e) + ch(e)(f)(g) + ki[j] + w[j]
@@ -143,6 +144,8 @@ const compress = ([a0, b0, c0, d0, e0, f0, g0, h0]) => data => {
             b = a
             a = (t1 + t2) | 0
         }
+        if (i === 3) { break }
+        ++i;
         w = nextW(w)
     }