add-coder 0.3.18 → 0.3.19

package/dist/index.js

@@ -331,13 +331,34 @@ async function writeFiles2(projectRoot, files, options = {}) {
 }
 function parseSchemaBlocks(content) {
   const blocks = /* @__PURE__ */ new Map();
-  const blockRegex = /^(model|enum)\s+(\w+)\s*\{([^}]*(?:\{[^}]*\}[^}]*)*)\}/gm;
-  let match;
-  while ((match = blockRegex.exec(content)) !== null) {
-    const [, type, name, inner] = match;
+  const lines = content.split("\n");
+  let i = 0;
+  while (i < lines.length) {
+    const head = lines[i].match(/^(model|enum)\s+(\w+)\s*\{/);
+    if (!head) {
+      i++;
+      continue;
+    }
+    const type = head[1];
+    const name = head[2];
+    const bodyLines = [lines[i]];
+    let depth = 1;
+    let j = i + 1;
+    while (j < lines.length && depth > 0) {
+      const line = lines[j];
+      bodyLines.push(line);
+      const commentless = line.split("//")[0];
+      for (const ch of commentless) {
+        if (ch === "{") depth++;
+        else if (ch === "}") depth--;
+      }
+      j++;
+    }
+    const body = bodyLines.join("\n");
+    const inner = bodyLines.slice(1, -1).join("\n");
     let fields = [];
     if (type === "enum") {
-      fields = inner.split("\n").map((l) => l.replace(/#.*$/, "").trim()).filter((l) => l.length > 0);
+      fields = inner.split("\n").map((l) => l.replace(/\/\/.*$/, "").replace(/#.*$/, "").trim()).filter((l) => l.length > 0);
     } else {
       const fieldRegex = /^\s*(\w+)\s+(\w+(?:\([^)]*\))?(?:\[\])?\??)/gm;
       let fm;
@@ -345,7 +366,8 @@ function parseSchemaBlocks(content) {
         fields.push(`${fm[1]}:${fm[2]}`);
       }
     }
-    blocks.set(`${type}:${name}`, { type, name, body: match[0], fields });
+    blocks.set(`${type}:${name}`, { type, name, body, fields });
+    i = j;
   }
   return blocks;
 }
@@ -1632,38 +1654,71 @@ function injectMissingModels(targetPath, models) {
 }
 function getBaseFieldLines(basePath, modelName) {
   const content = readFileSync7(basePath, "utf-8");
-  const blockRegex = /^(model|enum)\s+(\w+)\s*\{([^}]*(?:\{[^}]*\}[^}]*)*)\}/gm;
-  let match;
-  while ((match = blockRegex.exec(content)) !== null) {
-    if (match[2] !== modelName) continue;
-    const fields = {};
-    for (const line of match[3].split("\n")) {
+  const blocks = parseSchemaBlocks(content);
+  const block = blocks.get(`model:${modelName}`) ?? blocks.get(`enum:${modelName}`);
+  if (!block) return {};
+  const fields = {};
+  for (const line of block.body.split("\n")) {
+    const clean = line.replace(/\/\/.*$/, "").trim();
+    if (!clean) continue;
+    if (block.type === "enum") {
+      if (/^\w+$/.test(clean)) fields[clean] = line.trim();
+    } else {
       const fm = line.match(/^\s*(\w+)\s+/);
       if (fm) fields[fm[1]] = line.trim();
     }
-    return fields;
   }
-  return {};
+  return fields;
 }
 function injectFieldLines(targetPath, basePath, modelName, fieldKeys) {
   const baseFields = getBaseFieldLines(basePath, modelName);
-  if (Object.keys(baseFields).length === 0) return 0;
-  let content = readFileSync7(targetPath, "utf-8");
-  let count = 0;
+  if (Object.keys(baseFields).length === 0) {
+    console.warn(`\u26A0\uFE0F  \u6CE8\u5165\u5931\u8D25\uFF1A${modelName} \u5728\u57FA\u51C6\u4E2D\u672A\u627E\u5230\u5B57\u6BB5\u5B9A\u4E49\uFF08${fieldKeys.length} \u4E2A\u5B57\u6BB5\u672A\u5199\u5165\uFF09`);
+    return 0;
+  }
+  const content = readFileSync7(targetPath, "utf-8");
+  const lines = content.split("\n");
+  const blocks = parseSchemaBlocks(content);
+  const target = blocks.get(`model:${modelName}`) ?? blocks.get(`enum:${modelName}`);
+  if (!target) {
+    console.warn(`\u26A0\uFE0F  \u6CE8\u5165\u5931\u8D25\uFF1A\u76EE\u6807\u4E2D\u4E0D\u5B58\u5728 ${modelName} \u5757\uFF08${fieldKeys.length} \u4E2A\u5B57\u6BB5\u672A\u5199\u5165\uFF09`);
+    return 0;
+  }
+  const bodyLines = target.body.split("\n");
+  const startIdx = lines.findIndex((l) => l === bodyLines[0]);
+  if (startIdx < 0) {
+    console.warn(`\u26A0\uFE0F  \u6CE8\u5165\u5931\u8D25\uFF1A\u65E0\u6CD5\u5B9A\u4F4D ${modelName} \u5757\u4F4D\u7F6E\uFF08${fieldKeys.length} \u4E2A\u5B57\u6BB5\u672A\u5199\u5165\uFF09`);
+    return 0;
+  }
+  const endIdx = startIdx + bodyLines.length - 1;
+  const existingNames = new Set(
+    target.fields.map((f) => f.split(":")[0])
+  );
+  const newFieldLines = [];
   for (const key of fieldKeys) {
     const fieldName = key.split(":")[0];
     const fieldLine = baseFields[fieldName];
     if (!fieldLine) continue;
-    const modelRegex = new RegExp(`(model\\s+${modelName}\\s*\\{)([^}]*?)(\\n\\s*\\})`, "m");
-    const m = content.match(modelRegex);
-    if (!m) continue;
-    if (new RegExp(`^\\s*${fieldName}\\s+`, "m").test(m[2])) continue;
-    content = content.replace(modelRegex, `$1$2
-  ${fieldLine}$3`);
-    count++;
-  }
-  if (count > 0) writeFileSync5(targetPath, content, "utf-8");
-  return count;
+    if (existingNames.has(fieldName)) continue;
+    newFieldLines.push(`  ${fieldLine}`);
+  }
+  if (newFieldLines.length === 0) {
+    if (fieldKeys.length > 0) {
+      console.warn(`\u26A0\uFE0F  \u6CE8\u5165\u5931\u8D25\uFF1A${modelName} \u7684 ${fieldKeys.length} \u4E2A\u5B57\u6BB5\u672A\u5199\u5165\uFF08\u53EF\u80FD\u5DF2\u5B58\u5728\u6216\u5B9A\u4E49\u4E0D\u5339\u914D\uFF09`);
+    }
+    return 0;
+  }
+  let insertIdx = endIdx;
+  for (let k = startIdx + 1; k < endIdx; k++) {
+    if (/^\s*@@/.test(lines[k])) insertIdx = k;
+  }
+  const merged = [
+    ...lines.slice(0, insertIdx),
+    ...newFieldLines,
+    ...lines.slice(insertIdx)
+  ];
+  writeFileSync5(targetPath, merged.join("\n"), "utf-8");
+  return newFieldLines.length;
 }
 function overwriteFieldLines(targetPath, basePath, modelName, conflicts) {
   const baseFields = getBaseFieldLines(basePath, modelName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "add-coder",
-  "version": "0.3.18",
+  "version": "0.3.19",
   "private": false,
   "description": "[codein2027](https://github.com/xiaomingming92/codein2027) - A complete scaffolding for building the ADD programming paradigm, the implementation layer for AI code governance. Core principle: Audit as Infrastructure. Breaks the black-box programming process and cross-session amnesia, evolving programming paradigms into an auditable, traceable, and convergent new era. npx-ready.\n\n[codein2027](https://github.com/xiaomingming92/codein2027) 快速构建 ADD 编程范式的完整脚手架——AI 代码治理的落地方案。以「审计即基础设施」为核心，彻底打破编程过程黑盒与跨轮失忆，让编程范式进化为可审计、可追溯、可收敛的新时代。npx 即用，人人可体验。",
   "repository": {

package/templates/.add-coder-src-hash.json

@@ -1,5 +1,5 @@
 {
-  "_version": "0.3.18",
+  "_version": "0.3.19",
   "adapters/claude/hooks/doc-format-guard.sh": "ec59ad3f",
   "adapters/claude/hooks/lib/common.sh": "4f3e64ad",
   "adapters/claude/hooks/lib/context-inject.sh": "cfc8c65e",