package up protogen

Author: pyramation

.github/workflows/build-wasm-linux.yml

@@ -1,4 +1,4 @@
-name: Build Wasm Linux 🧪
+name: Build Wasm 🛠
 
 on:
   workflow_dispatch:
@@ -16,16 +16,34 @@ jobs:
           node-version: '20.x'
           cache: 'yarn'
 
-      - name: Install Linux Deps 🧶
+      - name: Cache Emscripten 📇
+        uses: actions/cache@v2
+        with:
+          path: |
+            emsdk/upstream
+            emsdk/node
+          key: ${{ runner.os }}-emsdk-${{ hashFiles('emsdk/emsdk_manifest.json') }}
+          restore-keys: |
+            ${{ runner.os }}-emsdk-
+
+      - name: Install Emscripten ✍🏻
+        if: steps.cache-emsdk.outputs.cache-hit != 'true'
         run: |
           sudo apt-get update
-          sudo apt-get install -y make
+          sudo apt-get install cmake python3 python3-pip
+          git clone --branch 3.1.59 --depth 1 https://github.com/emscripten-core/emsdk.git
+          cd emsdk
+          ./emsdk install 3.1.59
+          ./emsdk activate 3.1.59
+          source ./emsdk_env.sh
 
-      - name: Install Dependencies 🧶
+      - name: Build with Emscripten
         run: |
-          yarn
+          source ./emsdk/emsdk_env.sh
+          emmake make
 
-      - name: Test 🔍
-        run: |
-          yarn make:wasm
-          yarn make build:wasm
+      - name: Archive production artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: compiled-files
+          path: wasm

package.json

@@ -30,38 +30,39 @@
     }
   },
   "scripts": {
-    "protogen": "node ./script/codegen.js 16-latest",
+    "protogen": "node ./script/protogen.js 16-latest",
     "clean": "rimraf build",
     "configure": "node-pre-gyp configure",
     "install": "node-pre-gyp install --fallback-to-build --loglevel verbose",
     "rebuild": "node-pre-gyp rebuild --loglevel verbose",
-    "make:wasm": "docker run --rm -v $(pwd):/src -u $(id -u):$(id -g) emscripten/emsdk emmake make",
-    "build:wasm": "yarn make:wasm build",
-    "rebuild:wasm": "yarn make:wasm rebuild",
-    "clean:wasm": "yarn make:wasm clean",
-    "clean-cache:wasm": "yarn make:wasm clean-cache",
+    "wasm:make": "docker run --rm -v $(pwd):/src -u $(id -u):$(id -g) emscripten/emsdk emmake make",
+    "wasm:build": "npm run wasm:make build",
+    "wasm:rebuild": "npm run wasm:make rebuild",
+    "wasm:clean": "npm run wasm:make clean",
+    "wasm:clean-cache": "npm run wasm:make clean-cache",
     "test": "mocha --timeout 5000",
     "binary:build": "node-pre-gyp rebuild package",
-    "binary:publish": "AWS_PROFILE=supabase-dev node-pre-gyp publish"
-  },
+    "binary:publish": "AWS_PROFILE=supabase-dev node-pre-gyp publish",
+    "clean:all": "npm run clean && npm run wasm:clean && npm run wasm:clean-cache"
+  },  
   "author": "Dan Lynch <[email protected]> (http://github.com/pyramation)",
   "license": "LICENSE IN LICENSE",
   "repository": {
     "type": "git",
     "url": "git://github.com/launchql/libpg-query-node.git"
   },
   "devDependencies": {
-    "rimraf": "5.0.0",
+    "@launchql/proto-cli": "1.25.0",
     "chai": "^3.5.0",
     "emnapi": "^0.43.1",
     "lodash": "^4.17.15",
     "mocha": "^5.2.0",
-    "@pgsql/protobufjs-cli": "1.1.5"
+    "rimraf": "5.0.0"
   },
   "dependencies": {
     "@emnapi/runtime": "^0.43.1",
+    "@launchql/protobufjs": "7.2.6",
     "@mapbox/node-pre-gyp": "^1.0.8",
-    "@pgsql/protobufjs": "7.2.6",
     "node-addon-api": "^7.0.0",
     "node-gyp": "^10.0.1"
   },
@@ -80,4 +81,4 @@
     "host": "https://supabase-public-artifacts-bucket.s3.amazonaws.com",
     "remote_path": "./libpg-query-node/"
   }
-}
+}

proto.js

@@ -2,10 +2,10 @@
 (function(global, factory) { /* global define, require, module */
 
     /* AMD */ if (typeof define === 'function' && define.amd)
-        define(["@pgsql/protobufjs/minimal"], factory);
+        define(["@launchql/protobufjs/minimal"], factory);
 
     /* CommonJS */ else if (typeof require === 'function' && typeof module === 'object' && module && module.exports)
-        module.exports = factory(require("@pgsql/protobufjs/minimal"));
+        module.exports = factory(require("@launchql/protobufjs/minimal"));
 
 })(this, function($protobuf) {
     "use strict";

script/codegen.js

@@ -0,0 +1,44 @@
+const https = require('https');
+const fs = require('fs');
+const { exec } = require('child_process');
+
+if (typeof process.argv[2] !== 'string') {
+    throw new Error('branchName not provided');
+}
+
+// Configuration Variables
+const branchName = process.argv[2];
+const protoUrl = `https://raw.githubusercontent.com/pganalyze/libpg_query/${branchName}/protobuf/pg_query.proto`;
+const inFile = 'libpg_query/protobuf/pg_query.proto';
+const outFile = 'proto.js';
+
+const protogenCmd = [
+  'pg-proto-parser',
+  'protogen',
+  '--protoUrl',
+  protoUrl,
+  '--inFile',
+  inFile,
+  '--outFile',
+  outFile,
+  '--originalPackageName',
+  'protobufjs/minimal',
+  '--newPackageName',
+  '@launchql/protobufjs/minimal'
+];
+
+// Step 2: Generate proto.js using pbjs (Assuming pbjs is installed and accessible)
+function generateProtoJS(callback) {
+  exec(protogenCmd.join(' '), (error, stdout, stderr) => {
+    if (error) {
+      console.error(`Error during code generation: ${error.message}`);
+      return;
+    }
+    console.log('Generated proto.js from proto file.');
+    callback();
+  });
+}
+
+  generateProtoJS(() => {
+    console.log('all done 🎉');
+  });