functionalscript 0.0.535 → 0.0.537

package/.github/workflows/ci.yml

@@ -78,11 +78,13 @@ jobs:
     - uses: actions/setup-node@v2
       with:
         node-version: 20
+    - if: matrix.os == 'windows-latest'
+      run: choco install llvm --version=16
     - uses: actions/download-artifact@v3
       with:
         name: package-lock.json
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7
+        dotnet-version: 8
     - run: npm ci
     - run: npm run comtest

package/fjson/parser/module.f.cjs

@@ -32,6 +32,13 @@ const { fromMap } = require('../../types/object/module.f.cjs')
 
 /** @typedef {list.List<JsonStackElement>} JsonStack */
 
+/**
+ * @typedef {{
+*  readonly status: 'module'
+*  readonly stage: 'module' | '.' | 'exports' | '='
+* }} StateModule
+*/
+
 /**
  * @typedef {{
 *  readonly status: '' | '[' | '[v' | '[,' | '{' | '{k' | '{:' | '{v' | '{,'
@@ -56,12 +63,41 @@ const { fromMap } = require('../../types/object/module.f.cjs')
 
 /**
  * @typedef {|
+* StateModule |
 * StateParse |
 * StateResult |
 * StateError
 * } FjsonState
 */
 
+/** @type {(token: tokenizer.FjsonToken) => (state: StateModule) => FjsonState}} */
+const parseModuleOp = token => state => {
+    switch(state.stage)
+    {
+        case 'module':
+        {
+            if (token.kind === 'id' && token.value === 'module') return { status: 'module', stage: '.' }
+            break;
+        }
+        case '.':
+        {
+            if (token.kind === '.') return { status: 'module', stage: 'exports' }
+            break;
+        }
+        case 'exports':
+        {
+            if (token.kind === 'id' && token.value === 'exports') return { status: 'module', stage: '=' }
+            break;
+        }
+        case '=':
+        {
+            if (token.kind === '=') return { status: '', top: null, stack: null }
+            if (token.kind === 'ws') return state
+        }
+    }
+    return { status: 'error', message: 'unexpected token' }
+}
+
 /** @type {(obj: JsonObject) => (key: string) => JsonObject} */
 const addKeyToObject = obj => key => ({ kind: 'object', values: obj.values, key: key })
 
@@ -143,6 +179,7 @@ const parseValueOp = token => state => {
     if (isValueToken(token)) { return pushValue(state)(tokenToValue(token)) }
     if (token.kind === '[') { return startArray(state) }
     if (token.kind === '{') { return startObject(state) }
+    if (token.kind === 'ws') { return state }
     return { status: 'error', message: 'unexpected token' }
 }
 
@@ -152,6 +189,7 @@ const parseArrayStartOp = token => state => {
     if (token.kind === '[') { return startArray(state) }
     if (token.kind === ']') { return endArray(state) }
     if (token.kind === '{') { return startObject(state) }
+    if (token.kind === 'ws') { return state }
     return { status: 'error', message: 'unexpected token' }
 }
 
