@voxgig/create-sdkgen 0.30.9 → 0.31.1

package/src/create-sdkgen.ts

@@ -13,6 +13,13 @@ import Pkg from '../package.json'
 
 import { TARGETS, forwardingError } from './args'
 
+import { gitVersions, withCopyMerge } from './copymerge'
+
+import {
+  SCAFFOLD_BASE, SCAFFOLD_CONFLICT,
+  fingerprint, scaffoldMode, readScaffold, recordScaffold,
+} from './scaffold-record'
+
 
 type FullCreateSdkGenOptions = {
   fs?: any
@@ -36,6 +43,8 @@ type GenerateSpec = {
   target?: string[]
   feature?: string[]
   install?: boolean // perform installation - run npm install
+  force?: boolean // take the incoming scaffold over local changes
+  keep?: boolean // keep local changes whose merge stops
   folder?: string // Target folder for project
 
 }
@@ -135,7 +144,40 @@ function CreateSdkGen(opts: FullCreateSdkGenOptions) {
       note: JSON.stringify(jopts, null, 2)
     })
 
-    const jres = await jostraca.generate(jopts, () => CreateRoot({ model, spec }))
+    const kept = new Set<string>([...(rootModule.KEPT ?? []), ...(rootModule.SEEDS ?? [])]
+      .map((rel: string) => SDK_FOLDER + '/' + rel))
+
+    const manage = (rel: string) => !kept.has(rel) &&
+      !rel.startsWith(SDK_FOLDER + '/def/') && !rel.startsWith(SDK_FOLDER + '/log/') &&
+      !rel.split('/').includes('.jostraca') && !rel.endsWith('.aon')
+
+    const record = readScaffold(fs, folder)
+
+    const jres = await withCopyMerge({
+      fs,
+      folder,
+      log,
+      mode: scaffoldMode(fs, folder),
+      what: 'create-sdkgen ' + name,
+      force: !!spec.force,
+      keep: !!spec.keep,
+      dryrun,
+      manage,
+      recorded: (rel: string) => record[rel],
+      fingerprint,
+      basedir: SCAFFOLD_BASE,
+      conflictdir: SCAFFOLD_CONFLICT,
+      versions: gitVersions,
+    }, async (gfs: any) => {
+      const res = await jostraca.generate({ ...jopts, fs: () => gfs },
+        () => CreateRoot({ model, spec }))
+
+      if (!dryrun) {
+        recordScaffold(gfs, folder, res, Pkg.version, manage, record)
+      }
+
+      return res
+    })
 
     showChanges(jopts.log, 'generate-result', jres, process.cwd())
 

package/src/project/standard/CreateRoot.ts

@@ -88,6 +88,12 @@ const PROJECT_STUB = `# Project overlay — YOURS. The scaffold creates this fil
 # A published package name that does not follow the derivation:
 #
 #   main: kit: target: ts: publish: registry: package: '@scope/name'
+#
+# How an add, or a re-scaffold, treats a file in .sdk the project changed:
+# merged with the update (the default), or overwritten, for a project
+# regenerated in full from the toolchain:
+#
+#   main: kit: copies: 'overwrite'
 `
 
 
@@ -126,6 +132,17 @@ const KEPT = [
 ].map((rel: string[]) => rel.join('/'))
 
 
