@xemahq/repo-build-tooling 0.26.3 → 0.26.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xemahq/repo-build-tooling",
-  "version": "0.26.3",
+  "version": "0.26.4",
   "description": "Dev-time build tooling shared by every Xema repository. Ships as plain ESM, depending only on @xemahq/release-policy for registry access, so the published artifact is the reviewed source.",
   "license": "Apache-2.0",
   "author": "Neuralchowder Inc. <developer@xema.dev> (https://xema.dev)",
@@ -51,9 +51,9 @@
     "@xemahq/release-policy": "^16.0.0"
   },
   "scripts": {
-    "test": "node src/scrub-swagger-plugin-paths.mjs --self-test && node --test src/check-workspace-range-matches-local.test.mjs && node --test src/check-no-vendored-deps.test.mjs && node --test src/readiness.test.mjs && node --test src/composed-image.test.mjs && node --test src/composed-image-coordinate-cli.test.mjs && node --test src/declaration-refusal.test.mjs && node --test src/smoke-refusal.test.mjs && node --test src/load-image.test.mjs && node --test src/composed-image-coordinate.test.mjs && node --test src/composed-image-dockerfile.test.mjs && node --test src/service-bootstrap.test.mjs && node --test src/service-bootstrap-protocols.test.mjs && node --test src/composed-image-prebuilt-dockerfile.test.mjs && node --test src/composed-image-in-image-closure.test.mjs && node --test src/composed-image-stage.test.mjs && node --test src/composed-image-stage-tree.test.mjs && node --test src/composed-image-install.test.mjs && node --test src/composed-image-proof.test.mjs && node --test src/composed-image-pnpm-context.test.mjs && node --test src/composed-image-sync-injected.test.mjs && node --test src/composed-image-prisma-check.test.mjs && node --test src/composed-image-prisma-engine.test.mjs && node --test src/composed-migrate.test.mjs && node --test src/promote-image.test.mjs && node --test src/arm64-supplement-needed.test.mjs && node --test src/prepush-sanity.test.mjs && node --test src/service-image.test.mjs && node --test src/install-git-hooks.test.mjs"
+    "test": "node src/scrub-swagger-plugin-paths.mjs --self-test && node --test src/check-workspace-range-matches-local.test.mjs && node --test src/check-no-vendored-deps.test.mjs && node --test src/readiness.test.mjs && node --test src/composed-image.test.mjs && node --test src/composed-image-coordinate-cli.test.mjs && node --test src/declaration-refusal.test.mjs && node --test src/smoke-refusal.test.mjs && node --test src/load-image.test.mjs && node --test src/composed-image-coordinate.test.mjs && node --test src/composed-image-dockerfile.test.mjs && node --test src/service-bootstrap.test.mjs && node --test src/service-bootstrap-protocols.test.mjs && node --test src/composed-image-prebuilt-dockerfile.test.mjs && node --test src/composed-image-in-image-closure.test.mjs && node --test src/composed-image-stage.test.mjs && node --test src/composed-image-stage-tree.test.mjs && node --test src/composed-image-install.test.mjs && node --test src/composed-image-proof.test.mjs && node --test src/composed-image-pnpm-context.test.mjs && node --test src/composed-image-sync-injected.test.mjs && node --test src/composed-image-prisma-check.test.mjs && node --test src/composed-image-prisma-engine.test.mjs && node --test src/composed-migrate.test.mjs && node --test src/promote-image.test.mjs && node --test src/arm64-supplement-needed.test.mjs && node --test src/prepush-sanity.test.mjs && node --test src/service-image.test.mjs && node --test src/install-git-hooks.test.mjs && node --test src/image-cpu-arch.test.mjs"
   },
   "xemaRelease": {
-    "sourceDigest": "sha256:e36e1ebf9b6c0b4f12640d1f24212c43bb61d9a5a532279fb4f12a20dde70519"
+    "sourceDigest": "sha256:c6b72c65876d81f6a2548bb6da641b908eccb57c9a6ecaa435e31da9b237d75e"
   }
 }

