wurzel 0.0.16 → 0.0.18

package/dist/lib/index.js

@@ -12,8 +12,7 @@ import { readFile } from "node:fs/promises";
 import { pathToFileURL, fileURLToPath } from "node:url";
 import { createHash } from "node:crypto";
 import * as importMetaResolve from "import-meta-resolve";
-// @ts-expect-error missing types
-import { transpileCode } from "commentscript";
+import tsBlankSpace from "ts-blank-space";
 import { LRUCache } from "lru-cache";
 /*import type Express from "express";*/
 
@@ -68,7 +67,7 @@ const defaultResolveImportPath/*: TResolveImportPathFunc*/ = async ({ importer,
 };
 
 // es6-debug-server rejects uris containing "//" or "..", and a file path must not contain null bytes,
-// so such uris have to be answered before reaching es6-debug-server
+// such uris are answered right away, whatever else es6-debug-server rejects is caught in serveScript
 const isMalformedUri = ({ uri }/*: { uri: string }*/) => {
   return uri.includes("//") || uri.split("/").includes("..") || uri.includes("\0");
 };
@@ -159,7 +158,7 @@ const expressRouter = ({
   });
 
   // eslint-disable-next-line complexity
-  const maybeTranspile = async ({ filePath, code }/*: { filePath: string, code: string }*/)/*: Promise<TTranspileResult>*/ => {
+  const maybeTranspile = ({ filePath, code }/*: { filePath: string, code: string }*/)/*: TTranspileResult*/ => {
     if (filePath.endsWith(".js") || filePath.endsWith(".mjs")) {
       return {
         error: undefined,
@@ -181,18 +180,17 @@ const expressRouter = ({
     let transpiled/*: string | undefined*/ = undefined;
 
     try {
-      const result = await transpileCode({ code });
-      transpiled = result.transpiledCode;
+      // ts-blank-space reports syntax that cannot simply be blanked out, e.g. enums, instead of failing
+      transpiled = tsBlankSpace(code, (node) => {
+        const syntax = code.substring(node.pos, node.end).trim();
+        throw Error(`unsupported TypeScript syntax "${syntax}"`);
+      });
     } catch (ex) {
       return {
         error: ex /*as Error*/,
       };
     }
 
-    if (transpiled === undefined) {
-      throw Error("BUG: transpiled code is undefined");
-    }
-
     transpileCache.set(hash, transpiled);
 
     return {
@@ -205,6 +203,13 @@ const expressRouter = ({
 
     scriptRootFolder: baseFolder,
 
+    // es6-debug-server serves only the scripts in the script root and what they import, which files are
+    // scripts has to agree with the routing below, or scripts classified by a custom determineFileTypeByPath
+    // are routed to es6-debug-server but not served
+    isScriptFile: ({ filePath }) => {
+      return determineFileTypeByPath({ filePath }) === "script";
+    },
+
     tryReadScriptAsString: async ({ filePath }) => {
 
       const { error: readError, content } = await readFile(filePath, "utf8").then((fileContent) => {
@@ -234,7 +239,7 @@ const expressRouter = ({
         };
       }
 
-      const { error: transpileError, transpiled } = await maybeTranspile({
+      const { error: transpileError, transpiled } = maybeTranspile({
         filePath,
         code: content
       });
@@ -288,7 +293,8 @@ const expressRouter = ({
       return;
     }
 
-    server.handleRequest({
+    // up to es6-debug-server 0.0.15, handleRequest is declared as returning unknown, not as a promise
+    Promise.resolve(server.handleRequest({
       uri: filePath,
 
       // a relative redirect is resolved by the client against the url it requested, which keeps it below
@@ -313,6 +319,11 @@ const expressRouter = ({
         console.error(error);
         res.status(500).end("internal server error");
       }
+
+    // es6-debug-server rejects a uri it takes for malformed, e.g. one with a ".." segment between backslashes,
+    // unanswered that rejection would take down the whole process
+    })).catch(() => {
+      res.status(400).end("bad request");
     });
   };
 

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.16",
+  "version": "0.0.18",
   "name": "wurzel",
   "type": "module",
   "description": "A tool to serve script files from different directories",
@@ -8,11 +8,11 @@
   ],
   "main": "dist/lib/index.js",
   "dependencies": {
-    "commentscript": "^0.0.10",
-    "es6-debug-server": "^0.0.14",
+    "es6-debug-server": "^0.0.15",
     "esm-resource": "^0.0.3",
     "import-meta-resolve": "^4.0.0",
-    "lru-cache": "^10.2.1"
+    "lru-cache": "^10.2.1",
+    "ts-blank-space": "^0.9.0"
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",