owebjs 1.3.4 → 1.3.7

package/dist/index.d.ts

@@ -42,6 +42,8 @@ declare class Oweb extends _FastifyInstance {
     _options: OwebOptions;
     private hmrDirectory;
     private hmrMatchersDirectory;
+    private directory;
+    private matchersDirectory;
     routes: Map<string, any>;
     constructor(options?: OwebOptions);
     /**

package/dist/structures/Oweb.js

@@ -17,6 +17,8 @@ class Oweb extends _FastifyInstance {
   _options = {};
   hmrDirectory;
   hmrMatchersDirectory;
+  directory;
+  matchersDirectory;
   routes = /* @__PURE__ */ new Map();
   constructor(options) {
     super();
@@ -70,6 +72,8 @@ class Oweb extends _FastifyInstance {
   loadRoutes({ directory, matchersDirectory, hmr }) {
     if (hmr && !hmr.directory) hmr.directory = directory;
     if (hmr && !hmr.matchersDirectory) hmr.matchersDirectory = matchersDirectory;
+    this.directory = directory;
+    this.matchersDirectory = matchersDirectory;
     if (hmr?.enabled) {
       this.hmrDirectory = hmr.directory;
       this.hmrMatchersDirectory = hmr.matchersDirectory;
@@ -85,11 +89,11 @@ class Oweb extends _FastifyInstance {
    */
   watch() {
     watchDirectory(this.hmrDirectory, true, (op, path, content) => {
-      applyRouteHMR(this, op, this.hmrDirectory, path, content);
+      applyRouteHMR(this, op, this.hmrDirectory, this.directory, path, content);
     });
     if (this.hmrMatchersDirectory) {
       watchDirectory(this.hmrMatchersDirectory, true, (op, path, content) => {
-        applyMatcherHMR(this, op, this.hmrMatchersDirectory, path, content);
+        applyMatcherHMR(this, op, this.hmrMatchersDirectory, this.matchersDirectory, path, content);
       });
     }
   }

package/dist/utils/assignRoutes.js

@@ -31,7 +31,7 @@ function removeExtension(filePath) {
   return filePath;
 }
 __name(removeExtension, "removeExtension");
-const applyMatcherHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, filePath, content) => {
+const applyMatcherHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, fallbackDir, filePath, content) => {
   let def;
   const fileName = path.basename(filePath);
   if (op === "delete-file") {
@@ -57,7 +57,7 @@ const applyMatcherHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, file
     matcherOverrides[removeExtension(fileName)] = def;
   }
 }, "applyMatcherHMR");
-const applyRouteHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, path2, content) => {
+const applyRouteHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, fallbackDir, path2, content) => {
   if (path2.endsWith("hooks.js") || path2.endsWith("hooks.ts")) {
     warn(`Hot Module Replacement is not supported for hooks. Restart the server for changes to take effect.`, "HMR");
     return;
@@ -70,7 +70,7 @@ const applyRouteHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, path2,
   }
   if (op === "new-file") {
     const start = Date.now();
-    const files = await walk(workingDir);
+    const files = await walk(workingDir, [], fallbackDir);
     const routes = await generateRoutes(files);
     routesCache = routes;
     const f = routes.find((x) => x.fileInfo.filePath == path2);
@@ -79,7 +79,7 @@ const applyRouteHMR = /* @__PURE__ */ __name(async (oweb, op, workingDir, path2,
     success(`Route ${f.method.toUpperCase()}:${f.url} created in ${end}ms`, "HMR");
   } else if (op === "modify-file") {
     const start = Date.now();
-    const files = await walk(workingDir);
+    const files = await walk(workingDir, [], fallbackDir);
     const routes = await generateRoutes(files);
     routesCache = routes;
     const f = routes.find((x) => x.fileInfo.filePath == path2);

package/dist/utils/generateFunctionFromTypescript.js

@@ -7,13 +7,54 @@ import generate from "@babel/generator";
 import path from "node:path";
 import babel from "@babel/core";
 import { pathToFileURL } from "node:url";
-import { writeFile, unlink } from "node:fs/promises";
+import { writeFile, unlink, readFile } from "node:fs/promises";
+import { existsSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { randomBytes } from "node:crypto";
 import { createRequire } from "node:module";
 import { error } from './logger.js';
 const require2 = createRequire(import.meta.url);
+async function getAliasesFromTsConfig(tsConfigPath) {
+  if (!existsSync(tsConfigPath)) {
+    return null;
+  }
+  try {
+    const tsConfigFile = await readFile(tsConfigPath, "utf-8");
+    const json = JSON.parse(tsConfigFile.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, ""));
+    const compilerOptions = json.compilerOptions || {};
+    const baseUrl = path.resolve(path.dirname(tsConfigPath), compilerOptions.baseUrl || ".");
+    const paths = compilerOptions.paths || {};
+    return {
+      paths,
+      baseUrl
+    };
+  } catch (error2) {
+    console.error("Error reading or parsing tsconfig.json:", error2);
+    return null;
+  }
+}
+__name(getAliasesFromTsConfig, "getAliasesFromTsConfig");
+function resolveAlias(importPath, tsConfigPaths, baseUrl) {
+  for (const alias in tsConfigPaths) {
+    const aliasPattern = new RegExp(`^${alias.replace("*", "(.*)")}$`);
+    const match = importPath.match(aliasPattern);
+    if (match) {
+      const [_fullMatch, restOfPath] = match;
+      const targetPaths = tsConfigPaths[alias];
+      const targetPath = targetPaths[0];
+      if (!alias.endsWith("*")) {
+        return path.resolve(baseUrl, targetPath);
+      }
+      const resolvedPath = targetPath.replace("*", restOfPath);
+      return path.resolve(baseUrl, resolvedPath);
+    }
+  }
+  return null;
+}
+__name(resolveAlias, "resolveAlias");
 async function generateFunctionFromTypescript(tsCode, filePath) {
+  const tsConfigPath = path.join(process.cwd(), "tsconfig.json");
+  const tsConfig = await getAliasesFromTsConfig(tsConfigPath);
   const result = babel.transformSync(tsCode, {
     presets: [
       "@babel/preset-typescript"
@@ -24,32 +65,39 @@ async function generateFunctionFromTypescript(tsCode, filePath) {
   const ast = parse(jsCode, {
     sourceType: "module"
   });
+  const fileDir = path.dirname(filePath);
   traverse.default(ast, {
     ImportDeclaration(astPath) {
       const importSourceNode = astPath.node.source;
-      let relativePath = importSourceNode.value;
-      if (relativePath.startsWith(".")) {
-        let resolvedPath = relativePath;
-        if (path.extname(relativePath) === "") {
-          resolvedPath = relativePath + ".ts";
+      const importPath = importSourceNode.value;
+      let resolvedUrl = null;
+      if (tsConfig && tsConfig.paths) {
+        const resolvedAliasPath = resolveAlias(importPath, tsConfig.paths, tsConfig.baseUrl);
+        if (resolvedAliasPath) {
+          const finalPath = path.extname(resolvedAliasPath) === "" ? resolvedAliasPath + ".ts" : resolvedAliasPath;
+          resolvedUrl = pathToFileURL(finalPath).href;
         }
-        const originalFileDir = path.dirname(filePath);
-        const absoluteDepPath = path.resolve(originalFileDir, resolvedPath);
-        const absoluteDepUrl = pathToFileURL(absoluteDepPath).href;
-        importSourceNode.value = absoluteDepUrl;
-      } else {
+      }
+      if (!resolvedUrl && importPath.startsWith(".")) {
+        const resolvedPathWithExt = path.extname(importPath) === "" ? importPath + ".ts" : importPath;
+        const absoluteDepPath = path.resolve(fileDir, resolvedPathWithExt);
+        resolvedUrl = pathToFileURL(absoluteDepPath).href;
+      }
+      if (!resolvedUrl) {
         try {
-          const resolvedPath = require2.resolve(relativePath, {
+          const resolvedNodeModulePath = require2.resolve(importPath, {
             paths: [
-              path.dirname(filePath)
+              fileDir
             ]
           });
-          const resolvedUrl = pathToFileURL(resolvedPath).href;
-          importSourceNode.value = resolvedUrl;
+          resolvedUrl = pathToFileURL(resolvedNodeModulePath).href;
         } catch (_) {
-          error(`Could not resolve module "${relativePath}". Please ensure it is installed.`, "HMR");
+          error(`Could not resolve import path for: ${importPath} in ${filePath}.`, "HMR");
         }
       }
+      if (resolvedUrl) {
+        importSourceNode.value = resolvedUrl;
+      }
     }
   });
   const { code: modifiedCode } = generate.default(ast);

package/dist/utils/walk.js

@@ -15,7 +15,7 @@ const isParentOrGrandparent = /* @__PURE__ */ __name((parentFolderPath, childFol
   return false;
 }, "isParentOrGrandparent");
 const hookPaths = /* @__PURE__ */ new Set();
-const walk = /* @__PURE__ */ __name(async (directory, tree = []) => {
+const walk = /* @__PURE__ */ __name(async (directory, tree = [], fallbackDir) => {
   const results = [];
   const readDirPriority = readdirSync(directory);
   readDirPriority.sort((a, b) => {
@@ -39,7 +39,7 @@ const walk = /* @__PURE__ */ __name(async (directory, tree = []) => {
       results.push(...await walk(filePath, [
         ...tree,
         fileName
-      ]));
+      ], fallbackDir));
     } else {
       const spread = [
         ...hookPaths
@@ -63,7 +63,15 @@ const walk = /* @__PURE__ */ __name(async (directory, tree = []) => {
       } else {
         useHook = hooks;
       }
-      const hooksImport = useHook.map((hookPath) => new URL(hookPath, `file://${__dirname}`).pathname.replaceAll("\\", "/") + "/_hooks.js");
+      const hooksImport = useHook.map((hookPath) => {
+        if (fallbackDir) {
+          const findLastPath = hookPath.replace(process.cwd(), "").split("\\").at(-1);
+          const additionNeeded = !fallbackDir.endsWith(`/${findLastPath}`);
+          return new URL(path.join(process.cwd(), fallbackDir, additionNeeded ? `/${findLastPath}` : "")).pathname.replaceAll("\\", "/") + "/_hooks.js";
+        } else {
+          return new URL(hookPath, `file://${__dirname}`).pathname.replaceAll("\\", "/") + "/_hooks.js";
+        }
+      });
       const hookFunctions = [];
       for (const importPath of hooksImport) {
         const imp = await import(importPath);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "owebjs",
-    "version": "1.3.4",
+    "version": "1.3.7",
     "description": "A flexible and modern web framework built on top of Fastify",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     },
     "scripts": {
         "start": "node .",
-        "build": "tsup",
+        "build": "tsup && node scripts/copyBinaries",
         "dev": "tsup && node .",
         "test": "tsup && node scripts/copyBinaries && node test/index.js",
         "format": "prettier --write . --ignore-path .gitignore"