functionalscript 0.0.361 → 0.0.364

package/.github/workflows/bun.yml

@@ -11,5 +11,5 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - run: curl https://bun.sh/install | bash 
-    - run: /home/runner/.bun/bin/bun ./test.f.js
+    - run: curl https://bun.sh/install | bash
+    - run: /home/runner/.bun/bin/bun ./test.f.cjs

package/.github/workflows/deno.yml

@@ -14,4 +14,4 @@ jobs:
     - uses: denoland/setup-deno@v1
       with:
         deno-version: v1.x
-    - run: deno run --unstable --compat --allow-read --allow-env ./test.f.js
+    - run: deno run --unstable --compat --allow-read --allow-env ./test.f.cjs

package/com/cpp/com.hpp

@@ -0,0 +1,47 @@
+#ifndef COM_HPP
+#define COM_HPP
+
+#include <cstdint>
+
+namespace com
+{
+    class GUID
+    {
+    public:
+        uint64_t hi;
+        uint64_t lo;
+    };
+
+    typedef uint32_t HRESULT;
+    typedef uint32_t ULONG;
+
+    class IUnknown
+    {
+    public:
+        virtual HRESULT __stdcall QueryInterface(GUID const &riid, IUnknown **const ppvObject) noexcept = 0;
+        virtual ULONG __stdcall AddRef() noexcept = 0;
+        virtual ULONG __stdcall Release() noexcept = 0;
+    };
+
+    template <class I>
+    class Ref
+    {
+    public:
+        explicit Ref(I &other) noexcept : p(other.p)
+        {
+            p.AddRef();
+        }
+        Ref(Ref const &other) noexcept : Ref(other.p)
+        {
+        }
+        ~Ref() noexcept
+        {
+            p.Release();
+        }
+
+    private:
+        I &p;
+    };
+}
+
+#endif

package/com/cpp/main.f.cjs

@@ -0,0 +1,10 @@
+const types = require('../types/main.f.cjs')
+const text = require('../../text/main.f.cjs')
+
+/** @type {(name: string) => (library: types.Library) => text.Block} */
+const cpp = name => lib => []
+
+module.exports = {
+    /** @readonly */
+    cpp,
+}

package/com/cpp/test/build.cjs

@@ -0,0 +1,11 @@
+const fs = require('node:fs')
+const cp = require('node:child_process')
+// const cs = require('../test.f.js').result
+
+// fs.writeFileSync('_result.cpp', cs)
+try {
+    console.log(cp.execSync('clang main.cpp').toString())
+} catch (e) {
+    // @ts-ignore
+    console.error(e.output.toString())
+}

package/com/cpp/test/main.cpp

@@ -0,0 +1,5 @@
+#include "../com.hpp"
+
+int main()
+{
+}

package/com/cpp/test.f.cjs

@@ -0,0 +1,3 @@
+const _ = require('./main.f.cjs')
+
+module.exports = {}

package/com/cs/{main.f.js → main.f.cjs}

@@ -1,13 +1,10 @@
-const types = require('../types/main.f.js')
-const text = require('../../text/main.f.js')
-const list = require('../../types/list/main.f.js')
-const obj = require('../../types/object/main.f.js')
+const types = require('../types/main.f.cjs')
+const text = require('../../text/main.f.cjs')
+const list = require('../../types/list/main.f.cjs')
+const obj = require('../../types/object/main.f.cjs')
 
 /** @type {(v: string) => string} */
-const csUsing = v => `using ${v};`
-
-/** @type {(type: string) => (name: string) => (body: text.Block) => text.Block} */
-const csBlock = type => name => body => [`${type} ${name}`, '{', body, '}']
+const using = v => `using ${v};`
 
 /**
  * @type {(attributes: list.List<string>) =>
@@ -16,14 +13,14 @@ const csBlock = type => name => body => [`${type} ${name}`, '{', body, '}']
  *  (body: text.Block) =>
  *  list.List<text.Item>}
  */
