@absolutejs/absolute 0.19.0-beta.872 → 0.19.0-beta.873

package/dist/dev/client/handlers/angularRemount.ts

@@ -202,14 +202,29 @@ export const remountComponentClass = async (
 		Class: unknown,
 		namespaces: unknown[],
 		...locals: unknown[]
-	) => void,
+	) => unknown,
 	namespaces: unknown[],
 	locals: unknown[],
 	core: AngularCoreNamespace,
 	className: string
 ): Promise<RemountResult> => {
+	let FreshClass: ComponentClass = Class;
 	try {
-		applyMetadata.apply(null, [Class, namespaces, ...locals]);
+		// `applyMetadata` from a recent fastHmr build returns a `_Fresh`
+		// class with the new constructor + field initializers + the
+		// live class's `ɵcmp` re-bound. Older builds (or non-component
+		// surgical paths) return undefined; in that case the live
+		// class is used and `createComponent` will call its existing
+		// factory — no field-initializer refresh, but template /
+		// method patches still apply.
+		const returned = applyMetadata.apply(null, [
+			Class,
+			namespaces,
+			...locals
+		]);
+		if (typeof returned === 'function') {
+			FreshClass = returned as ComponentClass;
+		}
 	} catch (err) {
 		return {
 			className,
@@ -229,7 +244,7 @@ export const remountComponentClass = async (
 
 	for (const target of targets) {
 		try {
-			const fresh = createFreshAt(Class, target.host, core);
+			const fresh = createFreshAt(FreshClass, target.host, core);
 			if (!fresh) {
 				skipped++;
 				continue;

package/dist/index.js

@@ -9832,7 +9832,31 @@ __export(exports_hmrInjectionPlugin, {
 });
 import { readFile as readFile5 } from "fs/promises";
 import { relative as relative6, resolve as resolve15 } from "path";
-var ENTITY_DECORATOR_RE, buildHmrTail = (className, encodedIdLiteral) => `
+var ENTITY_DECORATOR_RE, IMPORT_RE, extractImportedLocalNames = (jsSource) => {
+  const names = new Set;
+  IMPORT_RE.lastIndex = 0;
+  let match;
+  while ((match = IMPORT_RE.exec(jsSource)) !== null) {
+    const [, , nsName, defaultName, namedAfterDefault, named] = match;
+    if (nsName)
+      names.add(nsName);
+    if (defaultName)
+      names.add(defaultName);
+    const namedClause = namedAfterDefault ?? named;
+    if (namedClause) {
+      for (const part of namedClause.split(",")) {
+        const trimmed = part.trim();
+        if (!trimmed)
+          continue;
+        const asIdx = trimmed.search(/\s+as\s+/);
+        const local = asIdx >= 0 ? trimmed.slice(asIdx).replace(/^\s+as\s+/, "").trim() : trimmed;
+        if (/^[A-Za-z_$][\w$]*$/.test(local))
+          names.add(local);
+      }
+    }
+  }
+  return [...names];
+}, buildHmrTail = (className, encodedIdLiteral) => `
 
 // absolutejs HMR \u2014 auto-generated; mirrors compileHmrInitializer from
 // @angular/compiler with import.meta.hot adapted to globalThis.__angularHmr.
@@ -9953,13 +9977,22 @@ var ENTITY_DECORATOR_RE, buildHmrTail = (className, encodedIdLiteral) => `
           const id = `${projectRel}@${className}`;
           return buildHmrTail(className, JSON.stringify(id));
         }).join("");
-        return { contents: text + tail, loader: "js" };
+        const importedLocalNames = extractImportedLocalNames(text);
+        const depsKeys = importedLocalNames.filter((n) => !classNames.includes(n)).join(", ");
+        const depsBlock = classNames.length > 0 && depsKeys ? `
+
+// absolutejs HMR \u2014 Tier 1a class-deps registry
+` + classNames.map((c) => `try { ${c}.__abs_deps = { ${depsKeys} }; } catch {}`).join(`
+`) + `
+` : "";
+        return { contents: text + tail + depsBlock, loader: "js" };
       });
     }
   };
 };
 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;
 });
 
 // src/utils/cleanStaleOutputs.ts
@@ -18854,10 +18887,22 @@ var fail = (reason, detail) => ({ ok: false, reason, detail }), fingerprintCache
     standalone: decoratorMeta.standalone
   };
 }, buildFreshClassMethodsBlock = (classNode, className) => {
-  const methodSources = [];
+  const memberSources = [];
   let hasStatic = false;
   const printer = ts7.createPrinter({ removeComments: true });
   for (const member of classNode.members) {
+    if (ts7.isPropertyDeclaration(member)) {
+      const modifiers = (ts7.getModifiers(member) ?? []).filter((m) => m.kind !== ts7.SyntaxKind.Decorator && m.kind !== ts7.SyntaxKind.PrivateKeyword && m.kind !== ts7.SyntaxKind.PublicKeyword && m.kind !== ts7.SyntaxKind.ProtectedKeyword && m.kind !== ts7.SyntaxKind.ReadonlyKeyword && m.kind !== ts7.SyntaxKind.OverrideKeyword);
+      const cleaned = ts7.factory.createPropertyDeclaration(modifiers, member.name, undefined, undefined, member.initializer);
+      memberSources.push(printer.printNode(ts7.EmitHint.Unspecified, cleaned, classNode.getSourceFile()));
+      continue;
+    }
+    if (ts7.isConstructorDeclaration(member)) {
+      const cleanedParams = member.parameters.map((param) => ts7.factory.updateParameterDeclaration(param, (ts7.getModifiers(param) ?? []).filter((m) => m.kind !== ts7.SyntaxKind.Decorator && m.kind !== ts7.SyntaxKind.PrivateKeyword && m.kind !== ts7.SyntaxKind.PublicKeyword && m.kind !== ts7.SyntaxKind.ProtectedKeyword && m.kind !== ts7.SyntaxKind.ReadonlyKeyword && m.kind !== ts7.SyntaxKind.OverrideKeyword), param.dotDotDotToken, param.name, param.questionToken, param.type, param.initializer));
+      const cleaned = ts7.factory.createConstructorDeclaration([], cleanedParams, member.body);
+      memberSources.push(printer.printNode(ts7.EmitHint.Unspecified, cleaned, classNode.getSourceFile()));
+      continue;
+    }
     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);
@@ -18873,13 +18918,13 @@ var fail = (reason, detail) => ({ ok: false, reason, detail }), fingerprintCache
         cleaned = ts7.factory.createSetAccessorDeclaration(modifiers.filter((m) => m.kind !== ts7.SyntaxKind.Decorator), member.name, cleanedParams, member.body);
       }
       const printed = printer.printNode(ts7.EmitHint.Unspecified, cleaned, classNode.getSourceFile());
-      methodSources.push(printed);
+      memberSources.push(printed);
     }
   }
-  if (methodSources.length === 0)
+  if (memberSources.length === 0)
     return null;
   const wrappedSource = `class _Fresh {
-${methodSources.join(`
+${memberSources.join(`
 `)}
 }`;
   let transpiled;
@@ -19118,55 +19163,59 @@ ${block}
     while ((idMatch = identRe.exec(provisionalMethodsBlock)) !== null) {
       referencedNames.add(idMatch[0]);
     }
-    const importDecls = [];
+    const sourceImportedNames = new Set;
     for (const stmt of sourceFile.statements) {
       if (!ts7.isImportDeclaration(stmt))
         continue;
       if (!ts7.isStringLiteral(stmt.moduleSpecifier))
         continue;
-      const spec = stmt.moduleSpecifier.text;
-      if (spec.startsWith(".") || spec.startsWith("/"))
-        continue;
-      const importedNames = [];
       const clause = stmt.importClause;
       if (clause?.name)
-        importedNames.push(clause.name.text);
+        sourceImportedNames.add(clause.name.text);
       if (clause?.namedBindings && ts7.isNamedImports(clause.namedBindings)) {
         for (const el of clause.namedBindings.elements) {
           if (el.isTypeOnly)
             continue;
-          importedNames.push(el.name.text);
+          sourceImportedNames.add(el.name.text);
         }
       } else if (clause?.namedBindings && ts7.isNamespaceImport(clause.namedBindings)) {
-        importedNames.push(clause.namedBindings.name.text);
+        sourceImportedNames.add(clause.namedBindings.name.text);
       }
-      if (!importedNames.some((n) => referencedNames.has(n)))
-        continue;
-      importDecls.push(printer.printNode(ts7.EmitHint.Unspecified, stmt, sourceFile));
     }
-    const tsSourceText = (importDecls.length > 0 ? importDecls.join(`
-`) + `
-
-` : "") + fnText;
+    const depsToDestructure = [...sourceImportedNames].filter((n) => referencedNames.has(n));
+    const tsSourceText = fnText;
     const transpiled = ts7.transpileModule(tsSourceText, {
       compilerOptions: {
         module: ts7.ModuleKind.ES2022,
-        target: ts7.ScriptTarget.ES2022,
-        verbatimModuleSyntax: true
+        target: ts7.ScriptTarget.ES2022
       },
       fileName: componentFilePath,
       reportDiagnostics: false
     }).outputText;
     const methodsBlock = buildFreshClassMethodsBlock(classNode, className);
     let moduleText = transpiled;
-    if (methodsBlock) {
-      const fnOpening = `function ${className}_UpdateMetadata(${className}, \u0275\u0275namespaces) {`;
-      const idx = moduleText.indexOf(fnOpening);
-      if (idx >= 0) {
-        const insertAt = idx + fnOpening.length;
-        moduleText = moduleText.slice(0, insertAt) + `
+    const fnOpening = `function ${className}_UpdateMetadata(${className}, \u0275\u0275namespaces) {`;
+    const fnOpeningIdx = moduleText.indexOf(fnOpening);
+    const depsDestructure = depsToDestructure.length > 0 ? `
+  const { ${depsToDestructure.join(", ")} } = ${className}.__abs_deps || {};
+` : "";
+    if (fnOpeningIdx >= 0 && (methodsBlock || depsDestructure)) {
+      const insertAt = fnOpeningIdx + fnOpening.length;
+      moduleText = moduleText.slice(0, insertAt) + depsDestructure + (methodsBlock ? `
 ` + methodsBlock + `
-` + moduleText.slice(insertAt);
+` : "") + moduleText.slice(insertAt);
+    }
+    if (methodsBlock) {
+      const tail = `
+  if (typeof _Fresh !== 'undefined') {
+    _Fresh.\u0275cmp = ${className}.\u0275cmp;
+    _Fresh.\u0275fac = function() { return new _Fresh(); };
+    return _Fresh;
+  }
+`;
+      const lastBrace = moduleText.lastIndexOf("}");
+      if (lastBrace >= 0) {
+        moduleText = moduleText.slice(0, lastBrace) + tail + moduleText.slice(lastBrace);
       }
     }
     fingerprintCache.set(fingerprintId, currentFingerprint);
@@ -30405,5 +30454,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=2A247ADD3B7452BD64756E2164756E21
+//# debugId=318C2BB565882B2764756E2164756E21
 //# sourceMappingURL=index.js.map