@@ -159,6 +197,7 @@ const parseArrayStartOp = token => state => {
 const parseArrayValueOp = token => state => {
     if (token.kind === ']') { return endArray(state) }
     if (token.kind === ',') { return { status: '[,', top: state.top, stack: state.stack } }
+    if (token.kind === 'ws') { return state }
     return { status: 'error', message: 'unexpected token' }
 }
 
@@ -166,12 +205,14 @@ const parseArrayValueOp = token => state => {
 const parseObjectStartOp = token => state => {
     if (token.kind === 'string') { return pushKey(state)(token.value) }
     if (token.kind === '}') { return endObject(state) }
+    if (token.kind === 'ws') { return state }
     return { status: 'error', message: 'unexpected token' }
 }
 
 /** @type {(token: tokenizer.FjsonToken) => (state: StateParse) => FjsonState}} */
 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' }
 }
 
@@ -180,6 +221,7 @@ const parseObjectColonOp = token => state => {
     if (isValueToken(token)) { return pushValue(state)(tokenToValue(token)) }
     if (token.kind === '[') { return startArray(state) }
     if (token.kind === '{') { return startObject(state) }
+    if (token.kind === 'ws') { return state }
     return { status: 'error', message: 'unexpected token' }
 }
 
@@ -187,18 +229,21 @@ const parseObjectColonOp = token => state => {
 const parseObjectNextOp = token => state => {
     if (token.kind === '}') { return endObject(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}} */
 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>} */
 const foldOp = token => state => {
     switch (state.status) {
+        case 'module': return parseModuleOp(token)(state)
         case 'result': return { status: 'error', message: 'unexpected token' }
         case 'error': return { status: 'error', message: state.message }
         case '': return parseValueOp(token)(state)
@@ -215,7 +260,7 @@ const foldOp = token => state => {
 
 /** @type {(tokenList: list.List<tokenizer.FjsonToken>) => result.Result<fjson.Unknown, string>} */
 const parse = tokenList => {
-    const state = fold(foldOp)({ status: '', top: null, stack: null })(tokenList)
+    const state = fold(foldOp)({ status: 'module', stage: 'module' })(tokenList)
     switch (state.status) {
         case 'result': return result.ok(state.value)
         case 'error': return result.error(state.message)

package/fjson/parser/test.f.cjs

@@ -13,97 +13,97 @@ const stringify = fjson.stringify(sort)
 module.exports = {
     valid: [
         () => {
-            const tokenList = tokenizeString('null')
+            const tokenList = tokenizeString('module.exports=null')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",null]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('true')
+            const tokenList = tokenizeString('module.exports=true')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",true]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('false')
+            const tokenList = tokenizeString('module.exports=false')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",false]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('0.1')
+            const tokenList = tokenizeString('module.exports=0.1')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",0.1]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('1.1e+2')
+            const tokenList = tokenizeString('module.exports=1.1e+2')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",110]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('"abc"')
+            const tokenList = tokenizeString('module.exports="abc"')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok","abc"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[]')
+            const tokenList = tokenizeString('module.exports=[]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",[]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[1]')
+            const tokenList = tokenizeString('module.exports=[1]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",[1]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[[]]')
+            const tokenList = tokenizeString('module.exports=[[]]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",[[]]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[0,[1,[2,[]]],3]')
+            const tokenList = tokenizeString('module.exports=[0,[1,[2,[]]],3]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",[0,[1,[2,[]]],3]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('{}')
+            const tokenList = tokenizeString('module.exports={}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",{}]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[{}]')
+            const tokenList = tokenizeString('module.exports=[{}]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",[{}]]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('{"a":true,"b":false,"c":null}')
+            const tokenList = tokenizeString('module.exports={"a":true,"b":false,"c":null}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",{"a":true,"b":false,"c":null}]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('{"a":{"b":{"c":["d"]}}}')
+            const tokenList = tokenizeString('module.exports={"a":{"b":{"c":["d"]}}}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",{"a":{"b":{"c":["d"]}}}]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('1234567890n')
+            const tokenList = tokenizeString('module.exports=1234567890n')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",1234567890n]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[1234567890n]')
+            const tokenList = tokenizeString('module.exports=[1234567890n]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["ok",[1234567890n]]') { throw result }
@@ -111,145 +111,181 @@ module.exports = {
     ],
     invalid: [
         () => {
-            const tokenList = tokenizeString('')
+            const tokenList = tokenizeString('module.exports=')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected end"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('"123')
+            const tokenList = tokenizeString('module.exports="123')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[,]')
+            const tokenList = tokenizeString('module.exports=[,]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[1 2]')
+            const tokenList = tokenizeString('module.exports=[1 2]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[1,,2]')
+            const tokenList = tokenizeString('module.exports=[1,,2]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[]]')
+            const tokenList = tokenizeString('module.exports=[]]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('["a"')
+            const tokenList = tokenizeString('module.exports=["a"')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected end"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[1,]')
+            const tokenList = tokenizeString('module.exports=[1,]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[,1]')
+            const tokenList = tokenizeString('module.exports=[,1]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[:]')
+            const tokenList = tokenizeString('module.exports=[:]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString(']')
+            const tokenList = tokenizeString('module.exports=]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('{,}')
+            const tokenList = tokenizeString('module.exports={,}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('{1:2}')
+            const tokenList = tokenizeString('module.exports={1:2}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('{"1"2}')
+            const tokenList = tokenizeString('module.exports={"1"2}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('{"1"::2}')
+            const tokenList = tokenizeString('module.exports={"1"::2}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('{"1":2,,"3":4')
+            const tokenList = tokenizeString('module.exports={"1":2,,"3":4')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('{}}')
+            const tokenList = tokenizeString('module.exports={}}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('{"1":2')
+            const tokenList = tokenizeString('module.exports={"1":2')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected end"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('{"1":2,}')
+            const tokenList = tokenizeString('module.exports={"1":2,}')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","unexpected token"]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('module.exports={,"1":2}')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["error","unexpected token"]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('module.exports=}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('{,"1":2}')
+            const tokenList = tokenizeString('module.exports=[{]}')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('}')
+            const tokenList = tokenizeString('module.exports={[}]')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('[{]}')
+            const tokenList = tokenizeString('module.exports=10-5')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
+    ],
+    validWhiteSpaces:[
+        () => {
+            const tokenList = tokenizeString('module.exports=[ 0 , 1 , 2 ]')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["ok",[0,1,2]]') { throw result }
+        },
+        () => {
+            const tokenList = tokenizeString('module.exports={ "a" : 0 , "b" : 1 }')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["ok",{"a":0,"b":1}]') { throw result }
+        },
+    ],
+    validModule:[
+        () => {
+            const tokenList = tokenizeString('module.exports = null')
+            const obj = parser.parse(tokenList)
+            const result = stringify(obj)
+            if (result !== '["ok",null]') { throw result }
+        },
+    ],
+    invalidModule:[
         () => {
-            const tokenList = tokenizeString('{[}]')
+            const tokenList = tokenizeString('null')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }
         },
         () => {
-            const tokenList = tokenizeString('10-5')
+            const tokenList = tokenizeString('module=null')
             const obj = parser.parse(tokenList)
             const result = stringify(obj)
             if (result !== '["error","unexpected token"]') { throw result }

package/fjson/tokenizer/module.f.cjs

@@ -7,12 +7,13 @@ const jsTokenizer = require('../../js/tokenizer/module.f.cjs')
 /**
  * @typedef {|
 * {readonly kind: 'true' | 'false' | 'null'} |
-* {readonly kind: '{' | '}' | ':' | ',' | '[' | ']' } |
+* {readonly kind: '{' | '}' | ':' | ',' | '[' | ']' | '.' | '=' } |
 * jsTokenizer.StringToken |
 * jsTokenizer.NumberToken |
 * jsTokenizer.ErrorToken |
 * jsTokenizer.IdToken |
-* jsTokenizer.BigIntToken
+* jsTokenizer.BigIntToken |
+* jsTokenizer.WhitespaceToken
 * } FjsonToken
 */
 
@@ -41,13 +42,15 @@ const mapToken = input =>
         case ',':
         case '[':
         case ']':
+        case '.':
+        case '=':
         case 'true':
         case 'false':
         case 'null':
         case 'string':
         case 'number':
+        case 'ws':
         case 'error': return [input]
-        case 'ws': return empty
         default: return jsTokenizer.isKeywordToken(input) ? [{ kind: 'id', value: input.kind }] : [{ kind: 'error', message: 'invalid token' }]
     }
 }

package/fjson/tokenizer/test.f.cjs

@@ -45,7 +45,7 @@ module.exports = {
         },
         () => {
             const result = stringify(tokenizeString('{ \t\n\r}'))
-            if (result !== '[{"kind":"{"},{"kind":"}"}]') { throw result }
+            if (result !== '[{"kind":"{"},{"kind":"ws"},{"kind":"}"}]') { throw result }
         },
         () => {
             const result = stringify(tokenizeString('""'))
@@ -61,7 +61,7 @@ module.exports = {
         },
         () => {
             const result = stringify(tokenizeString('"value1" "value2"'))
-            if (result !== '[{"kind":"string","value":"value1"},{"kind":"string","value":"value2"}]') { throw result }
+            if (result !== '[{"kind":"string","value":"value1"},{"kind":"ws"},{"kind":"string","value":"value2"}]') { throw result }
         },
         () => {
             const result = stringify(tokenizeString('"'))
@@ -129,11 +129,11 @@ module.exports = {
         },
         () => {
             const result = stringify(tokenizeString('1 2'))
-            if (result !== '[{"bf":[1n,0],"kind":"number","value":"1"},{"bf":[2n,0],"kind":"number","value":"2"}]') { throw result }
+            if (result !== '[{"bf":[1n,0],"kind":"number","value":"1"},{"kind":"ws"},{"bf":[2n,0],"kind":"number","value":"2"}]') { throw result }
         },
         () => {
             const result = stringify(tokenizeString('0. 2'))
-            if (result !== '[{"kind":"error","message":"invalid number"},{"bf":[2n,0],"kind":"number","value":"2"}]') { throw result }
+            if (result !== '[{"kind":"error","message":"invalid number"},{"kind":"ws"},{"bf":[2n,0],"kind":"number","value":"2"}]') { throw result }
         },
         () => {
             const result = stringify(tokenizeString('10-0'))
@@ -169,7 +169,7 @@ module.exports = {
         },
         () => {
             const result = stringify(tokenizeString('-.123'))
-            if (result !== '[{"kind":"error","message":"invalid token"},{"kind":"error","message":"invalid token"},{"bf":[123n,0],"kind":"number","value":"123"}]') { throw result }
+            if (result !== '[{"kind":"error","message":"invalid token"},{"kind":"."},{"bf":[123n,0],"kind":"number","value":"123"}]') { throw result }
         },
         () => {
             const result = stringify(tokenizeString('0.01'))
@@ -245,11 +245,11 @@ module.exports = {
         },
         () => {
             const result = stringify(tokenizeString('123 _123'))
-            if (result !== '[{"bf":[123n,0],"kind":"number","value":"123"},{"kind":"id","value":"_123"}]') { throw result }
+            if (result !== '[{"bf":[123n,0],"kind":"number","value":"123"},{"kind":"ws"},{"kind":"id","value":"_123"}]') { throw result }
         },
         () => {
             const result = stringify(tokenizeString('123 $123'))
-            if (result !== '[{"bf":[123n,0],"kind":"number","value":"123"},{"kind":"id","value":"$123"}]') { throw result }
+            if (result !== '[{"bf":[123n,0],"kind":"number","value":"123"},{"kind":"ws"},{"kind":"id","value":"$123"}]') { throw result }
         },
         () => {
             const result = stringify(tokenizeString('123_123'))

package/js/tokenizer/module.f.cjs

@@ -121,15 +121,16 @@ const {
 /**
  * @typedef {|
 * {readonly kind: '{' | '}' | ':' | ',' | '[' | ']' } |
+* {readonly kind: '.' | '=' } |
 * {readonly kind: '(' | ')' } |
 * {readonly kind: '==' | '!=' | '===' | '!==' | '>' | '>=' | '<' | '<=' } |
 * {readonly kind: '+' | '-' | '*' | '/' | '%' | '++' | '--' | '**' } |
-* {readonly kind: '=' | '+=' | '-=' | '*=' | '/=' | '%=' | '**='} |
+* {readonly kind: '+=' | '-=' | '*=' | '/=' | '%=' | '**='} |
 * {readonly kind: '&' | '|' | '^' | '~' | '<<' | '>>' | '>>>' } |
 * {readonly kind: '&=' | '|=' | '^=' | '<<=' | '>>=' | '>>>='} |
 * {readonly kind: '&&' | '||' | '!' | '??' } |
 * {readonly kind: '&&=' | '||=' | '??=' } |
-* {readonly kind: '?' | '?.' | '.' | '=>'}
+* {readonly kind: '?' | '?.' | '=>'}
 * } OperatorToken
 */
 

package/package.json

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

package/com/rust/nanocom/Cargo.lock

@@ -1,7 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "com"
-version = "0.1.0"