functionalscript 0.2.0 → 0.2.2

package/dev/module.mjs

@@ -183,7 +183,7 @@ export const index = async () => {
     const n = '/module.f.mjs'
     const jsr_json = JSON.parse(await readFile(jj, { encoding: 'utf8' }))
     const list = Object.keys(await loadModuleMap()).filter(v => v.endsWith(n))
-    const exportsA = list.map(v => [v.replace(n, ''), v])
+    const exportsA = list.filter(v => !v.startsWith('./out')).map(v => [v.replace(n, ''), `./out/${v.substring(2)}`])
     const exports = Object.fromEntries(exportsA)
     await writeFile(
         jj,

package/jsr.json

@@ -1,64 +1,64 @@
 {
   "name": "@functionalscript/functionalscript",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "exports": {
-    "./com/cpp": "./com/cpp/module.f.mjs",
-    "./com/cs": "./com/cs/module.f.mjs",
-    "./com/rust": "./com/rust/module.f.mjs",
-    "./com/types": "./com/types/module.f.mjs",
-    "./commonjs/build": "./commonjs/build/module.f.mjs",
-    "./commonjs": "./commonjs/module.f.mjs",
-    "./commonjs/module/function": "./commonjs/module/function/module.f.mjs",
-    "./commonjs/module": "./commonjs/module/module.f.mjs",
-    "./commonjs/package/dependencies": "./commonjs/package/dependencies/module.f.mjs",
-    "./commonjs/package": "./commonjs/package/module.f.mjs",
-    "./commonjs/path": "./commonjs/path/module.f.mjs",
-    "./dev": "./dev/module.f.mjs",
-    "./dev/test": "./dev/test/module.f.mjs",
-    "./djs": "./djs/module.f.mjs",
-    "./djs/parser": "./djs/parser/module.f.mjs",
-    "./djs/tokenizer": "./djs/tokenizer/module.f.mjs",
-    "./fsc": "./fsc/module.f.mjs",
-    "./fsm": "./fsm/module.f.mjs",
-    "./html": "./html/module.f.mjs",
-    "./js/tokenizer": "./js/tokenizer/module.f.mjs",
-    "./json": "./json/module.f.mjs",
-    "./json/parser": "./json/parser/module.f.mjs",
-    "./json/serializer": "./json/serializer/module.f.mjs",
-    "./json/tokenizer": "./json/tokenizer/module.f.mjs",
-    "./nodejs/version": "./nodejs/version/module.f.mjs",
-    "./prime_field": "./prime_field/module.f.mjs",
-    "./secp": "./secp/module.f.mjs",
-    "./sha2": "./sha2/module.f.mjs",
-    "./text/ascii": "./text/ascii/module.f.mjs",
-    "./text": "./text/module.f.mjs",
-    "./text/sgr": "./text/sgr/module.f.mjs",
-    "./text/utf16": "./text/utf16/module.f.mjs",
-    "./text/utf8": "./text/utf8/module.f.mjs",
-    "./types/array": "./types/array/module.f.mjs",
-    "./types/bigfloat": "./types/bigfloat/module.f.mjs",
-    "./types/bigint": "./types/bigint/module.f.mjs",
-    "./types/btree/find": "./types/btree/find/module.f.mjs",
-    "./types/btree": "./types/btree/module.f.mjs",
-    "./types/btree/remove": "./types/btree/remove/module.f.mjs",
-    "./types/btree/set": "./types/btree/set/module.f.mjs",
-    "./types/btree/types": "./types/btree/types/module.f.mjs",
-    "./types/byte_set": "./types/byte_set/module.f.mjs",
-    "./types/function/compare": "./types/function/compare/module.f.mjs",
-    "./types/function": "./types/function/module.f.mjs",
-    "./types/function/operator": "./types/function/operator/module.f.mjs",
-    "./types/list": "./types/list/module.f.mjs",
-    "./types/map": "./types/map/module.f.mjs",
-    "./types/nibble_set": "./types/nibble_set/module.f.mjs",
-    "./types/nullable": "./types/nullable/module.f.mjs",
-    "./types/number": "./types/number/module.f.mjs",
-    "./types/object": "./types/object/module.f.mjs",
-    "./types/range": "./types/range/module.f.mjs",
-    "./types/range_map": "./types/range_map/module.f.mjs",
-    "./types/result": "./types/result/module.f.mjs",
-    "./types/sorted_list": "./types/sorted_list/module.f.mjs",
-    "./types/sorted_set": "./types/sorted_set/module.f.mjs",
-    "./types/string": "./types/string/module.f.mjs",
-    "./types/string_set": "./types/string_set/module.f.mjs"
+    "./com/cpp": "./out/com/cpp/module.f.mjs",
+    "./com/cs": "./out/com/cs/module.f.mjs",
+    "./com/rust": "./out/com/rust/module.f.mjs",
+    "./com/types": "./out/com/types/module.f.mjs",
+    "./commonjs/build": "./out/commonjs/build/module.f.mjs",
+    "./commonjs": "./out/commonjs/module.f.mjs",
+    "./commonjs/module/function": "./out/commonjs/module/function/module.f.mjs",
+    "./commonjs/module": "./out/commonjs/module/module.f.mjs",
+    "./commonjs/package/dependencies": "./out/commonjs/package/dependencies/module.f.mjs",
+    "./commonjs/package": "./out/commonjs/package/module.f.mjs",
+    "./commonjs/path": "./out/commonjs/path/module.f.mjs",
+    "./dev": "./out/dev/module.f.mjs",
+    "./dev/test": "./out/dev/test/module.f.mjs",
+    "./djs": "./out/djs/module.f.mjs",
+    "./djs/parser": "./out/djs/parser/module.f.mjs",
+    "./djs/tokenizer": "./out/djs/tokenizer/module.f.mjs",
+    "./fsc": "./out/fsc/module.f.mjs",
+    "./fsm": "./out/fsm/module.f.mjs",
+    "./html": "./out/html/module.f.mjs",
+    "./js/tokenizer": "./out/js/tokenizer/module.f.mjs",
+    "./json": "./out/json/module.f.mjs",
+    "./json/parser": "./out/json/parser/module.f.mjs",
+    "./json/serializer": "./out/json/serializer/module.f.mjs",
+    "./json/tokenizer": "./out/json/tokenizer/module.f.mjs",
+    "./nodejs/version": "./out/nodejs/version/module.f.mjs",
+    "./prime_field": "./out/prime_field/module.f.mjs",
+    "./secp": "./out/secp/module.f.mjs",
+    "./sha2": "./out/sha2/module.f.mjs",
+    "./text/ascii": "./out/text/ascii/module.f.mjs",
+    "./text": "./out/text/module.f.mjs",
+    "./text/sgr": "./out/text/sgr/module.f.mjs",
+    "./text/utf16": "./out/text/utf16/module.f.mjs",
+    "./text/utf8": "./out/text/utf8/module.f.mjs",
+    "./types/array": "./out/types/array/module.f.mjs",
+    "./types/bigfloat": "./out/types/bigfloat/module.f.mjs",
+    "./types/bigint": "./out/types/bigint/module.f.mjs",
+    "./types/btree/find": "./out/types/btree/find/module.f.mjs",
+    "./types/btree": "./out/types/btree/module.f.mjs",
+    "./types/btree/remove": "./out/types/btree/remove/module.f.mjs",
+    "./types/btree/set": "./out/types/btree/set/module.f.mjs",
+    "./types/btree/types": "./out/types/btree/types/module.f.mjs",
+    "./types/byte_set": "./out/types/byte_set/module.f.mjs",
+    "./types/function/compare": "./out/types/function/compare/module.f.mjs",
+    "./types/function": "./out/types/function/module.f.mjs",
+    "./types/function/operator": "./out/types/function/operator/module.f.mjs",
+    "./types/list": "./out/types/list/module.f.mjs",
+    "./types/map": "./out/types/map/module.f.mjs",
+    "./types/nibble_set": "./out/types/nibble_set/module.f.mjs",
+    "./types/nullable": "./out/types/nullable/module.f.mjs",
+    "./types/number": "./out/types/number/module.f.mjs",
+    "./types/object": "./out/types/object/module.f.mjs",
+    "./types/range": "./out/types/range/module.f.mjs",
+    "./types/range_map": "./out/types/range_map/module.f.mjs",
+    "./types/result": "./out/types/result/module.f.mjs",
+    "./types/sorted_list": "./out/types/sorted_list/module.f.mjs",
+    "./types/sorted_set": "./out/types/sorted_set/module.f.mjs",
+    "./types/string": "./out/types/string/module.f.mjs",
+    "./types/string_set": "./out/types/string_set/module.f.mjs"
   }
 }

package/out/com/cpp/module.f.mjs

@@ -0,0 +1,123 @@
+// @ts-self-types="./module.f.d.mts"
+import * as types from '../types/module.f.mjs';
+import * as text from '../../text/module.f.mjs';
+import * as O from '../../types/object/module.f.mjs';
+import * as list from '../../types/list/module.f.mjs';
+import * as string from '../../types/string/module.f.mjs';
+const { join } = string;
+const { paramList } = types;
+const { map, flatMap, flat } = list;
+const { entries } = Object;
+/** @type {(name: string) => (body: text.Block) => text.Block} */
+const struct = name => body => [`struct ${name}`, '{', body, '};'];
+const baseTypeMap = {
+    u8: 'uint8_t',
+    i8: 'int8_t',
+    u16: 'uint16_t',
+    i16: 'int16_t',
+    u32: 'uint32_t',
+    i32: 'int32_t',
+    u64: 'uint64_t',
+    i64: 'int64_t',
+    usize: 'size_t',
+    isize: 'ptrdiff_t',
+    f32: 'float',
+    f64: 'double',
+    bool: 'bool',
+};
+/** @type {(t: types.BaseType) => string} */
+const baseType = t => baseTypeMap[t];
+const resultVoid = types.result('void');
+const namespace = text.curly('namespace');
+/** @type {(id: string) => string} */
+const comRef = id => `::nanocom::ref<${id}>`;
+/** @type {(id: string) => string} */
+const ptr = id => `${id} const*`;
+/** @type {(id: string) => string} */
+const ref = id => `${id} const&`;
+/** @type {(p: types.Field) => string} */
+const paramName = ([name]) => name;
+const mapParamName = map(paramName);
+const joinComma = join(', ');
+/** @type {(name: string) => (lib: types.Library) => text.Block} */
+export const cpp = name => lib => {
+    /** @type {(t: types.Type) => string|null} */
+    const interface_ = t => {
+        if (!(t instanceof Array) || t.length !== 1) {
+            return null;
+        }
+        const [name] = t;
+        return 'interface' in lib[name] ? name : null;
+    };
+    /** @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*`;
+        }
+        const [id] = t;
+        return 'interface' in lib[id] ? i(id) : id;
+    };
+    const type = objectType(comRef);
+    const resultType = objectType(ptr);
+    /** @type {(s: types.Field) => text.Item} */
+    const field = ([name, t]) => `${type(t)} ${name};`;
+    const mapField = map(field);
+    /** @type {(s: types.Struct) => text.Block} */
+    const defStruct = s => mapField(entries(s.struct));
+    /** @type {(fa: types.FieldArray) => string} */
+    const cppResult = resultVoid(resultType);
+    /** @type {(p: types.Field) => string} */
+    const param = ([name, t]) => `${objectType(ref)(t)} ${name}`;
+    const mapParam = map(param);
+    /** @type {(result: string) => (paramArrayStr: string) => (name: string) => text.Item} */
+    const methodHeader = result => paramArrayStr => name => `virtual ${result} ${name}${paramArrayStr} const noexcept = 0;`;
+    /** @type {(m: types.Method) => readonly text.Item[]} */
+    const method = ([name, paramArray]) => {
+        const result = cppResult(paramArray);
+        const paramL = paramList(paramArray);
+        const paramArrayStr = `(${joinComma(mapParam(paramL))})`;
+        const m = methodHeader(result)(paramArrayStr);
+        const resultName = interface_(paramArray._);
+        if (resultName === null) {
+            return [m(name)];
+        }
+        return [
+            m(`${name}_`),
+            `${comRef(resultName)} ${name}${paramArrayStr} const noexcept`,
+            '{',
+            [`return ::nanocom::move_to_ref(${name}_(${joinComma(mapParamName(paramL))}));`],
+            '}',
+        ];
+    };
+    const mapMethod = flatMap(method);
+    /** @type {(i: types.Interface) => text.Block} */
+    const defInterface = ({ guid, interface: i }) => {
+        const g = guid.replaceAll('-', '');
+        const lo = g.substring(0, 16);
+        const hi = g.substring(16);
+        return flat([
+            [`constexpr static ::nanocom::GUID const guid = ::nanocom::GUID(0x${lo}, 0x${hi});`],
+            mapMethod(entries(i))
+        ]);
+    };
+    /** @type {(kv: O.Entry<types.Definition>) => text.Block} */
+    const def = ([name, d]) => 'interface' in d
+        ? [
+            `class ${name} : public ::nanocom::IUnknown`,
+            '{',
+            'public:',
+            defInterface(d),
+            '};'
+        ]
+        : struct(name)(defStruct(d));
+    /** @type {(kv: O.Entry<types.Definition>) => text.Block} */
+    const forward = ([name]) => [`struct ${name};`];
+    const e = entries(lib);
+    return flat([
+        ['#pragma once', ''],
+        namespace(name)(flat([flatMap(forward)(e), flatMap(def)(e)]))
+    ]);
+};

package/out/com/cpp/test.f.mjs

@@ -0,0 +1,40 @@
+import cpp from './testlib.f.mjs';
+const f = () => {
+    const e = '#pragma once\n' +
+        '\n' +
+        'namespace My\n' +
+        '{\n' +
+        '    struct Slice;\n' +
+        '    struct ManagedStruct;\n' +
+        '    struct IMy;\n' +
+        '    struct Slice\n' +
+        '    {\n' +
+        '        uint8_t const* Start;\n' +
+        '        size_t Size;\n' +
+        '    };\n' +
+        '    struct ManagedStruct\n' +
+        '    {\n' +
+        '        ::nanocom::ref<IMy> M;\n' +
+        '    };\n' +
+        '    class IMy : public ::nanocom::IUnknown\n' +
+        '    {\n' +
+        '    public:\n' +
+        '        constexpr static ::nanocom::GUID const guid = ::nanocom::GUID(0xC66FB2702D8049AD, 0xBB6E88C1F90B805D);\n' +
+        '        virtual Slice GetSlice() const noexcept = 0;\n' +
+        '        virtual void SetSlice(Slice slice) const noexcept = 0;\n' +
+        '        virtual bool const* GetUnsafe() const noexcept = 0;\n' +
+        '        virtual void SetUnsafe(Slice const* p, uint32_t size) const noexcept = 0;\n' +
+        '        virtual bool Some(IMy const& p) const noexcept = 0;\n' +
+        '        virtual IMy const* GetIMy_(uint16_t a, int16_t b) const noexcept = 0;\n' +
+        '        ::nanocom::ref<IMy> GetIMy(uint16_t a, int16_t b) const noexcept\n' +
+        '        {\n' +
+        '            return ::nanocom::move_to_ref(GetIMy_(a, b));\n' +
+        '        }\n' +
+        '        virtual void SetManagedStruct(ManagedStruct a) const noexcept = 0;\n' +
+        '    };\n' +
+        '}';
+    if (cpp() !== e) {
+        throw cpp;
+    }
+};
+export default f;

package/out/com/cpp/testlib.f.mjs

@@ -0,0 +1,7 @@
+import * as string from '../../types/string/module.f.mjs';
+const { join } = string;
+import * as text from '../../text/module.f.mjs';
+const { flat } = text;
+import library from '../types/testlib.f.mjs';
+import { cpp } from './module.f.mjs';
+export default () => join('\n')(flat('    ')(cpp('My')(library)));

package/out/com/cs/module.f.mjs

@@ -0,0 +1,95 @@
+// @ts-self-types="./module.f.d.mts"
+import * as types from '../types/module.f.mjs';
+const { result, paramList } = types;
+import * as text from '../../text/module.f.mjs';
+const { curly } = text;
+import * as list from '../../types/list/module.f.mjs';
+const { flat, map, some, flatMap } = list;
+import * as string from '../../types/string/module.f.mjs';
+const { join } = string;
+import * as O from '../../types/object/module.f.mjs';
+const { entries } = Object;
+/** @type {(v: string) => string} */
+const using = v => `using ${v};`;
+/**
+ * @type {(attributes: list.List<string>) =>
+ *  (type: string) =>
+ *  (name: string) =>
+ *  (body: text.Block) =>
+ *  list.List<text.Item>}
+ */
+const typeDef = attributes => type => name => body => flat([
+    map(v => `[${v}]`)(attributes),
+    curly(`public ${type}`)(name)(body)
+]);
+const baseTypeMap = {
+    bool: 'byte',
+    f32: 'float',
+    f64: 'double',
+    i16: 'short',
+    i32: 'int',
+    i64: 'long',
+    i8: 'sbyte',
+    isize: 'IntPtr',
+    u16: 'ushort',
+    u32: 'uint',
+    u64: 'ulong',
+    u8: 'byte',
+    usize: 'UIntPtr',
+};
+/** @type {(t: types.BaseType) => string} */
+const baseType = t => baseTypeMap[t];
+/** @type {(isUnsafe: boolean) => string} */
+const unsafe = isUnsafe => isUnsafe ? 'unsafe ' : '';
+/** @type {(t: types.Type) => readonly[boolean, string]} */
+const fullType = t => typeof (t) === 'string' ? [false, baseType(t)] :
+    t.length === 1 ? [false, t[0]] :
+        [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)} ${name}`;
+const mapParam = map(param);
+/** @type {(f: types.Field) => string} */
+const field = ([name, comType]) => {
+    const [isUnsafe, t] = fullType(comType);
+    return `public ${unsafe(isUnsafe)}${t} ${name};`;
+};
+/** @type {(field: types.Field) => boolean} */
+const isUnsafeField = field => fullType(field[1])[0];
+const mapIsUnsafeField = map(isUnsafeField);
+const resultVoid = result('void');
+const joinComma = join(', ');
+/** @type {(e: O.Entry<types.FieldArray>) => readonly string[]} */
+const method = ([name, m]) => {
+    const paramAndResultList = entries(m);
+    const pl = paramList(m);
+    const isUnsafe = some(mapIsUnsafeField(paramAndResultList));
+    return [
+        '[PreserveSig]',
+        `${unsafe(isUnsafe)}${resultVoid(type)(m)} ${name}(${joinComma(mapParam(pl))});`
+    ];
+};
+const struct = typeDef(['StructLayout(LayoutKind.Sequential)'])('struct');
+const mapField = map(field);
+const flatMapMethod = flatMap(method);
+/** @type {(e: O.Entry<types.Definition>) => list.List<text.Item>} */
+const def = ([n, d]) => {
+    return !('interface' in d) ?
+        struct(n)(mapField(entries(d.struct))) :
+        typeDef([`Guid("${d.guid}")`, 'InterfaceType(ComInterfaceType.InterfaceIsIUnknown)'])('interface')(n)(flatMapMethod(entries(d.interface)));
+};
+const flatMapDef = flatMap(def);
+const namespace = curly('namespace');
+/** @type {text.Block} */
+const header = [
+    using('System'),
+    using('System.Runtime.InteropServices'),
+    ''
+];
+/** @type {(name: string) => (library: types.Library) => text.Block} */
+export const cs = name => library => {
+    const v = flatMapDef(entries(library));
+    const ns = namespace(name)(v);
+    return flat([header, ns]);
+};

package/out/com/cs/test.f.mjs

@@ -0,0 +1,43 @@
+import cs from './testlib.f.mjs';
+const f = () => {
+    const e = 'using System;\n' +
+        'using System.Runtime.InteropServices;\n' +
+        '\n' +
+        'namespace My\n' +
+        '{\n' +
+        '    [StructLayout(LayoutKind.Sequential)]\n' +
+        '    public struct Slice\n' +
+        '    {\n' +
+        '        public unsafe byte* Start;\n' +
+        '        public UIntPtr Size;\n' +
+        '    }\n' +
+        '    [StructLayout(LayoutKind.Sequential)]\n' +
+        '    public struct ManagedStruct\n' +
+        '    {\n' +
+        '        public IMy M;\n' +
+        '    }\n' +
+        '    [Guid("C66FB270-2D80-49AD-BB6E-88C1F90B805D")]\n' +
+        '    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]\n' +
+        '    public interface IMy\n' +
+        '    {\n' +
+        '        [PreserveSig]\n' +
+        '        Slice GetSlice();\n' +
+        '        [PreserveSig]\n' +
+        '        void SetSlice(Slice slice);\n' +
+        '        [PreserveSig]\n' +
+        '        unsafe byte* GetUnsafe();\n' +
+        '        [PreserveSig]\n' +
+        '        unsafe void SetUnsafe(Slice* p, uint size);\n' +
+        '        [PreserveSig]\n' +
+        '        byte Some(IMy p);\n' +
+        '        [PreserveSig]\n' +
+        '        IMy GetIMy(ushort a, short b);\n' +
+        '        [PreserveSig]\n' +
+        '        void SetManagedStruct(ManagedStruct a);\n' +
+        '    }\n' +
+        '}';
+    if (cs !== e) {
+        throw cs;
+    }
+};
+export default f;

package/out/com/cs/testlib.f.mjs

@@ -0,0 +1,7 @@
+import * as text from '../../text/module.f.mjs';
+const { flat } = text;
+import * as string from '../../types/string/module.f.mjs';
+const { join } = string;
+import { cs } from './module.f.mjs';
+import library from '../types/testlib.f.mjs';
+export default join('\n')(flat('    ')(cs('My')(library)));