okai 0.0.26 → 0.0.28

package/dist/cs-ast.js

@@ -182,12 +182,12 @@ export class CSharpAst {
     // Ignore properties with these attributes on APIs
     ignoreCreateProps = [
         'autoIncrement',
-        'references',
+        'reference',
         'compute',
         'computed',
     ].map(x => x.toLowerCase());
     ignoreUpdateProps = [
-        'references',
+        'reference',
         'compute',
         'computed',
     ].map(x => x.toLowerCase());

package/dist/index.js

@@ -8,6 +8,7 @@ import { CSharpApiGenerator } from "./cs-apis.js";
 import { CSharpMigrationGenerator } from "./cs-migrations.js";
 import { getFileContent } from "./client.js";
 import { toTsd } from "./tsd-gen.js";
+import { UiMjsGroupGenerator, UiMjsIndexGenerator } from "./ui-mjs.js";
 function normalizeSwitches(cmd) { return cmd.replace(/^-+/, '/'); }
 function parseArgs(...args) {
     const ret = {
@@ -147,6 +148,7 @@ export async function cli(cmdArgs) {
             migrationsDir: "/path/to/MyApp/Migrations",
             serviceModelDir: "/path/to/MyApp.ServiceModel",
             serviceInterfaceDir: "/path/to/MyApp.ServiceInterfaces",
+            uiMjsDir: "/path/to/MyApp/wwwroot/admin/sections",
         };
         fs.writeFileSync('okai.json', JSON.stringify(info, undefined, 2));
         console.log(`Added: okai.json`);
@@ -239,10 +241,14 @@ Options:
             tsdAst.references.push({ path: './api.d.ts' });
         }
         tsd = toTsd(tsdAst);
+        let uiFileName = info.uiMjsDir
+            ? path.join(info.uiMjsDir, `${groupName}.mjs`)
+            : null;
         const tsdContent = createTsdFile(info, {
             prompt: `New ${model}`,
             apiFileName: `${groupName}.cs`,
             tsd,
+            uiFileName,
         });
         command.type = "update"; // let update handle the rest
         command.tsdFile = groupName + '.d.ts';
@@ -280,15 +286,10 @@ Options:
         }
         return tsdPath;
     }