package/src/composed-image-install.mjs

@@ -10,6 +10,7 @@ import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 
 import { assertPinsUnchanged } from './composed-image-in-image.mjs';
+import { nodeArch } from './service-image-platform.mjs';
 
 /** The install-flag words that make pnpm copy workspace packages into the store layout. */
 export const injectFlags = () => ['--config.inject-workspace-packages=true', '--config.dedupe-injected-deps=false'];
@@ -26,7 +27,7 @@ export const lockfileOnlyCommand = (filters) => ['pnpm', 'install', '--lockfile-
 /** The production install for `filters` on `linux/<arch>` as `[file, ...args]`. */
 export const productionInstallCommand = (filters, arch) => [
   'pnpm', 'install', '--prod', '--offline', '--ignore-scripts', ...injectFlags(), ...filters, '--frozen-lockfile',
-  '--os=linux', `--cpu=${arch}`, '--libc=glibc',
+  '--os=linux', `--cpu=${nodeArch(arch)}`, '--libc=glibc',
 ];
 
 const defaultExec = (file, args, { cwd }) => execFileSync(file, args, { cwd, stdio: 'inherit' });

package/src/image-cpu-arch.test.mjs

@@ -0,0 +1,67 @@
+// pnpm's `--cpu` takes Node `process.arch` names. The OCI name `amd64` is unknown to it and silently skips every
+// optional x64 binary, so an amd64 image lost its @swc/core binding.
+import assert from 'node:assert/strict';
+import { execFileSync } from 'node:child_process';
+import { existsSync, mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import test from 'node:test';
+import { injectFlags, productionInstallCommand } from './composed-image-install.mjs';
+import { deployArgs } from './service-image-stage.mjs';
+import { nodeArch } from './service-image-platform.mjs';
+
+test('nodeArch maps amd64 to x64 and arm64 to arm64, and refuses an arch with no row', () => {
+  assert.equal(nodeArch('amd64'), 'x64');
+  assert.equal(nodeArch('arm64'), 'arm64');
+  assert.throws(() => nodeArch('riscv64'), /no Node arch for image arch 'riscv64'/);
+});
+
+test('both install commands pass the Node arch to --cpu and throw for an unknown arch', () => {
+  assert.ok(productionInstallCommand([], 'amd64').includes('--cpu=x64'));
+  assert.ok(productionInstallCommand([], 'arm64').includes('--cpu=arm64'));
+  assert.ok(deployArgs({ service: 's', arch: 'amd64', destination: '/d' }).includes('--cpu=x64'));
+  assert.ok(deployArgs({ service: 's', arch: 'arm64', destination: '/d' }).includes('--cpu=arm64'));
+  assert.throws(() => productionInstallCommand([], 'riscv64'), /no Node arch/);
+  assert.throws(() => deployArgs({ service: 's', arch: 'riscv64', destination: '/d' }), /no Node arch/);
+});
+
+// A fixture shaped like @swc/core: a package whose optional dependencies are one binding per platform.
+function fixturePackage(dir, name, manifest) {
+  const pkg = join(dir, name.replace(/\W/g, '_'));
+  mkdirSync(pkg, { recursive: true });
+  writeFileSync(join(pkg, 'package.json'), JSON.stringify({ name, version: '1.0.0', ...manifest }));
+  return pkg;
+}
+
+test('an amd64 stage installs @swc/core-linux-x64-gnu and no arm64 binding; arm64 the reverse', (t) => {
+  const dir = mkdtempSync(join(tmpdir(), 'xema-cpu-arch-'));
+  t.after(() => rmSync(dir, { recursive: true, force: true }));
+  const x64 = fixturePackage(dir, '@swc/core-linux-x64-gnu', { os: ['linux'], cpu: ['x64'], libc: ['glibc'] });
+  const arm64 = fixturePackage(dir, '@swc/core-linux-arm64-gnu', { os: ['linux'], cpu: ['arm64'], libc: ['glibc'] });
+  const core = fixturePackage(dir, '@swc/core', {
+    optionalDependencies: { '@swc/core-linux-x64-gnu': `file:${x64}`, '@swc/core-linux-arm64-gnu': `file:${arm64}` },
+  });
+  const store = join(dir, 'store');
+  const env = { ...process.env, npm_config_store_dir: store };
+  const run = (cwd, args) => {
+    try {
+      return execFileSync('pnpm', args, { cwd, env, stdio: 'pipe' });
+    } catch (error) {
+      throw new Error(`pnpm ${args.join(' ')}: ${error.stdout}${error.stderr}`);
+    }
+  };
+  for (const arch of ['amd64', 'arm64']) {
+    const app = join(dir, `app-${arch}`);
+    mkdirSync(app);
+    writeFileSync(join(app, 'package.json'), JSON.stringify({ name: 'app', version: '1.0.0', dependencies: { '@swc/core': `file:${core}` } }));
+    // Resolve and fetch every platform's tarball into the store, as the real stage's committed lockfile and primed store do.
+    run(app, ['install', '--ignore-workspace', '--ignore-scripts', ...injectFlags(), '--force', '--config.supported-architectures.cpu=*', '--config.supported-architectures.os=*', '--config.supported-architectures.libc=*']);
+    rmSync(join(app, 'node_modules'), { recursive: true, force: true });
+    const [file, ...args] = productionInstallCommand(['--ignore-workspace'], arch);
+    run(app, args);
+    assert.equal(file, 'pnpm');
+    const present = (binding) => existsSync(join(app, 'node_modules', '.pnpm', 'node_modules', '@swc', binding));
+    assert.equal(present('core-linux-x64-gnu'), arch === 'amd64', `${arch}: x64 binding`);
+    assert.equal(present('core-linux-arm64-gnu'), arch === 'arm64', `${arch}: arm64 binding`);
+  }
+});

package/src/service-image-platform.mjs

@@ -17,6 +17,14 @@ export const IMAGE_PLATFORMS = Object.freeze({
   arm64: Object.freeze({ node: 'arm64', elfMachine: 183, prismaBinaryTarget: 'linux-arm64-openssl-3.0.x' }),
 });
 
+/** The Node `process.arch` name of an image arch (`amd64` → `x64`): what pnpm's `--cpu` takes. Refuses an arch with no row. */
+export function nodeArch(arch) {
+  if (!Object.hasOwn(IMAGE_PLATFORMS, arch)) {
+    throw new Error(`no Node arch for image arch '${arch}'; known: ${Object.keys(IMAGE_PLATFORMS).join(', ')}`);
+  }
+  return IMAGE_PLATFORMS[arch].node;
+}
+
 /** `linux/<arch>` → `<arch>`; refuses any platform this recipe does not build. */
 export function platformArch(platform) {
   const match = /^linux\/([a-z0-9]+)$/.exec(String(platform ?? ''));

package/src/service-image-stage.mjs

@@ -31,7 +31,7 @@ import { prismaEnginesDirectories } from './composed-image-prisma-engine.mjs';
 import { copyTool, toolVersion } from './composed-image-stage.mjs';
 import { MANIFEST_FILE, MANIFEST_SCHEMA } from './service-image-in-image.mjs';
 import { LOCKFILE, TOOL_NAME, rootBuildInputNames, sha256File } from './staged-image-proof.mjs';
-import { IMAGE_PLATFORMS, platformArch, scanNatives } from './service-image-platform.mjs';
+import { IMAGE_PLATFORMS, nodeArch, platformArch, scanNatives } from './service-image-platform.mjs';
 
 
 export const DEFAULT_STAGE_DIR = '.xema-stage';
@@ -48,7 +48,7 @@ export const deployArgs = ({ service, arch, destination }) => [
   '--offline',
   '--ignore-scripts',
   '--os=linux',
-  `--cpu=${arch}`,
+  `--cpu=${nodeArch(arch)}`,
   '--libc=glibc',
   '--config.force-legacy-deploy=false',
   '--config.inject-workspace-packages=true',