@kosdev-code/kos-codegen-core 3.0.23 → 3.0.24

package/index.mjs

@@ -1866,36 +1866,44 @@ function generateModel(params) {
   }
 }
 const DECLARATION_MARKER = "@kosModel";
-function findModelDeclarationFile(codegenFs, searchRoot, typeIds) {
-  const wanted = new Set(typeIds.filter(Boolean));
-  if (wanted.size === 0) return null;
-  const matches = [];
+function collectModelDeclarations(codegenFs, searchRoot) {
+  const found = [];
   for (const filePath of codegenFs.listFiles(searchRoot)) {
     if (!filePath.endsWith(".ts") || filePath.endsWith(".d.ts")) continue;
     const content = codegenFs.read(filePath);
     if (!content || !content.includes(DECLARATION_MARKER)) continue;
-    const declared = readDeclaredModelType(codegenFs, filePath);
-    if (declared && wanted.has(declared)) matches.push(filePath);
+    const declared = readModelDeclaration(codegenFs, filePath);
+    if (declared) found.push(declared);
   }
+  return found;
+}
+function findModelDeclarationFile(codegenFs, searchRoot, identifiers) {
+  const wanted = new Set(identifiers.filter(Boolean));
+  if (wanted.size === 0) return null;
+  const matches = collectModelDeclarations(codegenFs, searchRoot).filter(
+    (d) => d.typeId && wanted.has(d.typeId) || d.className && wanted.has(d.className)
+  ).map((d) => d.filePath);
   if (matches.length === 0) return null;
   if (matches.length > 1) {
     throw new Error(
-      `Model type '${[...wanted].join("' / '")}' is declared in more than one file:
+      `Model '${[...wanted].join(
+        "' / '"
+      )}' is declared in more than one file:
 ` + matches.sort().map((c) => `  - ${c}`).join("\n") + `
 Pass modelPath to pick one.`
     );
   }
   return matches[0];
 }
-function readDeclaredModelType(codegenFs, filePath) {
+function readModelDeclaration(codegenFs, filePath) {
   try {
     return readSourceFile(codegenFs, filePath, (sf) => {
       const cls = sf.getClasses().find((c) => c.getDecorator("kosModel"));
       if (!cls) return void 0;
       const config = decoratorConfigText(sf, cls, "kosModel");
       const inner = config?.startsWith("{") ? modelTypeIdProperty(config) : config;
-      if (!inner) return void 0;
-      return resolveToStringLiteral(inner.trim(), sf.getFullText());
+      const typeId = inner ? resolveToStringLiteral(inner.trim(), sf.getFullText()) : void 0;
+      return { filePath, typeId, className: cls.getName() };
     });
   } catch {
     return void 0;
@@ -1910,7 +1918,9 @@ function resolveToStringLiteral(expression, fileText) {
   if (literal) return literal[1];
   if (!/^[A-Za-z_$][\w$]*$/.test(expression)) return void 0;
   const declared = fileText.match(
-    new RegExp(`\\b(?:const|let|var)\\s+${expression}\\s*(?::[^=]+)?=\\s*["'\`]([^"'\`]+)["'\`]`)
+    new RegExp(
+      `\\b(?:const|let|var)\\s+${expression}\\s*(?::[^=]+)?=\\s*["'\`]([^"'\`]+)["'\`]`
+    )
   );
   return declared ? declared[1] : void 0;
 }
