@absolutejs/absolute 0.19.0-beta.856 → 0.19.0-beta.857

package/dist/index.js

@@ -9832,7 +9832,7 @@ __export(exports_hmrInjectionPlugin, {
 });
 import { readFile as readFile5 } from "fs/promises";
 import { relative as relative6, resolve as resolve15 } from "path";
-var COMPONENT_DECORATOR_RE, buildHmrTail = (className, encodedIdLiteral) => `
+var ENTITY_DECORATOR_RE, buildHmrTail = (className, encodedIdLiteral) => `
 
 // absolutejs HMR \u2014 auto-generated; mirrors compileHmrInitializer from
 // @angular/compiler with import.meta.hot adapted to globalThis.__angularHmr.
@@ -9867,7 +9867,7 @@ var COMPONENT_DECORATOR_RE, buildHmrTail = (className, encodedIdLiteral) => `
         const seen = new Set;
         const classNames = [];
         let match;
-        const re2 = new RegExp(COMPONENT_DECORATOR_RE.source, COMPONENT_DECORATOR_RE.flags);
+        const re2 = new RegExp(ENTITY_DECORATOR_RE.source, ENTITY_DECORATOR_RE.flags);
         while ((match = re2.exec(text)) !== null) {
           const className = match[1];
           if (className && !seen.has(className)) {
@@ -9890,7 +9890,7 @@ var COMPONENT_DECORATOR_RE, buildHmrTail = (className, encodedIdLiteral) => `
   };
 };
 var init_hmrInjectionPlugin = __esm(() => {
-  COMPONENT_DECORATOR_RE = /([A-Z][A-Za-z0-9_$]*)\s*=\s*__legacyDecorateClassTS[A-Za-z0-9_$]*\s*\(\s*\[[\s\S]*?\bComponent[A-Za-z0-9_$]*\s*\(/g;
+  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;
 });
 
 // src/utils/cleanStaleOutputs.ts
@@ -17486,7 +17486,7 @@ __export(exports_resolveOwningComponents, {
 import { readdirSync as readdirSync2, readFileSync as readFileSync19, statSync as statSync3 } from "fs";
 import { dirname as dirname18, extname as extname9, join as join29, resolve as resolve32 } from "path";
 import ts3 from "typescript";
-var isComponentTsFile = (file5) => file5.endsWith(".component.ts") || file5.endsWith(".component.tsx"), walkComponentTsFiles = (root) => {
+var ENTITY_DECORATORS, isAngularSourceFile = (file5) => file5.endsWith(".ts") || file5.endsWith(".tsx"), walkAngularSourceFiles = (root) => {
   const out = [];
   const visit = (dir) => {
     let entries;
@@ -17502,7 +17502,7 @@ var isComponentTsFile = (file5) => file5.endsWith(".component.ts") || file5.ends
       const full = join29(dir, entry.name);
       if (entry.isDirectory()) {
         visit(full);
-      } else if (entry.isFile() && isComponentTsFile(entry.name)) {
+      } else if (entry.isFile() && isAngularSourceFile(entry.name)) {
         out.push(full);
       }
     }
@@ -17540,58 +17540,67 @@ var isComponentTsFile = (file5) => file5.endsWith(".component.ts") || file5.ends
     }
   }
   return out;
-}, parseComponentRefs = (filePath) => {
-  const refs = {
-    classNames: [],
-    templateUrls: [],
-    styleUrls: []
-  };
+}, parseDecoratedClasses = (filePath) => {
   let source;
   try {
     source = readFileSync19(filePath, "utf8");
   } catch {
-    return refs;
+    return [];
   }
   const sourceFile = ts3.createSourceFile(filePath, source, ts3.ScriptTarget.ES2022, true, ts3.ScriptKind.TS);
+  const out = [];
   const visit = (node) => {
     if (ts3.isClassDeclaration(node) && node.name) {
-      const decorators = ts3.getDecorators(node) ?? [];
-      for (const decorator of decorators) {
+      for (const decorator of ts3.getDecorators(node) ?? []) {
         const expr = decorator.expression;
         if (!ts3.isCallExpression(expr))
           continue;
         const fn2 = expr.expression;
-        if (!ts3.isIdentifier(fn2) || fn2.text !== "Component")
+        if (!ts3.isIdentifier(fn2))
           continue;
-        refs.classNames.push(node.name.text);
-        const arg = expr.arguments[0];
-        if (!arg || !ts3.isObjectLiteralExpression(arg))
+        const kind = ENTITY_DECORATORS[fn2.text];
+        if (!kind)
           continue;
-        const tplUrl = getStringPropertyValue(arg, "templateUrl");
-        if (tplUrl)
-          refs.templateUrls.push(tplUrl);
-        const styleUrl = getStringPropertyValue(arg, "styleUrl");
-        if (styleUrl)
-          refs.styleUrls.push(styleUrl);
-        refs.styleUrls.push(...getStringArrayProperty(arg, "styleUrls"));
+        const entry = {
+          className: node.name.text,
+          kind,
+          styleUrls: [],
+          templateUrls: []
+        };
+        const arg = expr.arguments[0];
+        if (arg && ts3.isObjectLiteralExpression(arg) && kind === "component") {
+          const tplUrl = getStringPropertyValue(arg, "templateUrl");
+          if (tplUrl)
+            entry.templateUrls.push(tplUrl);
+          const styleUrl = getStringPropertyValue(arg, "styleUrl");
+          if (styleUrl)
+            entry.styleUrls.push(styleUrl);
+          entry.styleUrls.push(...getStringArrayProperty(arg, "styleUrls"));
+        }
+        out.push(entry);
+        break;
       }
     }
     ts3.forEachChild(node, visit);
   };
   visit(sourceFile);
-  return refs;
+  return out;
 }, safeNormalize = (path) => resolve32(path).replace(/\\/g, "/"), resolveOwningComponents = (params) => {
   const { changedFilePath, userAngularRoot } = params;
   const changedAbs = safeNormalize(changedFilePath);
   const out = [];
-  if (changedAbs.endsWith(".component.ts")) {
-    const refs = parseComponentRefs(changedAbs);
-    for (const className of refs.classNames) {
-      out.push({ componentFilePath: changedAbs, className });
+  const ext = extname9(changedAbs).toLowerCase();
+  if (ext === ".ts" || ext === ".tsx") {
+    const classes = parseDecoratedClasses(changedAbs);
+    for (const cls of classes) {
+      out.push({
+        className: cls.className,
+        componentFilePath: changedAbs,
+        kind: cls.kind
+      });
     }
     return out;
   }
-  const ext = extname9(changedAbs).toLowerCase();
   if (ext !== ".html" && ext !== ".css" && ext !== ".scss" && ext !== ".sass") {
     return out;
   }
@@ -17603,26 +17612,36 @@ var isComponentTsFile = (file5) => file5.endsWith(".component.ts") || file5.ends
   }
   if (!rootStat.isDirectory())
     return out;
-  for (const componentTsPath of walkComponentTsFiles(userAngularRoot)) {
-    const refs = parseComponentRefs(componentTsPath);
-    const componentDir = dirname18(componentTsPath);
+  for (const tsPath of walkAngularSourceFiles(userAngularRoot)) {
+    const classes = parseDecoratedClasses(tsPath);
+    const componentDir = dirname18(tsPath);
     const matchesResource = (relativeUrl) => {
       const abs = safeNormalize(resolve32(componentDir, relativeUrl));
       return abs === changedAbs;
     };
-    const referencesChanged = refs.templateUrls.some(matchesResource) || refs.styleUrls.some(matchesResource);
-    if (!referencesChanged)
-      continue;
-    for (const className of refs.classNames) {
+    for (const cls of classes) {
+      if (cls.kind !== "component")
+        continue;
+      const referencesChanged = cls.templateUrls.some(matchesResource) || cls.styleUrls.some(matchesResource);
+      if (!referencesChanged)
+        continue;
       out.push({
-        componentFilePath: componentTsPath,
-        className
+        className: cls.className,
+        componentFilePath: tsPath,
+        kind: "component"
       });
     }
   }
   return out;
 };
-var init_resolveOwningComponents = () => {};
+var init_resolveOwningComponents = __esm(() => {
+  ENTITY_DECORATORS = {
+    Component: "component",
+    Directive: "directive",
+    Pipe: "pipe",
+    Injectable: "service"
+  };
+});
 
 // src/dev/angular/hmrImportGenerator.ts
 import ts4 from "typescript";
@@ -18724,13 +18743,14 @@ var fail = (reason, detail) => ({ ok: false, reason, detail }), fingerprintCache
   };
 }, buildFreshClassMethodsBlock = (classNode, className) => {
   const methodSources = [];
+  let hasStatic = false;
   for (const member of classNode.members) {
     if (ts7.isMethodDeclaration(member) || ts7.isGetAccessorDeclaration(member) || ts7.isSetAccessorDeclaration(member)) {
-      const modifiers = ts7.getModifiers(member) ?? [];
-      const isStatic = modifiers.some((m) => m.kind === ts7.SyntaxKind.StaticKeyword);
-      if (isStatic)
-        continue;
       methodSources.push(member.getText());
+      const modifiers = ts7.getModifiers(member) ?? [];
+      if (modifiers.some((m) => m.kind === ts7.SyntaxKind.StaticKeyword)) {
+        hasStatic = true;
+      }
     }
   }
   if (methodSources.length === 0)
@@ -18751,9 +18771,18 @@ ${methodSources.join(`
   } catch {
     return null;
   }
-  return `// SURGICAL_HMR \u2014 patch prototype methods so existing instances
-// pick up new method bodies (\`compileComponentFromMetadata\` only
-// updates \`\u0275cmp\`, never the prototype).
+  const staticPatch = hasStatic ? `
+{
+    for (const __name of Object.getOwnPropertyNames(_Fresh)) {
+        if (__name === 'length' || __name === 'name' || __name === 'prototype') continue;
+        const __desc = Object.getOwnPropertyDescriptor(_Fresh, __name);
+        if (__desc) Object.defineProperty(${className}, __name, __desc);
+    }
+}` : "";
+  return `// SURGICAL_HMR \u2014 patch prototype + static methods so existing
+// instances and direct \`Class.staticMethod()\` calls pick up new
+// method bodies (\`compileComponentFromMetadata\` only updates
+// \`\u0275cmp\`, never the prototype or the class itself).
 ${transpiled}
 {
     const __fresh_proto = _Fresh.prototype;
@@ -18762,7 +18791,7 @@ ${transpiled}
         const __desc = Object.getOwnPropertyDescriptor(__fresh_proto, __name);
         if (__desc) Object.defineProperty(${className}.prototype, __name, __desc);
     }
-}`;
+}${staticPatch}`;
 }, resolveAndReadResource = (componentDir, url) => {
   const abs = resolve33(componentDir, url);
   if (!existsSync26(abs))
@@ -18781,6 +18810,16 @@ ${transpiled}
     styles.push(css);
   }
   return { styles, missing: null };
+}, buildSimpleEntityModule = (classNode, className) => {
+  const block = buildFreshClassMethodsBlock(classNode, className);
+  if (!block) {
+    return `export default function ${className}_UpdateMetadata(${className}, \u0275\u0275namespaces) { /* no method-body changes detected */ }
+`;
+  }
+  return `export default function ${className}_UpdateMetadata(${className}, \u0275\u0275namespaces) {
+${block}
+}
+`;
 }, tryFastHmr = async (params) => {
   const { componentFilePath, className } = params;
   const projectRoot = params.projectRoot ?? process.cwd();
@@ -18799,6 +18838,14 @@ ${transpiled}
   if (!classNode) {
     return fail("class-not-found", `${className} in ${componentFilePath}`);
   }
+  const kind = params.kind ?? "component";
+  if (kind !== "component") {
+    const moduleText = buildSimpleEntityModule(classNode, className);
+    if (!moduleText) {
+      return fail("unexpected-error", `buildSimpleEntityModule returned null for ${className}`);
+    }
+    return { componentSource: sourceFile, moduleText, ok: true };
+  }
   if (inheritsDecoratedClass(classNode)) {
     return fail("inherits-decorated-class");
   }
@@ -19147,10 +19194,17 @@ var globalCache, getCachedHmrProgram = () => globalCache.__ABSOLUTE_ANGULAR_HMR_
   const filePathRel = decoded.slice(0, at2);
   const className = decoded.slice(at2 + 1);
   const componentFilePath = resolve34(process.cwd(), filePathRel);
+  const { resolveOwningComponents: resolveOwningComponents2 } = await Promise.resolve().then(() => (init_resolveOwningComponents(), exports_resolveOwningComponents));
+  const owners = resolveOwningComponents2({
+    changedFilePath: componentFilePath,
+    userAngularRoot: dirname20(componentFilePath)
+  });
+  const owner = owners.find((o2) => o2.className === className);
+  const kind = owner?.kind ?? "component";
   const fastStart = performance2.now();
-  const fast = await tryFastHmr({ componentFilePath, className });
+  const fast = await tryFastHmr({ className, componentFilePath, kind });
   if (fast.ok) {
-    logInfo(`[ng-hmr fast] ${className} ${(performance2.now() - fastStart).toFixed(1)}ms`);
+    logInfo(`[ng-hmr fast/${kind}] ${className} ${(performance2.now() - fastStart).toFixed(1)}ms`);
     return fast.moduleText;
   }
   logWarn(`[ng-hmr slow] ${className} fast path bailed (${fast.reason}${fast.detail ? `: ${fast.detail}` : ""}), falling back to ngtsc`);
@@ -19770,17 +19824,21 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, runSequent
       changedFilePath: editedFile,
       userAngularRoot: angularDir
     });
-    if (owners.length === 0 && editedFile.endsWith(".component.ts")) {
+    if (owners.length === 0 && (editedFile.endsWith(".component.ts") || editedFile.endsWith(".directive.ts") || editedFile.endsWith(".pipe.ts") || editedFile.endsWith(".service.ts"))) {
       return {
-        reason: `no @Component class found in ${editedFile}`,
+        reason: `no Angular-decorated class found in ${editedFile}`,
         tier: 1
       };
     }
-    for (const { componentFilePath, className } of owners) {
+    for (const { componentFilePath, className, kind } of owners) {
       const id = encodeHmrComponentId2(componentFilePath, className);
       if (queueIds.has(id))
         continue;
-      const result = await tryFastHmr2({ className, componentFilePath });
+      const result = await tryFastHmr2({
+        className,
+        componentFilePath,
+        kind
+      });
       if (!result.ok) {
         return {
           reason: `${className}: ${result.reason}${result.detail ? ` (${result.detail})` : ""}`,
@@ -30133,5 +30191,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=2BA92AA7B0159DCB64756E2164756E21
+//# debugId=E460962A6A20B90264756E2164756E21
 //# sourceMappingURL=index.js.map