functionalscript 0.0.442 → 0.0.444

package/.github/workflows/com.yml

@@ -25,4 +25,4 @@ jobs:
       with:
         node-version: 19
     - run: npm ci
-    - run: node ./com/test/build.cjs
+    - run: npm run comtest

package/com/cpp/test.f.cjs

@@ -1,11 +1,7 @@
-const _ = require('./module.f.cjs')
-const library = require('../types/testlib.f.cjs')
-const text = require('../../text/module.f.cjs')
-const { join } = require('../../types/module.f.cjs').string
+const cpp = require('./testlib.f.cjs')
 
 const f = () =>
 {
-    const r = join('\n')(text.flat('    ')(_.cpp('My')(library)))
     const e =
         '#pragma once\n' +
         '\n' +
@@ -34,11 +30,7 @@ const f = () =>
         '        virtual void COM_STDCALL SetManagedStruct(ManagedStruct a) = 0;\n' +
         '    };\n' +
         '}'
-    if (r !== e) { throw r }
-    return r
+    if (cpp !== e) { throw cpp }
 }
 
-module.exports = {
-    /** @readonly */
-    result: f()
-}
+module.exports = f

package/com/cpp/testlib.f.cjs

@@ -0,0 +1,6 @@
+const { join } = require("../../types/string/module.f.cjs");
+const { flat } = require("../../text/module.f.cjs")
+const library = require('../types/testlib.f.cjs')
+const { cpp } = require('./module.f.cjs')
+
+module.exports = join('\n')(flat('    ')(cpp('My')(library)))

package/com/cs/test.f.cjs

@@ -1,11 +1,7 @@
-const _ = require('./module.f.cjs')
-const text = require('../../text/module.f.cjs')
-const library = require('../types/testlib.f.cjs')
-const { join } = require('../../types/string/module.f.cjs')
+const cs = require('./testlib.f.cjs')
 
 const f = () =>
 {
-    const cs = join('\n')(text.flat('    ')(_.cs('My')(library)))
     const e =
         'using System;\n' +
         'using System.Runtime.InteropServices;\n' +
@@ -44,12 +40,6 @@ const f = () =>
         '    }\n' +
         '}'
     if (cs !== e) { throw cs }
-    return cs
 }
 
-const result = f()
-
-module.exports = {
-    /** @readonly */
-    result,
-}
+module.exports = f

package/com/cs/testlib.f.cjs

@@ -0,0 +1,6 @@
+const { flat } = require('../../text/module.f.cjs');
+const { join } = require('../../types/string/module.f.cjs');
+const { cs } = require('./module.f.cjs');
+const library = require('../types/testlib.f.cjs')
+
+module.exports = join('\n')(flat('    ')(cs('My')(library)))

package/com/rust/module.f.cjs