@@ -1965,7 +1975,82 @@ function resolveModelFilePath(codegenFs, query, projects) {
   if (byDeclaration) {
     return { modelFilePath: byDeclaration, internal, sourceRoot };
   }
-  return { modelFilePath, internal, sourceRoot };
+  throw new ModelFileNotFoundError(
+    query.modelName,
+    query.modelProject,
+    modelFilePath,
+    collectModelDeclarations(codegenFs, searchRoot)
+  );
+}
+class ModelFileNotFoundError extends Error {
+  constructor(modelName, modelProject, conventionalPath, candidates) {
+    super(
+      buildNotFoundMessage(
+        modelName,
+        modelProject,
+        conventionalPath,
+        candidates
+      )
+    );
+    this.modelName = modelName;
+    this.modelProject = modelProject;
+    this.conventionalPath = conventionalPath;
+    this.candidates = candidates;
+    this.name = "ModelFileNotFoundError";
+  }
+  modelName;
+  modelProject;
+  conventionalPath;
+  candidates;
+}
+function buildNotFoundMessage(modelName, modelProject, conventionalPath, candidates) {
+  const lines = [
+    `Model '${modelName}' not found in project '${modelProject}'.`,
+    `Looked for ${conventionalPath}, any '*-model.ts' under the model folder, and any '@kosModel' class named or typed '${modelName}'.`
+  ];
+  if (candidates.length === 0) {
+    lines.push(
+      `This project declares no '@kosModel' classes under its model folder.`
+    );
+    return lines.join("\n");
+  }
+  const ranked = [...candidates].sort(
+    (a, b) => closeness(modelName, b) - closeness(modelName, a)
+  );
+  const shown = ranked.slice(0, NOT_FOUND_SUGGESTIONS);
+  lines.push(
+    ``,
+    `Closest of the ${candidates.length} models this project declares:`
+  );
+  for (const c of shown) {
+    const names = [c.typeId, c.className].filter(Boolean).join("  |  ");
+    lines.push(`  ${names || "(name unresolved)"}
+    ${c.filePath}`);
+  }
+  if (ranked.length > shown.length) {
+    lines.push(`  …and ${ranked.length - shown.length} more.`);
+  }
+  lines.push(``, `Or pass modelPath to name the file directly.`);
+  return lines.join("\n");
+}
+const NOT_FOUND_SUGGESTIONS = 8;
+function closeness(wanted, candidate) {
+  const norm = (v) => v.toLowerCase().replace(/[^a-z0-9]/g, "");
+  const target = norm(wanted);
+  let best = 0;
+  for (const name of [candidate.typeId, candidate.className]) {
+    if (!name) continue;
+    const n = norm(name);
+    if (n === target) return 1e3;
+    if (n.includes(target) || target.includes(n)) {
+      best = Math.max(best, 500 + Math.min(n.length, target.length));
+      continue;
+    }
+    let i = 0;
+    while (i < n.length && i < target.length && n[i] === target[i]) i++;
+    best = Math.max(best, i);
+  }
+  return best;
 }
 function findModelFileByName(codegenFs, searchRoot, modelNameDashCase) {
   const fileName = `${modelNameDashCase}-model.ts`;
@@ -2062,7 +2147,9 @@ function generateViewModel(codegenFs, templateDir, options, cwd, projects) {
   logger.info(
     `Generating ViewModel ${normalized.nameDashCase} in ${projectRoot}`
   );
-  const constructorParams = resolved.map(({ name, type }) => ({ name, type }));
+  const constructorParams = resolved.map(({ name, type }) => {
+    return { name, type };
+  });
   generateFilesFromTemplates(codegenFs, templateDir, viewModelFolder, {
     ...normalized,
     internal,
@@ -2122,7 +2209,9 @@ function groupImports(resolved) {
       types.push(type);
     }
   }
-  return [...byModule].map(([module, types]) => ({ module, types }));
+  return [...byModule].map(([module, types]) => {
+    return { module, types };
+  });
 }
 function modelBaseName(modelFilePath, modelName) {
   const base = path.basename(modelFilePath);
@@ -4530,6 +4619,7 @@ export {
   KOS_JSON_PATHS,
   KosConfigBuilder,
   LOCALIZED_PLUGIN_TYPES,
+  ModelFileNotFoundError,
   PLUGIN_TYPES,
   PluginHandlerFactory,
   TrackingFileSystem,