@fugood/bricks-ctor 2.25.0-beta.61 → 2.25.0-beta.63

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@fugood/bricks-ctor",
-  "version": "2.25.0-beta.61",
+  "version": "2.25.0-beta.63",
   "description": "Deprecated: ctor tooling moved to the `bricks ctor` commands in @fugood/bricks-cli. This package now only forwards legacy project scripts and triggers migration.",
   "dependencies": {
-    "@fugood/bricks-cli": "^2.25.0-beta.61"
+    "@fugood/bricks-cli": "^2.25.0-beta.63"
   },
-  "gitHead": "342701683311c7e0dc295bac19a2f9a9517d3160"
+  "gitHead": "c298a2ceeab7fb5f94db9a165bb31e4486b7f025"
 }

package/tools/__tests__/legacy-forwarder.test.js

@@ -0,0 +1,91 @@
+const mockSpawnSync = jest.fn()
+const mockExistsSync = jest.fn()
+
+jest.mock('node:child_process', () => ({
+  __esModule: true,
+  spawnSync: (...args) => mockSpawnSync(...args),
+}))
+
+jest.mock('node:fs', () => ({
+  __esModule: true,
+  existsSync: (...args) => mockExistsSync(...args),
+}))
+
+const loadForwarder = () => require('../_forward.ts')
+
+describe('legacy bricks-ctor forwarder', () => {
+  let exitSpy
+  let errorSpy
+
+  beforeEach(() => {
+    jest.resetModules()
+    mockSpawnSync.mockReset()
+    mockExistsSync.mockReset()
+    exitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {})
+    errorSpy = jest.spyOn(console, 'error').mockImplementation(() => {})
+  })
+
+  afterEach(() => {
+    exitSpy.mockRestore()
+    errorSpy.mockRestore()
+  })
+
+  it('prefers the local bricks CLI next to the legacy package', () => {
+    mockExistsSync.mockReturnValue(true)
+    mockSpawnSync.mockReturnValue({ status: 0 })
+    const { forwardLegacyCtorTool } = loadForwarder()
+
+    forwardLegacyCtorTool(
+      'deploy',
+      'file:///repo/node_modules/@fugood/bricks-ctor/tools/deploy.ts',
+      ['--target', 'device'],
+    )
+
+    expect(mockSpawnSync).toHaveBeenCalledWith(
+      '/repo/node_modules/.bin/bricks',
+      ['ctor', 'deploy', '--target', 'device'],
+      { stdio: 'inherit' },
+    )
+    expect(exitSpy).toHaveBeenCalledWith(0)
+  })
+
+  it('falls back to PATH when the local bricks CLI is missing', () => {
+    mockExistsSync.mockReturnValue(false)
+    mockSpawnSync.mockReturnValue({ status: 3 })
+    const { forwardLegacyCtorTool } = loadForwarder()
+
+    forwardLegacyCtorTool('pull', 'file:///repo/node_modules/@fugood/bricks-ctor/tools/pull.ts', [])
+
+    expect(mockSpawnSync).toHaveBeenCalledWith('bricks', ['ctor', 'pull'], { stdio: 'inherit' })
+    expect(exitSpy).toHaveBeenCalledWith(3)
+  })
+
+  it('reports spawn errors and exits with failure', () => {
+    mockExistsSync.mockReturnValue(false)
+    mockSpawnSync.mockReturnValue({ error: new Error('ENOENT') })
+    const { forwardLegacyCtorTool } = loadForwarder()
+
+    forwardLegacyCtorTool(
+      'mcp',
+      'file:///repo/node_modules/@fugood/bricks-ctor/tools/mcp-server.ts',
+      [],
+    )
+
+    expect(errorSpy).toHaveBeenCalledWith('bricks-ctor forwarder failed to run `bricks`: ENOENT')
+    expect(exitSpy).toHaveBeenCalledWith(1)
+  })
+
+  it('treats a missing child status as failure', () => {
+    mockExistsSync.mockReturnValue(false)
+    mockSpawnSync.mockReturnValue({})
+    const { forwardLegacyCtorTool } = loadForwarder()
+
+    forwardLegacyCtorTool(
+      'simulator',
+      'file:///repo/node_modules/@fugood/bricks-ctor/tools/simulator.ts',
+      [],
+    )
+
+    expect(exitSpy).toHaveBeenCalledWith(1)
+  })
+})

