v0.0.7

Author: aheber

.github/workflows/publish-release.yml

@@ -24,11 +24,12 @@ jobs:
         node:
           - 14
           - 16
-        include:
-          - os: macos-m1
-            node: 16
-            host: arm64
-            target: arm64
+          - 18
+        # include:
+        #   - os: macos-m1
+        #     node: 16
+        #     host: arm64
+        #     target: arm64
     name: ${{ matrix.os }} (node=${{ matrix.node }}, host=${{ matrix.host }}, target=${{ matrix.target }})
     steps:
       - uses: actions/checkout@v3
@@ -56,16 +57,8 @@ jobs:
       - name: Package prebuilt binaries
         run: npx node-pre-gyp package --target_arch=${{ matrix.target }}
 
-      - name: Upload binaries to commit artifacts
-        uses: actions/upload-artifact@v3
-        if: matrix.node == 16
-        with:
-          name: prebuilt-binaries
-          path: build/stage/*/*
-          retention-days: 7
-
       - name: Upload binaries to GitHub Release
         run: node ./scripts/ghPublish.mjs
-        if: matrix.node == 16 && startsWith(github.ref, 'refs/tags/')
+        if: startsWith(github.ref, 'refs/tags/')
         env:
           NODE_PRE_GYP_GITHUB_TOKEN: ${{ github.token }}

bindings/node/apex.js

@@ -1 +1 @@
-module.exports = require("./index").apex;
+module.exports = require("./index").then((val) => val.apex);

bindings/node/index.js

@@ -1,21 +1,50 @@
+let exportedValues = {};
 try {
-  module.exports = require("../../build/Release/tree_sitter_sfapex_binding");
-} catch (error1) {
-  if (error1.code !== "MODULE_NOT_FOUND") {
-    throw error1;
-  }
+  exportedValues = require("node-gyp-build")(__dirname + "/../../");
+} catch (errorA) {
   try {
-    module.exports = require("../../build/Debug/tree_sitter_sfapex_binding");
-  } catch (error2) {
-    if (error2.code !== "MODULE_NOT_FOUND") {
-      throw error2;
+    exportedValues = require("../../build/Release/tree_sitter_sfapex_binding");
+  } catch (errorB) {
+    if (errorB.code !== "MODULE_NOT_FOUND") {
+      throw errorB;
+    }
+    try {
+      exportedValues = require("../../build/Debug/tree_sitter_sfapex_binding");
+    } catch (errorC) {
+      if (errorC.code !== "MODULE_NOT_FOUND") {
+        throw errorC;
+      }
+      // TODO: load WASM instead?? Not sure how to make it hot-swappable
+      // but leaving it async load to leave the door open
+      // exportedValues = getWasmModules();
+      throw errorA;
     }
-    throw error1;
   }
 }
 
-try {
-  module.exports.apex.nodeTypeInfo = require("../../apex/src/node-types.json");
-  module.exports.soql.nodeTypeInfo = require("../../soql/src/node-types.json");
-  module.exports.sosl.nodeTypeInfo = require("../../sosl/src/node-types.json");
-} catch (_) {}
+// Eventually, should be able to load the WASM module as a direct swap for the native... life goal
+async function getWasmModules() {
+  const TreeSitter = require(__dirname +
+    "/../../prebuilds/wasm/tree-sitter.js");
+  await TreeSitter.init();
+  return {
+    apex: await TreeSitter.Language.load(
+      __dirname + "/../../prebuilds/wasm/tree-sitter-apex.wasm"
+    ),
+    soql: await TreeSitter.Language.load(
+      __dirname + "/../../prebuilds/wasm/tree-sitter-soql.wasm"
+    ),
+    sosl: await TreeSitter.Language.load(
+      __dirname + "/../../prebuilds/wasm/tree-sitter-sosl.wasm"
+    ),
+  };
+}
+
+module.exports = Promise.resolve(exportedValues).then((mod) => {
+  try {
+    mod.apex.nodeTypeInfo = require("../../apex/src/node-types.json");
+    mod.soql.nodeTypeInfo = require("../../soql/src/node-types.json");
+    mod.sosl.nodeTypeInfo = require("../../sosl/src/node-types.json");
+  } catch (_) {}
+  return mod;
+});

bindings/node/soql.js

@@ -1 +1 @@
-module.exports = require("./index").soql;
+module.exports = require("./index").then((val) => val.soql);

bindings/node/sosl.js

@@ -1 +1 @@
-module.exports = require("./index").sosl;
+module.exports = require("./index").then((val) => val.sosl);

package-lock.json

@@ -28,7 +28,7 @@
     "build-apex": "cd apex && npx tree-sitter generate --no-bindings",
     "build-soql": "cd soql && npx tree-sitter generate --no-bindings",
     "build-sosl": "cd sosl && npx tree-sitter generate --no-bindings",
-    "test-load": "node -e \"console.log(require('./apex').name, require('./soql').name, require('./sosl').name)\"",
+    "test-load": "node -e \"require('./apex').then(apex => console.log(apex.name)), require('./soql').then(soql => console.log(soql.name)), require('./sosl').then(sosl => console.log(sosl.name))\"",
     "test": "npm run test-apex && npm run test-soql && npm run test-sosl && npm run test-load",
     "test-apex": "cd apex && npx tree-sitter test",
     "test-soql": "cd soql && npx tree-sitter test",