@absolutejs/absolute 0.19.0-beta.875 → 0.19.0-beta.877

package/dist/index.js

@@ -9832,12 +9832,12 @@ __export(exports_hmrInjectionPlugin, {
 });
 import { readFile as readFile5 } from "fs/promises";
 import { relative as relative6, resolve as resolve15 } from "path";
-var ENTITY_DECORATOR_RE, IMPORT_RE, extractImportedLocalNames = (jsSource) => {
+var ENTITY_DECORATOR_RE, IMPORT_RE, TOP_LEVEL_DECL_RE, extractAllTopLevelNames = (jsSource) => {
   const names = new Set;
   IMPORT_RE.lastIndex = 0;
-  let match;
-  while ((match = IMPORT_RE.exec(jsSource)) !== null) {
-    const [, , nsName, defaultName, namedAfterDefault, named] = match;
+  let importMatch;
+  while ((importMatch = IMPORT_RE.exec(jsSource)) !== null) {
+    const [, , nsName, defaultName, namedAfterDefault, named] = importMatch;
     if (nsName)
       names.add(nsName);
     if (defaultName)
@@ -9855,6 +9855,13 @@ var ENTITY_DECORATOR_RE, IMPORT_RE, extractImportedLocalNames = (jsSource) => {
       }
     }
   }
+  TOP_LEVEL_DECL_RE.lastIndex = 0;
+  let declMatch;
+  while ((declMatch = TOP_LEVEL_DECL_RE.exec(jsSource)) !== null) {
+    const name = declMatch[1];
+    if (name)
+      names.add(name);
+  }
   return [...names];
 }, buildHmrTail = (className, encodedIdLiteral) => `
 
@@ -9977,8 +9984,8 @@ var ENTITY_DECORATOR_RE, IMPORT_RE, extractImportedLocalNames = (jsSource) => {
           const id = `${projectRel}@${className}`;
           return buildHmrTail(className, JSON.stringify(id));
         }).join("");
-        const importedLocalNames = extractImportedLocalNames(text);
-        const depsKeys = importedLocalNames.filter((n) => !classNames.includes(n)).join(", ");
+        const topLevelNames = extractAllTopLevelNames(text);
+        const depsKeys = topLevelNames.filter((n) => !classNames.includes(n)).join(", ");
         const depsBlock = classNames.length > 0 && depsKeys ? `
 
 // absolutejs HMR \u2014 Tier 1a class-deps registry
@@ -9993,6 +10000,7 @@ var ENTITY_DECORATOR_RE, IMPORT_RE, extractImportedLocalNames = (jsSource) => {
 var init_hmrInjectionPlugin = __esm(() => {
   ENTITY_DECORATOR_RE = /([A-Z][A-Za-z0-9_$]*)\s*=\s*__legacyDecorateClassTS[A-Za-z0-9_$]*\s*\(\s*\[[\s\S]*?\b(?:Component|Directive|Pipe|Injectable)[A-Za-z0-9_$]*\s*\(/g;
   IMPORT_RE = /^\s*import\s+(?:(?:(\*)\s+as\s+([A-Za-z_$][\w$]*)\s+from)|(?:([A-Za-z_$][\w$]*)(?:\s*,\s*\{([^}]*)\})?\s+from)|(?:\{([^}]*)\}\s+from))\s*['"][^'"]+['"]/gm;
+  TOP_LEVEL_DECL_RE = /^(?:export\s+)?(?:const|let|var|function|class)\s+([A-Za-z_$][\w$]*)/gm;
 });
 
 // src/utils/cleanStaleOutputs.ts
@@ -19163,26 +19171,41 @@ ${block}
     while ((idMatch = identRe.exec(provisionalMethodsBlock)) !== null) {
       referencedNames.add(idMatch[0]);
     }
-    const sourceImportedNames = new Set;
+    const sourceScopeNames = new Set;
     for (const stmt of sourceFile.statements) {
-      if (!ts7.isImportDeclaration(stmt))
-        continue;
-      if (!ts7.isStringLiteral(stmt.moduleSpecifier))
+      if (ts7.isImportDeclaration(stmt)) {
+        if (!ts7.isStringLiteral(stmt.moduleSpecifier))
+          continue;
+        const clause = stmt.importClause;
+        if (clause?.name)
+          sourceScopeNames.add(clause.name.text);
+        if (clause?.namedBindings && ts7.isNamedImports(clause.namedBindings)) {
+          for (const el of clause.namedBindings.elements) {
+            if (el.isTypeOnly)
+              continue;
+            sourceScopeNames.add(el.name.text);
+          }
+        } else if (clause?.namedBindings && ts7.isNamespaceImport(clause.namedBindings)) {
+          sourceScopeNames.add(clause.namedBindings.name.text);
+        }
         continue;
-      const clause = stmt.importClause;
-      if (clause?.name)
-        sourceImportedNames.add(clause.name.text);
-      if (clause?.namedBindings && ts7.isNamedImports(clause.namedBindings)) {
-        for (const el of clause.namedBindings.elements) {
-          if (el.isTypeOnly)
-            continue;
-          sourceImportedNames.add(el.name.text);
+      }
+      if (ts7.isVariableStatement(stmt) || stmt.kind === ts7.SyntaxKind.VariableStatement) {
+        const varStmt = stmt;
+        for (const decl of varStmt.declarationList.declarations) {
+          if (ts7.isIdentifier(decl.name)) {
+            sourceScopeNames.add(decl.name.text);
+          }
         }
-      } else if (clause?.namedBindings && ts7.isNamespaceImport(clause.namedBindings)) {
-        sourceImportedNames.add(clause.namedBindings.name.text);
+        continue;
+      }
+      if (ts7.isFunctionDeclaration(stmt) || ts7.isClassDeclaration(stmt)) {
+        if (stmt.name)
+          sourceScopeNames.add(stmt.name.text);
       }
     }
-    const depsToDestructure = [...sourceImportedNames].filter((n) => referencedNames.has(n));
+    sourceScopeNames.delete(className);
+    const depsToDestructure = [...sourceScopeNames].filter((n) => referencedNames.has(n));
     const tsSourceText = fnText;
     const transpiled = ts7.transpileModule(tsSourceText, {
       compilerOptions: {
@@ -30466,5 +30489,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=A56696228D787EEA64756E2164756E21
+//# debugId=4117F8576985AF1A64756E2164756E21
 //# sourceMappingURL=index.js.map