okai 0.0.24 → 0.0.25

package/dist/cs-gen.js

@@ -1,3 +1,4 @@
+import { unwrap } from "./cs-ast";
 import { leftPart } from "./utils.js";
 export class CSharpGenerator {
     namespaces = [];
@@ -25,7 +26,7 @@ export class CSharpGenerator {
         }
         const optional = name.endsWith('?');
         return genericArgs?.length
-            ? `${leftPart(name, '`')}<${genericArgs.join(',')}>` + (optional ? '?' : '')
+            ? `${unwrap(leftPart(name, '`'))}<${genericArgs.join(',')}>` + (optional ? '?' : '')
             : name;
     }
     toAttribtue(attr) {
@@ -36,7 +37,7 @@ export class CSharpGenerator {
                 if (body)
                     body += ',';
                 const value = arg.type.toLowerCase() === 'string'
-                    ? `"${arg.value}"`
+                    ? this.toQuotedString(arg.value)
                     : arg.value;
                 body += value;
             }
@@ -47,7 +48,7 @@ export class CSharpGenerator {
                 if (body)
                     body += ',';
                 const value = arg.type.toLowerCase() === 'string'
-                    ? `"${arg.value}"`
+                    ? this.toQuotedString(arg.value)
                     : arg.value;
                 body += `${arg.name}=${value}`;
             }
@@ -55,7 +56,7 @@ export class CSharpGenerator {
         return `[${attr.name}${body ? `(${body})` : ''}]`;
     }
     toClass(cls, opt) {
-        const showDesc = !opt || !opt.hide?.includes('description');
+        const showDesc = !opt || !opt.hideAttrs?.includes('description');
         const sb = [];
         let clsDef = `public class ${cls.name}`;
         if (cls.inherits) {
@@ -71,7 +72,7 @@ export class CSharpGenerator {
             sb.push(`/// </summary>`);
         }
         for (const attr of cls.attributes ?? []) {
-            if (opt?.hide?.includes(attr.name.toLowerCase()))
+            if (opt?.hideAttrs?.includes(attr.name.toLowerCase()))
                 continue;
             const def = this.toAttribtue(attr);
             sb.push(`${def}`);
@@ -79,6 +80,8 @@ export class CSharpGenerator {
         sb.push(clsDef);
         sb.push('{');
         for (const prop of cls.properties ?? []) {
+            if (opt?.ignoreProp?.(prop))
+                continue;
             this.addNamespace(prop.namespace);
             if (showDesc && prop.description) {
                 sb.push(`    /// <summary>`);
@@ -95,11 +98,14 @@ export class CSharpGenerator {
         sb.push('}');
         return sb.join('\n');
     }
+    toQuotedString(s, defaultValue = '""') {
+        return s ? `"${s.replaceAll('\n', '\\n').replaceAll('"', '\\"')}"` : defaultValue;
+    }
     toEnum(enumType, opt) {
-        const showDesc = !opt || !opt.hide?.includes('description');
+        const showDesc = !opt || !opt.hideAttrs?.includes('description');
         const sb = [];
         if (showDesc && enumType.description) {
-            sb.push(`[Description("${enumType.description}")]`);
+            sb.push(`[Description(${this.toQuotedString(enumType.description)})]`);
         }
         sb.push(`public enum ${enumType.name}`);
         sb.push('{');
@@ -112,10 +118,10 @@ export class CSharpGenerator {
                     : value;
                 let desc = enumType.enumDescriptions?.[i];
                 if (desc) {
-                    sb.push(`    [Description("${desc}")]`);
+                    sb.push(`    [Description(${this.toQuotedString(desc)})]`);
                 }
                 if (memberValue && memberValue !== value && memberValue !== name) {
-                    sb.push(`    [EnumMember(Value = "${memberValue}")]`);
+                    sb.push(`    [EnumMember(Value = ${this.toQuotedString(memberValue)})]`);
                 }
                 sb.push(value
                     ? `    ${name} = ${value},`

package/dist/cs-migrations.js

@@ -9,9 +9,12 @@ export class CSharpMigrationGenerator extends CSharpGenerator {
             'ServiceStack.OrmLite',
             ...ast.namespaces
         ]));
-        const hideAttrs = { hide: ['description', 'icon'] };
-        this.classes = ast.types.filter(t => !t.isEnum && !t.isInterface).map(x => this.toClass(x, hideAttrs));
-        this.enums = ast.types.filter(t => t.isEnum).map(x => this.toEnum(x, hideAttrs));
+        // props with [Reference] attribute don't need to be included in the migration (ignore to avoid missing references e.g. User)
+        const ignoreProp = (prop) => prop.attributes?.some(x => x.name === 'Reference');
+        const hideAttrs = ['description', 'icon'];
+        const opt = { hideAttrs, ignoreProp };
+        this.classes = ast.types.filter(t => !t.isEnum && !t.isInterface).map(x => this.toClass(x, opt));
+        this.enums = ast.types.filter(t => t.isEnum).map(x => this.toEnum(x, opt));
         const sb = [];
         if (this.classes.length) {
             for (const cls of this.classes) {
@@ -80,16 +83,17 @@ export class CSharpMigrationGenerator extends CSharpGenerator {
                 orderedTypes.push(type.name);
             }
         });
+        const ignoreTables = ['User'];
         sb.push('    public override void Up()');
         sb.push('    {');
-        for (const typeName of orderedTypes) {
+        for (const typeName of orderedTypes.filter(x => !ignoreTables.includes(x))) {
             sb.push(`        Db.CreateTable<${typeName}>();`);
         }
         sb.push('    }');
         sb.push('');
         sb.push('    public override void Down()');
         sb.push('    {');
-        for (const typeName of orderedTypes.reverse()) {
+        for (const typeName of orderedTypes.filter(x => !ignoreTables.includes(x)).reverse()) {
             sb.push(`        Db.DropTable<${typeName}>();`);
         }
         sb.push('    }');
@@ -100,3 +104,8 @@ export class CSharpMigrationGenerator extends CSharpGenerator {
         };
     }
 }
+export function toCSharpMigration(csAst) {
+    const csFiles = new CSharpMigrationGenerator().generate(csAst);
+    const cs = csFiles[Object.keys(csFiles)[0]];
+    return cs;
+}

package/dist/index.js

@@ -2,13 +2,12 @@ import fs from "fs";
 import path from "path";
 import blessed from 'blessed';
 import { projectInfo } from './info.js';
-import { parseTsdHeader, toTsdHeader, getGroupName, leftPart, replaceMyApp, trimStart } from "./utils.js";
-import { toAst } from "./ts-ast.js";
-import { toMetadataTypes } from "./cs-ast.js";
+import { parseTsdHeader, toTsdHeader, leftPart, replaceMyApp, trimStart, toPascalCase, plural } from "./utils.js";
+import { generateCsAstFromTsd, toAst, astForProject } from "./ts-ast.js";
 import { CSharpApiGenerator } from "./cs-apis.js";
 import { CSharpMigrationGenerator } from "./cs-migrations.js";
-import { TsdDataModelGenerator } from "./tsd-gen.js";
 import { getFileContent } from "./client.js";
+import { toTsd } from "./tsd-gen.js";
 function normalizeSwitches(cmd) { return cmd.replace(/^-+/, '/'); }
 function parseArgs(...args) {
     const ret = {
@@ -62,8 +61,12 @@ function parseArgs(...args) {
                 ret.type = "help";
             else if (arg == "info")
                 ret.type = "info";
-            else if (arg == "init")
+            else if (arg == "init") {
                 ret.type = "init";
+                if (args[i + 1]) {
+                    ret.init = args[++i];
+                }
+            }
             else if (arg == "update") {
                 ret.type = "update";
                 ret.tsdFile = args[++i];
@@ -136,7 +139,7 @@ export async function cli(cmdArgs) {
         process.exit(0);
         return;
     }
-    if (command.type === "init") {
+    if (command.type === "init" && !command.init) {
         let info = projectInfo(process.cwd()) ?? {
             projectName: "<MyApp>",
             slnDir: "/path/to/.sln/folder",
@@ -146,6 +149,7 @@ export async function cli(cmdArgs) {
             serviceInterfaceDir: "/path/to/MyApp.ServiceInterfaces",
         };
         fs.writeFileSync('okai.json', JSON.stringify(info, undefined, 2));
+        console.log(`Added: okai.json`);
         process.exit(0);
         return;
     }
@@ -166,6 +170,7 @@ ${bin} <models>.d.ts        Regenerate C# *.cs files for Data Models defined in
 ${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} init <model>         Create an empty <model>.d.ts file for the specified model
 ${bin} info                 Display current project info
 
 Options:
@@ -212,6 +217,37 @@ Options:
             process.exit(0);
         }
     }
+    if (command.type == "init" && command.info) {
+        const toApiFile = path.join(info.serviceModelDir, 'api.d.ts');
+        fs.copyFileSync(path.join(import.meta.dirname, 'api.d.ts'), toApiFile);
+        console.log(`Added: ${toApiFile}`);
+        let model = toPascalCase(leftPart(command.init, '.'));
+        let groupName = plural(model);
+        if (model == groupName) {
+            if (model.endsWith('s')) {
+                model = model.substring(0, model.length - 1);
+            }
+        }
+        let tsd = `
+      export class ${model} {
+        id:number
+        name:string
+      }
+    `;
+        const tsdAst = toAst(tsd);
+        if (tsdAst.references.length == 0) {
+            tsdAst.references.push({ path: './api.d.ts' });
+        }
+        tsd = toTsd(tsdAst);
+        const tsdContent = createTsdFile(info, {
+            prompt: `New ${model}`,
+            apiFileName: `${groupName}.cs`,
+            tsd,
+        });
+        command.type = "update"; // let update handle the rest
+        command.tsdFile = groupName + '.d.ts';
+        fs.writeFileSync(path.join(info.serviceModelDir, command.tsdFile), tsdContent, { encoding: 'utf-8' });
+    }
     if (command.type === "add") {
         if (command.add == "types" || command.add?.startsWith("api")) {
             const apiFile = path.join(import.meta.dirname, 'api.d.ts');
@@ -263,14 +299,10 @@ Options:
         if (command.verbose)
             console.log(JSON.stringify(header, undefined, 2));
         function regenerate(header, tsdContent, logPrefix = '') {
-            const tsdAst = toAst(tsdContent);
-            const tsdGenerator = new TsdDataModelGenerator();
-            tsdContent = tsdGenerator.generate(tsdAst);
-            const csAst = toMetadataTypes(tsdAst);
-            // const groupName = path.basename(command.tsdFile, '.d.ts')
-            // console.log('groupName', groupName)
+            const result = generateCsAstFromTsd(tsdContent);
+            tsdContent = result.tsd;
             const genApis = new CSharpApiGenerator();
-            const csApiFiles = genApis.generate(csAst);
+            const csApiFiles = genApis.generate(result.csAst);
             const apiContent = replaceMyApp(csApiFiles[Object.keys(csApiFiles)[0]], info.projectName);
             const apiPath = resolveApiFile(header.api);
             console.log(`${logPrefix}${apiPath}`);
@@ -278,14 +310,14 @@ Options:
             if (header?.migration) {
                 const migrationCls = leftPart(path.basename(header.migration), '.');
                 const getMigrations = new CSharpMigrationGenerator();
-                const csMigrationFiles = getMigrations.generate(csAst);
+                const csMigrationFiles = getMigrations.generate(result.csAst);
                 const migrationContent = replaceMyApp(csMigrationFiles[Object.keys(csMigrationFiles)[0]].replaceAll('Migration1000', migrationCls), info.projectName);
                 const migrationPath = resolveApiFile(header.migration);
                 console.log(`${logPrefix}${migrationPath}`);
                 fs.writeFileSync(migrationPath, migrationContent, { encoding: 'utf-8' });
             }
             console.log(`${logPrefix}${tsdPath}`);
-            const newTsdContent = toTsdHeader(header) + '\n\n' + tsdContent;
+            const newTsdContent = toTsdHeader(header) + (tsdContent.startsWith('///') ? '' : '\n\n') + tsdContent;
             fs.writeFileSync(tsdPath, newTsdContent, { encoding: 'utf-8' });
             return newTsdContent;
         }
@@ -300,7 +332,7 @@ Options:
                         console.log(`No change detected`);
                     return;
                 }
-                console.log(`\n${++i}. ${leftPart(new Date().toTimeString(), ' ')} regenerating files:`);
+                console.log(`\n${++i}. regenerated files at ${leftPart(new Date().toTimeString(), ' ')}:`);
                 lastTsdContent = regenerate(header, tsdContent);
             });
             return;
@@ -620,35 +652,29 @@ function chooseFile(ctx, info, gist, comamnd) {
         acceptTask = fetch(acceptUrl, { method: 'POST' });
     }
     const origTsd = file.content;
-    const tsdAst = toAst(origTsd);
-    const generator = new TsdDataModelGenerator();
-    const tsd = generator.generate(tsdAst);
-    const csAst = toMetadataTypes(tsdAst);
-    const groupName = getGroupName(csAst);
+    const tsdAst = astForProject(toAst(origTsd), info);
+    const res = generateCsAstFromTsd(toTsd(tsdAst));
     const genApis = new CSharpApiGenerator();
-    const csApiFiles = genApis.generate(csAst);
+    const csApiFiles = genApis.generate(res.csAst);
     const getMigrations = new CSharpMigrationGenerator();
-    const csMigrationFiles = getMigrations.generate(csAst);
+    const csMigrationFiles = getMigrations.generate(res.csAst);
     const relativeServiceModelDir = trimStart(info.serviceModelDir.substring(info.slnDir.length), '~/');
     const relativeMigrationDir = trimStart(info.migrationsDir.substring(info.slnDir.length), '~/');
-    const apiFileName = `${groupName}.cs`;
+    const apiFileName = `${res.groupName}.cs`;
     const apiContent = replaceMyApp(csApiFiles[Object.keys(csApiFiles)[0]], info.projectName);
     const migrationPath = resolveMigrationFile(path.join(info.migrationsDir, `Migration1000.cs`));
     const migrationFileName = path.basename(migrationPath);
     const migrationCls = leftPart(migrationFileName, '.');
     const migrationContent = replaceMyApp(csMigrationFiles[Object.keys(csMigrationFiles)[0]].replaceAll('Migration1000', migrationCls), info.projectName);
-    const sb = [
-        `/// <reference path="./api.d.ts" />`,
-        `/*prompt: ${titleBar.content.replaceAll('/*', '').replaceAll('*/', '')}`,
-        `api:       ~/${path.join(relativeServiceModelDir, apiFileName)}`,
-        `migration: ~/${path.join(relativeMigrationDir, migrationFileName)}`,
-        `*/`,
-        '',
-        tsd,
-    ];
-    const tsdContent = sb.join('\n');
-    const tsdFileName = `${groupName}.d.ts`;
-    const typesApiPath = path.join(info.slnDir, relativeServiceModelDir, `api.d.ts`);
+    const apiTypesPath = path.join(info.slnDir, relativeServiceModelDir, `api.d.ts`);
+    const apiFile = path.join(import.meta.dirname, 'api.d.ts');
+    fs.writeFileSync(apiTypesPath, fs.readFileSync(apiFile, 'utf-8'));
+    const tsdContent = createTsdFile(info, {
+        prompt: titleBar.content.replaceAll('/*', '').replaceAll('*/', ''),
+        apiFileName,
+        tsd: res.tsd,
+    });
+    const tsdFileName = `${res.groupName}.d.ts`;
     const fullTsdPath = path.join(info.slnDir, relativeServiceModelDir, tsdFileName);
     const fullApiPath = path.join(info.slnDir, relativeServiceModelDir, apiFileName);
     const fullMigrationPath = path.join(info.slnDir, relativeMigrationDir, migrationFileName);
@@ -667,8 +693,6 @@ function chooseFile(ctx, info, gist, comamnd) {
         fs.writeFileSync(fullMigrationPath, migrationContent, { encoding: 'utf-8' });
         console.log(`Saved: ${fullMigrationPath}`);
     }
-    const apiFile = path.join(import.meta.dirname, 'api.d.ts');
-    fs.writeFileSync(typesApiPath, fs.readFileSync(apiFile, 'utf-8'));
     const script = path.basename(process.argv[1]);
     console.log(`\nTo regenerate classes, update '${tsdFileName}' then run:`);
     console.log(`$ ${script} ${tsdFileName}`);
@@ -742,6 +766,24 @@ function exit(screen, info, gist) {
     }
     process.exit(0);
 }
+function createTsdFile(info, opt) {
+    const migrationPath = resolveMigrationFile(path.join(info.migrationsDir, `Migration1000.cs`));
+    const migrationFileName = path.basename(migrationPath);
+    const relativeServiceModelDir = trimStart(info.serviceModelDir.substring(info.slnDir.length), '~/');
+    const relativeMigrationDir = info.migrationsDir && fs.existsSync(info.migrationsDir)
+        ? trimStart(info.migrationsDir.substring(info.slnDir.length), '~/')
+        : null;
+    const sb = [
+        `/*prompt:  ${opt.prompt}`,
+        `api:       ~/${path.join(relativeServiceModelDir, opt.apiFileName)}`,
+    ];
+    if (relativeMigrationDir) {
+        sb.push(`migration: ~/${path.join(relativeMigrationDir, migrationFileName)}`);
+    }
+    sb.push('*/');
+    sb.push('');
+    return sb.join('\n') + (opt.tsd.startsWith('///') ? '' : '\n\n') + opt.tsd;
+}
 function applyCSharpGist(ctx, info, gist, { accept = false, acceptAll = false, discard = false }) {
     const { screen, titleBar, fileList, preview, statusBar, result } = ctx;
     function removeSelected() {

package/dist/info.js

@@ -53,7 +53,83 @@ export function projectInfo(cwd) {
         serviceModelDir,
         serviceInterfaceDir,
     };
+    for (const file of walk(serviceInterfaceDir, [], {
+        include: (path) => path.endsWith(".cs"),
+        excludeDirs: ["obj", "bin"]
+    })) {
+        const content = fs.readFileSync(file).toString();
+        const userInfo = parseUserType(content);
+        if (userInfo) {
+            info.userType = userInfo.userType;
+            info.userIdType = userInfo.userIdType ?? 'string';
+            break;
+        }
+    }
+    for (const file of walk(serviceModelDir, [], {
+        include: (path) => path.endsWith(".cs"),
+        excludeDirs: ["obj", "bin"]
+    })) {
+        const content = fs.readFileSync(file).toString();
+        const dtoInfo = parseUserDtoType(content);
+        if (dtoInfo?.userType) {
+            info.userType = dtoInfo.userType;
+            if (dtoInfo.userIdType)
+                info.userIdType = dtoInfo.userIdType;
+            if (dtoInfo.userLabel)
+                info.userLabel = dtoInfo.userLabel;
+            break;
+        }
+    }
     return config
         ? Object.assign({}, info, config)
         : info;
 }
+export function parseUserType(cs) {
+    const typePattern = /class\s+(\w+)\s*:\s*IdentityUser(?:<(.+)>)?/;
+    const match = cs.match(typePattern);
+    if (!match)
+        return null;
+    return {
+        userType: match[1], // Type name
+        userIdType: match[2] || null // Generic arguments (content between < >)
+    };
+}
+export function parseUserDtoType(cs) {
+    const userAliasPos = cs.indexOf('[Alias("AspNetUsers")]');
+    if (userAliasPos === -1)
+        return null;
+    const typeMatch = cs.substring(userAliasPos).match(/class\s+(\w+)\s*/);
+    if (!typeMatch)
+        return null;
+    const idMatch = cs.substring(userAliasPos).match(/\s+(\w+\??)\s+Id\s+/i);
+    const nameMatch = Array.from(cs.substring(userAliasPos).matchAll(/\s+(\w+Name)\s+/ig))
+        .find(x => x[1].toLowerCase() !== 'username')?.[1];
+    const userLabel = cs.includes('DisplayName')
+        ? 'DisplayName'
+        : nameMatch
+            ? nameMatch
+            : undefined;
+    return {
+        userType: typeMatch[1], // DTO Type name
+        userIdType: idMatch ? idMatch[1] : null,
+        userLabel,
+    };
+}
+function walk(dir, fileList = [], opt) {
+    const files = fs.readdirSync(dir);
+    for (const file of files) {
+        const filePath = path.join(dir, file);
+        const stat = fs.statSync(filePath);
+        if (stat.isDirectory()) {
+            if (!opt?.excludeDirs || !opt.excludeDirs.includes(file)) {
+                walk(filePath, fileList, opt);
+            }
+        }
+        else {
+            if (!opt?.include || opt?.include(filePath)) {
+                fileList.push(filePath);
+            }
+        }
+    }
+    return fileList;
+}

package/dist/ts-ast.js

@@ -1,5 +1,10 @@
+import { toMetadataTypes } from "./cs-ast.js";
+import { createTdAstFromAIAst, transformUserRefs } from "./ts-once.js";
 import { TypeScriptParser } from "./ts-parser.js";
-export function toTypeScriptSrc(msg) {
+import { toTsd } from "./tsd-gen.js";
+import { getGroupName } from "./utils.js";
+// Extract TypeScript source code from a AI Response
+export function extractTypeScriptSrc(msg) {
     msg = msg.trim();
     const startPos = msg.indexOf("```typescript");
     if (startPos >= 0) {
@@ -12,7 +17,33 @@ export function toTypeScriptSrc(msg) {
         return msg;
     }
 }
+// Parse TypeScript source code into AST
 export function toAst(src) {
     const parser = new TypeScriptParser();
     return parser.parse(src);
 }
+// Tranforms that are only applied once on AI TypeScript AST
+export function createAstFromAITypeScript(ts) {
+    const parser = new TypeScriptParser();
+    const tdAst = parser.parse(ts);
+    return createTdAstFromAIAst(tdAst);
+}
+// Apply Project Info to the AST once after it's downloaded
+export function astForProject(tsAst, info) {
+    transformUserRefs(tsAst, info);
+    return tsAst;
+}
+// Convert User TypeScript into CS AST and Updated TSD
+export function generateCsAstFromTsd(userTs) {
+    const userTsAst = toAst(userTs); // user modified tsd
+    const tsd = toTsd(userTsAst);
+    const tsdAst = toAst(tsd);
+    const csAst = toMetadataTypes(tsdAst);
+    const result = {
+        tsdAst,
+        tsd,
+        csAst,
+        groupName: getGroupName(csAst)
+    };
+    return result;
+}