@zenithbuild/cli 0.6.9 → 0.6.11

package/dist/build.js

@@ -19,7 +19,7 @@ import { generateManifest } from './manifest.js';
 import { buildComponentRegistry, expandComponents, extractTemplate, isDocumentMode } from './resolve-components.js';
 import { collectExpandedComponentOccurrences } from './component-occurrences.js';
 import { applyOccurrenceRewritePlans, cloneComponentIrForInstance } from './component-instance-ir.js';
-import { resolveBundlerBin, resolveCompilerBin } from './toolchain-paths.js';
+import { resolveBundlerBin } from './toolchain-paths.js';
 import { createBundlerToolchain, createCompilerToolchain, ensureToolchainCompatibility, getActiveToolchainCandidate, runToolchainSync } from './toolchain-runner.js';
 import { maybeWarnAboutZenithVersionMismatch } from './version-check.js';
 const require = createRequire(import.meta.url);
@@ -106,7 +106,7 @@ function runCompiler(filePath, stdinSource, compilerOpts = {}, compilerRunOption
             : null);
     const compilerBin = !compilerToolchain && typeof compilerRunOptions.compilerBin === 'string'
         ? compilerRunOptions.compilerBin
-        : resolveCompilerBin();
+        : null;
     const args = stdinSource !== undefined
         ? ['--stdin', filePath]
         : [filePath];

package/dist/toolchain-paths.js

@@ -8,6 +8,24 @@ const CLI_ROOT = resolve(__dirname, '..');
 const localRequire = createRequire(import.meta.url);
 const IS_WINDOWS = process.platform === 'win32';
 const COMPILER_BRIDGE_RUNNER = resolve(__dirname, 'compiler-bridge-runner.js');
