okai 0.0.16 → 0.0.17

package/dist/client.js

@@ -1 +1,6 @@
-export function client() { }
+import { tsdWithoutPrompt } from "./utils.js";
+export function getFileContent(file) {
+    return file.filename.endsWith('.d.ts')
+        ? tsdWithoutPrompt(file.content)
+        : file.content;
+}

package/dist/icons.js

@@ -7,7 +7,7 @@ function withAliases(icons, aliases) {
     });
     return result;
 }
-const P = `<svg xmlns='http://www.w3.org/2000/svg' width="1em" height="1em" `;
+const P = `<svg xmlns='http://www.w3.org/2000/svg' width='1em' height='1em' `;
 function S(viewbox, body) {
     return P + `viewBox='${viewbox}'>${body}</svg>`;
 }
@@ -21,7 +21,7 @@ export const Icons = withAliases({
     Company: S(`0 0 24 24`, `<path fill='currentColor' d='M18 15h-2v2h2m0-6h-2v2h2m2 6h-8v-2h2v-2h-2v-2h2v-2h-2V9h8M10 7H8V5h2m0 6H8V9h2m0 6H8v-2h2m0 6H8v-2h2M6 7H4V5h2m0 6H4V9h2m0 6H4v-2h2m0 6H4v-2h2m6-10V3H2v18h20V7z'/>`),
     Location: S(`0 0 24 24`, `<path fill='currentColor' d='M12 6.5A2.5 2.5 0 0 1 14.5 9a2.5 2.5 0 0 1-2.5 2.5A2.5 2.5 0 0 1 9.5 9A2.5 2.5 0 0 1 12 6.5M12 2a7 7 0 0 1 7 7c0 5.25-7 13-7 13S5 14.25 5 9a7 7 0 0 1 7-7m0 2a5 5 0 0 0-5 5c0 1 0 3 5 9.71C17 12 17 10 17 9a5 5 0 0 0-5-5'/>`),
     /** Admin */
-    Dashboard: P + "viewBox='0 0 24 24' fill='none' stroke-width='1.5' stroke='currentColor'><path stroke-linecap='round' stroke-linejoin='round' d='M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25' /></svg>",
+    Dashboard: P + `viewBox='0 0 24 24' fill='none' stroke-width='1.5' stroke='currentColor'><path stroke-linecap='round' stroke-linejoin='round' d='M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25' /></svg>`,
     Stats: S(`0 0 24 24`, `<path fill='currentColor' d='M8.143 15.857H5.57V9.43h2.572v6.428zm5.143 0h-2.572V3h2.572v12.857zm5.142 0h-2.571v-9h2.571v9z'/><path fill='currentColor' fill-rule='evenodd' d='M21 20.714H3v-2h18v2z' clip-rule='evenodd'/>`),
     Logs: S(`0 0 24 24`, `<path fill='none' stroke='currentColor' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M13 12h8m-8 6h8M13 6h8M3 12h1m-1 6h1M3 6h1m4 6h1m-1 6h1M8 6h1'/>`),
     Task: S(`0 0 32 32`, `<path fill='currentColor' d='M10.293 5.293L7 8.586L5.707 7.293L4.293 8.707L7 11.414l4.707-4.707zM14 7v2h14V7zm0 8v2h14v-2zm0 8v2h14v-2z'/>`),

package/dist/index.js

@@ -8,6 +8,7 @@ import { toMetadataTypes } from "./cs-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";
 function normalizeSwitches(cmd) { return cmd.replace(/^-+/, '/'); }
 function parseArgs(...args) {
     const ret = {
@@ -491,7 +492,7 @@ async function createGistPreview(title, gist) {
         border: {
             type: 'line'
         },
-        content: gist.files[firstFilename].content,
+        content: getFileContent(gist.files[firstFilename]),
         scrollable: true,
         alwaysScroll: true,
         keys: true,
@@ -524,7 +525,8 @@ async function createGistPreview(title, gist) {
         result.selectedFile = filename;
         const file = gist.files[filename];
         if (file) {
-            preview.setContent(file.content);
+            const content = getFileContent(file);
+            preview.setContent(content);
             screen.render();
         }
     });
@@ -539,15 +541,17 @@ async function createGistPreview(title, gist) {
             // Calculate new scroll position, ensuring it doesn't go below 0
             const newScrollPosition = Math.max(0, currentScroll - scrollAmount);
             preview.setScroll(newScrollPosition);
+            // titleBar.setContent(`UP ${newScrollPosition} = ${currentScroll} - ${scrollAmount}`)
             screen.render();
         }
         // Page Down handler
         if (key.name === 'pagedown') {
             // Calculate max scroll position to prevent scrolling beyond content
-            const maxScroll = Math.max(0, contentHeight - boxHeight);
+            const maxScroll = Math.max(0, contentHeight - boxHeight + 1);
             // Calculate new scroll position, ensuring it doesn't exceed max
             const newScrollPosition = Math.min(maxScroll, currentScroll + scrollAmount);
             preview.setScroll(newScrollPosition);
+            // titleBar.setContent(`DOWN ${maxScroll} = ${contentHeight} - ${boxHeight}; min(${maxScroll}, ${currentScroll} + ${scrollAmount}) => ${newScrollPosition}`)
             screen.render();
         }
     });
@@ -573,8 +577,10 @@ function chooseFile(ctx, info, gist, comamnd) {
             console.log(`POST ${acceptUrl}`);
         acceptTask = fetch(acceptUrl, { method: 'POST' });
     }
-    const tsd = file.content;
-    const tsdAst = toAst(tsd);
+    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 genApis = new CSharpApiGenerator();
@@ -620,16 +626,16 @@ function chooseFile(ctx, info, gist, comamnd) {
     console.log(`\nTo regenerate classes, update '${tsdFileName}' then run:`);
     console.log(`$ ${script} ${tsdFileName}`);
     if (acceptTask) {
-        acceptTask.then(r => r.text())
+        acceptTask.then((r) => r.text())
             .then((txt) => {
             if (comamnd.verbose)
                 console.log(`${txt}`);
             process.exit(0);
         })
-            .catch(err => {
+            .catch((err) => {
             if (comamnd.verbose)
-                console.error(err);
-            process.exit(1);
+                console.log(`ERROR: ${err.message ?? err}`);
+            process.exit(0);
         });
     }
     else {

package/dist/utils.js

@@ -125,6 +125,11 @@ export function getGroupName(ast) {
 export function tsdWithPrompt(tsd, prompt) {
     return `/*prompt:  ${prompt}\n*/\n\n${tsd}`;
 }
+export function tsdWithoutPrompt(tsd) {
+    return tsd.trim().startsWith('/*prompt:')
+        ? tsd.substring(tsd.indexOf('*/') + 2).trim()
+        : tsd;
+}
 export function parseTsdHeader(tsd) {
     const header = tsd.includes('/*prompt:')
         ? leftPart(tsd, '*/').replace('/*prompt:', '').trim()

package/package.json

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