-    function resolveMigrationFile(migrationPath) {
-        return migrationPath.startsWith('~/')
-            ? path.join(info.slnDir, trimStart(migrationPath, '~/'))
-            : path.join(process.cwd(), migrationPath);
-    }
-    function resolveApiFile(apiPath) {
-        return apiPath.startsWith('~/')
-            ? path.join(info.slnDir, trimStart(apiPath, '~/'))
-            : path.join(process.cwd(), apiPath);
+    function resolveFile(filePath) {
+        return filePath.startsWith('~/')
+            ? path.join(info.slnDir, trimStart(filePath, '~/'))
+            : path.join(process.cwd(), filePath);
     }
     if (command.type === "update") {
         let tsdPath = assertTsdPath(command.tsdFile);
@@ -304,7 +305,7 @@ Options:
             const genApis = new CSharpApiGenerator();
             const csApiFiles = genApis.generate(result.csAst);
             const apiContent = replaceMyApp(csApiFiles[Object.keys(csApiFiles)[0]], info.projectName);
-            const apiPath = resolveApiFile(header.api);
+            const apiPath = resolveFile(header.api);
             console.log(`${logPrefix}${apiPath}`);
             fs.writeFileSync(apiPath, apiContent, { encoding: 'utf-8' });
             if (header?.migration) {
@@ -312,10 +313,23 @@ Options:
                 const getMigrations = new CSharpMigrationGenerator();
                 const csMigrationFiles = getMigrations.generate(result.csAst);
                 const migrationContent = replaceMyApp(csMigrationFiles[Object.keys(csMigrationFiles)[0]].replaceAll('Migration1000', migrationCls), info.projectName);
-                const migrationPath = resolveApiFile(header.migration);
+                const migrationPath = resolveFile(header.migration);
                 console.log(`${logPrefix}${migrationPath}`);
                 fs.writeFileSync(migrationPath, migrationContent, { encoding: 'utf-8' });
             }
+            if (header?.uiMjs) {
+                const uiMjsGroupPath = resolveFile(header.uiMjs);
+                const uiMjsGroupGen = new UiMjsGroupGenerator();
+                const uiMjsGroup = uiMjsGroupGen.generate(result.csAst, result.groupName);
+                console.log(`${logPrefix}${uiMjsGroupPath}`);
+                fs.writeFileSync(uiMjsGroupPath, uiMjsGroup, { encoding: 'utf-8' });
+                const uiMjsDir = path.dirname(uiMjsGroupPath);
+                const uiMjsIndexGen = new UiMjsIndexGenerator();
+                const uiMjsIndex = uiMjsIndexGen.generate(fs.readdirSync(uiMjsDir));
+                const uiMjsIndexPath = path.join(uiMjsDir, 'index.mjs');
+                console.log(`${logPrefix}${uiMjsIndexPath}`);
+                fs.writeFileSync(uiMjsIndexPath, uiMjsIndex, { encoding: 'utf-8' });
+            }
             console.log(`${logPrefix}${tsdPath}`);
             const newTsdContent = toTsdHeader(header) + (tsdContent.startsWith('///') ? '' : '\n\n') + tsdContent;
             fs.writeFileSync(tsdPath, newTsdContent, { encoding: 'utf-8' });
@@ -353,7 +367,7 @@ Options:
         if (command.verbose)
             console.log(JSON.stringify(header, undefined, 2));
         if (header?.migration) {
-            const migrationPath = resolveMigrationFile(header.migration);
+            const migrationPath = resolveFile(header.migration);
             if (fs.existsSync(migrationPath)) {
                 fs.unlinkSync(migrationPath);
                 console.log(`Removed: ${migrationPath}`);
@@ -363,7 +377,7 @@ Options:
             }
         }
         if (header?.api) {
-            const apiPath = resolveApiFile(header.api);
+            const apiPath = resolveFile(header.api);
             if (fs.existsSync(apiPath)) {
                 fs.unlinkSync(apiPath);
                 console.log(`Removed: ${apiPath}`);
@@ -372,6 +386,21 @@ Options:
                 console.log(`APIs .cs file not found: ${apiPath}`);
             }
         }
+        if (header?.uiMjs) {
+            const uiMjsGroupPath = resolveFile(header.uiMjs);
+            if (fs.existsSync(uiMjsGroupPath)) {
+                fs.unlinkSync(uiMjsGroupPath);
+                console.log(`Removed: ${uiMjsGroupPath}`);
+                const uiMjsDir = path.dirname(uiMjsGroupPath);
+                const uiMjsIndexGen = new UiMjsIndexGenerator();
+                const uiMjsIndex = uiMjsIndexGen.generate(fs.readdirSync(uiMjsDir));
+                const uiMjsIndexPath = path.join(uiMjsDir, 'index.mjs');
+                fs.writeFileSync(uiMjsIndexPath, uiMjsIndex, { encoding: 'utf-8' });
+            }
+            else {
+                console.log(`UI .mjs file not found: ${uiMjsGroupPath}`);
+            }
+        }
         fs.unlinkSync(tsdPath);
         console.log(`Removed: ${tsdPath}`);
         const serviceModelDir = path.dirname(tsdPath);
@@ -653,7 +682,7 @@ function chooseFile(ctx, info, gist, comamnd) {
     }
     const origTsd = file.content;
     const tsdAst = astForProject(toAst(origTsd), info);
-    const res = generateCsAstFromTsd(toTsd(tsdAst));
+    const res = generateCsAstFromTsd(toTsd(tsdAst), { references: [`./api.d.ts`] });
     const genApis = new CSharpApiGenerator();
     const csApiFiles = genApis.generate(res.csAst);
     const getMigrations = new CSharpMigrationGenerator();
@@ -669,10 +698,22 @@ function chooseFile(ctx, info, gist, comamnd) {
     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'));
+    let uiFileName = null;
+    if (info.uiMjsDir) {
+        uiFileName = `${res.groupName}.mjs`;
+        const uiGroupPath = path.join(info.uiMjsDir, uiFileName);
+        const uiVueGen = new UiMjsGroupGenerator();
+        const uiGroupSrc = uiVueGen.generate(res.csAst, res.groupName);
+        fs.writeFileSync(uiGroupPath, uiGroupSrc);
+        const uiIndexGen = new UiMjsIndexGenerator();
+        const uiIndexSrc = uiIndexGen.generate(fs.readdirSync(info.uiMjsDir));
+        fs.writeFileSync(path.join(info.uiMjsDir, `index.mjs`), uiIndexSrc);
+    }
     const tsdContent = createTsdFile(info, {
         prompt: titleBar.content.replaceAll('/*', '').replaceAll('*/', ''),
         apiFileName,
         tsd: res.tsd,
+        uiFileName,
     });
     const tsdFileName = `${res.groupName}.d.ts`;
     const fullTsdPath = path.join(info.slnDir, relativeServiceModelDir, tsdFileName);
@@ -680,7 +721,7 @@ function chooseFile(ctx, info, gist, comamnd) {
     const fullMigrationPath = path.join(info.slnDir, relativeMigrationDir, migrationFileName);
     if (!fs.existsSync(path.dirname(fullTsdPath))) {
         console.log(`Directory does not exist: ${path.dirname(fullTsdPath)}`);
-        process.exit(0);
+        process.exit(1);
     }
     console.log(`\nSelected '${result.selectedFile}' data models`);
     fs.writeFileSync(fullTsdPath, tsdContent, { encoding: 'utf-8' });
@@ -692,6 +733,7 @@ function chooseFile(ctx, info, gist, comamnd) {
     if (fs.existsSync(path.dirname(fullMigrationPath))) {
         fs.writeFileSync(fullMigrationPath, migrationContent, { encoding: 'utf-8' });
         console.log(`Saved: ${fullMigrationPath}`);
+        console.log(`\nRun 'dotnet run --AppTasks=migrate' to apply the new migration and create the new tables`);
     }
     const script = path.basename(process.argv[1]);
     console.log(`\nTo regenerate classes, update '${tsdFileName}' then run:`);
@@ -706,7 +748,7 @@ function chooseFile(ctx, info, gist, comamnd) {
             .catch((err) => {
             if (comamnd.verbose)
                 console.log(`ERROR: ${err.message ?? err}`);
-            process.exit(0);
+            process.exit(1);
         });
     }
     else {
@@ -773,6 +815,9 @@ function createTsdFile(info, opt) {
     const relativeMigrationDir = info.migrationsDir && fs.existsSync(info.migrationsDir)
         ? trimStart(info.migrationsDir.substring(info.slnDir.length), '~/')
         : null;
+    const relativeUiVueDir = opt.uiFileName && info.uiMjsDir && fs.existsSync(info.uiMjsDir)
+        ? trimStart(info.uiMjsDir.substring(info.slnDir.length), '~/')
+        : null;
     const sb = [
         `/*prompt:  ${opt.prompt}`,
         `api:       ~/${path.join(relativeServiceModelDir, opt.apiFileName)}`,
@@ -780,41 +825,10 @@ function createTsdFile(info, opt) {
     if (relativeMigrationDir) {
         sb.push(`migration: ~/${path.join(relativeMigrationDir, migrationFileName)}`);
     }
+    if (relativeUiVueDir) {
+        sb.push(`ui.mjs:    ~/${path.join(relativeUiVueDir, opt.uiFileName)}`);
+    }
     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() {
-        delete gist.files[result.selectedFile];
-        fileList.removeItem(result.selectedFile);
-        const nextFile = Object.keys(gist.files)[0];
-        if (nextFile) {
-            result.selectedFile = nextFile;
-            const nextFileIndex = fileList.getItemIndex(nextFile);
-            fileList.select(nextFileIndex);
-            preview.setContent(gist.files[nextFile].content);
-        }
-        screen.render();
-        if (Object.keys(gist.files).length === 0) {
-            //screen.destroy()
-            exit(screen, info, gist);
-        }
-    }
-    if (discard) {
-        const file = gist.files[result.selectedFile];
-        removeSelected();
-    }
-    else if (accept) {
-        const file = gist.files[result.selectedFile];
-        writeFile(info, result.selectedFile, file.content);
-        removeSelected();
-    }
-    else if (acceptAll) {
-        for (const [filename, file] of Object.entries(gist.files)) {
-            writeFile(info, filename, file.content);
-        }
-        exit(screen, info, gist);
-    }
-}

package/dist/info.js

@@ -53,6 +53,10 @@ export function projectInfo(cwd) {
         serviceModelDir,
         serviceInterfaceDir,
     };
+    const uiVueDir = path.join(hostDir, "wwwroot", "admin", "sections");
+    if (fs.existsSync(uiVueDir)) {
+        info.uiMjsDir = uiVueDir;
+    }
     for (const file of walk(serviceInterfaceDir, [], {
         include: (path) => path.endsWith(".cs"),
         excludeDirs: ["obj", "bin"]

package/dist/ts-ast.js

@@ -34,8 +34,14 @@ export function astForProject(tsAst, info) {
     return tsAst;
 }
 // Convert User TypeScript into CS AST and Updated TSD
-export function generateCsAstFromTsd(userTs) {
+export function generateCsAstFromTsd(userTs, opt) {
     const userTsAst = toAst(userTs); // user modified tsd
+    if (opt?.references) {
+        userTsAst.references = userTsAst.references || [];
+        opt.references
+            .filter(x => !userTsAst.references.some(y => y.path === x))
+            .forEach(path => userTsAst.references.push({ path }));
+    }
     const tsd = toTsd(userTsAst);
     const tsdAst = toAst(tsd);
     const csAst = toMetadataTypes(tsdAst);

package/dist/ui-mjs.js

@@ -0,0 +1,70 @@
+import { getGroupName, plural, toCamelCase } from "./utils.js";
+/*
+export default {
+    group: "Bookings",
+    items: {
+        Bookings: {
+            type: 'Booking',
+            component: {
+                template:`<AutoQueryGrid :type="type"
+                    selected-columns="id,name,roomType,roomNumber,bookingStartDate,bookingEndDate,cost,couponId,discount" />`,
+            },
+        },
+        Coupons: {
+            type: 'Coupon',
+            component: {
+                template:`<AutoQueryGrid :type="type"
+                    selected-columns="id,name,description,discount,expiryDate" />`,
+            },
+        },
+    },
+}
+*/
+export class UiMjsGroupGenerator {
+    generate(ast, groupLabel) {
+        if (!groupLabel) {
+            const groupName = getGroupName(ast);
+            groupLabel = plural(groupName);
+        }
+        const sb = [
+            `export default {`,
+            `    group: "${groupLabel}",`,
+            `    items: {`,
+            ...ast.types.filter(x => !x.isEnum && !x.isInterface).map(x => {
+                return [
+                    `        ${plural(x.name)}: {`,
+                    `            type: '${x.name}',`,
+                    `            component: {`,
+                    `                template:\`<AutoQueryGrid :type="type"`,
+                    `                    selected-columns="${x.properties.map(x => toCamelCase(x.name)).join(',')}" />\`,`,
+                    `            },`,
+                    `        },`,
+                ].join('\n');
+            }),
+            `    }`,
+            `}`,
+        ];
+        const src = sb.join('\n');
+        return src;
+    }
+}
+/*
+import Bookings from './Bookings.mjs'
+export {
+    Bookings,
+}
+*/
+export class UiMjsIndexGenerator {
+    generate(files) {
+        const imports = [];
+        const exports = ['export {'];
+        files.filter(x => x != 'index.mjs').forEach(x => {
+            const name = x.replace('.mjs', '');
+            imports.push(`import ${name} from './${name}.mjs'`);
+            exports.push(`    ${name},`);
+        });
+        exports.push('}');
+        const src = imports.join('\n') + '\n' + exports.join('\n');
+        return src;
+    }
+}

package/dist/utils.js

@@ -178,6 +178,9 @@ export function parseTsdHeader(tsd) {
         else if (line.startsWith('migration:')) {
             to.migration = line.replace('migration:', '').trim();
         }
+        else if (line.startsWith('ui.mjs:')) {
+            to.uiMjs = line.replace('ui.mjs:', '').trim();
+        }
         else if (!to.api && !to.migration && line.trim()) {
             to.prompt += line.trim() + '\n';
         }
@@ -198,7 +201,11 @@ export function toTsdHeader(header) {
     if (header.migration) {
         sb.push(`migration: ${header.migration}`);
     }
+    if (header.uiMjs) {
+        sb.push(`ui.mjs:    ${header.uiMjs}`);
+    }
     sb.push('*/');
+    sb.push('');
     return sb.join('\n');
 }
 export function toPascalCase(s) {

package/package.json

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