@mlightcad/libredwg-web 0.0.2 → 0.0.4

package/lib/libredwg.d.ts

@@ -29,7 +29,9 @@ export interface Dwg_Field_Value {
     message?: string;
     data?: string | number | Dwg_Array_Ptr | Dwg_Point_2D | Dwg_Point_3D;
 }
+export type LibreDwgEx = LibreDwg & MainModule;
 export declare class LibreDwg {
+    static instance: LibreDwgEx;
     private wasmInstance;
     private constructor();
     dwg_read_data(fileContent: string | ArrayBuffer, fileType: number): any;
@@ -68,6 +70,6 @@ export declare class LibreDwg {
     dwg_ptr_to_point3d_array(ptr: Dwg_Array_Ptr, size: number): Dwg_Point_3D[];
     dwg_ptr_to_ltype_dash_array(ptr: Dwg_Array_Ptr, size: number): Dwg_LTYPE_Dash[];
     dwg_dynapi_entity_value(obj: number, field: string): Dwg_Field_Value;
-    static create(): Promise<LibreDwg & MainModule>;
+    static create(wasmInstance: MainModule | undefined): Promise<LibreDwgEx>;
 }
 //# sourceMappingURL=libredwg.d.ts.map

package/lib/libredwg.js

@@ -1,5 +1,6 @@
 import { createModule, Dwg_File_Type, Dwg_Object_Type } from './utils';
 export class LibreDwg {
+    static instance;
     wasmInstance;
     constructor(wasmInstance) {
         this.wasmInstance = wasmInstance;
@@ -173,9 +174,10 @@ export class LibreDwg {
     dwg_dynapi_entity_value(obj, field) {
         return this.wasmInstance.dwg_dynapi_entity_value(obj, field);
     }
-    static async create() {
-        const wasmInstance = await createModule();
-        return new LibreDwg(wasmInstance);
+    static async create(wasmInstance) {
+        if (wasmInstance == null)
+            wasmInstance = await createModule();
+        return this.instance == null ? new LibreDwg(wasmInstance) : this.instance;
     }
 }
 //# sourceMappingURL=libredwg.js.map

package/lib/utils.d.ts

@@ -338,5 +338,5 @@ export const Dwg_File_Type: Readonly<{
     DWG: 0;
     DXF: 1;
 }>;
-import createModule from "./libredwg-web.js";
+import createModule from '../wasm/libredwg-web.js';
 //# sourceMappingURL=utils.d.ts.map

package/lib/utils.js

@@ -1,6 +1,4 @@
-// Not import 'libredwg-web.js' in folder 'wasm' on purpose so that 
-// Vite doesn't bundle 'libredwg-web.wasm' file into the js bundle.
-import createModule from "./libredwg-web.js";
+import createModule from '../wasm/libredwg-web.js';
 export { createModule };
 export const Dwg_Object_Supertype = Object.freeze({
     DWG_SUPERTYPE_ENTITY: 0,

package/package.json

@@ -3,7 +3,7 @@
   "description": "a webassembly version of libredwg, which can read/write DXF files (in both formats, ascii and binary form) and read DWG files from AutoCAD R14 to AutoCAD 2020.",
   "license": "GPL-2.0-only",
   "private": false,
-  "version": "0.0.2",
+  "version": "0.0.4",
   "author": "MLight Lee <mlight.lee@outlook.com>",
   "repository": {
     "type": "git",
@@ -23,18 +23,6 @@
     "wasm",
     "webassembly"
   ],
-  "scripts": {
-    "demo": "vite",
-    "build": "tsc && vite build && cp -f wasm/libredwg-web.wasm dist/ && cp -f wasm/libredwg-web.wasm test/ && cp -f dist/libredwg-web.mjs test/",
-    "build:prepare": "mkdir -p ../../build-wasm && cd ../../build-wasm && emconfigure ../configure CFLAGS=\"-O2 -sUSE_ZLIB=1\" CC=emcc --enable-release --disable-docs --disable-write --disable-bindings --disable-shared --disable-json --disable-dxf",
-    "build:obj": "cd ../../build-wasm && emmake make",
-    "build:wasm": "cd ../../build-wasm && emcc ../src/binding.cpp ../src/binding_enum.cpp ../src/binding_dynapi.cpp ../src/binding_func.cpp src/*.o -O2 -s LINKABLE=1 -lembind -std=c++11 -Isrc -I../include -o libredwg-web.js -s ALLOW_MEMORY_GROWTH=1 -s EXPORT_ES6=1 -s MODULARIZE=1 -s EXPORT_NAME=\"createModule\" -sEXPORTED_RUNTIME_METHODS=FS,ENV,ccall,cwrap,UTF8ToString,stringToNewUTF8,setValue",
-    "clean": "rm -rf ../../build-wasm",
-    "copy": "cp -f ../../build-wasm/libredwg-web.js ../../build-wasm/libredwg-web.wasm wasm/ && cp -f ../../build-wasm/libredwg-web.js src/",
-    "install:emsdk": "cd $EMSDK && ./emsdk install latest && ./emsdk activate latest",
-    "link": "node script/create-symlink.js ./wasm/libredwg-web.js ./src/libredwg-web.js",
-    "publish": "pnpm publish --access public --no-git-checks"
-  },
   "files": [
     "dist",
     "lib/*.js",
@@ -65,5 +53,16 @@
     "typescript": "^5.5.2",
     "typescript-eslint": "^8.4.0",
     "vite": "^5.2.10"
+  },
+  "scripts": {
+    "demo": "vite",
+    "build": "tsc && vite build && cp -f dist/libredwg-web.mjs test/",
+    "build:prepare": "mkdir -p ../../build-wasm && cd ../../build-wasm && emconfigure ../configure CFLAGS=\"-O2 -sUSE_ZLIB=1\" CC=emcc --enable-release --disable-docs --disable-write --disable-bindings --disable-shared --disable-json --disable-dxf",
+    "build:obj": "cd ../../build-wasm && emmake make",
+    "build:wasm": "cd ../../build-wasm && emcc ../bindings/javascript/embind/*.cpp src/*.o -O2 -s LINKABLE=1 -lembind -std=c++11 -Isrc -I../src -I../include -o libredwg-web.js -s ALLOW_MEMORY_GROWTH=1 -s EXPORT_ES6=1 -s MODULARIZE=1 -s EXPORT_NAME=\"createModule\" -sEXPORTED_RUNTIME_METHODS=FS,ENV,ccall,cwrap,UTF8ToString,stringToNewUTF8,setValue",
+    "clean": "rm -rf ../../build-wasm",
+    "copy": "cp -f ../../build-wasm/libredwg-web.js ../../build-wasm/libredwg-web.wasm wasm/ && cp -f ../../build-wasm/libredwg-web.js src/",
+    "install:emsdk": "cd $EMSDK && ./emsdk install latest && ./emsdk activate latest",
+    "link": "node script/create-symlink.js ./wasm/libredwg-web.js ./src/libredwg-web.js"
   }
-}
+}