functionalscript 0.0.369 → 0.0.372

package/.vscode/tasks.json

@@ -0,0 +1,41 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/com/cs/test/test.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "publish",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "publish",
+                "${workspaceFolder}/com/cs/test/test.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "watch",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "watch",
+                "run",
+                "--project",
+                "${workspaceFolder}/com/cs/test/test.csproj"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

package/com/cpp/com.hpp

@@ -1,7 +1,15 @@
-#ifndef COM_HPP
-#define COM_HPP
+#pragma once
 
 #include <cstdint>
+#include <cstddef>
+
+#if defined(__aarch64__)
+#define COM_STDCALL
+#elif defined(__clang__)
+#define COM_STDCALL __attribute__((stdcall))
+#else
+#define COM_STDCALL __stdcall
+#endif
 
 namespace com
 {
@@ -14,34 +22,32 @@ namespace com
 
     typedef uint32_t HRESULT;
     typedef uint32_t ULONG;
+    typedef int32_t BOOL;
 
     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;
+        virtual HRESULT COM_STDCALL QueryInterface(GUID const &riid, IUnknown **const ppvObject) noexcept = 0;
+        virtual ULONG COM_STDCALL AddRef() noexcept = 0;
+        virtual ULONG COM_STDCALL Release() noexcept = 0;
     };
 
     template <class I>
-    class Ref
+    class ref
     {
     public:
-        explicit Ref(I &other) noexcept : p(other.p)
+        explicit ref(I &other) noexcept : p(other.p)
         {
             p.AddRef();
         }
-        Ref(Ref const &other) noexcept : Ref(other.p)
+        ref(ref const &other) noexcept : ref(other.p)
         {
         }
-        ~Ref() noexcept
+        ~ref() noexcept
         {
             p.Release();
         }
-
     private:
         I &p;
     };
 }
-
-#endif

package/com/cpp/module.f.cjs

@@ -0,0 +1,78 @@
+const types = require('../types/module.f.cjs')
+const text = require('../../text/module.f.cjs')
+const obj = require('../../types/object/module.f.cjs')
+const { list } = require('../../types/module.f.cjs')
+
+/** @type {(name: string) => (body: text.Block) => text.Block} */
+const struct = name => body => [`struct ${name}`, '{', body, '};']
+
+/** @type {(t: types.BaseType) => string} */
+const baseType = t => {
+    switch (t) {
+        case 'u8': return 'uint8_t'
+        case 'i8': return 'int8_t'
+        case 'u16': return 'uint16_t'
+        case 'i16': return 'int16_t'
+        case 'u32': return 'uint32_t'
+        case 'i32': return 'int32_t'
+        case 'u64': return 'uint64_t'
+        case 'i64': return 'int64_t'
+        case 'usize': return 'size_t'
+        case 'isize': return 'ptrdiff_t'
+        case 'f32': return 'float'
+        case 'f64': return 'double'
+        case 'bool': return '::com::BOOL'
+    }
+}
+
+/** @type {(name: string) => (lib: types.Library) => text.Block} */
+const cpp = name => lib => {
+
+    /** @type {(i: (t: string) => string) => (t: types.Type) => string} */
+    const objectType = i => t => {
+        if (typeof(t) === 'string') { return baseType(t) }
+        if (t.length === 2) { return `${type(t[1])}*` } 
+        const [id] = t
+        if (lib[id].interface === undefined) { return id }
+        return i(id)
+    }
+
+    const type = objectType(id => `::com::ref<${id}>`)
+
+    /** @type {(s: types.Field) => text.Item} */
+    const field = ([name, t]) => `${type(t)} ${name};`
+
+    /** @type {(s: types.Struct) => text.Block} */
+    const defStruct = s => list.map(field)(Object.entries(s.struct))
+
+    /** @type {(fa: types.FieldArray) => string} */
+    const result = types.result('void')(type)
+
+    /** @type {(p: types.Field) => string} */
+    const param = ([name, t]) => `${objectType(id => `${id}&`)(t)} ${name}`
+
+    /** @type {(m: types.Method) => text.Item} */
+    const method = ([name, paramArray]) => 
+        `virtual ${result(paramArray)} COM_STDCALL ${name}(${list.join(', ')(list.map(param)(types.paramList(paramArray)))}) = 0;`
+
+    /** @type {(i: types.Interface) => text.Block} */
+    const defInterface = i => list.map(method)(Object.entries(i.interface))
+
+    /** @type {(kv: obj.Entry<types.Definition>) => text.Block} */
+    const def = ([name, d]) => d.interface === undefined 
+        ? struct(name)(defStruct(d)) 
+        : struct(`${name}: ::com::IUnknown`)(defInterface(d))
+
+    return list.flat([
+        ['#pragma once', ''],
+        text.curly
+            ('namespace')
+            (name)
+            (list.flatMap(def)(Object.entries(lib)))
+    ])
+}
+
+module.exports = {
+    /** @readonly */
+    cpp,
+}

package/com/cpp/test/build.cjs

@@ -1,10 +1,12 @@
 const fs = require('node:fs')
 const cp = require('node:child_process')
