@fugood/bricks-ctor 2.25.0-beta.8 → 2.25.0-beta.80

package/tools/pull.ts

@@ -1,122 +1,4 @@
-import { readFile, writeFile } from 'node:fs/promises'
-import { format } from 'oxfmt'
-import { sh } from './_shell'
-import { buildCommitArgs } from './_git-author'
+#!/usr/bin/env bun
+import { forwardLegacyCtorTool } from './_forward.ts'
 
-const cwd = process.cwd()
-const args = process.argv.slice(2)
-const force = args.includes('--force') || args.includes('-f')
-
-// Check git status
-const { exitCode } = await sh`cd ${cwd} && git status`.nothrow()
-const isGitRepo = exitCode === 0
-
-if (isGitRepo) {
-  const unstagedChanges = await sh`cd ${cwd} && git diff --name-only --diff-filter=ACMR`.text()
-  if (unstagedChanges) {
-    if (force) {
-      console.log('Force mode: committing unstaged changes before pull...')
-      await sh`cd ${cwd} && git add .`
-      const preCommitArgs = await buildCommitArgs(cwd, [
-        'chore(force-pull): saved unstaged changes before pull',
-      ])
-      await sh`cd ${cwd} && git ${preCommitArgs}`
-    } else {
-      throw new Error('Unstaged changes found, please commit or stash your changes before pulling')
-    }
-  }
-} else {
-  const confirmContinue = prompt(
-    'No git repository found, so it will not be safe to pull, continue? (y/n)',
-  )
-  if (confirmContinue !== 'y') throw new Error('Pull cancelled')
-}
-
-// Read application.json
-const app = JSON.parse(await readFile(`${cwd}/application.json`, 'utf8'))
-
-const isModule = app.type === 'module'
-const command = isModule ? 'module' : 'app'
-
-// Fetch project files using CLI
-console.log(`Pulling ${command} project (${app.id})...`)
-const result = await sh`bricks ${command} project-pull ${app.id} --json`.quiet().nothrow()
-
-if (result.exitCode !== 0) {
-  const output = result.stderr.toString() || result.stdout.toString()
-  try {
-    const json = JSON.parse(output)
-    throw new Error(json.error || 'Pull failed')
-  } catch {
-    throw new Error(output || 'Pull failed')
-  }
-}
-
-const { files, lastCommitId } = JSON.parse(result.stdout.toString())
-
-let useMain = false
-if (isGitRepo && !force) {
-  console.log(`Checking commit ${lastCommitId}...`)
-  const found = (await sh`cd ${cwd} && git rev-list -1 ${lastCommitId}`.nothrow().text())
-    .trim()
-    .match(/^[\da-f]{40}$/)
-
-  const commitId = (await sh`cd ${cwd} && git rev-parse HEAD`.text()).trim()
-
-  if (commitId === lastCommitId) throw new Error('Commit not changed')
-
-  const branchName = isModule
-    ? 'BRICKS_PROJECT_try-pull-module'
-    : 'BRICKS_PROJECT_try-pull-application'
-
-  await sh`cd ${cwd} && git branch -D ${branchName}`.nothrow()
-
-  if (found) {
-    await sh`cd ${cwd} && git checkout -b ${branchName} ${lastCommitId}`.nothrow()
-  } else {
-    await sh`cd ${cwd} && git checkout -b ${branchName}`
-    useMain = true
-  }
-}
-
-const oxfmtConfig = await readFile(`${cwd}/.oxfmtrc.json`, 'utf8')
-  .then(JSON.parse)
-  .catch(() => ({
-    trailingComma: 'all',
-    tabWidth: 2,
-    semi: false,
-    singleQuote: true,
-    printWidth: 100,
-  }))
-
-await Promise.all(
-  files.map(async (file: { name: string; input: string; formatable?: boolean }) => {
-    let content = file.input
-    if (file.formatable) {
-      const result = await format(file.name, file.input, oxfmtConfig)
-      content = result.code
-    }
-    return writeFile(`${cwd}/${file.name}`, content)
-  }),
-)
-
-if (isGitRepo) {
-  await sh`cd ${cwd} && git add .`
-  const hasChanges = !!(await sh`cd ${cwd} && git diff --cached --name-only`.text()).trim()
-  if (hasChanges) {
-    const commitMsg = force
-      ? `chore(force-pull): apply force pull-${command}`
-      : isModule
-        ? 'chore(project): apply file changes from BRICKS module'
-        : 'chore(project): apply file changes from BRICKS application'
-    const commitArgs = await buildCommitArgs(cwd, [commitMsg])
-    await sh`cd ${cwd} && git ${commitArgs}`
-  }
-  if (!force && !useMain) {
-    await sh`cd ${cwd} && git merge main`
-  }
-}
-
-console.log(
-  `${isModule ? 'Module' : 'App'} project pulled: ${files.length} files${force ? ' (force)' : ''}`,
-)
+forwardLegacyCtorTool('pull', import.meta.url)

