@absolutejs/absolute 0.19.0-beta.696 → 0.19.0-beta.698

package/dist/cli/index.js

@@ -1336,7 +1336,14 @@ var init_typecheck = __esm(() => {
     "../**/dist/**/*",
     "../**/generated/**/*"
   ];
-  TYPECHECK_INCLUDE = ["../**/*"];
+  TYPECHECK_INCLUDE = [
+    "../src/**/*",
+    "../types/**/*",
+    "../example/**/*",
+    "../tests/**/*",
+    "../test/**/*",
+    "../scripts/**/*"
+  ];
 });
 
 // src/cli/scripts/dev.ts

package/dist/index.js

@@ -43512,6 +43512,37 @@ var computeConfigHash = () => {
   } catch {
     return "";
   }
+}, readTsconfigPathAliases = () => {
+  try {
+    const configPath2 = resolve19(process.cwd(), "tsconfig.json");
+    const config = ts2.readConfigFile(configPath2, ts2.sys.readFile).config;
+    const compilerOptions = config?.compilerOptions ?? {};
+    const baseUrl = resolve19(process.cwd(), compilerOptions.baseUrl ?? ".");
+    const aliases = Object.entries(compilerOptions.paths ?? {}).map(([pattern, replacements]) => ({ pattern, replacements }));
+    return { aliases, baseUrl };
+  } catch {
+    return { aliases: [], baseUrl: process.cwd() };
+  }
+}, matchTsconfigAlias = (specifier, aliases, baseUrl, resolveSourceFile) => {
+  for (const alias of aliases) {
+    const wildcardIndex = alias.pattern.indexOf("*");
+    const exactMatch = wildcardIndex === -1;
+    if (exactMatch && specifier !== alias.pattern)
+      continue;
+    const prefix = exactMatch ? alias.pattern : alias.pattern.slice(0, wildcardIndex);
+    const suffix = exactMatch ? "" : alias.pattern.slice(wildcardIndex + 1);
+    if (!exactMatch && (!specifier.startsWith(prefix) || !specifier.endsWith(suffix))) {
+      continue;
+    }
+    const wildcardValue = exactMatch ? "" : specifier.slice(prefix.length, specifier.length - suffix.length);
+    for (const replacement of alias.replacements) {
+      const candidate = replacement.replace("*", wildcardValue);
+      const resolved = resolveSourceFile(resolve19(baseUrl, candidate));
+      if (resolved)
+        return resolved;
+    }
+  }
+  return;
 }, resolveDevClientDir4 = () => {
   const projectRoot = process.cwd();
   const fromSource = resolve19(import.meta.dir, "../dev/client");
@@ -43990,9 +44021,52 @@ ${fields}
       }
     })
   });
