owebjs 1.5.0-dev → 1.5.1-dev

package/dist/utils/walk.js

@@ -2,9 +2,10 @@ import {
   __name
 } from "../chunk-SHUYVCID.js";
 import { readdirSync, statSync } from "node:fs";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
 import path from "node:path";
 import { mergePaths } from './utils.js';
+import { warn } from './logger.js';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const isParentOrGrandparent = /* @__PURE__ */ __name((parentFolderPath, childFolderPath) => {
   if (childFolderPath.startsWith(parentFolderPath)) {
@@ -56,8 +57,8 @@ const walk = /* @__PURE__ */ __name(async (directory, tree = [], fallbackDir) =>
         hooks
       ].flat();
       let scopingSort = copyHooks.sort((a, b) => b.length - a.length);
-      const scopeIndex = scopingSort.findIndex((path2) => {
-        const lastdir = path2.split("\\").at(-1);
+      const scopeIndex = scopingSort.findIndex((pathstr) => {
+        const lastdir = pathstr.split(path.sep).at(-1);
         return lastdir.startsWith("(") && lastdir.endsWith(")");
       });
       let useHook = [];
@@ -68,24 +69,29 @@ const walk = /* @__PURE__ */ __name(async (directory, tree = [], fallbackDir) =>
         useHook = hooks;
       }
       const hooksImport = useHook.map((hookPath) => {
+        let targetFile = "";
         if (fallbackDir) {
-          const relativeToRoot = path.relative(process.cwd(), hookPath);
-          const normalizedFallback = fallbackDir.replace(/\\/g, "/").replace(/\/$/, "");
-          const normalizedRel = relativeToRoot.replace(/\\/g, "/");
-          let finalPath = normalizedRel;
-          if (!normalizedRel.startsWith(normalizedFallback)) {
-            finalPath = path.posix.join(normalizedFallback, normalizedRel);
+          let rootWalkDir = directoryResolve;
+          for (let i = 0; i < tree.length; i++) {
+            rootWalkDir = path.dirname(rootWalkDir);
           }
-          return new URL(`file://${path.join(process.cwd(), finalPath)}`).pathname + "/_hooks.js";
+          const relHook = path.relative(rootWalkDir, hookPath);
+          const targetDir = path.join(process.cwd(), fallbackDir, relHook);
+          targetFile = path.join(targetDir, "_hooks.js");
         } else {
-          return new URL(hookPath, `file://${__dirname}`).pathname.replaceAll("\\", "/") + "/_hooks.js";
+          targetFile = path.join(hookPath, "_hooks.js");
         }
+        return pathToFileURL(targetFile).href;
       });
       const hookFunctions = [];
       for (const importPath of hooksImport) {
-        const imp = await import(importPath);
-        if (imp?.default) {
-          hookFunctions.push(imp.default);
+        try {
+          const imp = await import(importPath);
+          if (imp?.default) {
+            hookFunctions.push(imp.default);
+          }
+        } catch (e) {
+          warn(`Failed to load hook from ${importPath}. Make sure the file exists.`);
         }
       }
       results.push({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "owebjs",
-    "version": "1.5.0-dev",
+    "version": "1.5.1-dev",
     "description": "A flexible and modern web framework built on top of Fastify",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",