Add test case

kateinoigakukun · kateinoigakukun · commit 051ef6818905 · 2020-03-04T18:35:46.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+dist
+node_modules
+.wasi-sdk
diff --git a/example/.gitignore b/example/.gitignore
diff --git a/src/swift/.gitignore b/src/swift/.gitignore
@@ -3,5 +3,3 @@
 /Packages
 /*.xcodeproj
 xcuserdata/
-
-/.wasi-sdk
diff --git a/src/swift/Package.swift b/src/swift/Package.swift
@@ -4,6 +4,9 @@ import PackageDescription
 
 let package = Package(
     name: "JavaScriptKit",
+    products: [
+        .library(name: "JavaScriptKit", targets: ["JavaScriptKit"])
+    ],
     targets: [
         .target(
             name: "JavaScriptKitExample",
diff --git a/src/swift/Sources/JavaScriptKit/JSValue.swift b/src/swift/Sources/JavaScriptKit/JSValue.swift
@@ -12,7 +12,7 @@ public class JSRef {
     }
 }
 
-public enum JSValue {
+public enum JSValue: Equatable {
     case boolean(Bool)
     case string(String)
 }
@@ -62,8 +62,6 @@ public func setJSValue(this: JSRef, name: String, value: JSValue) {
         }
         return
     }
-
-    print("\(#function) with prop name \"\(name)\" (length: \(name.count))")
     _set_js_value(this.id, name, Int32(name.count), kind, payload)
 }
 
diff --git a/src/swift/Sources/JavaScriptKitExample/main.swift b/src/swift/Sources/JavaScriptKitExample/main.swift
@@ -1,4 +0,0 @@
-import JavaScriptKit
-let global = JSRef.global()
-setJSValue(this: global, name: "foobar", value: .boolean(true))
-print(getJSValue(this: global, name: "foobar"))
diff --git a/src/web/src/index.ts b/src/web/src/index.ts
@@ -5,14 +5,24 @@ interface ExportedMemory {
 type ref = number;
 type pointer = number;
 
+interface GlobalVariable {}
+declare const window: GlobalVariable;
+declare const global: GlobalVariable;
+
 export class SwiftRuntime {
     private instance: WebAssembly.Instance | null;
     private _heapValues: any[]
 
     constructor() {
         this.instance = null;
+        let _global: any;
+        if (typeof window !== "undefined") {
+            _global = window
+        } else if (typeof global !== "undefined") {
+            _global = global
+        }
         this._heapValues = [
-            window,
+            _global,
         ]
     }
 
@@ -75,8 +85,6 @@ export class SwiftRuntime {
         return {
             swjs_set_js_value: (ref: ref, name: number, length: number, kind: number, payload: number) => {
                 const obj = this._heapValues[ref];
-                console.log(`obj = ${obj}, name = ${name}, length = ${length}, kind = ${kind}, value = ${payload}`)
-                console.log(`name is decoded as "${readString(name, length)}"`)
                 Reflect.set(obj, readString(name, length), decodeValue(kind, payload))
             },
             swjs_get_js_value: (ref: ref, name: number, length: number, kind_ptr: pointer, payload_ptr: pointer) => {
diff --git a/test/JavaScriptKitExec/.gitignore b/test/JavaScriptKitExec/.gitignore
@@ -0,0 +1,5 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
diff --git a/test/JavaScriptKitExec/.swift-version b/test/JavaScriptKitExec/.swift-version
@@ -0,0 +1 @@
+wasm-DEVELOPMENT
diff --git a/test/JavaScriptKitExec/Makefile b/test/JavaScriptKitExec/Makefile
@@ -0,0 +1 @@
+../../src/swift/Makefile
diff --git a/test/JavaScriptKitExec/Package.swift b/test/JavaScriptKitExec/Package.swift
@@ -0,0 +1,14 @@
+// swift-tools-version:5.2
+
+import PackageDescription
+
+let package = Package(
+    name: "JavaScriptKitExec",
+    products: [
+        .executable(
+            name: "JavaScriptKitExec", targets: ["JavaScriptKitExec"]
+        ),
+    ],
+    dependencies: [.package(name: "JavaScriptKit", path: "../../src/swift")],
+    targets: [.target(name: "JavaScriptKitExec", dependencies: ["JavaScriptKit"])]
+)
diff --git a/test/JavaScriptKitExec/Sources/JavaScriptKitExec/main.swift b/test/JavaScriptKitExec/Sources/JavaScriptKitExec/main.swift
@@ -0,0 +1,19 @@
+import JavaScriptKit
+
+func expectEqual<T: Equatable>(_ lhs: T, _ rhs: T) {
+    assert(lhs == rhs, "Expect to be equal \"\(lhs)\" and \"\(rhs)\"")
+}
+
+let global = JSRef.global()
+do {
+    let inputs: [JSValue] = [
+        .boolean(true),
+        .boolean(false),
+    ]
+    for (index, input) in inputs.enumerated() {
+        let prop = "prop_\(index)"
+        setJSValue(this: global, name: prop, value: input)
+        let got = getJSValue(this: global, name: prop)
+        expectEqual(input, got)
+    }
+}
diff --git a/test/JavaScriptKitExec/script b/test/JavaScriptKitExec/script
@@ -0,0 +1 @@
+../../src/swift/script
diff --git a/test/Makefile b/test/Makefile
@@ -0,0 +1,15 @@
+MAKEFILE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+SWIFT_LIB_DIR ?= $(MAKEFILE_DIR)/../src/swift
+
+.PHONY: JavaScriptKitExec
+JavaScriptKitExec:
+	cd JavaScriptKitExec && make build
+
+dist/JavaScriptKitExec.wasm: JavaScriptKitExec
+	mkdir -p dist
+	cp ./JavaScriptKitExec/.build/debug/JavaScriptKitExec $@
+
+build: dist/JavaScriptKitExec.wasm
+	cd ../src/web && npm run build
+test: build
+	node index.js
diff --git a/test/index.js b/test/index.js
@@ -0,0 +1,41 @@
+const SwiftRuntime = require("javascript-kit-swift").SwiftRuntime;
+const WASI = require("@wasmer/wasi").WASI;
+const WasmFs = require("@wasmer/wasmfs").WasmFs;
+
+const promisify = require("util").promisify;
+const fs = require("fs");
+const readFile = promisify(fs.readFile);
+
+const swift = new SwiftRuntime();
+// Instantiate a new WASI Instance
+const wasmFs = new WasmFs();
+let wasi = new WASI({
+  args: [],
+  env: {},
+  bindings: {
+    ...WASI.defaultBindings,
+    fs: wasmFs.fs
+  }
+});
+
+const startWasiTask = async () => {
+  // Fetch our Wasm File
+  const wasmBinary = await readFile("./dist/JavaScriptKitExec.wasm");
+
+  // Instantiate the WebAssembly file
+  let { instance } = await WebAssembly.instantiate(wasmBinary, {
+    wasi_snapshot_preview1: wasi.wasiImport,
+    javascript_kit: swift.importObjects(),
+  });
+
+  swift.setInsance(instance);
+  // Start the WebAssembly WASI instance!
+  wasi.start(instance);
+
+  // Output what's inside of /dev/stdout!
+  const stdout = await wasmFs.getStdOut();
+  console.log(stdout);
+};
+startWasiTask().catch(err => {
+  console.log(err)
+});
diff --git a/test/package-lock.json b/test/package-lock.json
diff --git a/test/package.json b/test/package.json

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+dist`
	`2`	`+node_modules`
	`3`	`+.wasi-sdk`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class JSRef {`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
`15`		`-public enum JSValue {`
	`15`	`+public enum JSValue: Equatable {`
`16`	`16`	`case boolean(Bool)`
`17`	`17`	`case string(String)`
`18`	`18`	`}`
`@@ -62,8 +62,6 @@ public func setJSValue(this: JSRef, name: String, value: JSValue) {`
`62`	`62`	`}`
`63`	`63`	`return`
`64`	`64`	`}`
`65`		`-`
`66`		`- print("\(#function) with prop name \"\(name)\" (length: \(name.count))")`
`67`	`65`	`_set_js_value(this.id, name, Int32(name.count), kind, payload)`
`68`	`66`	`}`
`69`	`67`