querysub 0.165.0 → 0.166.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.165.0",
+  "version": "0.166.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/3-path-functions/pathFunctionLoader.ts

@@ -279,19 +279,26 @@ export async function waitForImportBlockers() {
     }
 }
 
+function getDirname(fileName: string) {
+    fileName = fileName.replaceAll("\\", "/");
+    let lastSlash = fileName.lastIndexOf("/");
+    if (lastSlash === -1) return "";
+    return fileName.slice(0, lastSlash);
+}
+
 // On import every parent folder is set to the spec. For root folders this makes
 //  the spec useless, but for unique folders it will only be set once, making it very useful!
 // "overlapping" means multiple folders mapped to this spec
 let folderToSpec = new Map<string, LoadFunctionSpec | "overlapping">();
 function registerSpec(fileName: string, spec: LoadFunctionSpec | "overlapping") {
-    let folder = path.dirname(fileName);
+    let folder = getDirname(fileName);
     while (true) {
         if (folderToSpec.has(folder)) {
             folderToSpec.set(folder, "overlapping");
         } else {
             folderToSpec.set(folder, spec);
         }
-        let parentFolder = path.dirname(folder);
+        let parentFolder = getDirname(folder);
         if (parentFolder === folder) {
             break;
         }
@@ -300,11 +307,11 @@ function registerSpec(fileName: string, spec: LoadFunctionSpec | "overlapping")
 }
 
 export function getSpecFromModule(module: NodeJS.Module): LoadFunctionSpec | undefined {
-    let folder = path.dirname(module.filename);
+    let folder = getDirname(module.filename);
     while (true) {
         let spec = folderToSpec.get(folder);
         if (spec && typeof spec !== "string") return spec;
-        let parentFolder = path.dirname(folder);
+        let parentFolder = getDirname(folder);
         if (parentFolder === folder) break;
         folder = parentFolder;
     }