@fugood/bricks-project 2.24.4 → 2.24.6

package/utils/data.ts

@@ -85,7 +85,7 @@ type SystemDataName =
 type SystemDataInfo = {
   name: SystemDataName
   id: string
-  type: 'string' | 'number' | 'bool' | 'array' | 'object' | 'any'
+  type: 'string' | 'number' | 'bool' | 'boolean' | 'array' | 'object' | 'any'
   title?: string
   description?: string
   schema?: object

package/utils/id.ts

@@ -1,38 +1,83 @@
 import { v4 as uuid } from 'uuid'
+import { createHash } from 'node:crypto'
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
 
 let count = 0
 
-// Used for snapshot mode
-const countUUID = () => {
-  const current = count
-  count += 1
-  return `00000000-0000-0000-0000-${current.toString().padStart(12, '0')}`
+type IdType =
+  | 'animation'
+  | 'brick'
+  | 'canvas'
+  | 'generator'
+  | 'data'
+  | 'switch'
+  | 'property_bank_command'
+  | 'property_bank_calc'
+  | 'dynamic-brick'
+  | 'automation_map'
+  | 'test'
+  | 'test_case'
+  | 'test_var'
+  | 'subspace'
+
+type IdOptions = {
+  snapshotMode?: boolean
+}
+
+const APPLICATION_ID_FALLBACK = 'unknown-application'
+
+const usedStableAliases = new Set<string>()
+let applicationIdCache: { cwd: string; id: string } | null = null
+
+const readApplicationId = () => {
+  const cwd = process.cwd()
+  if (applicationIdCache?.cwd === cwd) return applicationIdCache.id
+
+  let id = APPLICATION_ID_FALLBACK
+  try {
+    const app = JSON.parse(readFileSync(join(cwd, 'application.json'), 'utf8'))
+    if (typeof app.id === 'string' && app.id) id = app.id
+  } catch {
+    // `makeId` is also used from tests and utilities outside project roots.
+  }
+
+  applicationIdCache = { cwd, id }
+  return id
+}
+
+const hashToRandomBytes = (parts: string[]) => {
+  const hash = createHash('sha256').update(JSON.stringify(parts)).digest()
+  return new Uint8Array(hash.subarray(0, 16))
 }
 
-// Make a random id if not want to use fixed id
-export const makeId = (
-  type:
-    | 'animation'
-    | 'brick'
-    | 'canvas'
-    | 'generator'
-    | 'data'
-    | 'switch'
-    | 'property_bank_command'
-    | 'property_bank_calc'
-    | 'dynamic-brick'
-    | 'automation_map'
-    | 'test'
-    | 'test_case'
-    | 'test_var'
-    | 'subspace',
-  opts?: {
-    snapshotMode?: boolean
-  },
-) => {
+const makeStableUuid = (type: string, alias?: string) => {
+  const applicationId = readApplicationId()
+  const seed = alias ?? String(count)
+  if (alias === undefined) count += 1
+
+  if (alias !== undefined) {
+    const aliasKey = JSON.stringify([applicationId, type, alias])
+    if (usedStableAliases.has(aliasKey)) {
+      throw new Error(`Duplicate makeId alias '${alias}' for type '${type}'`)
+    }
+    usedStableAliases.add(aliasKey)
+  }
+
+  return uuid({
+    random: hashToRandomBytes([applicationId, type, seed]),
+  })
+}
+
+// Make stable ids by default; explicit snapshotMode: false preserves the random escape hatch.
+export const makeId = (type: IdType, aliasOrOpts?: string | IdOptions, opts?: IdOptions) => {
   if (type === 'subspace') {
     throw new Error('Currently subspace is not supported for ID generation, please use a fixed ID')
   }
+
+  const alias = typeof aliasOrOpts === 'string' ? aliasOrOpts : undefined
+  const options = typeof aliasOrOpts === 'string' ? opts : (aliasOrOpts ?? opts)
+
   let prefix = ''
   switch (type) {
     case 'animation':
@@ -76,5 +121,11 @@ export const makeId = (
       break
     default:
   }
-  return `${prefix}${opts?.snapshotMode ? countUUID() : uuid()}`
+
+  const useCountFallback = aliasOrOpts === undefined && opts === undefined
+  const id =
+    alias !== undefined || options?.snapshotMode || useCountFallback
+      ? makeStableUuid(type, alias)
+      : uuid()
+  return `${prefix}${id}`
 }

package/package.json.bak

@@ -1,28 +0,0 @@
-{
-  "name": "@fugood/bricks-ctor",
-  "version": "2.24.4",
-  "main": "index.ts",
-  "scripts": {
-    "typecheck": "tsc --noEmit",
-    "build": "bun scripts/build.js"
-  },
-  "dependencies": {
-    "@fugood/bricks-cli": "^2.24.4",
-    "@huggingface/gguf": "^0.3.2",
-    "@iarna/toml": "^3.0.0",
-    "@modelcontextprotocol/sdk": "^1.15.0",
-    "@toon-format/toon": "^2.1.0",
-    "@types/bun": "^1.3.9",
-    "@types/escodegen": "^0.0.10",
-    "@types/lodash": "^4.17.12",
-    "acorn": "^8.13.0",
-    "escodegen": "2.1.0",
-    "fuse.js": "^7.0.0",
-    "json5": "^2.0.1",
-    "lodash": "^4.17.4",
-    "uuid": "^8.3.1"
-  },
-  "peerDependencies": {
-    "oxfmt": "^0.36.0"
-  }
-}