functionalscript 0.0.459 → 0.0.461

package/com/test/build.cjs

@@ -32,5 +32,5 @@ const run = f => {
 }
 
 run(cpp)
-run(cs)
 run(rust)
+run(cs)

package/com/test/build.f.cjs

@@ -62,22 +62,19 @@ const output = platform => name => {
 }
 
 /** @type {Func} */
-const cpp = ({dirname, platform}) => {
-    const extension = platform === 'win32' ? 'dll' : 'so'
-    return {
-        file: {
-            name: `${dirname}/cpp/_result.hpp`,
-            content: cppContent,
-        },
-        line: [
-            flat([
-                ['clang', '-shared', '-o', output(platform)('main')],
-                flags(platform),
-                [`${dirname}/cpp/main.cpp`]]
-            ),
-        ],
-    }
-}
+const cpp = ({dirname, platform}) => ({
+    file: {
+        name: `${dirname}/cpp/_result.hpp`,
+        content: cppContent,
+    },
+    line: [
+        flat([
+            ['clang', '-shared', '-o', output(platform)('testc')],
+            flags(platform),
+            [`${dirname}/cpp/main.cpp`]]
+        ),
+    ],
+})
 
 /** @type {Func} */
 const cs = ({dirname}) => ({
@@ -85,7 +82,8 @@ const cs = ({dirname}) => ({
         name: `${dirname}/cs/_result.cs`,
         content: csContent,
     },
-    line: [['dotnet', 'build', `${dirname}/cs/cs.csproj`]],
+    line: [
+        ['dotnet', 'run', '--project', `${dirname}/cs/cs.csproj`]],
 })
 
 /** @type {Func} */
@@ -104,4 +102,4 @@ module.exports = {
     cs,
     /** @readonly */
     rust,
-}
+}

package/com/test/cpp/main.cpp

@@ -1,2 +1,14 @@
 #include "../../cpp/com.hpp"
 #include "_result.hpp"
+
+#ifdef _WIN32
+#define DLL_EXPORT __declspec(dllexport)
+#else
+#define DLL_EXPORT
+#endif
+
+DLL_EXPORT
+extern "C" int c_get()
+{
+    return 43;
+}

package/com/test/cs/Program.cs

@@ -1,2 +1,12 @@
-// See https://aka.ms/new-console-template for more information
+using System.Runtime.InteropServices;
+
+[DllImport("testrust")]
+static extern int get();
+
+[DllImport("testc")]
+static extern int c_get();
+
+// See https://aka.ms/new-console-template for more information
 Console.WriteLine("Hello, World!");
+Console.WriteLine(get());
+Console.WriteLine(c_get());

package/com/test/cs/cs.csproj

@@ -8,4 +8,9 @@
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="../../../target/debug/*testrust.*" CopyToOutputDirectory="PreserveNewest"/>
+    <None Include="../../../*testc.*" CopyToOutputDirectory="PreserveNewest"/>
+  </ItemGroup>
+
 </Project>

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

@@ -41,3 +41,6 @@ impl _result::IMy::Ex for nanocom::CObject<My> {
         todo!()
     }
 }
+
+#[no_mangle]
+pub extern "C" fn get() -> i32 { 42 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionalscript",
-  "version": "0.0.459",
+  "version": "0.0.461",
   "description": "FunctionalScript is a functional subset of JavaScript",
   "main": "module.f.cjs",
   "scripts": {