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

package/index.d.ts

@@ -12,6 +12,6 @@ export { setCodegenLogger, getCodegenLogger } from './lib/logger';
 export { getCurrentDirectoryName, getProject, getKosProjectConfiguration, getKosModelConfiguration, getKosModelConfigProp, addKosModelConfiguration, } from './lib/kos-config';
 export type { KosModelConfiguration, KosProjectConfiguration, } from './lib/kos-config';
 export { getTemplateDir } from './lib/template-resolver';
-export { generateSplashProject, generateModelProject, resolveModelProjectLayout, DEFAULT_MODEL_LIBS_DIR, generateInit, generatePolyglotWorkspace, ensureJavaAggregatorPom, finalizeArchetypeModule, addJavaArtifactToManifests, syncCiManifests, discoverUiArtifacts, discoverJavaArtifacts, buildKabTargets, buildSbomTarget, listServiceCatalog, resolveKabPath, KAB_OUTPUT_DIR, KAB_OUTPUT_PATH, UPDATE_RELEASE_VERSION_SCRIPT, UPDATE_RELEASE_VERSION_SCRIPT_PATH, normalizeOptions, appendBarrelExport, updateModelIndex, generateHook, generateContext, generateContainerModel, generateCompanionModel, generateModel, generateViewModel, addFutureToModel, addContainerSupportToModel, addParentAwareToModel, addModelEffectToModel, addDependencyToModel, addChildToModel, addTopicHandlerToModel, addConfigPropertyToModel, addServiceRequestToModel, addPropertyToModel, addComputedToModel, validateModel, describeModel, upsertChainEntry, countChainEntries, lookupSdkType, resolveModelFilePath, generateComponent, PLUGIN_TYPES, CONTRIBUTION_TYPE_MAP, LOCALIZED_PLUGIN_TYPES, KOS_JSON_PATHS, PluginHandlerFactory, BasePluginHandler, KosConfigBuilder, ValidationError, } from './lib/generators';
+export { generateSplashProject, generateModelProject, resolveModelProjectLayout, DEFAULT_MODEL_LIBS_DIR, generateInit, generatePolyglotWorkspace, ensureJavaAggregatorPom, finalizeArchetypeModule, addJavaArtifactToManifests, syncCiManifests, discoverUiArtifacts, discoverJavaArtifacts, buildKabTargets, buildSbomTarget, listServiceCatalog, resolveKabPath, KAB_OUTPUT_DIR, KAB_OUTPUT_PATH, UPDATE_RELEASE_VERSION_SCRIPT, UPDATE_RELEASE_VERSION_SCRIPT_PATH, normalizeOptions, appendBarrelExport, updateModelIndex, generateHook, generateContext, generateContainerModel, generateCompanionModel, generateModel, generateViewModel, addFutureToModel, addContainerSupportToModel, addParentAwareToModel, addModelEffectToModel, addDependencyToModel, addChildToModel, addTopicHandlerToModel, addConfigPropertyToModel, addServiceRequestToModel, addPropertyToModel, addComputedToModel, validateModel, describeModel, upsertChainEntry, countChainEntries, lookupSdkType, resolveModelFilePath, ModelFileNotFoundError, generateComponent, PLUGIN_TYPES, CONTRIBUTION_TYPE_MAP, LOCALIZED_PLUGIN_TYPES, KOS_JSON_PATHS, PluginHandlerFactory, BasePluginHandler, KosConfigBuilder, ValidationError, } from './lib/generators';
 export type { SplashProjectOptions, ModelProjectOptions, ModelProjectLayout, KosInitOptions, KabTargetsOptions, KabTargetDefinition, PolyglotWorkspaceOptions, PolyglotWorkspaceResult, EnsureJavaAggregatorOptions, FinalizeArchetypeModuleOptions, AddJavaArtifactOptions, CiSyncOptions, CiSyncResult, CiSyncManifestResult, DiscoveredArtifact, KosBaseGeneratorOptions, NormalizedOptions, HookOptions, ContextOptions, ContainerModelOptions, CompanionModelOptions, ModelOptions, GenerateModelParams, ViewModelOptions, ViewModelSource, ViewModelResult, AddFutureToModelOptions, NormalizedAddFutureToModelOptions, AddContainerSupportOptions, AddModelEffectOptions, AddDependencyOptions, AddChildOptions, ChildShape, AddTopicHandlerOptions, AddConfigPropertyOptions, AddServiceRequestOptions, AddServiceRequestResult, ServiceRequestMockMode, UntypedEndpointDetails, UntypedEndpointError, AddPropertyOptions, AddComputedOptions, ValidateModelOptions, ValidationFinding, ValidationResult, UpsertChainEntryResult, DescribeModelOptions, DescribedMember, ModelDescription, ModelFileQuery, LookupSdkTypeOptions, SdkSymbolDeclaration, SdkTypeLookupResult, ComponentOptions, NormalizedComponentOptions, PluginConfiguration, PluginContribution, ExperienceConfig, PluginType, PluginHandler, } from './lib/generators';
 //# sourceMappingURL=index.d.ts.map

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/kos-codegen-core/src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/kos-codegen-core/src/index.ts"],"names":[],"mappings":"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"}

package/index.js

@@ -1888,36 +1888,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;
@@ -1932,7 +1940,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;
 }
@@ -1987,7 +1997,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`;
@@ -2084,7 +2169,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,
@@ -2144,7 +2231,9 @@ function groupImports(resolved) {
       types.push(type);
     }
   }
-  return [...byModule].map(([module2, types]) => ({ module: module2, types }));
+  return [...byModule].map(([module2, types]) => {
+    return { module: module2, types };
+  });
 }
 function modelBaseName(modelFilePath, modelName) {
   const base = path__namespace.basename(modelFilePath);
@@ -4551,6 +4640,7 @@ exports.KAB_OUTPUT_PATH = KAB_OUTPUT_PATH;
 exports.KOS_JSON_PATHS = KOS_JSON_PATHS;
 exports.KosConfigBuilder = KosConfigBuilder;
 exports.LOCALIZED_PLUGIN_TYPES = LOCALIZED_PLUGIN_TYPES;
+exports.ModelFileNotFoundError = ModelFileNotFoundError;
 exports.PLUGIN_TYPES = PLUGIN_TYPES;
 exports.PluginHandlerFactory = PluginHandlerFactory;
 exports.TrackingFileSystem = TrackingFileSystem;