okai 0.0.38 → 0.0.40

package/dist/icons.js

@@ -154,6 +154,7 @@ export const IconMap = {
     Refund: S(`0 0 20 20`, `<path fill='currentColor' fill-rule='evenodd' d='M5 2a2 2 0 0 0-2 2v14l3.5-2l3.5 2l3.5-2l3.5 2V4a2 2 0 0 0-2-2zm4.707 3.707a1 1 0 0 0-1.414-1.414l-3 3a1 1 0 0 0 0 1.414l3 3a1 1 0 0 0 1.414-1.414L8.414 9H10a3 3 0 0 1 3 3v1a1 1 0 1 0 2 0v-1a5 5 0 0 0-5-5H8.414z' clip-rule='evenodd'/>`),
     Play: S(`0 0 24 24`, `<path fill='currentColor' d='M8 5.14v14l11-7z'/>`),
     Result: S(`0 0 2048 2048`, `<path fill='currentColor' d='M2048 640v640h-768v512H128v128H0V0h128v128h1408v512zM128 256v384h1280V256zm1024 1408v-384H128v384zm768-512V768H128v384z'/>`),
+    Auction: S(`0 0 24 24`, `<path fill="currentColor" d="M14.005 20.003v2h-12v-2zM14.59.689l7.778 7.778l-1.414 1.414l-1.061-.353l-2.475 2.475l5.657 5.657l-1.414 1.414l-5.657-5.657l-2.404 2.404l.283 1.132l-1.415 1.414l-7.778-7.778l1.414-1.415l1.132.283l6.293-6.293l-.353-1.06zm.707 3.536l-7.071 7.07l3.535 3.536l7.071-7.07z"/>`),
     /** CMS */
     Page: S('0 0 24 24', `<g fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' stroke-width='1.5'><path d='M4 21.4V2.6a.6.6 0 0 1 .6-.6h11.652a.6.6 0 0 1 .424.176l3.148 3.148A.6.6 0 0 1 20 5.75V21.4a.6.6 0 0 1-.6.6H4.6a.6.6 0 0 1-.6-.6M8 10h8m-8 8h8m-8-4h4'/><path d='M16 2v3.4a.6.6 0 0 0 .6.6H20'/></g>`),
     Tag: S('0 0 24 24', `<g fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' stroke-width='2'><path d='M6.5 7.5a1 1 0 1 0 2 0a1 1 0 1 0-2 0'/><path d='M3 6v5.172a2 2 0 0 0 .586 1.414l7.71 7.71a2.41 2.41 0 0 0 3.408 0l5.592-5.592a2.41 2.41 0 0 0 0-3.408l-7.71-7.71A2 2 0 0 0 11.172 3H6a3 3 0 0 0-3 3'/></g>`),
@@ -183,6 +184,7 @@ export const IconMap = {
     Alert: S(`0 0 24 24`, `<path fill='currentColor' d='M12 2L1 21h22M12 6l7.53 13H4.47M11 10v4h2v-4m-2 6v2h2v-2'/>`),
     Data: S(`0 0 24 24`, `<path fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M18 12v5c0 1.657-2.686 3-6 3s-6-1.343-6-3v-5m12 0V7m0 5c0 1.657-2.686 3-6 3s-6-1.343-6-3m12-5c0-1.657-2.686-3-6-3S6 5.343 6 7m12 0c0 1.657-2.686 3-6 3S6 8.657 6 7m0 5V7'/>`),
     Tool: S(`0 0 24 24`, `<path fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M7 10h3V7L6.5 3.5a6 6 0 0 1 8 8l6 6a2 2 0 0 1-3 3l-6-6a6 6 0 0 1-8-8z'/>`),
+    Chip: S('0 0 512 512', `<rect width="352" height="352" x="80" y="80" fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="32" rx="48" ry="48"/><rect width="224" height="224" x="144" y="144" fill="none" stroke="currentColor" stroke-linejoin="round" stroke-width="32" rx="16" ry="16"/><path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="32" d="M256 80V48m80 32V48M176 80V48m80 416v-32m80 32v-32m-160 32v-32m256-176h32m-32 80h32m-32-160h32M48 256h32m-32 80h32M48 176h32"/>`),
     /** Actions */
     Completed: S(`0 0 2048 2048`, `<path fill='currentColor' d='M1024 0q141 0 272 36t244 104t207 160t161 207t103 245t37 272q0 141-36 272t-104 244t-160 207t-207 161t-245 103t-272 37q-141 0-272-36t-244-104t-207-160t-161-207t-103-245t-37-272q0-141 36-272t104-244t160-207t207-161T752 37t272-37m603 685l-136-136l-659 659l-275-275l-136 136l411 411z'/>`),
     Failed: S(`0 0 2048 2048`, `<path fill='currentColor' d='M1024 0q141 0 272 36t244 104t207 160t161 207t103 245t37 272q0 141-36 272t-104 244t-160 207t-207 161t-245 103t-272 37q-141 0-272-36t-244-104t-207-160t-161-207t-103-245t-37-272q0-141 36-272t104-244t160-207t207-161T752 37t272-37m113 1024l342-342l-113-113l-342 342l-342-342l-113 113l342 342l-342 342l113 113l342-342l342 342l113-113z'/>`),
@@ -233,7 +235,7 @@ export const IconGroups = {
     Post: ['Posting'],
     Content: ['Website', 'Blog', 'Template', 'LandingPage', 'Portal', 'Workspace'],
     Menu: ['Nav', 'Form', 'MenuList'],
-    Skill: ['Qualification', 'Certification', 'Experience', 'Training', 'Requirement'],
+    Skill: ['Qualification', 'Certification', 'Experience', 'Training', 'Requirement', 'Bid'],
     Analytics: ['Level', 'Metric', 'Kpi', 'Goal', 'Objective'],
     Review: ['Audit', 'Status'],
     Comment: ['Feedback'],
@@ -250,6 +252,7 @@ export const IconGroups = {
     Channel: ['Stream', 'Broadcast', 'Feed', 'Session'],
     Search: ['Filter', 'Lookup', 'Query', 'Match'],
     Save: ['Saved', 'Archive', 'Backup', 'Download', 'Export'],
+    Chip: ['Hardware'],
 };
 export const Icons = withAliases(IconMap, IconGroups);
 const IconKeys = Object.keys(Icons).sort((a, b) => b.length - a.length);

package/dist/index.js

@@ -162,7 +162,7 @@ export async function cli(cmdArgs) {
             uiMjsDir: "/path/to/MyApp/wwwroot/admin/sections",
         };
         fs.writeFileSync('okai.json', JSON.stringify(info, undefined, 2));
-        console.log(`Added: okai.json`);
+        console.log(`Saved: okai.json`);
         process.exit(0);
         return;
     }
@@ -272,7 +272,7 @@ Options:
     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}`);
+        console.log(`Saved: ${toApiFile}`);
         let model = toPascalCase(leftPart(command.init, '.'));
         let groupName = plural(model);
         if (model == groupName) {
@@ -300,7 +300,6 @@ Options:
             tsdAst,
             uiFileName,
         });
-        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' });
     }
@@ -313,7 +312,7 @@ Options:
             }
             const toFile = path.join(info.serviceModelDir, 'api.d.ts');
             fs.copyFileSync(apiFile, toFile);
-            console.log(`Added: ${toFile}`);
+            console.log(`Saved: ${toFile}`);
             process.exit(0);
         }
         else {
@@ -341,7 +340,7 @@ Options:
             ? path.join(info.slnDir, trimStart(filePath, '~/'))
             : path.join(process.cwd(), filePath);
     }
-    if (command.type === "update") {
+    if (command.type === "update" || (command.type == "init" && command.info)) {
         let tsdPath = assertTsdPath(command.tsdFile);
         if (command.verbose)
             console.log(`Updating: ${tsdPath}...`);
@@ -415,9 +414,15 @@ Options:
             return;
         }
         else {
-            regenerate(header, tsdContent, 'saved: ');
-            console.log(`\nLast migration can be rerun with 'npm run rerun:last' or:`);
-            console.log(`$ dotnet run --AppTasks=migrate.rerun:last`);
+            regenerate(header, tsdContent, 'Saved: ');
+            if (command.type == "init") {
+                console.log(`\nRun 'npm run migrate' to apply the new migration and create the new tables or:`);
+                console.log(`$ dotnet run --AppTasks=migrate`);
+            }
+            else {
+                console.log(`\nLast migration can be rerun with 'npm run rerun:last' or:`);
+                console.log(`$ dotnet run --AppTasks=migrate.rerun:last`);
+            }
             process.exit(0);
         }
     }

package/dist/ts-once.js

@@ -45,23 +45,27 @@ export function transformUserRefs(tsAst, info) {
                     prop.type = info.userType;
                 if (!prop.annotations)
                     prop.annotations = [];
-                const attr = {
-                    name: 'reference',
-                    args: {
-                        selfId: 'createdBy',
-                        refId: 'userName',
-                    }
-                };
-                if (info.userLabel)
-                    attr.args.refLabel = info.userLabel;
-                prop.annotations.push(attr);
+                if (!prop.annotations.find(x => x.name === 'reference')) {
+                    const attr = {
+                        name: 'reference',
+                        args: {
+                            selfId: 'createdBy',
+                            refId: 'userName',
+                        }
+                    };
+                    if (info.userLabel)
+                        attr.args.refLabel = info.userLabel;
+                    prop.annotations.push(attr);
+                }
             }
             if (prop.type === 'User[]') {
                 if (info.userType) {
                     prop.type = info.userType + '[]';
                     if (!prop.annotations)
                         prop.annotations = [];
-                    prop.annotations.push({ name: 'reference' });
+                    if (!prop.annotations.find(x => x.name === 'reference')) {
+                        prop.annotations.push({ name: 'reference' });
+                    }
                     const idPropType = cls.properties.find(x => x.name.toLowerCase() === 'id')?.type ?? 'number';
                     // Add Many to Many User Table
                     addClasses.push({

package/dist/ts-parser.js

@@ -340,12 +340,14 @@ export class TypeScriptParser {
         this.classes = [];
         this.interfaces = [];
         this.enums = [];
-        this.parseConfigType(sourceCode);
-        this.parseDefaultExport(sourceCode);
-        this.parseReferences(sourceCode);
-        this.parseInterfaces(sourceCode);
-        this.parseClasses(sourceCode);
-        this.parseEnums(sourceCode);
+        const src = removeMultilineComments(sourceCode);
+        // const src = sourceCode
+        this.parseConfigType(src);
+        this.parseDefaultExport(src);
+        this.parseReferences(src);
+        this.parseInterfaces(src);
+        this.parseClasses(src);
+        this.parseEnums(src);
         return {
             config: this.config,
             defaultExport: this.defaultExport,
@@ -523,3 +525,29 @@ function parseGenericType(typeStr) {
 function isNullableType(type) {
     return type === 'null' || type === 'undefined';
 }
+// Removes /*: Merge with User DTO... */ comments from the source code
+export function removeMultilineComments(src) {
+    let result = '';
+    let inComment = false;
+    let i = 0;
+    while (i < src.length) {
+        // Check for comment start
+        if (src[i] === '/' && src[i + 1] === '*' && src[i + 2] === ':') {
+            inComment = true;
+            i += 2;
+            continue;
+        }
+        // Check for comment end
+        if (inComment && (src[i] === '*' && src[i + 1] === '/')) {
+            inComment = false;
+            i += 2;
+            continue;
+        }
+        // Only append characters when not in a comment
+        if (!inComment) {
+            result += src[i];
+        }
+        i++;
+    }
+    return result;
+}

package/package.json

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