-  const transpileAndRewrite = (sourceCode, relativeDir, actualPath) => {
+  const tsconfigAliases = readTsconfigPathAliases();
+  const resolveSourceFile = (candidate) => {
+    const candidates = candidate.match(/\.[cm]?[tj]sx?$/) ? [candidate] : [
+      `${candidate}.ts`,
+      `${candidate}.tsx`,
+      `${candidate}.js`,
+      `${candidate}.jsx`,
+      join15(candidate, "index.ts"),
+      join15(candidate, "index.tsx"),
+      join15(candidate, "index.js"),
+      join15(candidate, "index.jsx")
+    ];
+    return candidates.find((file4) => existsSync16(file4));
+  };
+  const resolveLocalImport = (specifier, fromDir) => {
+    if (specifier.startsWith(".") || specifier.startsWith("/")) {
+      return resolveSourceFile(resolve19(fromDir, specifier));
+    }
+    const aliased = matchTsconfigAlias(specifier, tsconfigAliases.aliases, tsconfigAliases.baseUrl, resolveSourceFile);
+    if (aliased)
+      return aliased;
+    try {
+      const resolved = Bun.resolveSync(specifier, fromDir);
+      if (resolved.includes("/node_modules/"))
+        return;
+      const absolute = resolve19(resolved);
+      if (!absolute.startsWith(baseDir))
+        return;
+      return resolveSourceFile(absolute);
+    } catch {
+      return;
+    }
+  };
+  const toOutputPath = (sourcePath) => {
+    const inputDir = dirname11(sourcePath);
+    const relativeDir = inputDir.startsWith(baseDir) ? inputDir.substring(baseDir.length + 1) : inputDir;
+    const fileBase = basename7(sourcePath).replace(/\.[cm]?[tj]sx?$/, ".js");
+    return join15(outDir, relativeDir, fileBase);
+  };
+  const transpileAndRewrite = (sourceCode, relativeDir, actualPath, importRewrites) => {
     let processedContent = angularTranspiler.transformSync(sourceCode);
     const rewriteBareImport = (prefix, specifier, suffix) => {
+      const rewritten = importRewrites.get(specifier);
+      if (rewritten) {
+        return `${prefix}${rewritten}${suffix}`;
+      }
       if (specifier.startsWith(".") || specifier.startsWith("/")) {
         return `${prefix}${specifier}${suffix}`;
       }
@@ -44037,12 +44111,13 @@ ${fields}
     sourceCode = inlineTemplateAndLowerDeferSync(inlined.source, dirname11(actualPath)).source;
     const inputDir = dirname11(actualPath);
     const relativeDir = inputDir.startsWith(baseDir) ? inputDir.substring(baseDir.length + 1) : inputDir;
-    const fileBase = basename7(actualPath).replace(/\.ts$/, ".js");
+    const fileBase = basename7(actualPath).replace(/\.[cm]?[tj]sx?$/, ".js");
     const targetDir = join15(outDir, relativeDir);
-    const targetPath = join15(targetDir, fileBase);
+    const targetPath = toOutputPath(actualPath);
     const localImports = [];
-    const fromRegex = /(?:from|import)\s+['"](\.\.?\/[^'"]+)['"]/g;
-    const dynamicImportRegex = /import\(\s*['"](\.\.?\/[^'"]+)['"]\s*\)/g;
+    const importRewrites = new Map;
+    const fromRegex = /(?:from|import)\s+['"]([^'".][^'"]*|\.\.?\/[^'"]+)['"]/g;
+    const dynamicImportRegex = /import\(\s*['"]([^'".][^'"]*|\.\.?\/[^'"]+)['"]\s*\)/g;
     let importMatch;
     while ((importMatch = fromRegex.exec(sourceCode)) !== null) {
       if (importMatch[1])
@@ -44052,22 +44127,26 @@ ${fields}
       if (importMatch[1])
         localImports.push(importMatch[1]);
     }
+    const localImportPaths = localImports.map((specifier) => {
+      const resolved2 = resolveLocalImport(specifier, inputDir);
+      if (!resolved2)
+        return null;
+      const relativeImport = relative9(targetDir, toOutputPath(resolved2)).replace(/\\/g, "/").replace(/\.js$/, "");
+      importRewrites.set(specifier, relativeImport.startsWith(".") ? relativeImport : `./${relativeImport}`);
+      return resolved2;
+    }).filter((path2) => Boolean(path2));
     const contentHash = Bun.hash(sourceCode).toString(BASE_36_RADIX);
     const cacheKey2 = actualPath;
     if (jitContentCache.get(cacheKey2) === contentHash && existsSync16(targetPath)) {
       allOutputs.push(targetPath);
     } else {
-      const processedContent = transpileAndRewrite(sourceCode, relativeDir, actualPath);
+      const processedContent = transpileAndRewrite(sourceCode, relativeDir, actualPath, importRewrites);
       await fs2.mkdir(targetDir, { recursive: true });
       await fs2.writeFile(targetPath, processedContent, "utf-8");
       allOutputs.push(targetPath);
       jitContentCache.set(cacheKey2, contentHash);
     }
-    const inputDirForResolve = dirname11(actualPath);
-    await Promise.all(localImports.map((imp) => {
-      const importPath = resolve19(inputDirForResolve, imp);
-      return transpileFile(importPath);
-    }));
+    await Promise.all(localImportPaths.map((importPath) => transpileFile(importPath)));
   };
   await transpileFile(inputPath);
   return allOutputs;
@@ -49016,7 +49095,7 @@ var toSafeFileName5 = (specifier) => specifier.replace(/\//g, "_").replace(/@/g,
   } catch {
     return false;
   }
-}, isBareSpecifier = (spec) => !spec.startsWith(".") && !spec.startsWith("/") && !spec.startsWith("@src/"), FRAMEWORK_SPECIFIERS, isSkippedFile = (file4) => file4.includes("node_modules") || file4.includes("/build/") || file4.includes("/dist/") || file4.includes("/indexes/"), isDepSpecifier = (path2) => isBareSpecifier(path2) && !FRAMEWORK_SPECIFIERS.has(path2), readFileSpecifiers = async (file4, transpiler4) => {
+}, isBareSpecifier = (spec) => !spec.startsWith(".") && !spec.startsWith("/") && !spec.startsWith("@src/"), isAbsolutePackageSpecifier = (spec) => spec === "@absolutejs/absolute" || spec.startsWith("@absolutejs/absolute/"), FRAMEWORK_SPECIFIERS, isSkippedFile = (file4) => file4.includes("node_modules") || file4.includes("/build/") || file4.includes("/dist/") || file4.includes("/indexes/"), isDepSpecifier = (path2) => isBareSpecifier(path2) && !FRAMEWORK_SPECIFIERS.has(path2) && !isAbsolutePackageSpecifier(path2), readFileSpecifiers = async (file4, transpiler4) => {
   const empty = [];
   try {
     const content = await Bun.file(file4).text();
@@ -57733,5 +57812,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=0185851FF0EC0F6C64756E2164756E21
+//# debugId=E0B6115364277BC264756E2164756E21
 //# sourceMappingURL=index.js.map