@brickflow/cli 0.0.11 → 0.0.13

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @brickflow/cli
 
+## 0.0.13
+
+### Patch Changes
+
+- update multiply file in types
+
+## 0.0.12
+
+### Patch Changes
+
+- Fix workspace cli translate
+
 ## 0.0.11
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brickflow/cli",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "",
   "type": "module",
   "main": "index.mjs",

package/src/translate/ai-context.js

@@ -4,6 +4,7 @@ import fs from 'fs'
 import { dirname, join, relative, resolve } from 'path'
 import { fileURLToPath } from 'url'
 
+import { resolveWorkspaceRoot } from '../shared/workspace-root.js'
 import { generateContentWithLimits } from './gemini.js'
 import {
   buildTranslateHelp,
@@ -14,8 +15,7 @@ import {
 } from './runtime-config.js'
 import { listTranslationTargets, stringifySortedJson } from './utils.js'
 
-const currentDir = dirname(fileURLToPath(import.meta.url))
-const workspaceRoot = resolve(currentDir, '../../../..')
+const workspaceRoot = resolveWorkspaceRoot()
 const CONTEXT_FILE_NAME = 'ai-context.json'
 const CHANGE_THRESHOLD = readFloat('TRANSLATE_CONTEXT_MIN_CHANGE', 0.3)
 const SOURCE_MAX_CHARS = readPositiveInt('TRANSLATE_CONTEXT_SOURCE_MAX_CHARS', 16000)

package/src/translate/index.js

@@ -1,15 +1,14 @@
 import fs from 'fs'
 import { globSync } from 'glob'
-import { dirname, join, relative, resolve } from 'path'
-import { fileURLToPath } from 'url'
+import { dirname, join, relative } from 'path'
 
+import { resolveWorkspaceRoot } from '../shared/workspace-root.js'
 import { getAiContextState } from './ai-context.js'
 import { translateBatch } from './ai.js'
 import { buildTranslateHelp, parseTranslateRuntimeArgs, setTranslateRuntimeConfig } from './runtime-config.js'
 import { listTranslationTargets, sortObjectKeys, stringifySortedJson } from './utils.js'
 
-const currentDir = dirname(fileURLToPath(import.meta.url))
-const workspaceRoot = resolve(currentDir, '../../../..')
+const workspaceRoot = resolveWorkspaceRoot()
 const rawArgs = process.argv.slice(3)
 
 if (rawArgs.includes('--help') || rawArgs.includes('-h')) {

package/src/translate-sync/index.js

@@ -1,3 +1,18 @@
+import fs from 'fs'
+import { globSync } from 'glob'
+import path from 'path'
+
+import {
+  compileVueToJS,
+  extractStrings,
+  getTranslationPaths,
+  listWorkspaceFiles,
+  sortObjectKeys,
+  stringifySortedJson,
+} from '../translate/utils.js'
+
+const WORKSPACE_MARKERS = ['.git', 'pnpm-workspace.yaml', 'lerna.json', 'turbo.json']
+
 const args = process.argv.slice(3)
 
 if (args.includes('--help') || args.includes('-h')) {
@@ -10,7 +25,137 @@ if (args.length > 0) {
   process.exit(1)
 }
 
-await import('../translate/sync.js')
+const workspaceRoot = resolveWorkspaceRoot()
+const activeGeneratedDirs = new Set()
+const cleanupRoots = new Set()
+const staticCleanupRoots = [
+  path.resolve(workspaceRoot, 'packages/brick/global'),
+  ...globSync('apps/*/global', {
+    absolute: true,
+    cwd: workspaceRoot,
+  }),
+]
+
+const files = listWorkspaceFiles(workspaceRoot).filter(
+  (file) => /\.(?:js|ts|vue)$/.test(file) && !file.endsWith('.d.ts'),
+)
+const filtered = files.filter((file) => getTranslationPaths(file))
+
+for (const rootDir of staticCleanupRoots) {
+  cleanupRoots.add(rootDir)
+}
+
+const progress = createProgress(filtered.length)
+
+for (const file of filtered) {
+  processFile(file)
+  progress(file)
+}
+
+cleanupGeneratedDirs()
+
+process.stdout.write('\n')
+console.log('✅ Done')
+
+function cleanupGeneratedDirs() {
+  for (const rootDir of cleanupRoots) {
+    if (!fs.existsSync(rootDir)) {
+      continue
+    }
+
+    for (const entry of fs.readdirSync(rootDir, { withFileTypes: true })) {
+      if (!entry.isDirectory()) {
+        continue
+      }
+
+      const targetDir = path.resolve(rootDir, entry.name)
+
+      if (!activeGeneratedDirs.has(targetDir)) {
+        removeDir(targetDir)
+      }
+    }
+  }
+}
+
+function createProgress(total) {
+  let done = 0
+  const start = Date.now()
+
+  return function update(currentFile) {
+    done += 1
+
+    const percent = total === 0 ? 100 : Math.round((done * 100) / total)
+    const filled = Math.round(percent / 5)
+    const empty = 20 - filled
+
+    const elapsed = ((Date.now() - start) / 1000).toFixed(1)
+    const shortName = currentFile.split('/').slice(-3).join('/')
+
+    process.stdout.write(
+      `\r⚙️  Processing: [${'█'.repeat(filled)}${' '.repeat(empty)}] ` +
+        `${percent}% (${done}/${total}) ` +
+        `⏱ ${elapsed}s ` +
+        `\x1b[90m${shortName}\x1b[0m\x1b[K`,
+    )
+  }
+}
+
+function detectEol(filePath) {
+  if (!fs.existsSync(filePath)) {
+    return '\n'
+  }
+
+  const text = fs.readFileSync(filePath, 'utf-8')
+  return text.includes('\r\n') ? '\r\n' : '\n'
+}
+
+function ensureSortedJsonFile(filePath) {
+  if (!fs.existsSync(filePath)) {
+    return false
+  }
+
+  const currentText = fs.readFileSync(filePath, 'utf-8')
+  const parsed = JSON.parse(currentText)
+  const sortedText = stringifySortedJson(parsed)
+
+  if (normalizeJsonEol(currentText) === normalizeJsonEol(sortedText)) {
+    return false
+  }
+
+  writeTextPreservingEol(filePath, sortedText)
+  return true
+}
+
+function ensureSortedTranslationJsons(baseDir, samplePath) {
+  const filesToCheck = [samplePath, path.resolve(baseDir, 'ai-context.json')]
+  const generatedDir = path.resolve(baseDir, 'generated')
+
+  if (fs.existsSync(generatedDir)) {
+    for (const entry of fs.readdirSync(generatedDir, { withFileTypes: true })) {
+      if (entry.isFile() && entry.name.endsWith('.json')) {
+        filesToCheck.push(path.resolve(generatedDir, entry.name))
+      }
+    }
+  }
+
+  for (const filePath of filesToCheck) {
+    try {
+      if (ensureSortedJsonFile(filePath)) {
+        console.log('\n🔤 Sorted keys:', filePath)
+      }
+    } catch (error) {
+      console.error('\n❌ invalid translation json:', filePath, error)
+    }
+  }
+}
+
+function hasAnyFile(directoryPath, fileNames) {
+  return fileNames.some((fileName) => fs.existsSync(path.join(directoryPath, fileName)))
+}
+
+function normalizeJsonEol(content) {
+  return String(content).replace(/\r\n/g, '\n')
+}
 
 function printHelp() {
   console.log(`brick translate-sync
@@ -23,3 +168,109 @@ Notes:
   Removes obsolete generated translation directories
   Verifies and normalizes translation JSON key ordering`)
 }
+
+function processFile(filePath) {
+  let code = fs.readFileSync(filePath, 'utf-8')
+
+  try {
+    if (filePath.endsWith('.vue')) {
+      code = compileVueToJS(code, filePath)
+    }
+
+    const strings = extractStrings(code, filePath)
+
+    writeTranslations(filePath, strings)
+  } catch (error) {
+    console.error('\n❌ error:', filePath, error)
+  }
+}
+
+function removeDir(dir) {
+  if (fs.existsSync(dir)) {
+    fs.rmSync(dir, { force: true, recursive: true })
+  }
+}
+
+function resolveWorkspaceRoot(startDir = process.cwd()) {
+  let currentDir = path.resolve(startDir)
+  let packageRoot = null
+
+  while (true) {
+    if (hasAnyFile(currentDir, WORKSPACE_MARKERS)) {
+      return currentDir
+    }
+
+    if (fs.existsSync(path.join(currentDir, 'package.json'))) {
+      packageRoot = currentDir
+    }
+
+    const parentDir = path.dirname(currentDir)
+
+    if (parentDir === currentDir) {
+      return packageRoot || startDir
+    }
+
+    currentDir = parentDir
+  }
+}
+
+function writeTextPreservingEol(filePath, content) {
+  const eol = detectEol(filePath)
+  const normalized = String(content).replace(/\r?\n/g, eol)
+  fs.writeFileSync(filePath, normalized, 'utf-8')
+}
+
+function writeTranslations(id, strings) {
+  const paths = getTranslationPaths(id)
+
+  if (!paths) {
+    return
+  }
+
+  const { baseDir, isComponent, isLayout, isPage, isScript, samplePath } = paths
+
+  if (isPage || isLayout || isScript) {
+    cleanupRoots.add(path.dirname(baseDir))
+  }
+
+  if (strings.size === 0) {
+    if (isComponent || isPage || isLayout || isScript) {
+      removeDir(baseDir)
+    }
+    return
+  }
+
+  if (isPage || isLayout || isScript) {
+    activeGeneratedDirs.add(baseDir)
+  }
+
+  fs.mkdirSync(baseDir, { recursive: true })
+
+  let prev = {}
+
+  if (fs.existsSync(samplePath)) {
+    try {
+      prev = JSON.parse(fs.readFileSync(samplePath, 'utf-8'))
+    } catch {
+      prev = {}
+    }
+  }
+
+  const next = {}
+
+  for (const [key, value] of strings) {
+    next[key] = value
+  }
+
+  const sortedNext = sortObjectKeys(next)
+  const isSame =
+    Object.keys(prev).length === Object.keys(sortedNext).length &&
+    Object.keys(prev).every((key) => prev[key] === sortedNext[key])
+
+  if (!isSame) {
+    writeTextPreservingEol(samplePath, stringifySortedJson(sortedNext))
+    console.log('\n🧪 Updated:', samplePath)
+  }
+
+  ensureSortedTranslationJsons(baseDir, samplePath)
+}

package/src/types/index.js

@@ -10,29 +10,41 @@ if (args.includes('--help') || args.includes('-h')) {
 
 const options = parseArgs(args)
 
-if (!options.path || !options.typeName || !options.outputFile || !options.replacePattern) {
+if (options.paths.length === 0 || !options.typeName || !options.outputFile || !options.replacePattern) {
   printHelp()
   process.exit(1)
 }
 
-const inputDir = path.resolve(process.cwd(), options.path)
+const inputDirs = options.paths.map((inputPath) => path.resolve(process.cwd(), inputPath))
 const outputFile = path.resolve(process.cwd(), options.outputFile)
 const replacePattern = parseReplacePattern(options.replacePattern)
-const entries = readdirSync(inputDir)
-  .filter((entry) => statSync(path.join(inputDir, entry)).isFile())
-  .sort((first, second) => first.localeCompare(second))
+const entries = inputDirs
+  .flatMap((inputDir) =>
+    readdirSync(inputDir)
+      .filter((entry) => statSync(path.join(inputDir, entry)).isFile())
+      .map((entry) => ({ entry, inputDir })),
+  )
+  .sort((first, second) => {
+    const entryComparison = first.entry.localeCompare(second.entry)
+
+    if (entryComparison !== 0) {
+      return entryComparison
+    }
+
+    return first.inputDir.localeCompare(second.inputDir)
+  })
 
-const typeValues = new Set(entries.map((entry) => applyReplacePattern(entry, replacePattern)).filter(Boolean))
+const typeValues = new Set(entries.map(({ entry }) => applyReplacePattern(entry, replacePattern)).filter(Boolean))
 
 if (typeValues.size === 0) {
-  throw new Error(`No type values generated from: ${inputDir}`)
+  throw new Error(`No type values generated from: ${inputDirs.join(', ')}`)
 }
 
 const declaration = `declare type ${options.typeName} = ${[...typeValues].map((value) => `'${value}'`).join(' | ')}\n`
 writeFileSync(outputFile, declaration, 'utf8')
 
 console.log(`✅ Types generated for ${options.typeName}`)
-console.log(`   input:  ${inputDir}`)
+console.log(`   input:  ${inputDirs.join(', ')}`)
 console.log(`   output: ${outputFile}`)
 
 function applyReplacePattern(value, pattern) {
@@ -46,7 +58,7 @@ function applyReplacePattern(value, pattern) {
 function parseArgs(rawArgs) {
   const parsedOptions = {
     outputFile: null,
-    path: null,
+    paths: [],
     replacePattern: null,
     typeName: null,
   }
@@ -56,7 +68,12 @@ function parseArgs(rawArgs) {
     const value = rawArgs[index]
 
     if (value === '--path') {
-      parsedOptions.path = rawArgs[index + 1] ?? null
+      const inputPath = rawArgs[index + 1] ?? null
+
+      if (inputPath) {
+        parsedOptions.paths.push(inputPath)
+      }
+
       index += 1
       continue
     }
@@ -82,8 +99,8 @@ function parseArgs(rawArgs) {
     positional.push(value)
   }
 
-  if (!parsedOptions.path) {
-    parsedOptions.path = positional[0] ?? null
+  if (parsedOptions.paths.length === 0 && positional[0]) {
+    parsedOptions.paths.push(positional[0])
   }
 
   if (!parsedOptions.typeName) {
@@ -118,9 +135,10 @@ Usage:
   brick types ./path/to/files IconName ./types/icon.d.ts .svg
   brick types ./path/to/files IconName ./types/icon.d.ts /\\.svg$/
   brick types --path ./path/to/files --type-name IconName --output-file ./types/icon.d.ts --replace-pattern /\\.svg$/
+  brick types --path ./path/to/files --path ./path/to/more-files --type-name IconName --output-file ./types/icon.d.ts --replace-pattern /\\.svg$/
 
 Notes:
-  path: directory with source files
+  path: directory with source files, can be passed multiple times
   typeName: generated TypeScript type name
   outputFile: file to write declaration into
   replacePattern: string or regex literal used in replace(..., '') for each filename`)

package/src/translate/sync.js

@@ -1,238 +0,0 @@
-#!/usr/bin/env node
-
-import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from 'fs'
-import { globSync } from 'glob'
-import { dirname, resolve } from 'path'
-import { fileURLToPath } from 'url'
-
-import {
-  compileVueToJS,
-  extractStrings,
-  getTranslationPaths,
-  listWorkspaceFiles,
-  sortObjectKeys,
-  stringifySortedJson,
-} from './utils.js'
-
-const currentDir = dirname(fileURLToPath(import.meta.url))
-const workspaceRoot = resolve(currentDir, '../../../..')
-const activeGeneratedDirs = new Set()
-const cleanupRoots = new Set()
-const STATIC_CLEANUP_ROOTS = [
-  resolve(workspaceRoot, 'packages/brick/global'),
-  ...globSync('apps/*/global', {
-    absolute: true,
-    cwd: workspaceRoot,
-  }),
-]
-
-function cleanupGeneratedDirs() {
-  for (const rootDir of cleanupRoots) {
-    if (!existsSync(rootDir)) {
-      continue
-    }
-
-    for (const entry of readdirSync(rootDir, { withFileTypes: true })) {
-      if (!entry.isDirectory()) {
-        continue
-      }
-
-      const targetDir = resolve(rootDir, entry.name)
-
-      if (!activeGeneratedDirs.has(targetDir)) {
-        removeDir(targetDir)
-      }
-    }
-  }
-}
-
-function createProgress(total) {
-  let done = 0
-  const start = Date.now()
-
-  return function update(currentFile) {
-    done += 1
-
-    const percent = Math.round((done * 100) / total)
-    const filled = Math.round(percent / 5)
-    const empty = 20 - filled
-
-    const elapsed = ((Date.now() - start) / 1000).toFixed(1)
-
-    const shortName = currentFile.split('/').slice(-3).join('/')
-
-    process.stdout.write(
-      `\r⚙️  Processing: [${'█'.repeat(filled)}${' '.repeat(empty)}] ` +
-        `${percent}% (${done}/${total}) ` +
-        `⏱ ${elapsed}s ` +
-        `\x1b[90m${shortName}\x1b[0m\x1b[K`,
-    )
-  }
-}
-
-// ---------- progress ----------
-
-function detectEol(filePath) {
-  if (!existsSync(filePath)) {
-    return '\n'
-  }
-
-  const text = readFileSync(filePath, 'utf-8')
-  return text.includes('\r\n') ? '\r\n' : '\n'
-}
-
-// ---------- core ----------
-
-function ensureSortedJsonFile(filePath) {
-  if (!existsSync(filePath)) {
-    return false
-  }
-
-  const currentText = readFileSync(filePath, 'utf-8')
-  const parsed = JSON.parse(currentText)
-  const sortedText = stringifySortedJson(parsed)
-
-  if (normalizeJsonEol(currentText) === normalizeJsonEol(sortedText)) {
-    return false
-  }
-
-  writeTextPreservingEol(filePath, sortedText)
-  return true
-}
-
-function ensureSortedTranslationJsons(baseDir, samplePath) {
-  const filesToCheck = [samplePath, resolve(baseDir, 'ai-context.json')]
-  const generatedDir = resolve(baseDir, 'generated')
-
-  if (existsSync(generatedDir)) {
-    for (const entry of readdirSync(generatedDir, { withFileTypes: true })) {
-      if (entry.isFile() && entry.name.endsWith('.json')) {
-        filesToCheck.push(resolve(generatedDir, entry.name))
-      }
-    }
-  }
-
-  for (const filePath of filesToCheck) {
-    try {
-      if (ensureSortedJsonFile(filePath)) {
-        console.log('\n🔤 Sorted keys:', filePath)
-      }
-    } catch (error) {
-      console.error('\n❌ invalid translation json:', filePath, error)
-    }
-  }
-}
-
-function normalizeJsonEol(content) {
-  return String(content).replace(/\r\n/g, '\n')
-}
-
-// ---------- core ----------
-
-function processFile(filePath) {
-  let code = readFileSync(filePath, 'utf-8')
-
-  try {
-    if (filePath.endsWith('.vue')) {
-      code = compileVueToJS(code, filePath)
-    }
-
-    const strings = extractStrings(code, filePath)
-
-    writeTranslations(filePath, strings)
-  } catch (e) {
-    console.error('\n❌ error:', filePath, e)
-  }
-}
-
-// ---------- translations ----------
-
-function removeDir(dir) {
-  if (existsSync(dir)) {
-    rmSync(dir, { force: true, recursive: true })
-  }
-}
-
-function writeTextPreservingEol(filePath, content) {
-  const eol = detectEol(filePath)
-  const normalized = String(content).replace(/\r?\n/g, eol)
-  writeFileSync(filePath, normalized, 'utf-8')
-}
-
-function writeTranslations(id, strings) {
-  const paths = getTranslationPaths(id)
-
-  if (!paths) {
-    return
-  }
-
-  const { baseDir, isComponent, isLayout, isPage, isScript, samplePath } = paths
-
-  if (isPage || isLayout || isScript) {
-    cleanupRoots.add(dirname(baseDir))
-  }
-
-  if (strings.size === 0) {
-    if (isComponent || isPage || isLayout || isScript) {
-      removeDir(baseDir)
-    }
-    return
-  }
-
-  if (isPage || isLayout || isScript) {
-    activeGeneratedDirs.add(baseDir)
-  }
-
-  mkdirSync(baseDir, { recursive: true })
-
-  let prev = {}
-
-  if (existsSync(samplePath)) {
-    try {
-      prev = JSON.parse(readFileSync(samplePath, 'utf-8'))
-    } catch {
-      prev = {}
-    }
-  }
-
-  const next = {}
-
-  for (const [k, v] of strings) {
-    next[k] = v
-  }
-
-  const sortedNext = sortObjectKeys(next)
-  const isSame =
-    Object.keys(prev).length === Object.keys(sortedNext).length &&
-    Object.keys(prev).every((k) => prev[k] === sortedNext[k])
-
-  if (!isSame) {
-    writeTextPreservingEol(samplePath, stringifySortedJson(sortedNext))
-    console.log('\n🧪 Updated:', samplePath)
-  }
-
-  ensureSortedTranslationJsons(baseDir, samplePath)
-}
-
-// ---------- run ----------
-
-const files = listWorkspaceFiles(workspaceRoot).filter(
-  (file) => /\.(?:js|ts|vue)$/.test(file) && !file.endsWith('.d.ts'),
-)
-
-const filtered = files.filter((file) => getTranslationPaths(file))
-for (const rootDir of STATIC_CLEANUP_ROOTS) {
-  cleanupRoots.add(rootDir)
-}
-
-const progress = createProgress(filtered.length)
-
-for (const file of filtered) {
-  processFile(file)
-  progress(file)
-}
-
-cleanupGeneratedDirs()
-
-process.stdout.write('\n')
-console.log('✅ Done')