-// const cs = require('../test.f.js').result
+const cpp = require('../test.f.cjs').result
+const os = require('node:os');
 
-// fs.writeFileSync('_result.cpp', cs)
+fs.writeFileSync('_result.hpp', cpp)
 try {
-    console.log(cp.execSync('clang main.cpp').toString())
+    const flags = os.platform() === 'win32' ? '' : ' -std=c++11 -lc++'
+    console.log(cp.execSync(`clang${flags} main.cpp`).toString())
 } catch (e) {
     // @ts-ignore
     console.error(e.output.toString())

package/com/cpp/test/main.cpp

@@ -1,5 +1,9 @@
 #include "../com.hpp"
+#include "_result.hpp"
+
+#include <iostream>
 
 int main()
 {
+    std::cout << "Hello world!" << std::endl;
 }

package/com/cpp/test.f.cjs

@@ -1,3 +1,36 @@
-const _ = require('./main.f.cjs')
+const _ = require('./module.f.cjs')
+const library = require('../types/test.f.cjs')
+const text = require('../../text/module.f.cjs')
+const list = require('../../types/list/module.f.cjs')
 
-module.exports = {}
+const f = () =>
+{
+    const r = list.join('\n')(text.flat('    ')(_.cpp('My')(library)))
+    const e = 
+        '#pragma once\n' +
+        '\n' +
+        'namespace My\n' +
+        '{\n' +
+        '    struct Slice\n' +
+        '    {\n' +
+        '        uint8_t* Start;\n' +
+        '        size_t Size;\n' +
+        '    };\n' +
+        '    struct IMy: ::com::IUnknown\n' +
+        '    {\n' +
+        '        virtual Slice COM_STDCALL GetSlice() = 0;\n' +
+        '        virtual void COM_STDCALL SetSlice(Slice slice) = 0;\n' +
+        '        virtual ::com::BOOL* COM_STDCALL GetUnsafe() = 0;\n' +
+        '        virtual void COM_STDCALL SetUnsafe(Slice* p, uint32_t size) = 0;\n' +
+        '        virtual ::com::BOOL COM_STDCALL Some(IMy& p) = 0;\n' +
+        '        virtual ::com::ref<IMy> COM_STDCALL GetIMy() = 0;\n' +
+        '    };\n' +
+        '}'
+    if (r !== e) { throw r }
+    return r
+}
+
+module.exports = {
+    /** @readonly */
+    result: f()
+}

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

@@ -1,7 +1,7 @@
-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')
+const types = require('../types/module.f.cjs')
+const text = require('../../text/module.f.cjs')
+const list = require('../../types/list/module.f.cjs')
+const obj = require('../../types/object/module.f.cjs')
 
 /** @type {(v: string) => string} */
 const using = v => `using ${v};`
@@ -42,40 +42,34 @@ const baseType = t => {
 const unsafe = isUnsafe => isUnsafe ? 'unsafe ' : ''
 
 /** @type {(t: types.Type) => readonly[boolean, string]} */
-const type = t =>
+const fullType = t =>
     typeof (t) === 'string' ? [false, baseType(t)] :
         t.length === 1 ? [false, t[0]] :
-            [true, `${type(t[1])[1]}*`]
+            [true, `${type(t[1])}*`]
+
+/** @type {(m: types.Type) => string} */
+const type = t => fullType(t)[1]
 
 /** @type {(f: types.Field) => string} */
-const param = ([name, t]) => `${type(t)[1]} ${name}`
+const param = ([name, t]) => `${type(t)} ${name}`
 
 /** @type {(f: types.Field) => string} */
 const field = ([name, comType]) => {
-    const [isUnsafe, t] = type(comType)
+    const [isUnsafe, t] = fullType(comType)
     return `public ${unsafe(isUnsafe)}${t} ${name};`
 }
 
-/** @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 => type(field[1])[0]
-
-/** @type {(kv: obj.Entry<types.Type>) => boolean} */
-const isParam = kv => kv[0] !== '_'
+const isUnsafeField = field => fullType(field[1])[0]
 
 /** @type {(e: obj.Entry<types.FieldArray>) => readonly string[]} */
 const method = ([name, m]) => {
     const paramAndResultList = Object.entries(m)
-    const paramList = list.filter(isParam)(paramAndResultList)
+    const pl = types.paramList(m)
     const isUnsafe = list.some(list.map(isUnsafeField)(paramAndResultList))
     return [
         '[PreserveSig]',
-        `${unsafe(isUnsafe)}${result(m)} ${name}(${list.join(', ')(list.map(param)(paramList))});`
+        `${unsafe(isUnsafe)}${types.result('void')(type)(m)} ${name}(${list.join(', ')(list.map(param)(pl))});`
     ]
 }
 

package/com/cs/test.f.cjs

@@ -1,29 +1,8 @@
-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',
-        },
-    },
-    IMy: {
-        guid: 'C66FB270-2D80-49AD-BB6E-88C1F90B805D',
-        interface: {
-            GetSlice: { _: ['Slice'] },
-            SetSlice: { slice: ['Slice'] },
-            GetUnsafe: { _: ['*', 'bool'] },
-            SetUnsafe: {
-                p: ['*', ['Slice']],
-                size: 'u32'
-            },
-        },
-    }
-}
+const types = require('../types/module.f.cjs')
+const _ = require('./module.f.cjs')
+const list = require('../../types/list/module.f.cjs')
+const text = require('../../text/module.f.cjs')
+const library = require('../types/test.f.cjs')
 
 const f = () =>
 {
@@ -52,6 +31,10 @@ const f = () =>
         '        unsafe bool* GetUnsafe();\n' +
         '        [PreserveSig]\n' +
         '        unsafe void SetUnsafe(Slice* p, uint size);\n' +
+        '        [PreserveSig]\n' +
+        '        bool Some(IMy p);\n' +
+        '        [PreserveSig]\n' +
+        '        IMy GetIMy();\n' +
         '    }\n' +
         '}'
     if (cs !== e) { throw [cs,e] }

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

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

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

@@ -1,3 +1,7 @@
+const obj = require('../../types/object/module.f.cjs')
+const list = require('../../types/list/module.f.cjs')
+const { types } = require('../module.f.cjs')
+
 /** @typedef {{readonly[k in string]: Definition}} Library */
 
 /** @typedef {Struct|Interface} Definition */
@@ -11,7 +15,7 @@
 
 /** @typedef {{readonly[k in string]: Type}} FieldArray */
 
-/** @typedef {readonly[string, Type]} Field */
+/** @typedef {obj.Entry<Type>} Field */
 
 /**
  * @typedef {{
@@ -22,6 +26,8 @@
 
 /** @typedef {{readonly[k in string]: FieldArray}} MethodArray */
 
+/** @typedef {obj.Entry<FieldArray>} Method */
+
 /** @typedef {BaseType|Id|Pointer} Type */
 
 /** @typedef {readonly[string]} Id */
@@ -46,4 +52,21 @@
 
 /** @typedef {readonly['*', Type]} Pointer */
 
-module.exports = {}
+/** @type {(kv: obj.Entry<Type>) => boolean} */
+const isParam = ([name]) => name !== '_'
+
+/** @type {(fa: FieldArray) => list.List<Field> } */
+const paramList = fa => list.filter(isParam)(Object.entries(fa))
+
+/** @type {<T>(v: T) => (f: (type: Type) => T) => (fa: FieldArray) => T} */
+const result = v => f => fa => {
+    const type = fa._
+    return type === undefined ? v : f(type)
+} 
+
+module.exports = {
+    /** @readonly */
+    paramList,
+    /** @readonly */
+    result,
+}

package/com/types/test.f.cjs

@@ -0,0 +1,25 @@
+const _ = require('./module.f.cjs')
+
+/** @type {_.Library} */
+module.exports = {
+    Slice: {
+        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'
+            },
+            Some: { p: ['IMy'], _: 'bool' },
+            GetIMy: { _: ['IMy'] }
+        },
+    }
+}

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

