@kosdev-code/kos-codegen-core 0.1.0-next.780 → 0.1.0-next.782

package/index.mjs

@@ -585,6 +585,13 @@ function updateModelIndex(codegenFs, indexPath, modelPath) {
     ts.ScriptTarget.Latest,
     true
   );
+  const alreadyExported = sourceFile.statements.some(
+    (st) => ts.isExportDeclaration(st) && st.moduleSpecifier !== void 0 && ts.isStringLiteral(st.moduleSpecifier) && st.moduleSpecifier.text === `./${modelPath}`
+  );
+  if (alreadyExported) {
+    logger.info(`Export for ${modelPath} already present in ${indexPath}`);
+    return;
+  }
   const exportDeclaration = ts.factory.createExportDeclaration(
     void 0,
     false,
@@ -646,7 +653,12 @@ function generateHook(codegenFs, templateDir, options, cwd, projects) {
     generateFilesFromTemplates(
       codegenFs,
       templateDir,
-      path.join(projectRoot, options.appDirectory, "hooks", normalized.nameDashCase),
+      path.join(
+        projectRoot,
+        options.appDirectory,
+        "hooks",
+        normalized.nameDashCase
+      ),
       normalized
     );
     appendBarrelExport(
@@ -765,9 +777,7 @@ function generateContainerModel(codegenFs, templateDir, options, cwd, projects)
       { ...normalized, internal }
     );
     if (options.dataServices) {
-      logger.info(
-        `Generating data services for ${modelNameDashCase}`
-      );
+      logger.info(`Generating data services for ${modelNameDashCase}`);
       generateFilesFromTemplates(
         codegenFs,
         path.join(templateDir, "services"),
@@ -873,9 +883,7 @@ function generateModel(params) {
   const modelLocation = kosConfig?.generator?.defaults?.model?.folder || "";
   const internal = !!kosConfig?.generator?.internal;
   options.modelDirectory = options.modelDirectory || modelLocation;
-  logger.info(
-    `Generating model ${normalized.nameDashCase} in ${projectRoot}`
-  );
+  logger.info(`Generating model ${normalized.nameDashCase} in ${projectRoot}`);
   generateFilesFromTemplates(
     codegenFs,
     path.join(modelTemplateDir, "model"),
@@ -1472,9 +1480,7 @@ class RegistrationFileTransformer {
     const logger = getCodegenLogger();
     const { registrationFilePath } = this.options;
     if (!registrationFilePath || !this.codegenFs.exists(registrationFilePath)) {
-      logger.warn(
-        "Registration file not found, skipping registration updates"
-      );
+      logger.warn("Registration file not found, skipping registration updates");
       return;
     }
     let content = this.codegenFs.read(registrationFilePath);
@@ -1666,9 +1672,7 @@ function ensureNamedImport(sourceFile, moduleSpecifier, names) {
   }
 }
 function resolveSdkModuleSpecifier(sourceFile) {
-  const decl = sourceFile.getImportDeclarations().find(
-    (d) => d.getNamedImports().some((n) => n.getName() === "kosModel")
-  );
+  const decl = sourceFile.getImportDeclarations().find((d) => d.getNamedImports().some((n) => n.getName() === "kosModel"));
   return decl?.getModuleSpecifierValue() ?? "@kosdev-code/kos-ui-sdk";
 }
 function getModelClass(sourceFile, preferName) {
@@ -1687,7 +1691,10 @@ function addClassDecorator(cls, name, opts) {
   const decorators = cls.getDecorators();
   const kosModelIdx = decorators.findIndex((d) => d.getName() === "kosModel");
   const insertIdx = kosModelIdx >= 0 ? kosModelIdx + 1 : decorators.length;
-  cls.insertDecorator(insertIdx, { name: `${name}${typeArgs}`, arguments: args ? [args] : [] });
+  cls.insertDecorator(insertIdx, {
+    name: `${name}${typeArgs}`,
+    arguments: args ? [args] : []
+  });
 }
 function ensureDeclarationMerge(sourceFile, interfaceName, extendsExpr, typeParameters = []) {
   const baseType = extendsExpr.split("<")[0].trim();
@@ -1719,7 +1726,9 @@ function addDecoratedMethod(cls, spec) {
     name: spec.name,
     isAsync: spec.isAsync,
     returnType: spec.returnType,
-    parameters: spec.parameters?.map((p) => ({ name: p.name, type: p.type })),
+    parameters: spec.parameters?.map((p) => {
+      return { name: p.name, type: p.type };
+    }),
     statements: spec.statements,
     decorators: [
       {
@@ -1785,7 +1794,9 @@ function buildDecoratorArgs(options) {
     top.push(`containerProperty: ${JSON.stringify(options.containerProperty)}`);
   }
   if (options.sortKey) {
-    top.push(`containerOptions: { sortKey: ${JSON.stringify(options.sortKey)} }`);
+    top.push(
+      `containerOptions: { sortKey: ${JSON.stringify(options.sortKey)} }`
+    );
   }
   return top.length ? `{ ${top.join(", ")} }` : "";
 }
@@ -1842,7 +1853,9 @@ function addModelEffectToModel(codegenFs, options, projects) {
   if (!codegenFs.exists(modelFilePath)) {
     throw new Error(`Model file not found: ${modelFilePath}`);
   }
-  logger.info(`Adding @kosModelEffect "${options.methodName}" to ${options.modelName}`);
+  logger.info(
+    `Adding @kosModelEffect "${options.methodName}" to ${options.modelName}`
+  );
   transformSourceFile(codegenFs, modelFilePath, (sf) => {
     const sdk = resolveSdkModuleSpecifier(sf);
     ensureNamedImport(sf, sdk, [{ name: "kosModelEffect" }]);
@@ -1866,7 +1879,9 @@ function addDependencyToModel(codegenFs, options, projects) {
   if (!codegenFs.exists(modelFilePath)) {
     throw new Error(`Model file not found: ${modelFilePath}`);
   }
-  logger.info(`Adding @kosDependency "${options.propertyName}" to ${options.modelName}`);
+  logger.info(
+    `Adding @kosDependency "${options.propertyName}" to ${options.modelName}`
+  );
   const argsParts = [`modelType: ${options.modelTypeRef}`];
   if (options.id) argsParts.push(`id: ${JSON.stringify(options.id)}`);
   transformSourceFile(codegenFs, modelFilePath, (sf) => {
@@ -1874,7 +1889,9 @@ function addDependencyToModel(codegenFs, options, projects) {
     ensureNamedImport(sf, sdk, [{ name: "kosDependency" }]);
     if (options.dependencyPackage) {
       const named = [];
-      const bean = options.modelTypeRef.match(/^([A-Za-z_$][\w$]*)\.type$/)?.[1];
+      const bean = options.modelTypeRef.match(
+        /^([A-Za-z_$][\w$]*)\.type$/
+      )?.[1];
       if (bean) named.push({ name: bean });
       const depType = options.dependencyType?.trim();
       if (depType && /^[A-Za-z_$][\w$]*$/.test(depType) && !FRAMEWORK_TYPES.has(depType)) {
@@ -1900,7 +1917,9 @@ function addTopicHandlerToModel(codegenFs, options, projects) {
   if (!codegenFs.exists(modelFilePath)) {
     throw new Error(`Model file not found: ${modelFilePath}`);
   }
-  logger.info(`Adding @kosTopicHandler "${options.handlerName}" to ${options.modelName}`);
+  logger.info(
+    `Adding @kosTopicHandler "${options.handlerName}" to ${options.modelName}`
+  );
   const websocket = options.websocket ?? true;
   const eventType = options.eventType || "unknown";
   transformSourceFile(codegenFs, modelFilePath, (sf) => {
@@ -1926,7 +1945,9 @@ function addConfigPropertyToModel(codegenFs, options, projects) {
   if (!codegenFs.exists(modelFilePath)) {
     throw new Error(`Model file not found: ${modelFilePath}`);
   }
-  logger.info(`Adding @kosConfigProperty "${options.propertyName}" to ${options.modelName}`);
+  logger.info(
+    `Adding @kosConfigProperty "${options.propertyName}" to ${options.modelName}`
+  );
   const valueType = options.valueType || "unknown";
   transformSourceFile(codegenFs, modelFilePath, (sf) => {
     const sdk = resolveSdkModuleSpecifier(sf);
@@ -1967,7 +1988,9 @@ function addPropertyToModel(codegenFs, options, projects) {
   }
   const type = options.type || "string";
   const initializer = options.initializer !== void 0 ? options.initializer : defaultInitializer(type);
-  logger.info(`Adding property "${options.propertyName}: ${type}" to ${options.modelName}`);
+  logger.info(
+    `Adding property "${options.propertyName}: ${type}" to ${options.modelName}`
+  );
   transformSourceFile(codegenFs, modelFilePath, (sf) => {
     const cls = getModelClass(sf);
     addPlainProperty(cls, {
@@ -1986,7 +2009,9 @@ function addComputedToModel(codegenFs, options, projects) {
   if (!codegenFs.exists(modelFilePath)) {
     throw new Error(`Model file not found: ${modelFilePath}`);
   }
-  logger.info(`Adding computed getter "${options.name}" to ${options.modelName}`);
+  logger.info(
+    `Adding computed getter "${options.name}" to ${options.modelName}`
+  );
   transformSourceFile(codegenFs, modelFilePath, (sf) => {
     const cls = getModelClass(sf);
     addGetter(cls, {
@@ -2047,7 +2072,9 @@ function addServiceRequestToModel(codegenFs, options, projects) {
     `Adding @kosServiceRequest "${options.methodName}" (${method} ${options.servicePath}) to ${options.modelName}`
   );
   transformSourceFile(codegenFs, modelFilePath, (sf) => {
-    ensureNamedImport(sf, serviceImport, [{ name: "kosServiceRequest" }]);
+    ensureNamedImport(sf, serviceImport, [
+      { name: "kosServiceRequest" }
+    ]);
     ensureNamedImport(sf, resolveSdkModuleSpecifier(sf), [
       { name: "DependencyLifecycle" }
     ]);
@@ -2057,7 +2084,9 @@ function addServiceRequestToModel(codegenFs, options, projects) {
       decoratorName: "kosServiceRequest",
       decoratorArgsText: `{ path: ${JSON.stringify(
         options.servicePath
-      )}, method: ${JSON.stringify(method)}, lifecycle: DependencyLifecycle.${lifecycle} }`,
+      )}, method: ${JSON.stringify(
+        method
+      )}, lifecycle: DependencyLifecycle.${lifecycle} }`,
       returnType: "void",
       statements: "// TODO: handle the typed response"
     });
@@ -2079,7 +2108,9 @@ function validateModel(codegenFs, options, projects) {
     throw new Error(`Model file not found: ${modelFilePath}`);
   }
   const project = new Project({ useInMemoryFileSystem: true });
-  const sf = project.createSourceFile(modelFilePath, content, { overwrite: true });
+  const sf = project.createSourceFile(modelFilePath, content, {
+    overwrite: true
+  });
   const findings = [];
   const hasKosModel = sf.getClasses().some((c) => c.getDecorator("kosModel"));
   if (!hasKosModel) {
@@ -2158,11 +2189,7 @@ function collectDecorated(cls, decoratorName) {
   for (const m of cls.getMethods()) {
     const dec = m.getDecorator(decoratorName);
     if (dec) {
-      visit(
-        m.getName(),
-        () => dec.getText(),
-        m.getReturnTypeNode()?.getText()
-      );
+      visit(m.getName(), () => dec.getText(), m.getReturnTypeNode()?.getText());
     }
   }
   for (const p of cls.getProperties()) {
@@ -2180,7 +2207,9 @@ function describeModel(codegenFs, options, projects) {
     throw new Error(`Model file not found: ${modelFilePath}`);
   }
   const project = new Project({ useInMemoryFileSystem: true });
-  const sf = project.createSourceFile(modelFilePath, content, { overwrite: true });
+  const sf = project.createSourceFile(modelFilePath, content, {
+    overwrite: true
+  });
   let modelType;
   const modelTypeDecl = sf.getVariableDeclaration("MODEL_TYPE");
   if (modelTypeDecl) {
@@ -2255,7 +2284,10 @@ function resolveCandidateEntries(codegenFs, options, projects) {
   const out = [];
   if (options.entryFile) {
     const abs = path.isAbsolute(options.entryFile) ? options.entryFile : path.join(root, options.entryFile);
-    out.push({ file: abs, mode: abs.endsWith(".d.ts") ? "declarations" : "source" });
+    out.push({
+      file: abs,
+      mode: abs.endsWith(".d.ts") ? "declarations" : "source"
+    });
   }
   const sdkProject = findProjectByName(root, sdkPackage, projects);
   const sourceRoot = sdkProject ? sdkProject.sourceRoot || path.join(sdkProject.root, "src") : void 0;
@@ -2384,11 +2416,13 @@ function lookupSdkType(codegenFs, options, projects) {
       mode: candidate.mode,
       entryFile: path.relative(codegenFs.root, candidate.file),
       triedEntries,
-      declarations: decls.map((d) => ({
-        kind: d.getKindName(),
-        file: path.relative(codegenFs.root, d.getSourceFile().getFilePath()),
-        signature: signatureText(d)
-      }))
+      declarations: decls.map((d) => {
+        return {
+          kind: d.getKindName(),
+          file: path.relative(codegenFs.root, d.getSourceFile().getFilePath()),
+          signature: signatureText(d)
+        };
+      })
     };
   }
   return {
@@ -2851,7 +2885,11 @@ function validateOptions(codegenFs, options, projects) {
   if (!options.appProject) {
     throw new ValidationError("App project is required");
   }
-  const project = findProjectByName(codegenFs.root, options.appProject, projects);
+  const project = findProjectByName(
+    codegenFs.root,
+    options.appProject,
+    projects
+  );
   if (!project) {
     throw new ValidationError(
       `Project "${options.appProject}" not found in workspace`