toolcraft-openapi 0.0.72 → 0.0.74

package/dist/bin/generate.js

@@ -554,20 +554,47 @@ async function assertSafeProjectPath(fs, cwd, filePath) {
         path.isAbsolute(relativePath)) {
         throw new Error("Generated skill output must remain inside the project directory.");
     }
-    const parentOfRoot = path.dirname(rootPath);
-    let currentPath = resolvedFilePath;
-    while (currentPath !== parentOfRoot) {
-        try {
-            if ((await fs.lstat(currentPath)).isSymbolicLink()) {
+    const canonicalRoot = await fs.realpath(cwd);
+    const canonicalFileParent = await realpathExistingAncestor(fs, path.dirname(filePath));
+    const relativeParentPath = path.relative(canonicalRoot, canonicalFileParent);
+    if (relativeParentPath === ".." ||
+        relativeParentPath.startsWith(`..${path.sep}`) ||
+        path.isAbsolute(relativeParentPath)) {
+        throw new Error("Generated skill output must remain inside the project directory.");
+    }
+    try {
+        if ((await fs.lstat(filePath)).isSymbolicLink()) {
+            const canonicalFilePath = await fs.realpath(filePath);
+            const relativeFilePath = path.relative(canonicalRoot, canonicalFilePath);
+            if (relativeFilePath === ".." ||
+                relativeFilePath.startsWith(`..${path.sep}`) ||
+                path.isAbsolute(relativeFilePath)) {
                 throw new Error("Generated skill output must remain inside the project directory.");
             }
         }
+    }
+    catch (error) {
+        if (!isNotFoundError(error)) {
+            throw error;
+        }
+    }
+}
+async function realpathExistingAncestor(fs, targetPath) {
+    let currentPath = targetPath;
+    while (true) {
+        try {
+            return await fs.realpath(currentPath);
+        }
         catch (error) {
             if (!isNotFoundError(error)) {
                 throw error;
             }
+            const parentPath = path.dirname(currentPath);
+            if (parentPath === currentPath) {
+                throw error;
+            }
+            currentPath = parentPath;
         }
-        currentPath = path.dirname(currentPath);
     }
 }
 async function atomicWriteGeneratedFile(fs, outputDir, filePath, contents) {

package/node_modules/toolcraft-design/dist/explorer/runtime.js

@@ -74,14 +74,24 @@ class ExplorerRuntime {
         this.driver.enterAltScreen();
         this.driver.disableLineWrap();
         this.driver.hideCursor();
-        this.unsubscribeKeypress = this.driver.onKeypress((key) => {
-            this.dispatch({ type: "key", key });
-        });
+        this.subscribeKeypress();
         this.unsubscribeResize = this.driver.onResize(() => {
             const size = this.driver.getSize();
             this.dispatch({ type: "resize", cols: size.cols, rows: size.rows });
         });
     }
+    subscribeKeypress() {
+        if (this.unsubscribeKeypress !== undefined) {
+            return;
+        }
+        this.unsubscribeKeypress = this.driver.onKeypress((key) => {
+            this.dispatch({ type: "key", key });
+        });
+    }
+    pauseKeypress() {
+        this.unsubscribeKeypress?.();
+        this.unsubscribeKeypress = undefined;
+    }
     async loadRows(requestToken = ++this.rowsRequestToken) {
         const rows = await this.config.rows();
         if (requestToken === this.rowsRequestToken) {
@@ -161,7 +171,13 @@ class ExplorerRuntime {
                 if (typeof content === "string") {
                     return { ...item, renderedContent: content };
                 }
-                this.track(content.then((resolved) => this.dispatch({ type: "detailItemRendered", rowId, token, itemIndex, content: resolved }), (error) => this.dispatch({
+                this.track(content.then((resolved) => this.dispatch({
+                    type: "detailItemRendered",
+                    rowId,
+                    token,
+                    itemIndex,
+                    content: resolved
+                }), (error) => this.dispatch({
                     type: "detailItemRendered",
                     rowId,
                     token,
@@ -204,6 +220,7 @@ class ExplorerRuntime {
         }
     }
     async suspendAnd(fn) {
+        this.pauseKeypress();
         this.driver.exitAltScreen();
         this.driver.enableLineWrap();
         this.driver.showCursor();
@@ -217,6 +234,7 @@ class ExplorerRuntime {
                 this.driver.enterAltScreen();
                 this.driver.disableLineWrap();
                 this.driver.hideCursor();
+                this.subscribeKeypress();
                 const size = this.driver.getSize();
                 this.dispatch({
                     type: "suspendResumed",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "toolcraft-openapi",
-  "version": "0.0.72",
+  "version": "0.0.74",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,7 +28,7 @@
     "toolcraft-openapi-generate": "dist/bin/generate.js"
   },
   "dependencies": {
-    "toolcraft": "0.0.72",
+    "toolcraft": "0.0.74",
     "auth-store": "^0.0.1",
     "fast-string-width": "^3.0.2",
     "fast-wrap-ansi": "^0.2.0",