okai 0.0.20 → 0.0.22

package/dist/index.js

@@ -150,18 +150,19 @@ export async function cli(cmdArgs) {
         if (command.unknown?.length) {
             console.log(`Unknown Command: ${command.script} ${command.unknown.join(' ')}\n`);
         }
+        const bin = script.padStart(7, ' ');
         console.log(`Usage: 
-${script} <prompt>                Generate new TypeScript Data Models, C# APIs and Migrations from prompt
+${bin} <prompt>             Generate new TypeScript Data Models, C# APIs and Migrations from prompt
     -m, -models <model,>     Specify up to 5 LLM models to generate .d.ts Data Models
     -l, -license <LC-xxx>    Specify valid license certificate or key to use premium models
 
-${script} <models>.d.ts           Regenerate C# *.cs files for Data Models defined in the TypeScript .d.ts file
+${bin} <models>.d.ts        Regenerate C# *.cs files for Data Models defined in the TypeScript .d.ts file
     -w, -watch               Watch for changes to <models>.d.ts and regenerate *.cs on save
 
-${script} rm <models>.d.ts     Remove <models>.d.ts and its generated *.cs files
-${script} ls models            Display list of available premium LLM models
-${script} init                 Initialize okai.json with project info to override default paths
-${script} info                 Display current project info
+${bin} rm <models>.d.ts     Remove <models>.d.ts and its generated *.cs files
+${bin} ls models            Display list of available premium LLM models
+${bin} init                 Initialize okai.json with project info to override default paths
+${bin} info                 Display current project info
 
 Options:
     -v, -verbose             Display verbose logging

package/dist/tsd-gen.js

@@ -97,29 +97,50 @@ export class TsdGenerator {
     }
 }
 export class TsdDataModelGenerator extends TsdGenerator {
-    generate(ast) {
-        function convertProps(properties) {
-            properties?.forEach(prop => {
-                prop.name = toCamelCase(prop.name);
-                if (prop.type === 'User') {
-                    prop.name = 'userId';
-                    prop.type = 'string';
-                }
-                if (prop.type === 'User[]') {
-                    if (prop.name.endsWith('s')) {
-                        prop.name = prop.name.slice(0, -1) + 'Ids';
-                    }
-                    prop.type = 'string[]';
+    duplicateTypePropMap = {
+        note: 'content',
+    };
+    convertType(type) {
+        type.name = toPascalCase(type.name);
+        type.properties?.forEach(prop => {
+            prop.name = toCamelCase(prop.name);
+            if (prop.type.startsWith('Array<')) {
+                const elType = prop.type.slice('Array<'.length, -1);
+                prop.type = elType + '[]';
+            }
+            if (prop.type === 'User') {
+                prop.name = 'userId';
+                prop.type = 'string';
+            }
+            if (prop.type === 'User[]') {
+                if (prop.name.endsWith('s')) {
+                    prop.name = prop.name.slice(0, -1) + 'Ids';
                 }
-            });
+                prop.type = 'string[]';
+            }
+        });
+        this.rewriteDuplicateTypePropNames(type);
+        this.rewriteSelfReferencingIds(type);
+    }
+    rewriteDuplicateTypePropNames(type) {
+        const duplicateProp = type.properties?.find(x => toPascalCase(x.name) === type.name);
+        if (duplicateProp) {
+            const newName = this.duplicateTypePropMap[duplicateProp.name] ?? 'value';
+            duplicateProp.name = newName;
+        }
+    }
+    rewriteSelfReferencingIds(type) {
+        const selfRefId = type.properties?.find(x => x.name.toLowerCase() === `${type.name}id`.toLowerCase());
+        if (selfRefId) {
+            selfRefId.name = `parentId`;
         }
+    }
+    generate(ast) {
         ast.classes?.forEach(cls => {
-            cls.name = toPascalCase(cls.name);
-            convertProps(cls.properties);
+            this.convertType(cls);
         });
         ast.interfaces?.forEach(cls => {
-            cls.name = toPascalCase(cls.name);
-            convertProps(cls.properties);
+            this.convertType(cls);
         });
         ast.enums?.forEach(e => {
             e.name = toPascalCase(e.name);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "okai",
   "type": "module",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "bin": "./dist/okai.js",
   "main": "./dist/index.js",
   "module": "./dist/index.js",