@bufbuild/protoc-gen-es 0.0.1-alpha.1 → 0.0.1-alpha.4

package/bin/protoc-gen-es

@@ -1,11 +1,95 @@
 #!/usr/bin/env node
 
-const { basename } = require("path");
+const {basename, join, dirname} = require("path");
+const {existsSync, readFileSync} = require("fs");
+const {execFileSync} = require("child_process");
 
-// TODO(tstamm) shim for failed installation/yarn berry/windows/missing optional dependency
+const baseDir = dirname(__dirname);
+let basePkg;
+try {
+    basePkg = readPackage(baseDir);
+} catch (e) {
+    exitReadBasePackage(e);
+}
+const wantName = findPlatformPackageName(basePkg);
+if (!basePkg.optionalDependencies[wantName]) {
+    exitUnsupportedPlatform(basePkg);
+}
+const binPath = Object.values(basePkg.bin)[0];
+let absBinPath;
+try {
+    absBinPath = require.resolve(join(wantName, binPath));
+} catch (e) {
+    exitMissingPlatformBinary(basePkg);
+}
+execFileSync(absBinPath, process.argv.slice(2), {stdio: 'inherit', cwd: process.cwd(), env: process.env});
 
-process.stderr.write(`Failed to locate the binary for ${basename(__dirname)}.
-Platform: ${process.platform}
-Architecture: ${process.arch}
-`);
-process.exit(1);
+function exitReadBasePackage(error) {
+    const message = error instanceof Error ? error.message : String(error);
+    process.stderr.write(`${basename(__filename)}: ${message}\n`);
+    process.exit(1);
+}
+
+function exitUnsupportedPlatform(basePkg) {
+    process.stderr.write(`${basePkg.name}: unsupported platform/architecture: ${process.platform}/${process.arch}\n`);
+    process.exit(1);
+}
+
+function exitMissingPlatformBinary(basePkg) {
+    process.stderr.write(`${basePkg.name}: binary for ${process.platform}/${process.arch} is missing\n`);
+    process.exit(1);
+}
+
+function readPackage(dir) {
+    const pkgPath = join(dir, "package.json");
+    if (!existsSync(pkgPath)) {
+        throw new Error(`invalid npm-base: ${pkgPath} not found`);
+    }
+    const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
+    if (!pkg.name) {
+        throw new Error(`${pkgPath} is missing "name"`);
+    }
+    if (!pkg.bin) {
+        throw new Error(`${pkgPath} is missing "bin"`);
+    }
+    if (Object.keys(pkg.bin).length !== 1) {
+        throw new Error(`${pkgPath} is requires exactly one entry in "bin"`);
+    }
+    const binName = Object.keys(pkg.bin)[0];
+    const binValue = Object.values(pkg.bin)[0];
+    if (
+        binName === undefined ||
+        binValue === undefined ||
+        binValue !== `bin/${binName}`
+    ) {
+        throw new Error(
+            `${pkgPath} is missing an entry in "bin" in the form of {"foo": "bin/foo"}`
+        );
+    }
+    return pkg;
+}
+
+function findPlatformPackageName() {
+    // prettier-ignore
+    const platforms = [
+        { name: "darwin-64",     npmOs: "darwin",  npmCpu: "x64",   },
+        { name: "darwin-64",     npmOs: "darwin",  npmCpu: "x64",   },
+        { name: "darwin-arm64",  npmOs: "darwin",  npmCpu: "arm64", },
+        { name: "windows-64",    npmOs: "win32",   npmCpu: "x64",   },
+        { name: "windows-arm64", npmOs: "win32",   npmCpu: "arm64", },
+        { name: "windows-32",    npmOs: "win32",   npmCpu: "ia32",  },
+        { name: "linux-64",      npmOs: "linux",   npmCpu: "x64",   },
+        { name: "linux-32",      npmOs: "linux",   npmCpu: "ia32",  },
+        { name: "linux-arm",     npmOs: "linux",   npmCpu: "arm",   },
+        { name: "linux-arm64",   npmOs: "linux",   npmCpu: "arm64", },
+        { name: "freebsd-64",    npmOs: "freebsd", npmCpu: "x64",   },
+        { name: "freebsd-arm64", npmOs: "freebsd", npmCpu: "arm64", },
+        { name: "netbsd-64",     npmOs: "netbsd",  npmCpu: "x64",   },
+        { name: "openbsd-64",    npmOs: "openbsd", npmCpu: "x64",   },
+    ];
+    const platform = platforms.find(p => p.npmOs === process.platform && p.npmCpu === process.arch);
+    if (!platform) {
+        return undefined;
+    }
+    return `${basePkg.name}-${platform.name}`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protoc-gen-es",
-  "version": "0.0.1-alpha.1",
+  "version": "0.0.1-alpha.4",
   "description": "protoc-gen-es",
   "license": "Apache-2.0",
   "repository": {
@@ -10,25 +10,19 @@
   "bin": {
     "protoc-gen-es": "bin/protoc-gen-es"
   },
-  "scripts": {
-    "postinstall": "node postinstall.cjs"
-  },
-  "engines": {
-    "node": ">=8.5"
-  },
   "optionalDependencies": {
-    "@bufbuild/protoc-gen-es-darwin-64": "0.0.1-alpha.1",
-    "@bufbuild/protoc-gen-es-darwin-arm64": "0.0.1-alpha.1",
-    "@bufbuild/protoc-gen-es-windows-64": "0.0.1-alpha.1",
-    "@bufbuild/protoc-gen-es-windows-arm64": "0.0.1-alpha.1",
-    "@bufbuild/protoc-gen-es-windows-32": "0.0.1-alpha.1",
-    "@bufbuild/protoc-gen-es-linux-64": "0.0.1-alpha.1",
-    "@bufbuild/protoc-gen-es-linux-32": "0.0.1-alpha.1",
-    "@bufbuild/protoc-gen-es-linux-arm": "0.0.1-alpha.1",
-    "@bufbuild/protoc-gen-es-linux-arm64": "0.0.1-alpha.1",
-    "@bufbuild/protoc-gen-es-freebsd-64": "0.0.1-alpha.1",
-    "@bufbuild/protoc-gen-es-freebsd-arm64": "0.0.1-alpha.1",
-    "@bufbuild/protoc-gen-es-netbsd-64": "0.0.1-alpha.1",
-    "@bufbuild/protoc-gen-es-openbsd-64": "0.0.1-alpha.1"
+    "@bufbuild/protoc-gen-es-darwin-64": "0.0.1-alpha.4",
+    "@bufbuild/protoc-gen-es-darwin-arm64": "0.0.1-alpha.4",
+    "@bufbuild/protoc-gen-es-windows-64": "0.0.1-alpha.4",
+    "@bufbuild/protoc-gen-es-windows-arm64": "0.0.1-alpha.4",
+    "@bufbuild/protoc-gen-es-windows-32": "0.0.1-alpha.4",
+    "@bufbuild/protoc-gen-es-linux-64": "0.0.1-alpha.4",
+    "@bufbuild/protoc-gen-es-linux-32": "0.0.1-alpha.4",
+    "@bufbuild/protoc-gen-es-linux-arm": "0.0.1-alpha.4",
+    "@bufbuild/protoc-gen-es-linux-arm64": "0.0.1-alpha.4",
+    "@bufbuild/protoc-gen-es-freebsd-64": "0.0.1-alpha.4",
+    "@bufbuild/protoc-gen-es-freebsd-arm64": "0.0.1-alpha.4",
+    "@bufbuild/protoc-gen-es-netbsd-64": "0.0.1-alpha.4",
+    "@bufbuild/protoc-gen-es-openbsd-64": "0.0.1-alpha.4"
   }
 }

package/postinstall.cjs

@@ -1,50 +0,0 @@
-const { join, basename } = require("path");
-const { existsSync, readFileSync, copyFileSync } = require("fs");
-
-// TODO(tstamm) make this optional, and rely on shim for yarn berry
-try {
-  const pkg = readBasePackage(__dirname);
-  const pkgBinPath =
-    Object.values(pkg.bin)[0] + (process.platform === "win32" ? ".exe" : "");
-  copyFileSync(
-    `${__dirname}-${process.platform}-${process.arch}/${pkgBinPath}`,
-    `${__dirname}/${pkgBinPath}`
-  );
-} catch (e) {
-  basename(__dirname);
-  process.stderr.write(`Failed to install the binary for ${basename(__dirname)}.
-Platform: ${process.platform}
-Architecture: ${process.arch}
-Error: ${e}
-`);
-  process.exit(1);
-}
-
-function readBasePackage(npmBase) {
-  const pkgPath = join(npmBase, "package.json");
-  if (!existsSync(pkgPath)) {
-    throw new Error(`invalid npm-base: ${pkgPath} not found`);
-  }
-  const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
-  if (!pkg.name) {
-    throw new Error(`${pkgPath} is missing "name"`);
-  }
-  if (!pkg.bin) {
-    throw new Error(`${pkgPath} is missing "bin"`);
-  }
-  if (Object.keys(pkg.bin).length !== 1) {
-    throw new Error(`${pkgPath} is requires exactly one entry in "bin"`);
-  }
-  const binName = Object.keys(pkg.bin)[0];
-  const binValue = Object.values(pkg.bin)[0];
-  if (
-    binName === undefined ||
-    binValue === undefined ||
-    binValue !== `bin/${binName}`
-  ) {
-    throw new Error(
-      `${pkgPath} is missing an entry in "bin" in the form of {"foo": "bin/foo"}`
-    );
-  }
-  return pkg;
-}