@xsrg2008/web-tree-sitter-cpp 0.1.1 → 0.1.2

package/index.browser.js

@@ -0,0 +1,35 @@
+import { Parser, Language } from "web-tree-sitter";
+
+function getDefaultWasmUrl() {
+  return new URL("./tree-sitter-cpp.wasm", import.meta.url).href;
+}
+
+function normalizeBrowserInput(wasmLangFile) {
+  if (wasmLangFile == null) {
+    return getDefaultWasmUrl();
+  }
+
+  if (wasmLangFile instanceof URL) {
+    return wasmLangFile.href;
+  }
+
+  if (wasmLangFile instanceof ArrayBuffer) {
+    return new Uint8Array(wasmLangFile);
+  }
+
+  return wasmLangFile;
+}
+
+/**
+ * @param {string | URL | Uint8Array | ArrayBuffer} [wasmLangFile]
+ * @returns {Promise<Parser>}
+ */
+async function getCppParser(wasmLangFile) {
+  await Parser.init();
+  const parser = new Parser();
+  const lang = await Language.load(normalizeBrowserInput(wasmLangFile));
+  parser.setLanguage(lang);
+  return parser;
+}
+
+export { getCppParser };

package/index.cjs

@@ -1,34 +1,34 @@
 const { Parser, Language } = require("web-tree-sitter");
-const fs = require("fs");
+const fs = require("fs/promises");
 const path = require("path");
 
-function getCppParser() {
-  const wasmPath = path.join(__dirname, "tree-sitter-cpp.wasm");
-  return getParser(wasmPath);
+function getDefaultWasmPath() {
+  return path.join(__dirname, "tree-sitter-cpp.wasm");
 }
 
 /**
- * @param {string} wasmLangFile
+ * @param {string | URL | Uint8Array | ArrayBuffer} [wasmLangFile]
  * @returns {Promise<any>}
  */
-async function getParser(wasmLangFile) {
-  return new Promise(async (resolve, reject) => {
-    await Parser.init();
-    const parser = new Parser();
-    fs.readFile(wasmLangFile, async (err, data) => {
-      if (err) {
-        reject(err);
-        return;
-      }
-      try {
-        const lang = await Language.load(data);
-        parser.setLanguage(lang);
-        resolve(parser);
-      } catch (err2) {
-        reject(err2);
-      }
-    });
-  });
+async function getCppParser(wasmLangFile = getDefaultWasmPath()) {
+  await Parser.init();
+  const parser = new Parser();
+  const lang = await loadLanguage(wasmLangFile);
+  parser.setLanguage(lang);
+  return parser;
+}
+
+async function loadLanguage(wasmLangFile) {
+  if (typeof wasmLangFile === "string" || wasmLangFile instanceof URL) {
+    const data = await fs.readFile(wasmLangFile);
+    return Language.load(data);
+  }
+
+  if (wasmLangFile instanceof ArrayBuffer) {
+    return Language.load(new Uint8Array(wasmLangFile));
+  }
+
+  return Language.load(wasmLangFile);
 }
 
 module.exports = {

package/index.d.ts

@@ -1,4 +1,6 @@
-import type { Parser } from "web-tree-sitter";
-export type { Parser };
+import { Parser } from "web-tree-sitter";
+export { Parser };
 
-export declare function getCppParser(): Promise<Parser>;
+export type WasmInput = string | URL | Uint8Array | ArrayBuffer;
+
+export declare function getCppParser(wasmLangFile?: WasmInput): Promise<Parser>;

package/index.js

@@ -1,34 +1,33 @@
-import { Parser } from 'web-tree-sitter';
-import { Language } from 'web-tree-sitter';
-import fs from "fs";
+import { Parser, Language } from "web-tree-sitter";
+import { readFile } from "node:fs/promises";
 
-function getCppParser() {
-  const wasmPath = new URL("./tree-sitter-cpp.wasm", import.meta.url);
-  return getParser(wasmPath);
+function getDefaultWasmPath() {
+  return new URL("./tree-sitter-cpp.wasm", import.meta.url);
 }
+
 /**
- * @param {string | URL} wasmLangFile
+ * @param {string | URL | Uint8Array | ArrayBuffer} [wasmLangFile]
  * @returns {Promise<Parser>}
  */
-async function getParser(wasmLangFile) {
-  return new Promise(async (resolve, reject) => {
-    await Parser.init();
-    const parser = new Parser();
-    fs.readFile(wasmLangFile, async (err, data) => {
-      if (err) {
-        reject(err);
-      }
-      try {
-        const lang = await Language.load(data);
-        parser.setLanguage(lang);
-        resolve(parser);
-      } catch (err2) {
-        reject(err2);
-      }
-    });
-  });
+async function getCppParser(wasmLangFile = getDefaultWasmPath()) {
+  await Parser.init();
+  const parser = new Parser();
+  const lang = await loadLanguage(wasmLangFile);
+  parser.setLanguage(lang);
+  return parser;
+}
+
+async function loadLanguage(wasmLangFile) {
+  if (typeof wasmLangFile === "string" || wasmLangFile instanceof URL) {
+    const data = await readFile(wasmLangFile);
+    return Language.load(data);
+  }
+
+  if (wasmLangFile instanceof ArrayBuffer) {
+    return Language.load(new Uint8Array(wasmLangFile));
+  }
+
+  return Language.load(wasmLangFile);
 }
 
-export {
-  getCppParser,
-};
+export { getCppParser };

package/package.json

@@ -1,23 +1,31 @@
 {
   "name": "@xsrg2008/web-tree-sitter-cpp",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "tree-sitter-cpp WASM",
   "main": "index.cjs",
   "types": "index.d.ts",
   "exports": {
     ".": {
       "types": "./index.d.ts",
+      "browser": "./index.browser.js",
+      "node": {
+        "import": "./index.js",
+        "require": "./index.cjs"
+      },
       "import": "./index.js",
       "require": "./index.cjs",
       "default": "./index.js"
-    }
+    },
+    "./tree-sitter-cpp.wasm": "./tree-sitter-cpp.wasm"
   },
+  "browser": "./index.browser.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "type": "module",
   "files": [
     "index.cjs",
+    "index.browser.js",
     "index.js",
     "index.d.ts",
     "tree-sitter-cpp.wasm",