@hpcc-js/wasm-expat 1.0.0 → 1.1.0

package/package.json

@@ -1,55 +1,58 @@
 {
-    "name": "@hpcc-js/wasm-expat",
-    "version": "1.0.0",
-    "description": "hpcc-js - WASM expat",
-    "type": "module",
-    "exports": {
-        ".": {
-            "types": "./types/index.d.ts",
-            "import": "./dist/index.js"
-        }
-    },
-    "types": "./types/index.d.ts",
-    "files": [
-        "dist/**/*",
-        "src/**/*",
-        "types/**/*"
-    ],
-    "scripts": {
-        "clean": "rimraf ./dist ./dist-test ./types",
-        "build-types": "tsc --project tsconfig.json --emitDeclarationOnly",
-        "build-types-watch": "npm run build-types -- --watch",
-        "build-ts": "node esbuild.mjs",
-        "build-ts-dev": "npm run build-ts -- --mode=development",
-        "build-ts-watch": "npm run compile-ts-dev -- --watch",
-        "build-dev": "run-p build-types build-ts-dev",
-        "build": "run-p build-types build-ts",
-        "lint-skypack": "npx -y @skypack/package-check",
-        "lint-eslint": "eslint src/**/*.ts",
-        "lint": "run-p lint-eslint lint-skypack",
-        "test-chrome": "karma start --single-run --browsers ChromiumHeadless karma.conf.cjs",
-        "test-firefox": "karma start --single-run --browsers Firefox karma.conf.cjs",
-        "test-node": "mocha ./dist-test/index.node.js --reporter spec",
-        "test": "run-s test-chrome test-node"
-    },
-    "dependencies": {},
-    "devDependencies": {
-        "@hpcc-js/esbuild-plugins": "1.0.0"
-    },
-    "keywords": [
-        "graphviz",
-        "typescript",
-        "webassembly",
-        "wasm",
-        "dot",
-        "neato",
-        "twopi"
-    ],
-    "author": "hpcc-systems",
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/hpcc-systems/hpcc-js-wasm.git"
-    },
-    "homepage": "https://hpcc-systems.github.io/hpcc-js-wasm/",
-    "license": "Apache-2.0"
-}
+  "name": "@hpcc-js/wasm-expat",
+  "version": "1.1.0",
+  "description": "hpcc-js - WASM expat",
+  "type": "module",
+  "exports": {
+    ".": {
+      "types": "./types/index.d.ts",
+      "default": "./dist/index.js"
+    }
+  },
+  "main": "./dist/index.js",
+  "types": "./types/index.d.ts",
+  "files": [
+    "dist/**/*",
+    "src/**/*",
+    "types/**/*"
+  ],
+  "scripts": {
+    "clean": "rimraf ./dist ./dist-test ./types",
+    "build-types": "tsc --project tsconfig.json --emitDeclarationOnly",
+    "build-types-watch": "npm run build-types -- --watch",
+    "build-ts": "node esbuild.mjs",
+    "build-ts-dev": "npm run build-ts -- --mode=development",
+    "build-ts-watch": "npm run compile-ts-dev -- --watch",
+    "build-dev": "run-p build-types build-ts-dev",
+    "build": "run-p build-types build-ts",
+    "lint-skypack": "npx -y @skypack/package-check",
+    "lint-eslint": "eslint src/**/*.ts",
+    "lint": "run-p lint-eslint",
+    "test-chrome": "karma start --single-run --browsers ChromiumHeadless karma.conf.cjs",
+    "test-firefox": "karma start --single-run --browsers Firefox karma.conf.cjs",
+    "test-node": "mocha ./dist-test/index.node.js --reporter spec",
+    "test": "run-s test-chrome test-node",
+    "update": "npx -y npm-check-updates -u -t minor",
+    "update-major": "npx -y npm-check-updates -u"
+  },
+  "devDependencies": {
+    "@hpcc-js/esbuild-plugins": "1.0.7"
+  },
+  "keywords": [
+    "graphviz",
+    "typescript",
+    "webassembly",
+    "wasm",
+    "dot",
+    "neato",
+    "twopi"
+  ],
+  "author": "hpcc-systems",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/hpcc-systems/hpcc-js-wasm.git"
+  },
+  "homepage": "https://hpcc-systems.github.io/hpcc-js-wasm/",
+  "license": "Apache-2.0",
+  "gitHead": "841d4713a5ccd8644024e27f929cbb63ffff0573"
+}

package/src/expat.ts