+const COMPILER_PLATFORM_PACKAGES = {
+    'darwin-arm64': {
+        packageName: '@zenithbuild/compiler-darwin-arm64',
+        binaryName: 'zenith-compiler'
+    },
+    'darwin-x64': {
+        packageName: '@zenithbuild/compiler-darwin-x64',
+        binaryName: 'zenith-compiler'
+    },
+    'linux-x64': {
+        packageName: '@zenithbuild/compiler-linux-x64',
+        binaryName: 'zenith-compiler'
+    },
+    'win32-x64': {
+        packageName: '@zenithbuild/compiler-win32-x64',
+        binaryName: 'zenith-compiler.exe'
+    }
+};
 const BUNDLER_PLATFORM_PACKAGES = {
     'darwin-arm64': {
         packageName: '@zenithbuild/bundler-darwin-arm64',
@@ -86,8 +104,8 @@ function createCompilerBridgeCandidate(modulePath) {
         argsPrefix: [COMPILER_BRIDGE_RUNNER, '--bridge-module', modulePath]
     };
 }
-function currentBundlerPlatformPackage() {
-    return BUNDLER_PLATFORM_PACKAGES[`${process.platform}-${process.arch}`] || null;
+function currentPlatformPackage(packages) {
+    return packages[`${process.platform}-${process.arch}`] || null;
 }
 export function resolveBinary(candidates) {
     for (const candidate of candidates) {
@@ -133,6 +151,24 @@ export function readCliPackageVersion() {
         return '0.0.0';
     }
 }
+function createInstalledPlatformPackageCandidate(tool, packages, projectRoot) {
+    const platformPackage = currentPlatformPackage(packages);
+    if (!platformPackage) {
+        return null;
+    }
+    const platformPackageRoot = resolvePackageRoot(platformPackage.packageName, projectRoot);
+    if (!platformPackageRoot) {
+        return null;
+    }
+    return createBinaryCandidate(tool, 'installed platform package binary', resolve(platformPackageRoot, 'bin', platformPackage.binaryName));
+}
+function createLegacyInstalledPackageCandidate(tool, packageName, binaryName, projectRoot) {
+    const installedRoot = resolvePackageRoot(packageName, projectRoot);
+    if (!installedRoot) {
+        return null;
+    }
+    return createBinaryCandidate(tool, 'legacy installed package binary', resolve(installedRoot, 'target', 'release', binaryName));
+}
 function compilerWorkspaceBinaryCandidates() {
     return [
         createBinaryCandidate('compiler', 'workspace binary', resolve(CLI_ROOT, '../compiler/target/release/zenith-compiler')),
@@ -154,11 +190,16 @@ export function compilerCommandCandidates(projectRoot = null, env = process.env)
             explicit: true
         });
     }
-    const installedRoot = resolvePackageRoot('@zenithbuild/compiler', projectRoot);
-    if (installedRoot) {
-        candidates.push(createBinaryCandidate('compiler', 'installed package binary', resolve(installedRoot, 'target/release/zenith-compiler')));
+    const platformCandidate = createInstalledPlatformPackageCandidate('compiler', COMPILER_PLATFORM_PACKAGES, projectRoot);
+    if (platformCandidate) {
+        candidates.push(platformCandidate);
+    }
+    const legacyCandidate = createLegacyInstalledPackageCandidate('compiler', '@zenithbuild/compiler', IS_WINDOWS ? 'zenith-compiler.exe' : 'zenith-compiler', projectRoot);
+    if (legacyCandidate) {
+        candidates.push(legacyCandidate);
     }
     candidates.push(...compilerWorkspaceBinaryCandidates());
+    const installedRoot = resolvePackageRoot('@zenithbuild/compiler', projectRoot);
     if (installedRoot) {
         const bridgeCandidate = createCompilerBridgeCandidate(resolve(installedRoot, 'dist/index.js'));
         if (bridgeCandidate) {
@@ -184,16 +225,13 @@ export function bundlerCommandCandidates(projectRoot = null, env = process.env)
             explicit: true
         });
     }
-    const platformPackage = currentBundlerPlatformPackage();
-    if (platformPackage) {
-        const platformPackageRoot = resolvePackageRoot(platformPackage.packageName, projectRoot);
-        if (platformPackageRoot) {
-            candidates.push(createBinaryCandidate('bundler', 'installed platform package binary', resolve(platformPackageRoot, 'bin', platformPackage.binaryName)));
-        }
+    const platformCandidate = createInstalledPlatformPackageCandidate('bundler', BUNDLER_PLATFORM_PACKAGES, projectRoot);
+    if (platformCandidate) {
+        candidates.push(platformCandidate);
     }
-    const installedRoot = resolvePackageRoot('@zenithbuild/bundler', projectRoot);
-    if (installedRoot) {
-        candidates.push(createBinaryCandidate('bundler', 'installed package binary', resolve(installedRoot, 'target/release/zenith-bundler')));
+    const legacyCandidate = createLegacyInstalledPackageCandidate('bundler', '@zenithbuild/bundler', IS_WINDOWS ? 'zenith-bundler.exe' : 'zenith-bundler', projectRoot);
+    if (legacyCandidate) {
+        candidates.push(legacyCandidate);
     }
     candidates.push(...bundlerWorkspaceBinaryCandidates());
     return candidates;

package/dist/toolchain-runner.js

@@ -9,6 +9,7 @@ const INCOMPATIBLE_STDERR_PATTERNS = [
     /cannot execute binary file/i,
     /not a valid win32 application/i
 ];
+const INSTALL_COMPATIBILITY_DOC = 'https://github.com/zenithbuild/framework/blob/master/docs/documentation/install-compatibility.md';
 function currentPlatformLabel() {
     return `${process.platform}-${process.arch}`;
 }
@@ -56,14 +57,17 @@ function emitFallbackWarning(toolchain, nextCandidate) {
 function missingToolchainError(toolchain) {
     if (toolchain.tool === 'bundler') {
         return new Error(`[zenith] Bundler binary not installed for ${process.platform}/${process.arch}. ` +
-            'Reinstall @zenithbuild/bundler or ensure optional dependency installed.');
+            `Reinstall @zenithbuild/bundler and ensure the matching platform package is installed. ` +
+            `See ${INSTALL_COMPATIBILITY_DOC}.`);
     }
     return new Error(`[zenith] ${toolchain.tool} binary not installed for ${currentPlatformLabel()}; ` +
-        `reinstall or set ${toolEnvVar(toolchain.tool)}=...`);
+        `reinstall, ensure the matching platform package is installed, or set ${toolEnvVar(toolchain.tool)}=... ` +
+        `See ${INSTALL_COMPATIBILITY_DOC}.`);
 }
 function incompatibleBinaryError(toolchain) {
     return new Error(`[zenith] ${toolchain.tool} binary is incompatible for ${currentPlatformLabel()}; ` +
-        `reinstall or set ${toolEnvVar(toolchain.tool)}=...`);
+        `reinstall, clear the wrong-platform package, or set ${toolEnvVar(toolchain.tool)}=... ` +
+        `See ${INSTALL_COMPATIBILITY_DOC}.`);
 }
 function toolchainProbeError(toolchain, result) {
     const detail = result?.error?.message

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zenithbuild/cli",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "description": "Deterministic project orchestrator for Zenith framework",
   "license": "MIT",
   "type": "module",
@@ -34,7 +34,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@zenithbuild/compiler": "0.6.9",
+    "@zenithbuild/compiler": "0.6.11",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {