Merge pull request #26 from kamakiri01/drop-typings-d-ts

build without include typings d.ts

CHANGELOG.md

@@ -1,4 +1,7 @@
 # ChangeLog
 
-# 0.0.3
-- release
+## 0.0.4
+- Reorganized type definition dependencies
+
+## 0.0.3
+- Release

package.json

@@ -1,6 +1,6 @@
 {
   "name": "qulacs-wasm",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "Qulacs WebAssembly version",
   "main": "lib/bundle/index.js",
   "scripts": {
@@ -25,8 +25,8 @@
     "build:emscripten:em++:bundle": "em++ -O1 -s SINGLE_FILE=1 -I ./submodules/boost -I ./submodules/qulacs/include -L ./submodules/qulacs/lib -o ./lib-cpp/bundle/module.js   ./src-cpp/QulacsWasmModule.cpp -lvqcsim_static -lcppsim_static -lcsim_static -s MODULARIZE=1 -s 'EXPORT_NAME=\"ModuleQulacsWasm\"' --bind -s DISABLE_EXCEPTION_CATCHING=0 -s EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,ccall,cwrap,dyncall -s ALLOW_TABLE_GROWTH -s EXTRA_EXPORTED_RUNTIME_METHODS=['dynCall','getValue','setValue'] -s ALLOW_MEMORY_GROWTH",
     "build:emscripten:em++:nobundle": "em++ -O1 -I ./submodules/boost -I ./submodules/qulacs/include -L ./submodules/qulacs/lib -o ./lib-cpp/nobundle/module.js ./src-cpp/QulacsWasmModule.cpp -lvqcsim_static -lcppsim_static -lcsim_static -s MODULARIZE=1 -s 'EXPORT_NAME=\"ModuleQulacsWasm\"' --bind -s DISABLE_EXCEPTION_CATCHING=0 -s EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,ccall,cwrap,dyncall -s ALLOW_TABLE_GROWTH -s EXTRA_EXPORTED_RUNTIME_METHODS=['dynCall','getValue','setValue'] -s ALLOW_MEMORY_GROWTH",
     "build:emscripten:cp": "npm run build:emscripten:cp:bundle && npm run build:emscripten:cp:nobundle",
-    "build:emscripten:cp:bundle": "cpx \"./lib-cpp/bundle/**\" \"./lib/bundle/wasm/\" --clean",
-    "build:emscripten:cp:nobundle": "cpx \"./lib-cpp/nobundle/**\" \"./lib/nobundle/wasm/\" --clean",
+    "build:emscripten:cp:bundle": "cpx \"./lib-cpp/bundle/**\" \"./lib/bundle/wasm/\"",
+    "build:emscripten:cp:nobundle": "cpx \"./lib-cpp/nobundle/**\" \"./lib/nobundle/wasm/\"",
     "test": "jest && npm run lint",
     "lint": "eslint \"./src-ts/**/*.ts\" \"./test/**/*.ts\""
   },

src-cpp/QulacsWasmModule.cpp

@@ -85,9 +85,8 @@ EMSCRIPTEN_BINDINGS(Bindings) {
         .function("multiply_elementwise_function_wrapper", emscripten::optional_override([](QuantumState& self, intptr_t funcPtr) {
             // JSのfuncPtr先の関数をC++の型でラップする
             std::function<CPPCTYPE(ITYPE)> func = [funcPtr](ITYPE num) -> CPPCTYPE {
-                int castedNum = (int) num;
                 double complexArr[2]; // 戻り値のcomplex要素を格納するメモリを確保する
-                QuantumStateMultiplyElementwiseFunctionWrapper(funcPtr, castedNum, complexArr); // メモリにfuncPtrの実行結果を書き込む
+                QuantumStateMultiplyElementwiseFunctionWrapper(funcPtr, num, complexArr); // メモリにfuncPtrの実行結果を書き込む
                 double real = complexArr[0];
                 double imag = complexArr[1];
                 std::complex<double> c(real, imag);
@@ -743,7 +742,7 @@ EMSCRIPTEN_BINDINGS(Bindings) {
             auto size = list.size();
             int arr[size];
             for (int i = 0; i < size; i++) {
-                arr[i] = (int)list[i];
+                arr[i] = list[i];
             }
             return AdaptiveWrapper(funcPtr, arr, size);
         };

src-cpp/util.cpp

@@ -64,7 +64,7 @@ emscripten::EM_VAL transpaleITYPEVecToJSArray(const std::vector<ITYPE> &vec) {
     int size = vec.size();
     int arr[size];
     for (int i = 0; i < size; i++) {
-        arr[i] = (int) vec[i]; // NOTE: long long intをintに丸めている。JSで (un)signed long long intを取得する方法を検討
+        arr[i] = vec[i];
     }
     return convertIntArrayToJSArray(arr, size);
 }

src-ts/main/emsciptenModule/QulacsWasmModule.ts

@@ -1,3 +1,4 @@
+import { EmscriptenWasm } from "../../wasm/emscriptem-types";
 export interface QulacsWasmModule extends EmscriptenWasm.Module {
     //QuantumState: QuantumStateI; // NOTE: applyModuleのObject.keysで取得するため、メンバを型では直接参照しない。そのため、ここでメンバを定義する必要はない
     getExceptionMessage(exceptionPtr: number): string;

src-ts/main/init.ts

@@ -1,4 +1,5 @@
-const ModuleQulacsWasm = require("../wasm/module.js");
+import ModuleQulacsWasm from "../wasm/module";
+import { EmscriptenWasm } from "../wasm/emscriptem-types";
 import { QulacsWasmModule } from "./emsciptenModule/QulacsWasmModule";
 import { applyModule } from "./instance";
 
@@ -30,6 +31,7 @@ function _initQulacsFromModule(compiledModule: WebAssembly.Module): Promise<Qula
                     successCallback(instance);
                 })
                 .catch(e => reject(e));
+                return undefined!; // NOTE: @types/emscriptenでは不要なnon-null assertionかもしれない
         }
         ModuleQulacsWasm({ instantiateWasm: onInstantiateWasm })
             .then((emscriptenModule: EmscriptenWasm.Module) => {

typings/emscriptem-types.d.ts → src-ts/wasm/emscriptem-types.ts

@@ -1,8 +1,9 @@
 // reference from https://github.com/jamsinclair/jSquash/blob/db110f3adb463615e9022bd62b124c87ae2c8bc0/packages/jpeg/emscriptem-types.d.ts
-
 // These types roughly model the object that the JS files generated by Emscripten define. Copied from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/emscripten/index.d.ts and turned into a type definition rather than a global to support our way of using Emscripten.
 // TODO(@surma): Upstream this?
-declare namespace EmscriptenWasm {
+
+// eslint-disable-next-line @typescript-eslint/no-namespace
+export declare namespace EmscriptenWasm {
     type ModuleFactory<T extends Module = Module> = (
       moduleOverrides?: ModuleOpts,
     ) => Promise<T>;
@@ -30,6 +31,7 @@ declare namespace EmscriptenWasm {
       preInit: { (): void }[];
       preRun: { (): void }[];
       postRun: { (): void }[];
+      // eslint-disable-next-line no-undef
       preinitializedWebGLContext: WebGLRenderingContext;
       noInitialRun: boolean;
       noExitRuntime: boolean;

src-ts/wasm/module.ts

@@ -0,0 +1,6 @@
+// NOTE: このファイルはtscビルドを通す型整合性のためだけに利用し、publishには含まない。このファイルはnpm run build終了時点でemscriptenのmodule.jsに上書きされる
+import {EmscriptenWasm} from "./emscriptem-types";
+import { QulacsWasmModule } from "../main/emsciptenModule/QulacsWasmModule";
+
+declare const ModuleQulacsWasm: EmscriptenWasm.ModuleFactory<QulacsWasmModule>;
+export = ModuleQulacsWasm;

tsconfig.json

@@ -10,10 +10,6 @@
       "esModuleInterop": true,
       "forceConsistentCasingInFileNames": true
     },
-    "files": [
-        "./typings/ModuleQulacsWasm.d.ts",
-        "./typings/emscriptem-types.d.ts"
-    ],
     "include": [
       "./src-ts/**/*"
     ]