okai 0.0.35 → 0.0.36

package/dist/index.js

@@ -471,8 +471,10 @@ Options:
     }
     if (command.type === "prompt") {
         try {
-            if (!info.serviceModelDir)
-                throw new Error("Could not find ServiceModel directory");
+            if (!info.serviceModelDir) {
+                console.log("Could not find ServiceModel directory, ensure okai is run within the context of a ServiceStack App");
+                process.exit(1);
+            }
             console.log(`Generating new APIs and Tables for: ${command.prompt}...`);
             const gist = await fetchGistFiles(command);
             // const projectGist = convertToProjectGist(info, gist)

package/dist/info.js

@@ -136,6 +136,8 @@ export function parseUserDtoType(cs) {
     };
 }
 function walk(dir, fileList = [], opt) {
+    if (!dir)
+        return fileList;
     const files = fs.readdirSync(dir);
     for (const file of files) {
         const filePath = path.join(dir, file);

package/dist/ts-once.js

@@ -7,6 +7,7 @@ export function createTdAstFromAIAst(tsAst, gropName) {
     replaceIds(tsAst);
     tsAst.classes.forEach(cls => {
         // replaceUserRefs(cls)
+        replaceUserBaseClass(cls);
         rewriteDuplicateTypePropNames(cls);
         rewriteSelfReferencingIds(cls);
         convertToAuditBase(cls);
@@ -86,6 +87,16 @@ export function transformUserRefs(tsAst, info) {
         tsAst.classes = tsAst.classes.filter(x => x.name !== 'User');
     }
 }
+function replaceUserBaseClass(type) {
+    if (type.extends === 'User') {
+        type.extends = 'AuditBase';
+        let idProp = type.properties?.find(x => x.name.toLowerCase() === 'id');
+        if (!idProp) {
+            idProp = { name: 'id', type: 'number' };
+            type.properties?.unshift(idProp);
+        }
+    }
+}
 function rewriteDuplicateTypePropNames(type) {
     const duplicateTypePropMap = {
         note: 'content',
@@ -111,8 +122,8 @@ export function addCustomInputs(cls) {
             if (!prop.annotations)
                 prop.annotations = [];
             prop.annotations.push({
-                name: "IntlNumber",
-                args: { Currency: "NumberCurrency.USD" }
+                name: "intlNumber",
+                args: { currency: "USD" }
             });
         }
     }

package/package.json

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