@dforge-core/dforge-cli 0.1.0-rc.1 → 0.1.0-test.5

package/README.md

@@ -77,3 +77,22 @@ The validate/pack/install pipeline is the same code that runs on the dForge
 server, packaged as a single-file binary per platform via `dotnet publish
 --self-contained`. Avoids drift between author-time validation and server-side
 install validation: same parser, same validators, same error messages.
+
+## For maintainers
+
+C# source lives in [`iash44/dForge-core`](https://github.com/iash44/dForge-core)
+under `server/src/dForge.Cli/`. This repo only ships the npm wrapper + 6
+platform sidecars. Release flow:
+
+1. Tag `cli-vX.Y.Z` in `dForge-core` → `.github/workflows/release-cli.yml`
+   cross-compiles 6 binaries and attaches them to a GitHub Release.
+2. Run `gh workflow run publish.yml -f source_tag=cli-vX.Y.Z -f npm_version=X.Y.Z -f npm_tag=next`
+   in this repo. `scripts/fetch-binaries.sh` pulls binaries from the source
+   release; `scripts/publish.sh` aligns versions and publishes 7 packages.
+3. After smoke-testing `npx -y @dforge-core/dforge-cli@next --version`, promote
+   with another workflow run using `-f npm_tag=latest`.
+
+To test a freshly-built binary without going through the publish pipeline,
+set `DFORGE_CLI_BINARY=/path/to/dforge-cli` and `node index.js` will exec
+that path directly, skipping require.resolve and the sibling-packages
+fallback.

package/index.js

@@ -19,6 +19,18 @@ const platformMap = {
 };
 
 function resolveBinary() {
+	// Escape hatch for source-repo / dist-repo maintainers who want to test a
+	// freshly-built binary without going through the publish pipeline.
+	// Honored before anything else.
+	const override = process.env.DFORGE_CLI_BINARY;
+	if (override) {
+		if (!fs.existsSync(override)) {
+			console.error(`dforge-cli: DFORGE_CLI_BINARY points at non-existent path: ${override}`);
+			process.exit(1);
+		}
+		return override;
+	}
+
 	const key = `${process.platform}-${process.arch}`;
 	const pkg = platformMap[key];
 	if (!pkg) {
@@ -32,11 +44,23 @@ function resolveBinary() {
 	try {
 		pkgJsonPath = require.resolve(`${pkg}/package.json`);
 	} catch {
-		console.error(
-			`dforge-cli: platform package "${pkg}" not installed. ` +
-				`Re-run \`npm install\` without --no-optional, or install it explicitly.`,
-		);
-		process.exit(1);
+		// Dist-repo dev fallback: after running scripts/fetch-binaries.sh the
+		// sidecars sit under ./packages/<shortName>/ at the repo root, but
+		// they're not in node_modules (no `pnpm install` to symlink them).
+		// Check that path before bailing. Consumers of the published package
+		// never hit this branch — require.resolve succeeds via npm-installed
+		// node_modules.
+		const shortName = pkg.split("/").pop();
+		const siblingPkgJson = path.join(__dirname, "packages", shortName, "package.json");
+		if (fs.existsSync(siblingPkgJson)) {
+			pkgJsonPath = siblingPkgJson;
+		} else {
+			console.error(
+				`dforge-cli: platform package "${pkg}" not installed. ` +
+					`Re-run \`npm install\` without --no-optional, or install it explicitly.`,
+			);
+			process.exit(1);
+		}
 	}
 
 	const pkgDir = path.dirname(pkgJsonPath);
@@ -46,6 +70,21 @@ function resolveBinary() {
 		console.error(`dforge-cli: binary missing at ${binPath}`);
 		process.exit(1);
 	}
+
+	// Ensure the binary is executable. pnpm/npm tarball-packing has dropped the
+	// +x bit on files outside `bin` fields in some versions, so a freshly-
+	// downloaded sidecar can land as 0644 even though the local checkout was
+	// 0755. chmod is idempotent — no-op when already executable — and skipped
+	// on Windows where it has no effect on .exe invocation.
+	if (process.platform !== "win32") {
+		try {
+			const mode = fs.statSync(binPath).mode;
+			if ((mode & 0o111) === 0) fs.chmodSync(binPath, mode | 0o755);
+		} catch (e) {
+			// Non-fatal: spawnSync below will surface EACCES with a clear message
+			// if chmod failed for an unexpected reason (read-only fs, perms).
+		}
+	}
 	return binPath;
 }
 

package/package.json

@@ -1,26 +1,30 @@
 {
-  "name": "@dforge-core/dforge-cli",
-  "version": "0.1.0-rc.1",
-  "description": "dForge CLI — validate, pack, publish, and install dForge modules. Distributes a single-file native binary per platform via optionalDependencies (esbuild-style).",
-  "license": "MIT",
-  "homepage": "https://github.com/dforge-core/create-module",
-  "bin": {
-    "dforge-cli": "index.js"
-  },
-  "files": [
-    "index.js",
-    "README.md"
-  ],
-  "main": "index.js",
-  "engines": {
-    "node": ">=18"
-  },
-  "optionalDependencies": {
-    "@dforge-core/dforge-cli-darwin-arm64": "0.1.0-rc.1",
-    "@dforge-core/dforge-cli-darwin-x64": "0.1.0-rc.1",
-    "@dforge-core/dforge-cli-win32-x64": "0.1.0-rc.1",
-    "@dforge-core/dforge-cli-linux-x64": "0.1.0-rc.1",
-    "@dforge-core/dforge-cli-win32-arm64": "0.1.0-rc.1",
-    "@dforge-core/dforge-cli-linux-arm64": "0.1.0-rc.1"
-  }
-}
+	"name": "@dforge-core/dforge-cli",
+	"version": "0.1.0-test.5",
+	"description": "dForge CLI \u2014 validate, pack, publish, and install dForge modules. Distributes a single-file native binary per platform via optionalDependencies (esbuild-style).",
+	"license": "MIT",
+	"homepage": "https://github.com/iash44/dForge-core",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/dforge-core/dforge-cli.git"
+	},
+	"bin": {
+		"dforge-cli": "index.js"
+	},
+	"files": [
+		"index.js",
+		"README.md"
+	],
+	"main": "index.js",
+	"engines": {
+		"node": ">=18"
+	},
+	"optionalDependencies": {
+		"@dforge-core/dforge-cli-darwin-arm64": "0.1.0-test.5",
+		"@dforge-core/dforge-cli-darwin-x64": "0.1.0-test.5",
+		"@dforge-core/dforge-cli-linux-x64": "0.1.0-test.5",
+		"@dforge-core/dforge-cli-linux-arm64": "0.1.0-test.5",
+		"@dforge-core/dforge-cli-win32-x64": "0.1.0-test.5",
+		"@dforge-core/dforge-cli-win32-arm64": "0.1.0-test.5"
+	}
+}