package/tools/push-config.ts

@@ -0,0 +1,4 @@
+#!/usr/bin/env bun
+import { forwardLegacyCtorTool } from './_forward.ts'
+
+forwardLegacyCtorTool('push', import.meta.url)

package/tools/simulator.ts

@@ -0,0 +1,4 @@
+#!/usr/bin/env bun
+import { forwardLegacyCtorTool } from './_forward.ts'
+
+forwardLegacyCtorTool('simulator', import.meta.url)

package/compile/__tests__/index.test.js

@@ -1,115 +0,0 @@
-import { compile } from '../index'
-
-const SUBSPACE_ID = 'SUBSPACE_00000000-0000-0000-0000-000000000001'
-const CANVAS_ID = 'CANVAS_00000000-0000-0000-0000-000000000001'
-const ANIMATION_ID = 'ANIMATION_00000000-0000-0000-0000-000000000001'
-
-const makeApp = (animations) => {
-  const rootCanvas = {
-    __typename: 'Canvas',
-    id: CANVAS_ID,
-    items: [],
-  }
-  const rootSubspace = {
-    __typename: 'Subspace',
-    id: SUBSPACE_ID,
-    title: 'Main Subspace',
-    layout: {
-      width: 96,
-      height: 54,
-    },
-    rootCanvas,
-    canvases: [rootCanvas],
-    animations,
-    bricks: [],
-    generators: [],
-    data: [],
-    dataRouting: [],
-    dataCalculation: [],
-  }
-
-  return {
-    name: 'Compile animation test',
-    rootSubspace,
-    subspaces: [rootSubspace],
-  }
-}
-
-describe('compile animations', () => {
-  test('normalizes mixed legacy spring config', async () => {
-    const warnSpy = jest.spyOn(console, 'warn').mockImplementation(() => {})
-    try {
-      const config = await compile(
-        makeApp([
-          {
-            __typename: 'Animation',
-            id: ANIMATION_ID,
-            alias: 'btnPressOut',
-            title: 'Button Press Out',
-            property: 'transform.scale',
-            config: {
-              __type: 'AnimationSpringConfig',
-              toValue: 1,
-              friction: 5,
-              tension: 200,
-              speed: 14,
-              bounciness: 8,
-            },
-          },
-        ]),
-      )
-
-      expect(config.subspace_map[SUBSPACE_ID].animation_map[ANIMATION_ID].config).toEqual({
-        toValue: 1,
-        friction: 5,
-        tension: 200,
-      })
-      const warning = warnSpy.mock.calls[0][0]
-      expect(warning).toContain('Resolved animation spring config')
-      expect(warning).toContain('Button Press Out')
-      expect(warning).toContain('btnPressOut')
-      expect(warning).toContain('transform.scale')
-      expect(warning).toContain('Main Subspace')
-      expect(warning).not.toContain('ANIMATION_')
-      expect(warning).not.toContain('SUBSPACE_')
-    } finally {
-      warnSpy.mockRestore()
-    }
-  })
-
-  test('rejects invalid animation property', async () => {
-    await expect(
-      compile(
-        makeApp([
-          {
-            __typename: 'Animation',
-            id: ANIMATION_ID,
-            property: 'transform.skewX',
-            config: {
-              __type: 'AnimationTimingConfig',
-              toValue: 1,
-            },
-          },
-        ]),
-      ),
-    ).rejects.toThrow(/Invalid animation property/)
-  })
-
-  test('rejects invalid animation config type', async () => {
-    await expect(
-      compile(
-        makeApp([
-          {
-            __typename: 'Animation',
-            id: ANIMATION_ID,
-            property: 'opacity',
-            config: {
-              __type: 'AnimationUnknownConfig',
-              toValue: 1,
-            },
-          },
-        ]),
-      ),
-    ).rejects.toThrow(/Invalid animation config type/)
-  })
-})