+// Starting points that apidef or the model build rewrites, so a difference
+// is the build's, not the project's: a re-scaffold overwrites them.
+const SEEDS = [
+  'model/api/api-info.aontu',
+  'model/entity/entity-index.aontu',
+  'model/flow/flow-index.aontu',
+  'test/.model-config/model-config.json',
+  'test/test.json',
+]
+
+
 function mergeGuide(existing: string | null, template: string): string {
   if (null == existing) {
     return template
@@ -303,5 +320,7 @@ const CreateRoot = cmp(function CreateRoot(props: any) {
 
 export {
   CreateRoot,
+  KEPT,
+  SEEDS,
   sanitizeDefName,
 }

package/src/scaffold-record.ts

@@ -0,0 +1,119 @@
+/* Copyright (c) 2026 Richard Rodger, MIT License */
+
+import Path from 'node:path'
+import { createHash } from 'node:crypto'
+
+import { copyMode } from './copymerge'
+import type { CopyMode } from './copymerge'
+
+
+// Relative to the project folder.
+const SCAFFOLD_LOG = '.sdk/log/scaffold.jsonl'
+const SCAFFOLD_BASE = '.sdk/log/scaffold-base'
+const SCAFFOLD_CONFLICT = '.sdk/log/scaffold-conflict'
+const PROJECT_MODEL = '.sdk/model/project.aontu'
+
+const COPIES_RE = /^\s*main\s*:\s*kit\s*:\s*copies\s*:\s*['"]?(merge|overwrite)\b/m
+
+
+// As @voxgig/sdkgen fingerprints its copies: CRLF and LF read the same.
+function fingerprint(content: any): string {
+  const bytes = Buffer.isBuffer(content) ? content : Buffer.from(String(content))
+  const lf = Buffer.from(bytes.toString('latin1').replace(/\r\n/g, '\n'), 'latin1')
+  return createHash('sha256').update(lf).digest('hex').slice(0, 16)
+}
+
+
+function at(folder: string, rel: string): string {
+  return Path.join(folder, ...rel.split('/'))
+}
+
+
+// `main.kit.copies`, read from the project overlay without building the model.
+function scaffoldMode(fs: any, folder: string): CopyMode {
+  const path = at(folder, PROJECT_MODEL)
+  const text = fs.existsSync(path) ? String(fs.readFileSync(path, 'utf8')) : ''
+  return copyMode(COPIES_RE.exec(text)?.[1])
+}
+
+
+// Replays the append-only log: each line holds what one scaffold changed.
+function readScaffold(fs: any, folder: string): Record<string, string> {
+  const files: Record<string, string> = {}
+  const path = at(folder, SCAFFOLD_LOG)
+
+  if (!fs.existsSync(path)) {
+    return files
+  }
+
+  for (const line of String(fs.readFileSync(path, 'utf8')).split('\n')) {
+    let entry: any
+    try {
+      entry = '' === line.trim() ? undefined : JSON.parse(line)
+    }
+    catch (err: any) {
+      continue
+    }
+
+    for (const [rel, print] of Object.entries(entry?.files ?? {})) {
+      if ('string' === typeof print) {
+        files[rel] = print
+      }
+      else if (null === print) {
+        delete files[rel]
+      }
+    }
+  }
+
+  return files
+}
+
+
+function recordScaffold(
+  fs: any, folder: string, jres: any, version: string,
+  manage: (rel: string) => boolean, record: Record<string, string>,
+) {
+  const written: string[] = [
+    ...(jres?.files?.written ?? []), ...(jres?.files?.unchanged ?? []),
+  ]
+
+  const files: Record<string, string> = {}
+
+  for (const path of written) {
+    const rel = Path.relative(Path.resolve(folder), Path.resolve(path))
+      .split(Path.sep).join('/')
+
+    if ('' === rel || rel.startsWith('../') || !manage(rel) || !fs.existsSync(path)) {
+      continue
+    }
+
+    const print = fingerprint(fs.readFileSync(path))
+    if (print !== record[rel]) {
+      files[rel] = print
+    }
+  }
+
+  if (0 === Object.keys(files).length) {
+    return
+  }
+
+  const sorted = Object.fromEntries(Object.keys(files).sort()
+    .map((rel: string) => [rel, files[rel]]))
+
+  const log = at(folder, SCAFFOLD_LOG)
+  fs.mkdirSync(Path.dirname(log), { recursive: true })
+  fs.appendFileSync(log, JSON.stringify({
+    at: new Date().toISOString(), op: 'scaffold', version, files: sorted,
+  }) + '\n')
+}
+
+
+export {
+  SCAFFOLD_LOG,
+  SCAFFOLD_BASE,
+  SCAFFOLD_CONFLICT,
+  fingerprint,
+  scaffoldMode,
+  readScaffold,
+  recordScaffold,
+}