functionalscript 0.0.562 → 0.0.564

package/doc/byte-code.md

@@ -0,0 +1,60 @@
+# Byte Code
+
+This format is designed for fast and straightforward serialization and doesn't depend on a particular VM implementation.
+
+**Requirements:** 
+- VM serializer/deserializer should be very simple.
+    - string: UTF16
+    - number: in a binary format
+    - bigint: in a binary format
+    - len: u32
+- the byte code doesn't know anything about importing modules or I/O functions.
+- the byte code shouldn't contain syntax sugar.
+- serialized in a byte array so we can save it into a file. One byte is one unit.
+- least-significant byte first.
+
+```rust
+struct Array<T> {
+    len: u32,
+    array: [T; self.len],
+}
+ 
+type String = Array<u16>;
+
+// LSB first.
+type BigUInt = Array<u64>;
+
+type Object = Array<(String, Any)>;
+
+// This is the main structure for serialization.
+type Code = Array<u8>;
+
+struct Function {
+    length: u32
+    code: Code
+}
+
+// This structure is not for serialization because
+// a serialized module should resolve all imports.
+struct Module {
+    import: Array<String>
+    code: Code
+}
+```
+
+|type|any           |tag|                       |                             |
+|----|--------------|---|-----------------------|-----------------------------|
+|JSON|null          | 00|                       |                             |
+|    |number        | 01|u64                    |                             |
+|    |false         | 02|                       |                             |
+|    |true          | 03|                       |                             |
+|    |string        | 04|String                 |                             |
+|    |object        | 05|Object                 |                             |
+|    |array         | 06|Array<Any>             |                             |
+|DJS |bigint+       | 07|BigUInt                |                             |
+|    |bigint-       | 08|BigUInt                |                             |
+|    |local_ref     | 09|u32                    |consts[i]                    |
+|FJS |arg_ref       | 0A|u32                    |args[i]                      |
+|    |undefined     | 0B|                       |                             |
+|    |function      | 0C|Function               |the last constant is a return|
+|    |...           |   |                       |                             |

package/html/module.f.cjs

@@ -7,63 +7,38 @@ const { stringToList } = require('../text/utf16/module.f.cjs')
 const { fromCharCode } = String
 const { entries } = Object
 
-/**
- * @typedef {|
- *  'a' |
- *  'b' |
- *  'body' |
- *  'canvas' |
- *  'div' |
- *  'h1' |
- *  'h2' |
- *  'h3' |
- *  'h4' |
- *  'h5' |
- *  'h6' |
- *  'head' |
- *  'html' |
- *  'label' |
- *  'p' |
- *  'pre' |
- *  'script' |
- *  'table' |
- *  'td' |
- *  'th' |
- *  'title' |
- *  'tr'
- * } Tag
- */
-
-/**
- * https://developer.mozilla.org/en-US/docs/Glossary/Void_element
- *
- * @typedef {
- *  | 'area'
- *  | 'base'
- *  | 'br'
- *  | 'col'
- *  | 'embed'
- *  | 'hr'
- *  | 'img'
- *  | 'input'
- *  | 'link'
- *  | 'meta'
- *  | 'param'
- *  | 'source'
- *  | 'track'
- *  | 'wbr'
- * } VoidTag
- */
-
-/** @typedef {readonly[VoidTag]} VoidElement1*/
-
-/** @typedef {readonly[VoidTag, Attributes]} VoidElement2 */
-
-/** @typedef {readonly[Tag, readonly Node[]]} Element2 */
+/** @typedef {string} Tag */
+
+// https://developer.mozilla.org/en-US/docs/Glossary/Void_element
+const voidTagList = [
+    'area',
+    'base',
+    'br',
+    'col',
+    'embed',
+    'hr',
+    'img',
+    'input',
+    'link',
+    'meta',
+    'param',
+    'source',
+    'track',
+    'wbr',
+]
+
+/** @type {(tag: string) => boolean} */
+const isVoid = tag => voidTagList.includes(tag)
+
+/** @typedef {readonly[Tag]} Element1*/
+
+/** @typedef {readonly[Tag, Attributes]} Element2A */
+
+/** @typedef {readonly[Tag, readonly Node[]]} Element2N */
 
 /** @typedef {readonly[Tag, Attributes, Nodes]} Element3*/
 
-/** @typedef {VoidElement1 | VoidElement2 | Element2 | Element3} Element */
+/** @typedef {Element1 | Element2A | Element2N | Element3} Element */
 
 /**
  * @typedef {{
@@ -103,29 +78,39 @@ const attribute = ([name, value]) => flat([[' ', name, '="'], escape(value), ['"
 /** @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>} */
+const element3 = ([tag, a, ns]) =>
+    flat([open([tag, a]), nodes(ns), close(tag)])
+
+/** @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>} */
 const element = e => {
-    const f = () => {
-        switch (e.length) {
-            case 1: { return [[`<`, e[0], '/>']] }
-            case 2: {
-                const [tag, a] = e
-                return a instanceof Array ?
-                    [['<', tag, '>'], nodes(a), ['</', tag, '>']] :
-                    [[`<`, tag], attributes(a), [`/>`]]
-            }
-            default: {
-                const [tag, a, ns] = e
-                return [['<', tag], attributes(a), ['>'], nodes(ns), ['</', tag, '>']]
-            }
+    switch (e.length) {
+        case 1: { return element2a([e[0], {}]) }
+        case 2: {
+            const [tag, a] = e
+            return a instanceof Array ?
+                element3([tag, {}, a]) :
+                element2a([tag, a])
+        }
+        default: {
+            return element3(e)
         }
     }
-    return flat(f())
 }
 
 const html = compose(element)(listConcat(['<!DOCTYPE html>']))
 
-const htmlToString =  compose(html)(stringConcat)
+const htmlToString = compose(html)(stringConcat)
 
 module.exports = {
     /** @readonly */

package/html/test.f.cjs

@@ -5,10 +5,30 @@ module.exports = {
         const r = _.htmlToString(['html', []])
         if (r !== '<!DOCTYPE html><html></html>') { throw r }
     },
+    empty2: () => {
+        const r = _.htmlToString(['html'])
+        if (r !== '<!DOCTYPE html><html></html>') { throw r }
+    },
+    void: () => {
+        const r = _.htmlToString(['area'])
+        if (r !== '<!DOCTYPE html><area>') { throw r }
+    },
     some: () => {
         /** @type {_.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} */
+        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} */
+        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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.562",
+  "version": "0.0.564",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {
@@ -30,7 +30,7 @@
   },
   "homepage": "https://github.com/functionalscript/functionalscript#readme",
   "devDependencies": {
-    "@types/node": "^22.0.0",
-    "typescript": "^5.5.4"
+    "@types/node": "^22.9.0",
+    "typescript": "^5.6.3"
   }
 }