@@ -1,10 +1,10 @@
-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')
+const package_ = require('../package/module.f.cjs')
+const module_ = require('../module/module.f.cjs')
+const function_ = require('../module/function/module.f.cjs')
+const map = require('../../types/map/module.f.cjs')
+const object = require('../../types/object/module.f.cjs')
+const path = require('../path/module.f.cjs')
+const stringSet = require('../../types/stringset/module.f.cjs')
 
 /**
  * @template M

package/commonjs/build/test.f.cjs

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

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

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

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

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

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

@@ -10,11 +10,11 @@
 
 module.exports = {
     /** @readonly */
-    build: require('./build/main.f.cjs'),
+    build: require('./build/module.f.cjs'),
     /** @readonly */
-    module: require('./module/main.f.cjs'),
+    module: require('./module/module.f.cjs'),
     /** @readonly */
-    package: require('./package/main.f.cjs'),
+    package: require('./package/module.f.cjs'),
     /** @readonly */
-    path: require('./path/main.f.cjs'),
+    path: require('./path/module.f.cjs'),
 }

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

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

package/commonjs/package/dependencies/test.f.cjs

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

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

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

package/commonjs/package/test.f.cjs

@@ -1,4 +1,4 @@
-const _ = require('./main.f.cjs')
+const _ = require('./module.f.cjs')
 
 require('./dependencies/test.f.cjs')
 

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

@@ -1,6 +1,6 @@
-const list = require("../../types/list/main.f.cjs")
-const package_ = require("../package/main.f.cjs")
-const module_ = require("../module/main.f.cjs")
+const list = require("../../types/list/module.f.cjs")
+const package_ = require("../package/module.f.cjs")
+const module_ = require("../module/module.f.cjs")
 
 /** @typedef {readonly string[]} Items */
 

package/commonjs/path/test.f.cjs

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

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

@@ -1,6 +1,6 @@
-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')
+const list = require('../types/list/module.f.cjs')
+const object = require('../types/object/module.f.cjs')
+const { operator, compose } = require('../types/function/module.f.cjs')
 
 /**
  * @typedef {|

package/html/test.f.cjs

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

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

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

package/io/commonjs/test.cjs

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

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

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

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

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