okai 0.0.8 → 0.0.10

package/dist/cs-apis.js

@@ -1,5 +1,5 @@
-import { getGroupName, splitCase } from "./utils.js";
-import { CSharpGenerator } from "./cs-gen.js";
+import { getGroupName, splitCase } from "./utils";
+import { CSharpGenerator } from "./cs-gen";
 export class CSharpApiGenerator extends CSharpGenerator {
     toApiClass(op) {
         const cls = op.request;

package/dist/cs-ast.js

@@ -1,5 +1,5 @@
-import { plural, toPascalCase } from "./utils.js";
-import { Icons } from "./icons.js";
+import { plural, toPascalCase } from "./utils";
+import { Icons } from "./icons";
 const sys = (name, genericArgs) => ({ name, namespace: "System", genericArgs });
 const sysObj = sys("object");
 const sysDictObj = { name: "Dictionary", genericArgs: ["string", "object"], namespace: "System.Collections.Generic" };
@@ -62,6 +62,10 @@ export class CSharpAst {
         return toPascalCase(tsName);
     }
     csharpType(type, propName) {
+        if (type.endsWith('[]')) {
+            const elType = this.csharpType(type.substring(0, type.length - 2), propName);
+            return Object.assign({}, elType, { name: elType.name + '[]' });
+        }
         if (propName) {
             if (type === "number") {
                 if (this.decimalTypeProps.some(x => propName.toLowerCase().includes(x))) {
@@ -231,21 +235,24 @@ export class CSharpAst {
                         idProp = { name: 'Id', type: 'int', isPrimaryKey: true, isValueType: true, namespace: 'System' };
                         refType.properties?.unshift(idProp);
                     }
-                    const fkProp = {
-                        name: fkId,
-                        type: idProp.type,
-                        namespace: idProp.namespace,
-                        attributes: [{
-                                name: "References",
-                                constructorArgs: [{
-                                        name: "type",
-                                        type: "Type",
-                                        value: `typeof(${p.type})`
-                                    }],
-                                args: []
-                            }]
-                    };
-                    type.properties.splice(i, 0, fkProp);
+                    // Only add if FK Id prop does not already exist
+                    if (!type.properties.find(x => x.name === fkId)) {
+                        const fkProp = {
+                            name: fkId,
+                            type: idProp.type,
+                            namespace: idProp.namespace,
+                            attributes: [{
+                                    name: "References",
+                                    constructorArgs: [{
+                                            name: "type",
+                                            type: "Type",
+                                            value: `typeof(${p.type})`
+                                        }],
+                                    args: []
+                                }]
+                        };
+                        type.properties.splice(i, 0, fkProp);
+                    }
                     if (!p.attributes)
                         p.attributes = [];
                     p.attributes.push({ name: "Reference" });

package/dist/index.js

@@ -518,6 +518,8 @@ function chooseFile(ctx, info, gist) {
     const fullTsdPath = path.join(info.slnDir, relativeServiceModelDir, tsdFileName);
     const fullApiPath = path.join(info.slnDir, relativeServiceModelDir, apiFileName);
     const fullMigrationPath = path.join(info.slnDir, relativeMigrationDir, migrationFileName);
+    const clearScreen = blessed.screen();
+    clearScreen.render();
     if (!fs.existsSync(path.dirname(fullTsdPath))) {
         console.log(`Directory does not exist: ${path.dirname(fullTsdPath)}`);
         process.exit(0);
@@ -535,7 +537,7 @@ function chooseFile(ctx, info, gist) {
     }
     const script = path.basename(process.argv[1]);
     console.log(`\nTo regenerate classes, update '${tsdFileName}' then run:`);
-    console.log(`$ ${script} ${tsdFileName}`);
+    console.log(`$ ${script} ${tsdFileName}\n\n`);
     process.exit(0);
 }
 function writeFile(info, filename, content) {

package/dist/ts-ast.js

@@ -12,14 +12,6 @@ export function toTypeScriptSrc(msg) {
         return msg;
     }
 }
-// export function toAst(typescriptSrc:string) {
-//     const parsed = parseTypeScriptSource(typescriptSrc)
-//     return parsed
-// }
-// export function toAst(src:string) {
-//     const parsed = TypeScriptMultiParser.parse(src)
-//     return parsed
-// }
 export function toAst(src) {
     const parser = new TypeScriptParser();
     return parser.parse(src);

package/dist/ts-parser.js

@@ -33,6 +33,8 @@ export class TypeScriptParser {
         const props = [];
         const lines = this.cleanBody(classBody).split('\n');
         lines.forEach((line, index) => {
+            if (line.trim().startsWith('//'))
+                return;
             const match = line.match(TypeScriptParser.PROPERTY_PATTERN);
             if (match?.groups) {
                 const member = {

package/dist/utils.js

@@ -80,6 +80,9 @@ export function plural(word, amount) {
     }
     return word;
 }
+export function indentLines(src, indent = '    ') {
+    return src.split('\n').map(x => indent + x).join('\n');
+}
 export function requestKey(date) {
     return `requests/${timestampKey(date)}`;
 }
@@ -90,9 +93,6 @@ export function timestampKey(date) {
     const timestamp = date.valueOf();
     return `${year}/${month}/${day}/${timestamp}`;
 }
-export function indentLines(src, indent = '    ') {
-    return src.split('\n').map(x => indent + x).join('\n');
-}
 export function trimStart(str, chars = ' ') {
     const cleanStr = String(str);
     const charsToTrim = new Set(chars);

package/package.json

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