@absolutejs/absolute 0.19.0-beta.97 → 0.19.0-beta.98

package/dist/index.js

@@ -202325,17 +202325,6 @@ var init_pageHandler = __esm(() => {
 });
 
 // src/dev/transformCache.ts
-var exports_transformCache = {};
-__export(exports_transformCache, {
-  setTransformed: () => setTransformed,
-  markAsDataFile: () => markAsDataFile,
-  isDataFile: () => isDataFile,
-  invalidateAll: () => invalidateAll,
-  invalidate: () => invalidate,
-  getTransformed: () => getTransformed,
-  getInvalidationVersion: () => getInvalidationVersion,
-  findNearestComponent: () => findNearestComponent
-});
 var globalStore, cache, importers, getTransformed = (filePath) => cache.get(filePath)?.content, setTransformed = (filePath, content, mtime, imports) => {
   const resolvedImports = imports ?? [];
   cache.set(filePath, { content, imports: resolvedImports, mtime });
@@ -202354,31 +202343,9 @@ var globalStore, cache, importers, getTransformed = (filePath) => cache.get(file
       cache.delete(parent);
     }
   }
-}, invalidateAll = () => {
-  cache.clear();
-  importers.clear();
 }, dataFiles, markAsDataFile = (filePath) => {
   dataFiles.add(filePath);
-}, isDataFile = (filePath) => dataFiles.has(filePath), findNearestComponent = (filePath) => {
-  const visited = new Set;
-  const queue = [filePath];
-  while (queue.length > 0) {
-    const current = queue.shift();
-    if (visited.has(current))
-      continue;
-    visited.add(current);
-    const parents = importers.get(current);
-    if (!parents)
-      continue;
-    for (const parent of parents) {
-      if (parent.endsWith(".tsx") || parent.endsWith(".jsx")) {
-        return parent;
-      }
-      queue.push(parent);
-    }
-  }
-  return;
-};
+}, isDataFile = (filePath) => dataFiles.has(filePath);
 var init_transformCache = __esm(() => {
   globalStore = globalThis;
   cache = globalStore.__transformCache ?? new Map;
@@ -202533,19 +202500,54 @@ ${stubs}
   });
   return result;
 }, NAMED_IMPORT_RE, rewriteDataImports = (code, projectRoot) => {
+  const rewrites = [];
   let counter = 0;
-  return code.replace(NAMED_IMPORT_RE, (_match, names, q1, srcUrl2, q2) => {
-    const urlPath = srcUrl2.replace(/^\/\@src\//, "").split("?")[0];
-    if (!urlPath)
-      return _match;
+  let m;
+  NAMED_IMPORT_RE.lastIndex = 0;
+  while ((m = NAMED_IMPORT_RE.exec(code)) !== null) {
+    const [fullMatch, names, q1, srcUrl2, q2] = m;
+    if (!names || !srcUrl2)
+      continue;
+    const urlPath = srcUrl2.replace(/^\/@src\//, "").split("?")[0];
+    if (!urlPath || !urlPath.endsWith(".ts") || urlPath.endsWith(".d.ts"))
+      continue;
     const absPath = resolve18(projectRoot, urlPath);
-    if (!isDataFile(absPath))
-      return _match;
+    if (!isDataFile(absPath)) {
+      if (!urlPath.endsWith(".tsx") && existsSync13(absPath)) {
+        try {
+          const src = readFileSync9(absPath, "utf-8");
+          const exps = tsTranspiler2.scan(src).exports;
+          if (isDataOnlyFile(exps, src, absPath))
+            markAsDataFile(absPath);
+        } catch {}
+      }
+      if (!isDataFile(absPath))
+        continue;
+    }
     const alias = `__hmr_${counter++}`;
-    const trimmedNames = names.trim();
-    return `import ${alias} from ${q1}${srcUrl2}${q2};
-const { ${trimmedNames} } = ${alias}`;
-  });
+    const importedNames = names.split(",").map((n) => n.trim().split(/\s+as\s+/)).filter(([n]) => n).map(([orig, asName]) => ({
+      local: (asName ?? orig).trim(),
+      orig: orig.trim()
+    }));
+    rewrites.push({
+      alias,
+      fullMatch,
+      importLine: `import ${alias} from ${q1}${srcUrl2}${q2}`,
+      names: importedNames
+    });
+  }
+  if (rewrites.length === 0)
+    return code;
+  let result = code;
+  for (const r of rewrites) {
+    result = result.replace(r.fullMatch, r.importLine);
+  }
+  for (const r of rewrites) {
+    for (const { orig, local } of r.names) {
+      result = result.replace(new RegExp(`(?<![.\\w])${local}(?![\\w])`, "g"), `${r.alias}.${orig}`);
+    }
+  }
+  return result;
 }, HOOK_NAMES, REFRESH_PREAMBLE, JSX_AUTO_RE, JSXS_AUTO_RE, JSX_PROD_RE, FRAGMENT_RE, addJsxImport = (code) => {
   const imports = [];
   const jsxDevMatch = JSX_AUTO_RE.exec(code);
@@ -202586,31 +202588,33 @@ const { ${trimmedNames} } = ${alias}`;
   let result = rewriteImports2(transpiled, filePath, projectRoot, rewriter);
   result = rewriteDataImports(result, projectRoot);
   return result;
-}, isDataOnlyFile = (exports, transpiled) => {
+}, isDataOnlyFile = (exports, _source, filePath) => {
   if (exports.length === 0)
     return false;
-  if (exports.some((e) => /^[A-Z]/.test(e) && /^(use|[A-Z])/.test(e)))
-    return false;
-  if (/export\s+(function|class|async\s+function)\s/.test(transpiled))
+  if (filePath) {
+    const normalized = filePath.replace(/\\/g, "/");
+    if (!normalized.includes("/data/"))
+      return false;
+  }
+  if (exports.some((e) => /^[A-Z]/.test(e) || /^use[A-Z]/.test(e)))
     return false;
   return true;
 }, wrapDataExports = (transpiled, filePath, exports) => {
   const storeKey = filePath.replace(/\\/g, "/");
   let result = transpiled;
-  const preamble = `const __hmr = ((globalThis.__HMR_DATA__ ??= {})[${JSON.stringify(storeKey)}] ??= {});
-`;
   for (const name of exports) {
-    result = result.replace(new RegExp(`export\\s+const\\s+${name}\\s*=`), `__hmr.${name} =`);
-    result = result.replace(new RegExp(`export\\s+var\\s+${name}\\s*=`), `__hmr.${name} =`);
-    result = result.replace(new RegExp(`export\\s+let\\s+${name}\\s*=`), `__hmr.${name} =`);
+    result = result.replace(new RegExp(`export\\s+(const|let|var)\\s+${name}\\s*=`), `$1 ${name} =`);
   }
-  const defaultExport = `
-export default __hmr;
+  const preamble = `const __hmr = ((globalThis.__HMR_DATA__ ??= {})[${JSON.stringify(storeKey)}] ??= {});
 `;
-  const namedExports = exports.map((name) => `export const ${name} = __hmr.${name};`).join(`
+  const storeWrites = exports.map((name) => `__hmr.${name} = ${name};`).join(`
 `);
+  const namedExport = exports.length > 0 ? `export { ${exports.join(", ")} };
+` : "";
   return preamble + result + `
-` + namedExports + defaultExport;
+` + storeWrites + `
+` + namedExport + `export default __hmr;
+`;
 }, transformPlainFile = (filePath, projectRoot, rewriter) => {
   const raw = readFileSync9(filePath, "utf-8");
   const ext = extname3(filePath);
@@ -202622,7 +202626,7 @@ export default __hmr;
   if (isTS) {
     transpiled = preserveTypeExports(raw, transpiled, valueExports);
   }
-  if (isTS && !isTSX && isDataOnlyFile(valueExports, transpiled)) {
+  if (isTS && !isTSX && isDataOnlyFile(valueExports, transpiled, filePath)) {
     transpiled = wrapDataExports(transpiled, filePath, valueExports);
     markAsDataFile(filePath);
   }
@@ -203569,15 +203573,7 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, parseError
     for (const file4 of reactFiles) {
       invalidateModule2(file4);
     }
-    const isComponentFile = primaryFile.endsWith(".tsx") || primaryFile.endsWith(".jsx");
-    let broadcastTarget = primaryFile;
-    if (!isComponentFile) {
-      const { findNearestComponent: findNearestComponent2 } = await Promise.resolve().then(() => (init_transformCache(), exports_transformCache));
-      const nearest = findNearestComponent2(resolve21(primaryFile));
-      if (nearest)
-        broadcastTarget = nearest;
-    }
-    const pageModuleUrl = await getReactModuleUrl(broadcastTarget);
+    const pageModuleUrl = await getReactModuleUrl(primaryFile);
     if (pageModuleUrl) {
       const serverDuration = Date.now() - startTime;
       state.lastHmrPath = relative8(process.cwd(), primaryFile).replace(/\\/g, "/");
@@ -205365,5 +205361,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=961251AD68B6490564756E2164756E21
+//# debugId=78D70B808786BC8A64756E2164756E21
 //# sourceMappingURL=index.js.map