-const csTypeDef = attributes => type => name => body =>
+const typeDef = attributes => type => name => body =>
     list.flat([
         list.map(v => `[${v}]`)(attributes),
-        csBlock(`public ${type}`)(name)(body)
+        text.curly(`public ${type}`)(name)(body)
     ])
 
 /** @type {(t: types.BaseType) => string} */
-const csBaseType = t => {
+const baseType = t => {
     switch (t) {
         case 'bool': return 'bool'
         case 'f32': return 'float'
@@ -45,65 +42,72 @@ const csBaseType = t => {
 const unsafe = isUnsafe => isUnsafe ? 'unsafe ' : ''
 
 /** @type {(t: types.Type) => readonly[boolean, string]} */
-const csType = t =>
-    typeof (t) === 'string' ? [false, csBaseType(t)] :
-        t instanceof Array ? [false, t[0]] :
-            [true, `${csType(t['*'])[1]}*`]
+const type = t =>
+    typeof (t) === 'string' ? [false, baseType(t)] :
+        t.length === 1 ? [false, t[0]] :
+            [true, `${type(t[1])[1]}*`]
 
 /** @type {(f: types.Field) => string} */
-const csParam = ([name, type]) => `${csType(type)[1]} ${name}`
+const param = ([name, t]) => `${type(t)[1]} ${name}`
 
 /** @type {(f: types.Field) => string} */
-const csField = ([name, type]) => {
-    const [isUnsafe, t] = csType(type)
+const field = ([name, comType]) => {
+    const [isUnsafe, t] = type(comType)
     return `public ${unsafe(isUnsafe)}${t} ${name};`
 }
 
-/** @type {(m: types.Method) => readonly[boolean, string]} */
-const csResult = m => m.length === 2 ? [false, 'void'] : csType(m[2])
+/** @type {(m: types.FieldArray) => string} */
+const result = m => {
+    const result = m._
+    return result === undefined ? 'void' : type(result)[1]
+}
 
 /** @type {(field: types.Field) => boolean} */
-const isUnsafeField = field => csType(field[1])[0]
+const isUnsafeField = field => type(field[1])[0]
+
+/** @type {(kv: obj.Entry<types.Type>) => boolean} */
+const isParam = kv => kv[0] !== '_'
 
-/** @type {(m: types.Method) => readonly string[]} */
-const csMethod = m => {
-    const result = csResult(m)
-    const isUnsafe = result[0] || list.some(list.map(isUnsafeField)(m[1]))
+/** @type {(e: obj.Entry<types.FieldArray>) => readonly string[]} */
+const method = ([name, m]) => {
+    const paramAndResultList = Object.entries(m)
+    const paramList = list.filter(isParam)(paramAndResultList)
+    const isUnsafe = list.some(list.map(isUnsafeField)(paramAndResultList))
     return [
         '[PreserveSig]',
-        `${unsafe(isUnsafe)}${result[1]} ${m[0]}(${list.join(', ')(list.map(csParam)(m[1]))});`
+        `${unsafe(isUnsafe)}${result(m)} ${name}(${list.join(', ')(list.map(param)(paramList))});`
     ]
 }
 
 /** @type {(e: obj.Entry<types.Definition>) => list.List<text.Item>} */
-const csDef = ([n, d]) => {
+const def = ([n, d]) => {
     const i = d.interface
     return i === undefined ?
-        csTypeDef
+        typeDef
             (['StructLayout(LayoutKind.Sequential)'])
             ('struct')
             (n)
-            (() => list.map(csField)(d.struct)) :
-        csTypeDef
+            (list.map(field)(Object.entries(d.struct))) :
+        typeDef
             ([`Guid("${d.guid}")`, 'InterfaceType(ComInterfaceType.InterfaceIsIUnknown)'])
             ('interface')
             (n)
-            (() => list.flatMap(csMethod)(d.interface))
+            (list.flatMap(method)(Object.entries(d.interface)))
 }
 
 /** @type {(name: string) => (library: types.Library) => text.Block} */
 const cs = name => library => {
-    const v = list.flatMap(csDef)(Object.entries(library))
+    const v = list.flatMap(def)(Object.entries(library))
 
     /** @type {text.Block} */
     const h = [
-        csUsing('System'),
-        csUsing('System.Runtime.InteropServices'),
+        using('System'),
+        using('System.Runtime.InteropServices'),
         ''
     ]
 
-    const ns = csBlock('namespace')(name)(() => v)
-    return () => list.flat([h, ns])
+    const ns = text.curly('namespace')(name)(() => v)
+    return list.flat([h, ns])
 }
 
 module.exports = {

package/com/cs/test/{build.js → build.cjs}

@@ -1,11 +1,11 @@
 const fs = require('node:fs')
 const cp = require('node:child_process')
-const cs = require('../test.f.js').result
+const cs = require('../test.f.cjs').result
 
 fs.writeFileSync('_result.cs', cs)
 try {
     console.log(cp.execSync('dotnet build').toString())
 } catch (e) {
     // @ts-ignore
-    console.log(e.output.toString())
+    console.error(e.output.toString())
 }

package/com/cs/{test.f.js → test.f.cjs}

@@ -1,24 +1,27 @@
-const types = require('../types/main.f.js')
-const _ = require('./main.f.js')
-const list = require('../../types/list/main.f.js')
-const text = require('../../text/main.f.js')
+const types = require('../types/main.f.cjs')
+const _ = require('./main.f.cjs')
+const list = require('../../types/list/main.f.cjs')
+const text = require('../../text/main.f.cjs')
 
 /** @type {types.Library} */
 const library = {
     Slice: {
-        struct: [
-            ['Start', { '*': 'u8' }],
-            ['Size', 'usize'],
-        ]
+        struct: {
+            Start: ['*', 'u8'],
+            Size: 'usize',
+        },
     },
     IMy: {
         guid: 'C66FB270-2D80-49AD-BB6E-88C1F90B805D',
-        interface: [
-            ['GetSlice', [], ['Slice']],
-            ['SetSlice', [['slice', ['Slice']]]],
-            ['GetUnsafe', [], {'*': 'bool'}],
-            ['SetUnsafe', [['p', {'*': ['Slice']}], ['size', 'u32']]],
-        ],
+        interface: {
+            GetSlice: { _: ['Slice'] },
+            SetSlice: { slice: ['Slice'] },
+            GetUnsafe: { _: ['*', 'bool'] },
+            SetUnsafe: {
+                p: ['*', ['Slice']],
+                size: 'u32'
+            },
+        },
     }
 }
 

package/com/{main.f.js → main.f.cjs}

@@ -1,4 +1,4 @@
-const types = require('./types/main.f.js');
+const types = require('./types/main.f.cjs');
 
 module.exports = {
     /** @readonly */

package/com/types/{main.f.js → main.f.cjs}

@@ -9,7 +9,7 @@
  * }} Struct
  */
 
-/** @typedef {readonly Field[]} FieldArray */
+/** @typedef {{readonly[k in string]: Type}} FieldArray */
 
 /** @typedef {readonly[string, Type]} Field */
 
@@ -20,13 +20,7 @@
  * }} Interface
  */
 
-/** @typedef {readonly Method[]} MethodArray */
-
-/** @typedef {readonly[string, FieldArray, Type]} GetMethod */
-
-/** @typedef {readonly[string, FieldArray]} SetMethod */
-
-/** @typedef {GetMethod|SetMethod} Method */
+/** @typedef {{readonly[k in string]: FieldArray}} MethodArray */
 
 /** @typedef {BaseType|Id|Pointer} Type */
 
@@ -50,6 +44,6 @@
  * } BaseType
  */
 
-/** @typedef {{readonly '*': Type}} Pointer */
+/** @typedef {readonly['*', Type]} Pointer */
 
 module.exports = {}

package/commonjs/build/{main.f.js → main.f.cjs}

@@ -1,10 +1,10 @@
-const package_ = require('../package/main.f.js')
-const module_ = require('../module/main.f.js')
-const function_ = require('../module/function/main.f.js')
-const map = require('../../types/map/main.f.js')
-const object = require('../../types/object/main.f.js')
-const path = require('../path/main.f.js')
-const stringSet = require('../../types/stringset/main.f.js')
+const package_ = require('../package/main.f.cjs')
+const module_ = require('../module/main.f.cjs')
+const function_ = require('../module/function/main.f.cjs')
+const map = require('../../types/map/main.f.cjs')
+const object = require('../../types/object/main.f.cjs')
+const path = require('../path/main.f.cjs')
+const stringSet = require('../../types/stringset/main.f.cjs')
 
 /**
  * @template M

package/commonjs/build/{test.f.js → test.f.cjs}

@@ -1,9 +1,9 @@
-const _ = require('./main.f.js')
-const map = require('../../types/map/main.f.js')
-const module_ = require('../module/main.f.js')
-const function_ = require('../module/function/main.f.js')
-const result = require('../../types/result/main.f.js')
-const package_ = require('../package/main.f.js')
+const _ = require('./main.f.cjs')
+const map = require('../../types/map/main.f.cjs')
+const module_ = require('../module/main.f.cjs')
+const function_ = require('../module/function/main.f.cjs')
+const result = require('../../types/result/main.f.cjs')
+const package_ = require('../package/main.f.cjs')
 
 /** @type {{ readonly [k in string]?: result.Result<function_.Function_, unknown> }} */
 const compileMap = {

package/commonjs/{main.f.js → main.f.cjs}

@@ -1,20 +1,20 @@
 /** @typedef {(packageName: string) => PackageMap|Package|undefined} PackageMap */
 
-/** 
+/**
  * @typedef {readonly[
- *  string, 
- *  PackageMap, 
+ *  string,
+ *  PackageMap,
  *  (fileName: string) => string|undefined
- * ]} Package 
+ * ]} Package
  */
 
 module.exports = {
     /** @readonly */
-    build: require('./build/main.f.js'),
+    build: require('./build/main.f.cjs'),
     /** @readonly */
-    module: require('./module/main.f.js'),
+    module: require('./module/main.f.cjs'),
     /** @readonly */
-    package: require('./package/main.f.js'),
+    package: require('./package/main.f.cjs'),
     /** @readonly */
-    path: require('./path/main.f.js'),
+    path: require('./path/main.f.cjs'),
 }

package/commonjs/module/function/{main.f.js → main.f.cjs}

@@ -2,7 +2,7 @@
  * An IO interface for creating and running module functions.
  */
 
-const result = require('../../../types/result/main.f.js')
+const result = require('../../../types/result/main.f.cjs')
 
 /** @typedef {<M>(require: Require<M>) => (prior: M) => Result<M>} Function_ */
 

package/commonjs/module/{main.f.js → main.f.cjs}

@@ -1,4 +1,4 @@
-const object = require('../../types/object/main.f.js')
+const object = require('../../types/object/main.f.cjs')
 
 /**
  * @template M
@@ -53,7 +53,7 @@ const idToString = id => `${id.package}/${id.path.join('/')}`
 
 module.exports = {
     /** @readonly */
-    function: require('./function/main.f.js'),
+    function: require('./function/main.f.cjs'),
     /** @readonly */
     dir,
     /** @readonly */

package/commonjs/package/dependencies/{main.f.js → main.f.cjs}

@@ -1,5 +1,5 @@
-const json = require('../../../json/main.f.js')
-const list = require('../../../types/list/main.f.js')
+const json = require('../../../json/main.f.cjs')
+const list = require('../../../types/list/main.f.cjs')
 
 /** @typedef {readonly[string, string]} DependencyJson */
 

package/commonjs/package/dependencies/{test.f.js → test.f.cjs}

@@ -1,4 +1,4 @@
-const _ = require('./main.f.js')
+const _ = require('./main.f.cjs')
 
 {
     if (!_.isDependenciesJson(undefined)) { throw 'error' }

package/commonjs/package/{main.f.js → main.f.cjs}

@@ -1,5 +1,5 @@
-const json = require('../../json/main.f.js')
-const dependencies = require('./dependencies/main.f.js')
+const json = require('../../json/main.f.cjs')
+const dependencies = require('./dependencies/main.f.cjs')
 
 /**
  * @typedef {{

package/commonjs/package/{test.f.js → test.f.cjs}

@@ -1,6 +1,6 @@
-const _ = require('./main.f.js')
+const _ = require('./main.f.cjs')
 
-require('./dependencies/test.f.js')
+require('./dependencies/test.f.cjs')
 
 {
     if (_.isPackageJson(null)) { throw 'error' }

package/commonjs/path/{main.f.js → main.f.cjs}

@@ -1,6 +1,6 @@
-const list = require("../../types/list/main.f.js")
-const package_ = require("../package/main.f.js")
-const module_ = require("../module/main.f.js")
+const list = require("../../types/list/main.f.cjs")
+const package_ = require("../package/main.f.cjs")
+const module_ = require("../module/main.f.cjs")
 
 /** @typedef {readonly string[]} Items */
 
@@ -98,7 +98,7 @@ const mapDependency = d => ([external, internal]) => {
  *  (items: list.List<string>) =>
  *  Path|undefined}
  */
-const parseGlobal = dependencies => 
+const parseGlobal = dependencies =>
 {
     const filterMap = list.filterMap(mapDependency(dependencies))
     return dir => items => {

package/commonjs/path/{test.f.js → test.f.cjs}

@@ -1,10 +1,10 @@
-const _ = require('./main.f.js')
-const { todo } = require('../../dev/main.f.js')
-const json = require('../../json/main.f.js')
-const { identity } = require('../../types/function/main.f.js')
-const object = require('../../types/object/main.f.js')
-const { at } = require('../../types/object/main.f.js')
-const package_ = require('../package/main.f.js')
+const _ = require('./main.f.cjs')
+const { todo } = require('../../dev/main.f.cjs')
+const json = require('../../json/main.f.cjs')
+const { identity } = require('../../types/function/main.f.cjs')
+const object = require('../../types/object/main.f.cjs')
+const { at } = require('../../types/object/main.f.cjs')
+const package_ = require('../package/main.f.cjs')
 
 /** @type {(g: json.Unknown|undefined) => string} */
 const stringify = g => {

package/doc/README.md

@@ -1,10 +1,13 @@
 # Documentation
 
+FunctionalScript files have `.f.cjs` file extensions because it's using a `Common.JS` module system. See
+[ESM. Resolver Algorithm Specification](https://nodejs.org/api/esm.html#resolver-algorithm-specification).
+
 ## 1. Creating a New Repository
 
 Creating from a template https://github.com/functionalscript/template/generate
 
-## 1.1. Creating From Scratch 
+## 1.1. Creating From Scratch
 
 Prerequisites:
 
@@ -16,10 +19,10 @@ Creating a new GitHub repository
 
 1. Create a public git repository on GitHub using Node template.
 2. Clone the repository.
-3. Go to the root directory of the cloned repository. 
+3. Go to the root directory of the cloned repository.
 4. Run `npm init`. It should create `package.json` file.
-5. Create an `index.js` file in the repository root directory.
-6. Edit the `index.js` file. For example
+5. Create a `main.f.cjs` file in the repository root directory.
+6. Edit the `main.f.cjs` file. For example
     ```js
     module.exports = "Hello world!"
     ```
@@ -54,7 +57,7 @@ module.exports = x => x * x
 #### 2.2.1. Local File
 
 ```js
-const x = require('./folder/index.js')
+const x = require('./folder/main.f.cjs')
 ```
 
 ### 2.2.2. External Module
@@ -62,7 +65,7 @@ const x = require('./folder/index.js')
 Run `npm install -D github:USER/REPO`
 
 ```js
-const x = require(`REPO/DIR/FILE.js`)
+const x = require(`REPO/DIR/FILE.f.cjs`)
 ```
 
 ### 2.3. Functions

package/html/{main.f.js → main.f.cjs}

@@ -1,6 +1,6 @@
-const list = require('../types/list/main.f.js')
-const object = require('../types/object/main.f.js')
-const { operator, compose } = require('../types/function/main.f.js')
+const list = require('../types/list/main.f.cjs')
+const object = require('../types/object/main.f.cjs')
+const { operator, compose } = require('../types/function/main.f.cjs')
 
 /**
  * @typedef {|
@@ -73,7 +73,7 @@ const escapeCharCode = code => {
     }
 }
 
-const escape = compose(list.toCharCodes)(list.map(escapeCharCode))
+const escape = compose(list.toCharCodeList)(list.map(escapeCharCode))
 
 /** @type {(n: Node) => list.List<string>} */
 const node = n => typeof n === 'string' ? escape(n) : element(n)

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

@@ -1,4 +1,4 @@
-const _ = require('./main.f.js')
+const _ = require('./main.f.cjs')
 
 {
     const r = _.htmlToString(['html', []])

package/io/commonjs/{main.js → main.cjs}

@@ -1,6 +1,6 @@
-const { tryCatch } = require('../result/main.js')
-const { unwrap } = require('../../types/result/main.f.js')
-const moduleFunction = require('../../commonjs/module/function/main.f.js')
+const { tryCatch } = require('../result/main.cjs')
+const { unwrap } = require('../../types/result/main.f.cjs')
+const moduleFunction = require('../../commonjs/module/function/main.f.cjs')
 
 /** @type {(f: Function) => moduleFunction.Function_} */
 const build = f => immutableRequire => mutableData => {

package/io/commonjs/{test.js → test.cjs}

@@ -1,5 +1,5 @@
-const _ = require('./main.js')
-const run = require('../../commonjs/module/function/main.f.js')
+const _ = require('./main.cjs')
+const run = require('../../commonjs/module/function/main.f.cjs')
 
 // ok:
 {

package/io/result/{main.js → main.cjs}

@@ -1,4 +1,4 @@
-const result = require('../../types/result/main.f.js')
+const result = require('../../types/result/main.f.cjs')
 
 /** @type {<T>(f: () => T) => result.Result<T, unknown>} */
 const tryCatch = f => {

package/json/{main.f.js → main.f.cjs}

@@ -1,7 +1,7 @@
-const list = require('../types/list/main.f.js')
-const object = require('../types/object/main.f.js')
-const operator = require('../types/function/operator/main.f.js')
-const { compose } = require('../types/function/main.f.js')
+const list = require('../types/list/main.f.cjs')
+const object = require('../types/object/main.f.cjs')
+const operator = require('../types/function/operator/main.f.cjs')
+const { compose } = require('../types/function/main.f.cjs')
 
 /**
  * @typedef {{
@@ -111,7 +111,7 @@ const isObject = value => typeof value === 'object' && value !== null && !(value
 
 module.exports = {
     /** @readonly */
-    tokenizer: require('./tokenizer/main.f.js'),
+    tokenizer: require('./tokenizer/main.f.cjs'),
     /** @readonly */
     setProperty,
     /** @readonly */

package/json/{test.f.js → test.f.cjs}

@@ -1,6 +1,6 @@
-const json = require('./main.f.js')
-const { sort } = require('../types/object/main.f.js')
-const { identity } = require('../types/function/main.f.js')
+const json = require('./main.f.cjs')
+const { sort } = require('../types/object/main.f.cjs')
+const { identity } = require('../types/function/main.f.cjs')
 
 if (json.setProperty("Hello")([])({}) !== "Hello") { throw 'error' }