@@ -230,8 +230,12 @@ const rust = library => {
             traitImpl({
                 pub: true,
                 type: 'ClassEx',
-                content: [`const INTERFACE: Interface = Interface {`,
-                    mapAssign(e),
+                content: ['const VMT: Vmt = Vmt {',
+                    [   'iunknown: Self::IUNKNOWN,',
+                        'interface: Interface {',
+                            mapAssign(e),
+                        '},',
+                    ],
                     '};'
                 ]
             }),

package/com/rust/nanocom/tests/itmod.rs

@@ -36,9 +36,12 @@ mod library {
         where
             nanocom::CObject<Self>: Ex,
         {
-            const INTERFACE: Interface = Interface {
-                A: Self::A,
-                B: Self::B,
+            const VMT: Vmt = Vmt {
+                iunknown: Self::IUNKNOWN,
+                interface: Interface {
+                    A: Self::A,
+                    B: Self::B,
+                }
             };
         }
 
@@ -73,10 +76,7 @@ mod number {
     impl nanocom::Class for X {
         type Interface = IMy::Interface;
         fn static_vmt() -> &'static Vmt<Self::Interface> {
-            static V: IMy::Vmt = Vmt {
-                iunknown: X::IUNKNOWN,
-                interface: X::INTERFACE,
-            };
+            static V: IMy::Vmt = X::VMT;
             &V
         }
     }
@@ -142,10 +142,7 @@ mod destructor {
     impl nanocom::Class for X {
         type Interface = IMy::Interface;
         fn static_vmt() -> &'static Vmt<Self::Interface> {
-            static V: IMy::Vmt = Vmt {
-                iunknown: X::IUNKNOWN,
-                interface: X::INTERFACE,
-            };
+            static V: IMy::Vmt = X::VMT;
             &V
         }
     }

package/com/rust/test.f.cjs

@@ -1,127 +1,123 @@
-const { rust } = require('./module.f.cjs')
-const { flat } = require('../../text/module.f.cjs')
-const { join } = require('../../types/string/module.f.cjs')
-const library = require('../types/testlib.f.cjs')
+const rust = require('./testlib.f.cjs')
 
-module.exports = {
-    result: () => {
-        const e =
-            '#![allow(non_snake_case)]\n' +
-            '#[repr(C)]\n' +
-            'pub struct Slice {\n' +
-            '    pub Start: *const u8,\n' +
-            '    pub Size: usize,\n' +
-            '}\n' +
-            '#[repr(C)]\n' +
-            'pub struct ManagedStruct {\n' +
-            '    pub M: IMy::Ref,\n' +
-            '}\n' +
-            'pub mod IMy {\n' +
-            '    pub type Object = nanocom::Object<Interface>;\n' +
-            '    pub type Ref = nanocom::Ref<Interface>;\n' +
-            '    pub type Vmt = nanocom::Vmt<Interface>;\n' +
-            '    #[repr(C)]\n' +
-            '    pub struct Interface {\n' +
-            '        pub GetSlice: unsafe extern "system" fn(this: &Object) -> super::Slice,\n' +
-            '        pub SetSlice: unsafe extern "system" fn(this: &Object, slice: super::Slice),\n' +
-            '        pub GetUnsafe: unsafe extern "system" fn(this: &Object) -> *const bool,\n' +
-            '        pub SetUnsafe: unsafe extern "system" fn(this: &Object, p: *const super::Slice, size: u32),\n' +
-            '        pub Some: unsafe extern "system" fn(this: &Object, p: &super::IMy::Object) -> bool,\n' +
-            '        pub GetIMy: unsafe extern "system" fn(this: &Object) -> super::IMy::Ref,\n' +
-            '        pub SetManagedStruct: unsafe extern "system" fn(this: &Object, a: super::ManagedStruct),\n' +
-            '    }\n' +
-            '    impl nanocom::Interface for Interface {\n' +
-            '        const GUID: nanocom::GUID = 0xC66FB270_2D80_49AD_BB6E_88C1F90B805D;\n' +
-            '    }\n' +
-            '    pub trait Ex {\n' +
-            '        fn GetSlice(&self) -> super::Slice;\n' +
-            '        fn SetSlice(&self, slice: super::Slice);\n' +
-            '        fn GetUnsafe(&self) -> *const bool;\n' +
-            '        fn SetUnsafe(&self, p: *const super::Slice, size: u32);\n' +
-            '        fn Some(&self, p: &super::IMy::Object) -> bool;\n' +
-            '        fn GetIMy(&self) -> super::IMy::Ref;\n' +
-            '        fn SetManagedStruct(&self, a: super::ManagedStruct);\n' +
-            '    }\n' +
-            '    impl Ex for Object {\n' +
-            '        fn GetSlice(&self) -> super::Slice {\n' +
-            '            unsafe { (self.interface().GetSlice)(self) }\n' +
-            '        }\n' +
-            '        fn SetSlice(&self, slice: super::Slice) {\n' +
-            '            unsafe { (self.interface().SetSlice)(self, slice) }\n' +
-            '        }\n' +
-            '        fn GetUnsafe(&self) -> *const bool {\n' +
-            '            unsafe { (self.interface().GetUnsafe)(self) }\n' +
-            '        }\n' +
-            '        fn SetUnsafe(&self, p: *const super::Slice, size: u32) {\n' +
-            '            unsafe { (self.interface().SetUnsafe)(self, p, size) }\n' +
-            '        }\n' +
-            '        fn Some(&self, p: &super::IMy::Object) -> bool {\n' +
-            '            unsafe { (self.interface().Some)(self, p) }\n' +
-            '        }\n' +
-            '        fn GetIMy(&self) -> super::IMy::Ref {\n' +
-            '            unsafe { (self.interface().GetIMy)(self) }\n' +
-            '        }\n' +
-            '        fn SetManagedStruct(&self, a: super::ManagedStruct) {\n' +
-            '            unsafe { (self.interface().SetManagedStruct)(self, a) }\n' +
-            '        }\n' +
-            '    }\n' +
-            '    pub trait ClassEx\n' +
-            '    where\n' +
-            '        Self: nanocom::Class<Interface = Interface>,\n' +
-            '        nanocom::CObject<Self>: Ex,\n' +
-            '    {\n' +
-            '        const INTERFACE: Interface = Interface {\n' +
-            '            GetSlice: Self::GetSlice,\n' +
-            '            SetSlice: Self::SetSlice,\n' +
-            '            GetUnsafe: Self::GetUnsafe,\n' +
-            '            SetUnsafe: Self::SetUnsafe,\n' +
-            '            Some: Self::Some,\n' +
-            '            GetIMy: Self::GetIMy,\n' +
-            '            SetManagedStruct: Self::SetManagedStruct,\n' +
-            '        };\n' +
-            '    }\n' +
-            '    impl<T> ClassEx for T\n' +
-            '    where\n' +
-            '        Self: nanocom::Class<Interface = Interface>,\n' +
-            '        nanocom::CObject<Self>: Ex,\n' +
-            '    {\n' +
-            '    }\n' +
-            '    trait PrivateClassEx\n' +
-            '    where\n' +
-            '        Self: nanocom::Class<Interface = Interface>,\n' +
-            '        nanocom::CObject<Self>: Ex,\n' +
-            '    {\n' +
-            '        extern "system" fn GetSlice(this: &Object) -> super::Slice {\n' +
-            '            unsafe { Self::to_cobject(this) }.GetSlice()\n' +
-            '        }\n' +
-            '        extern "system" fn SetSlice(this: &Object, slice: super::Slice) {\n' +
-            '            unsafe { Self::to_cobject(this) }.SetSlice(slice)\n' +
-            '        }\n' +
-            '        extern "system" fn GetUnsafe(this: &Object) -> *const bool {\n' +
-            '            unsafe { Self::to_cobject(this) }.GetUnsafe()\n' +
-            '        }\n' +
-            '        extern "system" fn SetUnsafe(this: &Object, p: *const super::Slice, size: u32) {\n' +
-            '            unsafe { Self::to_cobject(this) }.SetUnsafe(p, size)\n' +
-            '        }\n' +
-            '        extern "system" fn Some(this: &Object, p: &super::IMy::Object) -> bool {\n' +
-            '            unsafe { Self::to_cobject(this) }.Some(p)\n' +
-            '        }\n' +
-            '        extern "system" fn GetIMy(this: &Object) -> super::IMy::Ref {\n' +
-            '            unsafe { Self::to_cobject(this) }.GetIMy()\n' +
-            '        }\n' +
-            '        extern "system" fn SetManagedStruct(this: &Object, a: super::ManagedStruct) {\n' +
-            '            unsafe { Self::to_cobject(this) }.SetManagedStruct(a)\n' +
-            '        }\n' +
-            '    }\n' +
-            '    impl<T> PrivateClassEx for T\n' +
-            '    where\n' +
-            '        Self: nanocom::Class<Interface = Interface>,\n' +
-            '        nanocom::CObject<Self>: Ex,\n' +
-            '    {\n' +
-            '    }\n' +
-            '}'
-        const r = join('\n')(flat('    ')(rust(library)))
-        if (r !== e) { throw r }
-        return r
-    }
-}
+module.exports = () => {
+    const e =
+        '#![allow(non_snake_case)]\n' +
+        '#[repr(C)]\n' +
+        'pub struct Slice {\n' +
+        '    pub Start: *const u8,\n' +
+        '    pub Size: usize,\n' +
+        '}\n' +
+        '#[repr(C)]\n' +
+        'pub struct ManagedStruct {\n' +
+        '    pub M: IMy::Ref,\n' +
+        '}\n' +
+        'pub mod IMy {\n' +
+        '    pub type Object = nanocom::Object<Interface>;\n' +
+        '    pub type Ref = nanocom::Ref<Interface>;\n' +
+        '    pub type Vmt = nanocom::Vmt<Interface>;\n' +
+        '    #[repr(C)]\n' +
+        '    pub struct Interface {\n' +
+        '        pub GetSlice: unsafe extern "system" fn(this: &Object) -> super::Slice,\n' +
+        '        pub SetSlice: unsafe extern "system" fn(this: &Object, slice: super::Slice),\n' +
+        '        pub GetUnsafe: unsafe extern "system" fn(this: &Object) -> *const bool,\n' +
+        '        pub SetUnsafe: unsafe extern "system" fn(this: &Object, p: *const super::Slice, size: u32),\n' +
+        '        pub Some: unsafe extern "system" fn(this: &Object, p: &super::IMy::Object) -> bool,\n' +
+        '        pub GetIMy: unsafe extern "system" fn(this: &Object) -> super::IMy::Ref,\n' +
+        '        pub SetManagedStruct: unsafe extern "system" fn(this: &Object, a: super::ManagedStruct),\n' +
+        '    }\n' +
+        '    impl nanocom::Interface for Interface {\n' +
+        '        const GUID: nanocom::GUID = 0xC66FB270_2D80_49AD_BB6E_88C1F90B805D;\n' +
+        '    }\n' +
+        '    pub trait Ex {\n' +
+        '        fn GetSlice(&self) -> super::Slice;\n' +
+        '        fn SetSlice(&self, slice: super::Slice);\n' +
+        '        fn GetUnsafe(&self) -> *const bool;\n' +
+        '        fn SetUnsafe(&self, p: *const super::Slice, size: u32);\n' +
+        '        fn Some(&self, p: &super::IMy::Object) -> bool;\n' +
+        '        fn GetIMy(&self) -> super::IMy::Ref;\n' +
+        '        fn SetManagedStruct(&self, a: super::ManagedStruct);\n' +
+        '    }\n' +
+        '    impl Ex for Object {\n' +
+        '        fn GetSlice(&self) -> super::Slice {\n' +
+        '            unsafe { (self.interface().GetSlice)(self) }\n' +
+        '        }\n' +
+        '        fn SetSlice(&self, slice: super::Slice) {\n' +
+        '            unsafe { (self.interface().SetSlice)(self, slice) }\n' +
+        '        }\n' +
+        '        fn GetUnsafe(&self) -> *const bool {\n' +
+        '            unsafe { (self.interface().GetUnsafe)(self) }\n' +
+        '        }\n' +
+        '        fn SetUnsafe(&self, p: *const super::Slice, size: u32) {\n' +
+        '            unsafe { (self.interface().SetUnsafe)(self, p, size) }\n' +
+        '        }\n' +
+        '        fn Some(&self, p: &super::IMy::Object) -> bool {\n' +
+        '            unsafe { (self.interface().Some)(self, p) }\n' +
+        '        }\n' +
+        '        fn GetIMy(&self) -> super::IMy::Ref {\n' +
+        '            unsafe { (self.interface().GetIMy)(self) }\n' +
+        '        }\n' +
+        '        fn SetManagedStruct(&self, a: super::ManagedStruct) {\n' +
+        '            unsafe { (self.interface().SetManagedStruct)(self, a) }\n' +
+        '        }\n' +
+        '    }\n' +
+        '    pub trait ClassEx\n' +
+        '    where\n' +
+        '        Self: nanocom::Class<Interface = Interface>,\n' +
+        '        nanocom::CObject<Self>: Ex,\n' +
+        '    {\n' +
+        '        const VMT: Vmt = Vmt {\n' +
+        '            iunknown: Self::IUNKNOWN,\n' +
+        '            interface: Interface {\n' +
+        '                GetSlice: Self::GetSlice,\n' +
+        '                SetSlice: Self::SetSlice,\n' +
+        '                GetUnsafe: Self::GetUnsafe,\n' +
+        '                SetUnsafe: Self::SetUnsafe,\n' +
+        '                Some: Self::Some,\n' +
+        '                GetIMy: Self::GetIMy,\n' +
+        '                SetManagedStruct: Self::SetManagedStruct,\n' +
+        '            },\n' +
+        '        };\n' +
+        '    }\n' +
+        '    impl<T> ClassEx for T\n' +
+        '    where\n' +
+        '        Self: nanocom::Class<Interface = Interface>,\n' +
+        '        nanocom::CObject<Self>: Ex,\n' +
+        '    {\n' +
+        '    }\n' +
+        '    trait PrivateClassEx\n' +
+        '    where\n' +
+        '        Self: nanocom::Class<Interface = Interface>,\n' +
+        '        nanocom::CObject<Self>: Ex,\n' +
+        '    {\n' +
+        '        extern "system" fn GetSlice(this: &Object) -> super::Slice {\n' +
+        '            unsafe { Self::to_cobject(this) }.GetSlice()\n' +
+        '        }\n' +
+        '        extern "system" fn SetSlice(this: &Object, slice: super::Slice) {\n' +
+        '            unsafe { Self::to_cobject(this) }.SetSlice(slice)\n' +
+        '        }\n' +
+        '        extern "system" fn GetUnsafe(this: &Object) -> *const bool {\n' +
+        '            unsafe { Self::to_cobject(this) }.GetUnsafe()\n' +
+        '        }\n' +
+        '        extern "system" fn SetUnsafe(this: &Object, p: *const super::Slice, size: u32) {\n' +
+        '            unsafe { Self::to_cobject(this) }.SetUnsafe(p, size)\n' +
+        '        }\n' +
+        '        extern "system" fn Some(this: &Object, p: &super::IMy::Object) -> bool {\n' +
+        '            unsafe { Self::to_cobject(this) }.Some(p)\n' +
+        '        }\n' +
+        '        extern "system" fn GetIMy(this: &Object) -> super::IMy::Ref {\n' +
+        '            unsafe { Self::to_cobject(this) }.GetIMy()\n' +
+        '        }\n' +
+        '        extern "system" fn SetManagedStruct(this: &Object, a: super::ManagedStruct) {\n' +
+        '            unsafe { Self::to_cobject(this) }.SetManagedStruct(a)\n' +
+        '        }\n' +
+        '    }\n' +
+        '    impl<T> PrivateClassEx for T\n' +
+        '    where\n' +
+        '        Self: nanocom::Class<Interface = Interface>,\n' +
+        '        nanocom::CObject<Self>: Ex,\n' +
+        '    {\n' +
+        '    }\n' +
+        '}'
+    if (rust !== e) { throw rust }
+}

package/com/rust/testlib.f.cjs

@@ -0,0 +1,6 @@
+const { flat } = require('../../text/module.f.cjs');
+const { join } = require('../../types/string/module.f.cjs');
+const { rust } = require('./module.f.cjs');
+const library = require('../types/testlib.f.cjs')
+
+module.exports = join('\n')(flat('    ')(rust(library)))

package/com/test/build.f.cjs

@@ -1,9 +1,9 @@
 const list = require('../../types/list/module.f.cjs')
 const { flat } = list
 
-const cppContent = require('../cpp/test.f.cjs').result
-const csContent = require('../cs/test.f.cjs').result
-const rustContent = require("../rust/test.f.cjs").result();
+const cppContent = require('../cpp/testlib.f.cjs')
+const csContent = require('../cs/testlib.f.cjs')
+const rustContent = require("../rust/testlib.f.cjs")
 
 /**
  * @typedef {|

package/com/test/rust/Cargo.toml

@@ -5,5 +5,8 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[lib]
+crate-type = ["cdylib"]
+
 [dependencies]
 nanocom = { path = "../../rust/nanocom" }

package/com/test/rust/src/lib.rs

@@ -1 +1,43 @@
+use crate::_result::IMy::ClassEx;
+
 mod _result;
+
+struct My {}
+
+impl nanocom::Class for My {
+    type Interface = _result::IMy::Interface;
+    fn static_vmt() -> &'static _result::IMy::Vmt {
+        static VMT: _result::IMy::Vmt = My::VMT;
+        &VMT
+    }
+}
+
+impl _result::IMy::Ex for nanocom::CObject<My> {
+    fn GetSlice(&self) -> _result::Slice {
+        todo!()
+    }
+
+    fn SetSlice(&self, slice: _result::Slice) {
+        todo!()
+    }
+
+    fn GetUnsafe(&self) -> *const bool {
+        todo!()
+    }
+
+    fn SetUnsafe(&self, p: *const _result::Slice, size: u32) {
+        todo!()
+    }
+
+    fn Some(&self, p: &_result::IMy::Object) -> bool {
+        todo!()
+    }
+
+    fn GetIMy(&self) -> _result::IMy::Ref {
+        todo!()
+    }
+
+    fn SetManagedStruct(&self, a: _result::ManagedStruct) {
+        todo!()
+    }
+}

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "functionalscript",
-  "version": "0.0.442",
+  "version": "0.0.444",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {
     "tsc": "tsc",
     "test": "tsc && npm run test-only",
     "version": "node ./nodejs/version/main.cjs",
-    "test-only": "node --trace-uncaught ./dev/test.mjs"
+    "test-only": "node --trace-uncaught ./dev/test.mjs",
+    "comtest": "node ./com/test/build.cjs"
   },
   "repository": {
     "type": "git",