package/tools/_forward.ts

@@ -0,0 +1,26 @@
+import { spawnSync } from 'node:child_process'
+import { existsSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+
+// @fugood/bricks-ctor is deprecated; all tooling now lives in @fugood/bricks-cli.
+// This shared forwarder keeps legacy project scripts working until postinstall migrates them.
+export function resolveLegacyBricksCommand(baseUrl: string) {
+  const localBricks = fileURLToPath(new URL('../../../.bin/bricks', baseUrl))
+  return existsSync(localBricks) ? localBricks : 'bricks'
+}
+
+export function forwardLegacyCtorTool(
+  command: string,
+  baseUrl: string,
+  args = process.argv.slice(2),
+) {
+  const bricks = resolveLegacyBricksCommand(baseUrl)
+  const result = spawnSync(bricks, ['ctor', command, ...args], { stdio: 'inherit' })
+
+  if (result.error) {
+    console.error(`bricks-ctor forwarder failed to run \`${bricks}\`: ${result.error.message}`)
+    process.exit(1)
+  }
+
+  process.exit(result.status ?? 1)
+}

package/tools/deploy.ts

@@ -1,19 +1,4 @@
 #!/usr/bin/env bun
-// @fugood/bricks-ctor is deprecated — all tooling now lives in the `bricks ctor *` commands
-// (the @fugood/bricks-cli package). This thin forwarder keeps legacy project scripts working
-// and lets `bricks ctor postinstall` migrate the project onto the new commands.
-import { spawnSync } from 'node:child_process'
-import { existsSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
+import { forwardLegacyCtorTool } from './_forward.ts'
 
-// Prefer the CLI installed next to this shim (@fugood/bricks-cli is our only dependency)
-// over a PATH lookup, so the forwarder works without a global install.
-const localBricks = fileURLToPath(new URL('../../../.bin/bricks', import.meta.url))
-const bricks = existsSync(localBricks) ? localBricks : 'bricks'
-
-const result = spawnSync(bricks, ['ctor', 'deploy', ...process.argv.slice(2)], { stdio: 'inherit' })
-if (result.error) {
-  console.error(`bricks-ctor forwarder failed to run \`${bricks}\`: ${result.error.message}`)
-  process.exit(1)
-}
-process.exit(result.status ?? 1)
+forwardLegacyCtorTool('deploy', import.meta.url)

package/tools/mcp-server.ts

@@ -1,19 +1,4 @@
 #!/usr/bin/env bun
-// @fugood/bricks-ctor is deprecated — all tooling now lives in the `bricks ctor *` commands
-// (the @fugood/bricks-cli package). This thin forwarder keeps legacy project scripts working
-// and lets `bricks ctor postinstall` migrate the project onto the new commands.
-import { spawnSync } from 'node:child_process'
-import { existsSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
+import { forwardLegacyCtorTool } from './_forward.ts'
 
-// Prefer the CLI installed next to this shim (@fugood/bricks-cli is our only dependency)
-// over a PATH lookup, so the forwarder works without a global install.
-const localBricks = fileURLToPath(new URL('../../../.bin/bricks', import.meta.url))
-const bricks = existsSync(localBricks) ? localBricks : 'bricks'
-
-const result = spawnSync(bricks, ['ctor', 'mcp', ...process.argv.slice(2)], { stdio: 'inherit' })
-if (result.error) {
-  console.error(`bricks-ctor forwarder failed to run \`${bricks}\`: ${result.error.message}`)
-  process.exit(1)
-}
-process.exit(result.status ?? 1)
+forwardLegacyCtorTool('mcp', import.meta.url)

package/tools/postinstall.ts

@@ -1,21 +1,4 @@
 #!/usr/bin/env bun
-// @fugood/bricks-ctor is deprecated — all tooling now lives in the `bricks ctor *` commands
-// (the @fugood/bricks-cli package). This thin forwarder keeps legacy project scripts working
-// and lets `bricks ctor postinstall` migrate the project onto the new commands.
-import { spawnSync } from 'node:child_process'
-import { existsSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
+import { forwardLegacyCtorTool } from './_forward.ts'
 
-// Prefer the CLI installed next to this shim (@fugood/bricks-cli is our only dependency)
-// over a PATH lookup, so the forwarder works without a global install.
-const localBricks = fileURLToPath(new URL('../../../.bin/bricks', import.meta.url))
-const bricks = existsSync(localBricks) ? localBricks : 'bricks'
-
-const result = spawnSync(bricks, ['ctor', 'postinstall', ...process.argv.slice(2)], {
-  stdio: 'inherit',
-})
-if (result.error) {
-  console.error(`bricks-ctor forwarder failed to run \`${bricks}\`: ${result.error.message}`)
-  process.exit(1)
-}
-process.exit(result.status ?? 1)
+forwardLegacyCtorTool('postinstall', import.meta.url)

package/tools/pull.ts

@@ -1,19 +1,4 @@
 #!/usr/bin/env bun
-// @fugood/bricks-ctor is deprecated — all tooling now lives in the `bricks ctor *` commands
-// (the @fugood/bricks-cli package). This thin forwarder keeps legacy project scripts working
-// and lets `bricks ctor postinstall` migrate the project onto the new commands.
-import { spawnSync } from 'node:child_process'
-import { existsSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
+import { forwardLegacyCtorTool } from './_forward.ts'
 
-// Prefer the CLI installed next to this shim (@fugood/bricks-cli is our only dependency)
-// over a PATH lookup, so the forwarder works without a global install.
-const localBricks = fileURLToPath(new URL('../../../.bin/bricks', import.meta.url))
-const bricks = existsSync(localBricks) ? localBricks : 'bricks'
-
-const result = spawnSync(bricks, ['ctor', 'pull', ...process.argv.slice(2)], { stdio: 'inherit' })
-if (result.error) {
-  console.error(`bricks-ctor forwarder failed to run \`${bricks}\`: ${result.error.message}`)
-  process.exit(1)
-}
-process.exit(result.status ?? 1)
+forwardLegacyCtorTool('pull', import.meta.url)

package/tools/push-config.ts

@@ -1,19 +1,4 @@
 #!/usr/bin/env bun
-// @fugood/bricks-ctor is deprecated — all tooling now lives in the `bricks ctor *` commands
-// (the @fugood/bricks-cli package). This thin forwarder keeps legacy project scripts working
-// and lets `bricks ctor postinstall` migrate the project onto the new commands.
-import { spawnSync } from 'node:child_process'
-import { existsSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
+import { forwardLegacyCtorTool } from './_forward.ts'
 
-// Prefer the CLI installed next to this shim (@fugood/bricks-cli is our only dependency)
-// over a PATH lookup, so the forwarder works without a global install.
-const localBricks = fileURLToPath(new URL('../../../.bin/bricks', import.meta.url))
-const bricks = existsSync(localBricks) ? localBricks : 'bricks'
-
-const result = spawnSync(bricks, ['ctor', 'push', ...process.argv.slice(2)], { stdio: 'inherit' })
-if (result.error) {
-  console.error(`bricks-ctor forwarder failed to run \`${bricks}\`: ${result.error.message}`)
-  process.exit(1)
-}
-process.exit(result.status ?? 1)
+forwardLegacyCtorTool('push', import.meta.url)

package/tools/simulator.ts

@@ -1,21 +1,4 @@
 #!/usr/bin/env bun
-// @fugood/bricks-ctor is deprecated — all tooling now lives in the `bricks ctor *` commands
-// (the @fugood/bricks-cli package). This thin forwarder keeps legacy project scripts working
-// and lets `bricks ctor postinstall` migrate the project onto the new commands.
-import { spawnSync } from 'node:child_process'
-import { existsSync } from 'node:fs'
-import { fileURLToPath } from 'node:url'
+import { forwardLegacyCtorTool } from './_forward.ts'
 
-// Prefer the CLI installed next to this shim (@fugood/bricks-cli is our only dependency)
-// over a PATH lookup, so the forwarder works without a global install.
-const localBricks = fileURLToPath(new URL('../../../.bin/bricks', import.meta.url))
-const bricks = existsSync(localBricks) ? localBricks : 'bricks'
-
-const result = spawnSync(bricks, ['ctor', 'simulator', ...process.argv.slice(2)], {
-  stdio: 'inherit',
-})
-if (result.error) {
-  console.error(`bricks-ctor forwarder failed to run \`${bricks}\`: ${result.error.message}`)
-  process.exit(1)
-}
-process.exit(result.status ?? 1)
+forwardLegacyCtorTool('simulator', import.meta.url)