okai 0.0.33 → 0.0.35

package/dist/api.d.ts

@@ -125,7 +125,7 @@ declare global {
     export function route(path:string, opt?:{ summary?:string, notes?:string, verbs?:string, priority?:number, matches?:string, }|string) : ClassDecoratorDef
     export function icon(opt?:{ svg?:string, uri?:string, alt?:string, cls?:string, }) : ClassDecoratorDef
     export function field(opt?:InputAttrOptions & { name?:string, fieldCss?:string, inputCss?:string, labelCss?:string, }) : ClassDecoratorDef
-    export function tag(name:string) : ClassDecoratorDef
+    export function tag(name?:string) : ClassDecoratorDef
     export function worker(name:string) : ClassDecoratorDef
     export function notes(notes:string) : ClassDecoratorDef
     export function namedConnection(name:string) : ClassDecoratorDef
@@ -167,7 +167,7 @@ declare global {
     export function flags() : ClassDecoratorDef
     export function enumMember(opt:{ value:string }) : ClassFieldDecoratorDef
 
-    export function validate(validator:string) : ClassFieldDecoratorDef
+    export function validate(validator?:string) : ClassFieldDecoratorDef
     export function validateNull() : ClassFieldDecoratorDef
     export function validateEmpty() : ClassFieldDecoratorDef
     export function validateEmail() : ClassFieldDecoratorDef

package/dist/cs-ast.js

@@ -648,8 +648,9 @@ export class CSharpAst {
                         else if (prop.type === 'List`1' && this.commonValueTypes.includes(prop.genericArgs[0])) {
                             prop.attributes.push(...inputTagAttrs);
                         }
-                        const emptyValidateAttr = prop.attributes.find(x => x.name.toLowerCase() === 'validate');
-                        if (emptyValidateAttr && emptyValidateAttr.constructorArgs?.[0]?.value === '') {
+                        const emptyValidateAttr = prop.attributes
+                            .find(x => x.name.toLowerCase() === 'validate' && !x.constructorArgs?.length && !x.args?.length);
+                        if (emptyValidateAttr) {
                             prop.attributes = prop.attributes.filter(x => x !== emptyValidateAttr);
                         }
                     }
@@ -708,6 +709,11 @@ export class CSharpAst {
                             prop.attributes.push(...inputTagAttrs);
                         }
                     }
+                    const emptyValidateAttr = prop.attributes
+                        .find(x => x.name.toLowerCase() === 'validate' && !x.constructorArgs?.length && !x.args?.length);
+                    if (emptyValidateAttr) {
+                        prop.attributes = prop.attributes.filter(x => x !== emptyValidateAttr);
+                    }
                 }
                 if (isAuditBase) {
                     updateApi.requiresAuth = true;
@@ -838,6 +844,7 @@ export const Transforms = {
         addAutoIncrementAttrs,
         addIconsToKnownTypes,
         hideReferenceProperties,
+        removeEmptyAttributes,
     ],
 };
 export function toMetadataTypes(ast, transforms) {
@@ -919,6 +926,22 @@ export function replaceIds(gen) {
         }
     }
 }
+export function removeEmptyAttributes(gen) {
+    const removeEmptyAttrsNamed = ['icon', 'description', 'notes', 'tag', 'icon', 'alias']; // 'validate' removed in gen APIs
+    const filterEmptyAttrs = (attrs) => attrs.filter(x => !(removeEmptyAttrsNamed.includes(x.name.toLowerCase()) && !x.constructorArgs?.length && !x.args?.length));
+    for (const type of gen.classes) {
+        if (type.attributes) {
+            type.attributes = filterEmptyAttrs(type.attributes);
+        }
+        if (type.properties) {
+            for (const prop of type.properties) {
+                if (prop.attributes) {
+                    prop.attributes = filterEmptyAttrs(prop.attributes);
+                }
+            }
+        }
+    }
+}
 export function convertReferenceTypes(gen) {
     for (const type of gen.classes) {
         for (let i = 0; i < type.properties.length; i++) {
@@ -1061,7 +1084,7 @@ export function addIconsToKnownTypes(gen) {
             const existingIcon = type.attributes.find(x => x.name === 'Icon');
             if (existingIcon) {
                 // remove empty icon
-                if (existingIcon.constructorArgs?.[0]?.value === '') {
+                if (existingIcon.constructorArgs?.length === 0 && existingIcon.args?.length === 0) {
                     type.attributes = type.attributes.filter(x => x !== existingIcon);
                 }
                 return;

package/dist/index.js

@@ -751,17 +751,7 @@ 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);
-    }
+    let uiFileName = info.uiMjsDir ? `${res.groupName}.mjs` : null;
     const tsdContent = createTsdFile(info, {
         prompt: titleBar.content.replaceAll('/*', '').replaceAll('*/', ''),
         apiFileName,
@@ -783,6 +773,18 @@ function chooseFile(ctx, info, gist, comamnd) {
         fs.writeFileSync(fullApiPath, apiContent, { encoding: 'utf-8' });
         console.log(`Saved: ${fullApiPath}`);
     }
+    if (info.uiMjsDir) {
+        const uiGroupPath = path.join(info.uiMjsDir, uiFileName);
+        const uiVueGen = new UiMjsGroupGenerator();
+        const uiGroupSrc = uiVueGen.generate(res.csAst, res.groupName);
+        fs.writeFileSync(uiGroupPath, uiGroupSrc);
+        console.log(`Saved: ${uiGroupPath}`);
+        const uiIndexGen = new UiMjsIndexGenerator();
+        const uiIndexSrc = uiIndexGen.generate(fs.readdirSync(info.uiMjsDir));
+        const uiIndexPath = path.join(info.uiMjsDir, `index.mjs`);
+        fs.writeFileSync(uiIndexPath, uiIndexSrc);
+        console.log(`Saved: ${uiIndexPath}`);
+    }
     if (fs.existsSync(path.dirname(fullMigrationPath))) {
         fs.writeFileSync(fullMigrationPath, migrationContent, { encoding: 'utf-8' });
         console.log(`Saved: ${fullMigrationPath}`);

package/package.json

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