@ohos-ports/protoc 36.0.0-beta.0 → 36.0.0-beta.1

package/assets.json

@@ -40,11 +40,11 @@
     "executable": "protoc-win64.exe"
   },
   {
-    "name": "protoc-36.0-openharmony-arm64.zip",
-    "browser_download_url": "https://github.com/protocolbuffers/protobuf/releases/download/v36.0/protoc-36.0-openharmony-arm64.zip",
+    "name": "protoc-36.0-openharmony-arm64.tar.gz",
+    "browser_download_url": "compiled-from-source://protobuf-36.0/protoc-openharmony-arm64 (statically linked, built with OHOS GCC 16.2.0, aarch64-unknown-linux-ohos)",
     "platform": "openharmony",
     "arch": "arm64",
     "dotExe": false,
     "executable": "protoc-openharmony-arm64"
   }
-]
+]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohos-ports/protoc",
-  "version": "36.0.0-beta.0",
+  "version": "36.0.0-beta.1",
   "upstreamVersion": "v36.0",
   "description": "Installs the protocol buffer compiler \"protoc\" for you.",
   "bin": {
@@ -9,10 +9,21 @@
   "engines": {
     "node": ">=20.0.0"
   },
+  "scripts": {
+    "build": "npm run build:protoc && npm run build:tsc",
+    "build:protoc": "esbuild src/protoc.ts --bundle --platform=node --outfile=protoc.cjs",
+    "build:tsc": "tsc --noEmit",
+    "test": "tsx --test src/*.test.ts",
+    "lint": "biome lint --error-on-warnings",
+    "format": "biome format --write"
+  },
   "type": "commonjs",
+  "publishConfig": {
+    "access": "public"
+  },
   "license": "Apache-2.0",
   "author": "Timo Stamm <ts@timostamm.com>",
-  "homepage": "https://github.com/ohos-ports/ohos-ports",
+  "homepage": "https://github.com/timostamm/protobuf-npm",
   "repository": {
     "type": "git",
     "url": "https://github.com/ohos-ports/ohos-ports.git",
@@ -22,21 +33,20 @@
     "Protocol Buffers",
     "protobuf",
     "protoc",
-    "installation",
-    "openharmony",
-    "ohos"
+    "installation"
   ],
-  "publishConfig": {
-    "access": "public"
+  "devDependencies": {
+    "tsx": "^4.23.1",
+    "fflate": "^0.8.3"
+  },
+  "bugs": {
+    "url": "https://github.com/ohos-ports/ohos-ports/issues"
   },
   "files": [
     "protoc.cjs",
     "assets.json",
-    "README.md",
     "bin/",
-    "include/"
-  ],
-  "optionalDependencies": {
-    "@ohos-ports/protoc-openharmony-arm64": "^36.0.0-beta.0"
-  }
+    "include/",
+    "README.md"
+  ]
 }

package/protoc.cjs

@@ -1,51 +1,27 @@
 #!/usr/bin/env node
 "use strict";
 
-// Modified protoc launcher for @ohos-ports/protoc
-// Resolves openharmony binary from @ohos-ports/protoc-openharmony-arm64 dependency
-
+// src/protoc.ts
 var import_node_path = require("node:path");
 var import_node_child_process = require("node:child_process");
 var import_node_fs = require("node:fs");
-
-var rootDir = __dirname.endsWith("src") ? import_node_path.dirname(__dirname) : __dirname;
+var rootDir = __dirname.endsWith("src") ? (0, import_node_path.dirname)(__dirname) : __dirname;
 var assets = JSON.parse(
-  import_node_fs.readFileSync(import_node_path.join(rootDir, "assets.json"), "utf-8")
+  (0, import_node_fs.readFileSync)((0, import_node_path.join)(rootDir, "assets.json"), "utf-8")
 );
-
 var asset = assets.find(
-  function (a) { return a.arch === process.arch && a.platform === process.platform; }
+  (asset2) => asset2.arch === process.arch && asset2.platform === process.platform
 );
-
 if (!asset) {
   throw new Error(
-    "No protoc executable available for your platform (" + process.platform + ") and architecture (" + process.arch + ")"
+    `No protoc executable available for your platform (${process.platform}) and architecture (${process.arch})`
   );
 }
-
-var command = import_node_path.join(rootDir, "bin", asset.executable);
-
-// If binary not found locally, try resolving from the platform-specific dependency
-if (!import_node_fs.existsSync(command)) {
-  var depPkg = "@ohos-ports/protoc-" + process.platform + "-" + process.arch;
-  try {
-    var depPath = require.resolve(depPkg + "/package.json");
-    var depDir = import_node_path.dirname(depPath);
-    command = import_node_path.join(depDir, "bin", asset.executable);
-  } catch (e) {
-    // Fallback: try node_modules path directly
-    var nmPath = import_node_path.join(rootDir, "node_modules", depPkg, "bin", asset.executable);
-    if (import_node_fs.existsSync(nmPath)) {
-      command = nmPath;
-    }
-  }
-}
-
-var p = import_node_child_process.spawnSync(command, process.argv.slice(2), {
+var command = (0, import_node_path.join)(rootDir, "bin", asset.executable);
+var p = (0, import_node_child_process.spawnSync)(command, process.argv.slice(2), {
   stdio: "inherit"
 });
-
 if (p.error !== void 0) {
   throw p.error;
 }
-process.exit(p.status !== null ? p.status : 0);
+process.exit(p.status ?? 0);