wurzel 0.0.4 → 0.0.6

package/dist/bin/wurzel.js

@@ -13,5 +13,5 @@ app.use("/", wurzel({ express, baseFolder: rootFolder }));
 const port = 8080;
 
 app.listen(port, () => {
-    console.log(`listening on :${port}`);
+  console.log(`listening on :${port}`);
 });

package/dist/lib/index.d.ts

@@ -1,8 +1,13 @@
-declare const expressRouter: ({ express, baseFolder, fileEndings, maxAnalyzeCacheSize, maxTranspileCacheSize, }: {
-    express: any;
+import type { TResolveImportPathFunc } from "es6-debug-server";
+import type Express from "express";
+declare const defaultResolveImportPath: TResolveImportPathFunc;
+declare const expressRouter: ({ express, baseFolder, fileEndings, maxAnalyzeCacheSize, maxTranspileCacheSize, resolveImportPath }: {
+    express: typeof Express;
     baseFolder: string;
     fileEndings?: string[];
     maxAnalyzeCacheSize?: number;
     maxTranspileCacheSize?: number;
+    resolveImportPath?: TResolveImportPathFunc;
 }) => any;
-export { expressRouter, };
+export { expressRouter, defaultResolveImportPath };
+export type { TResolveImportPathFunc };

package/dist/lib/index.js

@@ -1,247 +1,263 @@
-import { create as createServer, ETryReadErrorCode, defaultCodeAnalyzer } from "es6-debug-server";
+import {
+  create as createServer,
+  ETryReadErrorCode,
+  defaultCodeAnalyzer
+} from "es6-debug-server";
+/*import type {
+  ICodeAnalyzeResult,
+  TResolveImportPathFunc,
+} from "es6-debug-server";*/
 import { readFile } from "node:fs/promises";
 import { pathToFileURL, fileURLToPath } from "node:url";
 import { createHash } from "node:crypto";
 import { resolve as resolveImport } from "import-meta-resolve";
-// @ts-ignore
+// @ts-expect-error missing types
 import { transpileCode } from "commentscript";
 import { LRUCache } from "lru-cache";
-
-// @ts-ignore
-/*import type { ICodeAnalyzeResult } from "es6-debug-server";*/
+/*import type Express from "express";*/
 
 const md5 = ({ content }/*: { content: string }*/) => {
-    return createHash("md5").update(content).digest("hex");
+  return createHash("md5").update(content).digest("hex");
 };
 
 /*interface ITranspileErrorResult {
-    error: Error;
-    transpiled?: undefined;
+  error: Error;
+  transpiled?: undefined;
 }*/;
 
 /*interface ITranspileSuccessResult {
-    error: undefined;
-    transpiled: string;
+  error: undefined;
+  transpiled: string;
 }*/;
 
 /*type TTranspileResult = ITranspileErrorResult | ITranspileSuccessResult;*/
 
+const defaultResolveImportPath/*: TResolveImportPathFunc*/ = async ({ importer, specifier }) => {
+  const parentUrl = pathToFileURL(importer);
+  let resolvedUrl/*: string | undefined*/ = undefined;
+
+  try {
+    resolvedUrl = resolveImport(specifier, parentUrl.toString());
+  } catch (error) {
+    return {
+      error: error/* as Error*/
+    };
+  }
+
+  const resolvedPath = fileURLToPath(resolvedUrl);
+  return {
+    error: undefined,
+    filePath: resolvedPath
+  };
+};
+
 const expressRouter = ({
-    express,
-    baseFolder,
-    fileEndings = [".js", ".ts"],
+  express,
+  baseFolder,
+  fileEndings = [".js", ".ts"],
 
-    maxAnalyzeCacheSize = 1 * 1024 * 1024,
-    maxTranspileCacheSize = 64 * 1024 * 1024,
+  maxAnalyzeCacheSize = 1 * 1024 * 1024,
+  maxTranspileCacheSize = 64 * 1024 * 1024,
+
+  resolveImportPath = defaultResolveImportPath
 }/*: {
-    express: any,
-    baseFolder: string,
-    fileEndings?: string[],
+  express: typeof Express,
+  baseFolder: string,
+  fileEndings?: string[],
 
-    maxAnalyzeCacheSize?: number,
-    maxTranspileCacheSize?: number,
-}*/) => {
+  maxAnalyzeCacheSize?: number,
+  maxTranspileCacheSize?: number,
 
-    const router = express.Router();
+  resolveImportPath?: TResolveImportPathFunc
+}*/) => {
 
-    const transpileCache = new LRUCache/*<string, string>*/({
-        maxSize: maxTranspileCacheSize,
-        sizeCalculation: (value, key) => {
-            return key.length + value.length;
-        }
-    });
+  const router = express.Router();
+
+  const transpileCache = new LRUCache/*<string, string>*/({
+    maxSize: maxTranspileCacheSize,
+    sizeCalculation: (value, key) => {
+      return key.length + value.length;
+    }
+  });
+
+  const analyzeCache = new LRUCache/*<string, ICodeAnalyzeResult>*/({
+    maxSize: maxAnalyzeCacheSize,
+    sizeCalculation: (value, key) => {
+      return key.length + JSON.stringify(value).length;
+    }
+  });
+
+  // eslint-disable-next-line complexity
+  const maybeTranspile = async ({ filePath, code }/*: { filePath: string, code: string }*/)/*: Promise<TTranspileResult>*/ => {
+    if (filePath.endsWith(".js") || filePath.endsWith(".mjs")) {
+      return {
+        error: undefined,
+        transpiled: code
+      };
+    }
+
+    const hash = md5({ content: code });
+
+    const cached = transpileCache.get(hash);
+    if (cached !== undefined) {
+      return {
+        error: undefined,
+        transpiled: cached
+      };
+    }
+
+    let transpiled/*: string | undefined*/ = undefined;
+
+    try {
+      const result = await transpileCode({ code });
+      transpiled = result.transpiledCode;
+    } catch (ex) {
+      return {
+        error: ex/* as Error*/,
+      };
+    }
+
+    if (transpiled === undefined) {
+      throw Error("BUG: transpiled code is undefined");
+    }
+
+    transpileCache.set(hash, transpiled);
+
+    return {
+      error: undefined,
+      transpiled
+    };
+  };
 
-    const analyzeCache = new LRUCache/*<string, ICodeAnalyzeResult>*/({
-        maxSize: maxAnalyzeCacheSize,
-        sizeCalculation: (value, key) => {
-            return key.length + JSON.stringify(value).length;
-        }
-    });
+  const server = createServer({
 
-    const maybeTranspile = async ({ filePath, code }/*: { filePath: string, code: string }*/)/*: Promise<TTranspileResult>*/ => {
+    scriptRootFolder: baseFolder,
 
-        if (filePath.endsWith(".js") || filePath.endsWith(".mjs")) {
-            return {
-                error: undefined,
-                transpiled: code
-            };
-        }
+    tryReadScriptAsString: async ({ filePath }) => {
 
-        const hash = md5({ content: code });
+      const { error: readError, content } = await readFile(filePath, "utf8").then((fileContent) => {
+        return { error: undefined, content: fileContent };
+      }, (err/*: NodeJS.ErrnoException*/) => {
+        return { error: err, content: undefined };
+      });
 
-        const cached = transpileCache.get(hash);
-        if (cached !== undefined) {
-            return {
-                error: undefined,
-                transpiled: cached
-            };
+      if (readError !== undefined) {
+        if (readError.code === "ENOENT") {
+          return {
+            error: {
+              code: ETryReadErrorCode.FILE_NOT_FOUND,
+              message: readError.message,
+            }
+          };
         }
 
-        let transpiled/*: string | undefined*/ = undefined;
-
-        try {
-            const result = await transpileCode({ code });
-            transpiled = result.transpiledCode;
-        } catch (ex) {
-            return {
-                error: ex/* as Error*/,
-            };
-        }
+        return {
+          error: {
+            code: ETryReadErrorCode.IO_ERROR,
+            message: readError.message,
+          }
+        };
+      }
 
-        if (transpiled === undefined) {
-            throw Error("BUG: transpiled code is undefined");
-        }
+      const { error: transpileError, transpiled } = await maybeTranspile({
+        filePath,
+        code: content
+      });
 
-        transpileCache.set(hash, transpiled);
+      if (transpileError !== undefined) {
+        console.error(transpileError);
 
         return {
-            error: undefined,
-            transpiled
+          error: {
+            code: ETryReadErrorCode.IO_ERROR,
+            message: transpileError.message,
+          }
         };
-    };
+      }
 
-    const server = createServer({
-
-        scriptRootFolder: baseFolder,
-
-        tryReadScriptAsString: async ({ filePath }) => {
-
-            const { error: readError, content } = await readFile(filePath, "utf8").then((content) => {
-                return { error: undefined, content };
-            }, (err/*: NodeJS.ErrnoException*/) => {
-                return { error: err, content: undefined };
-            });
-
-            if (readError !== undefined) {
-                if (readError.code === "ENOENT") {
-                    return {
-                        error: {
-                            code: ETryReadErrorCode.FILE_NOT_FOUND,
-                            message: readError.message,
-                        }
-                    };
-                }
-
-                return {
-                    error: {
-                        code: ETryReadErrorCode.IO_ERROR,
-                        message: readError.message,
-                    }
-                };
-            }
+      return {
+        error: undefined,
+        content: transpiled
+      };
+    },
 
-            const { error: transpileError, transpiled } = await maybeTranspile({
-                filePath,
-                code: content
-            });
+    // cache code analysis
+    analyzeCode: ({ code }) => {
+      const hash = md5({ content: code });
 
-            if (transpileError !== undefined) {
-                console.error(transpileError);
+      const cached = analyzeCache.get(hash);
+      if (cached !== undefined) {
+        return {
+          error: undefined,
+          result: cached
+        };
+      }
 
-                return {
-                    error: {
-                        code: ETryReadErrorCode.IO_ERROR,
-                        message: transpileError.message,
-                    }
-                };
-            }
+      const analyzeResult = defaultCodeAnalyzer({ code });
+      if (analyzeResult.error !== undefined) {
+        return {
+          error: analyzeResult.error
+        };
+      }
 
-            return {
-                error: undefined,
-                content: transpiled
-            };
-        },
+      analyzeCache.set(hash, analyzeResult.result);
+      return analyzeResult;
+    },
 
-        // cache code analysis
-        analyzeCode: ({ code }) => {
-            const hash = md5({ content: code });
+    resolveImportPath
+  });
 
-            const cached = analyzeCache.get(hash);
-            if (cached !== undefined) {
-                return {
-                    error: undefined,
-                    result: cached
-                };
-            }
+  router.use((req, res, next) => {
 
-            const analyzeResult = defaultCodeAnalyzer({ code });
-            if (analyzeResult.error !== undefined) {
-                return {
-                    error: analyzeResult.error
-                };
-            }
+    if (req.method === "HEAD") {
+      throw Error("HEAD not supported yet");
+    }
 
-            analyzeCache.set(hash, analyzeResult.result);
-            return analyzeResult;
-        },
+    const isScript = fileEndings.some((ending) => req.url.endsWith(ending));
+    if (isScript) {
 
-        resolveImportPath: async ({ importer, specifier }) => {
-            const parentUrl = pathToFileURL(importer);
-            let resolvedUrl/*: string | undefined*/ = undefined;
+      server.handleRequest({
+        uri: req.url,
 
-            try {
-                resolvedUrl = resolveImport(specifier, parentUrl.toString());
-            }
-            catch (error) {
-                return {
-                    error: error/* as Error*/
-                };
-            }
+        handleRedirect: ({ uri }) => {
+          const redirectLocation = `${req.baseUrl}${uri}`;
+          res.redirect(redirectLocation);
+        },
 
-            const resolvedPath = fileURLToPath(resolvedUrl);
-            return {
-                error: undefined,
-                filePath: resolvedPath
-            };
+        handleContent: ({ contentType, content }) => {
+          res.writeHead(200, {
+            "Content-Type": contentType
+          });
+          res.end(content);
         },
-    });
 
-    // @ts-ignore
-    router.use((req, res, next) => {
+        handleFileNotFound: () => {
+          res.status(404).end("not found");
+        },
 
-        if (req.method === "HEAD") {
-            throw Error("HEAD not supported yet");
+        handleInternalError: ({ error }) => {
+          console.error(error);
+          res.status(500).end("internal server error");
         }
+      });
 
-        const isScript = fileEndings.some((ending) => req.url.endsWith(ending));
-        if (isScript) {
-
-            server.handleRequest({
-                uri: req.url,
-
-                handleRedirect: ({ uri }) => {
-                    const redirectLocation = `${req.baseUrl}${uri}`;
-                    res.redirect(redirectLocation);
-                },
-
-                handleContent: ({ contentType, content }) => {
-                    res.writeHead(200, {
-                        "Content-Type": contentType
-                    });
-                    res.end(content);
-                },
-
-                handleFileNotFound: () => {
-                    res.status(404).end("not found");
-                },
+      return;
+    }
 
-                handleInternalError: ({ error }) => {
-                    console.error(error);
-                    res.status(500).end("internal server error");
-                }
-            });
+    next();
+  });
 
-            return;
-        }
-
-        next();
-    });
-
-    router.use(express.static(baseFolder));
+  router.use(express.static(baseFolder));
 
-    return router;
+  return router;
 };
 
 export {
-    expressRouter,
+  expressRouter,
+
+  defaultResolveImportPath
 };
+
+/*export type {
+  TResolveImportPathFunc
+};*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wurzel",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "type": "module",
   "files": [
     "dist"
@@ -8,21 +8,25 @@
   "main": "dist/lib/index.js",
   "dependencies": {
     "commentscript": "^0.0.5",
-    "es6-debug-server": "^0.0.3",
+    "es6-debug-server": "^0.0.4",
     "esm-resource": "^0.0.1",
     "express": "^4.19.2",
     "import-meta-resolve": "^4.0.0",
     "lru-cache": "^10.2.1"
   },
   "devDependencies": {
+    "@eslint/js": "^9.7.0",
     "@types/express": "^4.17.21",
     "@types/node": "^20.12.7",
-    "deno-node": "^0.0.4"
+    "deno-node": "^0.0.5",
+    "typescript-eslint": "^7.16.1"
   },
   "bin": {
     "wurzel": "dist/bin/wurzel.js"
   },
   "scripts": {
-    "build": "rm -rf dist/ && deno-node-build --root . --out dist/ --entry lib/index.ts --entry bin/wurzel.ts"
+    "build": "rm -rf dist/ && deno-node-build --root . --out dist/ --entry lib/index.ts --entry bin/wurzel.ts",
+    "lint": "eslint .",
+    "test": "true"
   }
 }