@@ -1,5 +1,5 @@
-// @ts-ignore
-import load, { reset } from "../../../build/src-cpp/expat/expatlib/expatlib.wasm";
+// @ts-expect-error importing from a wasm file is resolved via a custom esbuild plugin
+import load, { reset } from "../../../build/packages/expat/src-cpp/expatlib/expatlib.wasm";
 
 export type Attributes = { [key: string]: string };
 export interface IParser {
@@ -26,7 +26,7 @@ function parseAttrs(attrs: string): Attributes {
  * See [libexpat.github.io](https://libexpat.github.io/) for c++ details.
  * 
  * ```ts
- * import { Expat } from "@hpcc-js/wasm/expat";
+ * import { Expat } from "@hpcc-js/wasm-expat";
  * 
  * const expat = await Expat.load();
  * 
@@ -144,7 +144,7 @@ export class StackParser implements IParser {
         return retVal;
     }
 
-    endElement(tag: string): StackElement {
+    endElement(_tag: string): StackElement {
         return this._stack.pop()!;
     }
 
@@ -152,4 +152,3 @@ export class StackParser implements IParser {
         this.top().appendContent(content);
     }
 }
-

package/types/expat.d.ts

@@ -12,7 +12,7 @@ export interface IParser {
  * See [libexpat.github.io](https://libexpat.github.io/) for c++ details.
  *
  * ```ts
- * import { Expat } from "@hpcc-js/wasm/expat";
+ * import { Expat } from "@hpcc-js/wasm-expat";
  *
  * const expat = await Expat.load();
  *
@@ -80,6 +80,6 @@ export declare class StackParser implements IParser {
     parse(xml: string): Promise<boolean>;
     top(): StackElement;
     startElement(tag: string, attrs: Attributes): StackElement;
-    endElement(tag: string): StackElement;
+    endElement(_tag: string): StackElement;
     characterData(content: string): void;
 }

package/src/wasm-library.ts

@@ -1,59 +0,0 @@
-export type PTR = number;
-export interface HeapU8 {
-    ptr: PTR;
-    size: number;
-}
-
-/**
- * Base class to simplify moving data into and out of Wasm memory.
- */
-export class WasmLibrary {
-
-    protected _module: any;
-    protected _exports: any;
-
-    protected constructor(_module: any, _export: any) {
-        this._module = _module;
-        this._exports = _export;
-    }
-
-    protected malloc_heapu8(size: number): HeapU8 {
-        const ptr: PTR = this._exports.malloc(size);
-        return {
-            ptr,
-            size
-        };
-    }
-
-    protected free_heapu8(data: HeapU8) {
-        this._exports.free(data.ptr);
-    }
-
-    protected uint8_heapu8(data: Uint8Array): HeapU8 {
-        const retVal = this.malloc_heapu8(data.byteLength);
-        this._module.HEAPU8.set(data, retVal.ptr);
-        return retVal;
-    }
-
-    protected heapu8_view(data: HeapU8): Uint8Array {
-        return this._module.HEAPU8.subarray(data.ptr, data.ptr + data.size);
-    }
-
-    protected heapu8_uint8(data: HeapU8): Uint8Array {
-        return new Uint8Array([...this.heapu8_view(data)]);
-    }
-
-    protected string_heapu8(str: string): HeapU8 {
-        const data = Uint8Array.from(str, x => x.charCodeAt(0));
-        return this.uint8_heapu8(data);
-    }
-
-    protected heapu8_string(data: HeapU8): string {
-        const retVal = Array.from({ length: data.size });
-        const submodule = this._module.HEAPU8.subarray(data.ptr, data.ptr + data.size);
-        submodule.forEach((c: number, i: number) => {
-            retVal[i] = String.fromCharCode(c);
-        });
-        return retVal.join("");
-    }
-}

package/types/wasm-library.d.ts

@@ -1,20 +0,0 @@
-export type PTR = number;
-export interface HeapU8 {
-    ptr: PTR;
-    size: number;
-}
-/**
- * Base class to simplify moving data into and out of Wasm memory.
- */
-export declare class WasmLibrary {
-    protected _module: any;
-    protected _exports: any;
-    protected constructor(_module: any, _export: any);
-    protected malloc_heapu8(size: number): HeapU8;
-    protected free_heapu8(data: HeapU8): void;
-    protected uint8_heapu8(data: Uint8Array): HeapU8;
-    protected heapu8_view(data: HeapU8): Uint8Array;
-    protected heapu8_uint8(data: HeapU8): Uint8Array;
-    protected string_heapu8(str: string): HeapU8;
-    protected heapu8_string(data: HeapU8): string;
-}