@absolutejs/absolute 0.19.0-beta.939 → 0.19.0-beta.940

package/dist/index.js

@@ -10226,7 +10226,7 @@ var ENTITY_DECORATOR_RE, IMPORT_RE, TOP_LEVEL_DECL_RE, extractAllTopLevelNames =
 }, createAngularHmrInjectionPlugin = (params) => ({
   name: "absolute-angular-hmr-injection",
   setup(build2) {
-    build2.onLoad({ filter: /\.component\.js$/ }, async (args) => {
+    build2.onLoad({ filter: /\.js$/ }, async (args) => {
       const text = await readFile5(args.path, "utf8");
       const transformed = applyAngularHmrInjection(text, args.path, params);
       if (transformed === undefined)
@@ -17806,8 +17806,8 @@ export default {};
   const stat3 = statSync2(filePath);
   const resolvedVueDir = vueDir ? resolve33(vueDir) : undefined;
   let content = REACT_EXTENSIONS.has(ext) ? transformReactFile(filePath, projectRoot, rewriter) : transformPlainFile(filePath, projectRoot, rewriter, resolvedVueDir);
-  const isComponentJs = ext === ".js" && filePath.endsWith(".component.js") && filePath.replace(/\\/g, "/").includes("/.absolutejs/generated/angular/");
-  if (isComponentJs) {
+  const isAngularGeneratedJs = ext === ".js" && filePath.replace(/\\/g, "/").includes("/.absolutejs/generated/angular/");
+  if (isAngularGeneratedJs) {
     const userAngularRoot = await getAngularUserRoot(projectRoot);
     if (userAngularRoot) {
       const { applyAngularHmrInjection: applyAngularHmrInjection2 } = await Promise.resolve().then(() => (init_hmrInjectionPlugin(), exports_hmrInjectionPlugin));
@@ -19055,6 +19055,12 @@ var fail = (reason, detail, location) => ({
     return false;
   if (a.changeDetection !== b2.changeDetection)
     return false;
+  if (a.importsArraySig !== b2.importsArraySig)
+    return false;
+  if (a.hostDirectivesSig !== b2.hostDirectivesSig)
+    return false;
+  if (a.animationsArraySig !== b2.animationsArraySig)
+    return false;
   return true;
 }, recordFingerprint = (id, fp) => {
   fingerprintCache.set(id, fp);
@@ -19305,6 +19311,8 @@ var fail = (reason, detail, location) => ({
   const styleUrlsExpr = getProperty(args, "styleUrls");
   const stylesExpr = getProperty(args, "styles");
   const importsExpr = getProperty(args, "imports");
+  const hostDirectivesExpr = getProperty(args, "hostDirectives");
+  const animationsExpr = getProperty(args, "animations");
   const styleUrls = [];
   if (styleUrlsExpr && ts7.isArrayLiteralExpression(styleUrlsExpr)) {
     for (const el of styleUrlsExpr.elements) {
@@ -19334,6 +19342,8 @@ var fail = (reason, detail, location) => ({
     hasProviders: getProperty(args, "providers") !== null,
     hasViewProviders: getProperty(args, "viewProviders") !== null,
     importsExpr: importsExpr && ts7.isArrayLiteralExpression(importsExpr) ? importsExpr : null,
+    hostDirectivesExpr: hostDirectivesExpr && ts7.isArrayLiteralExpression(hostDirectivesExpr) ? hostDirectivesExpr : null,
+    animationsExpr: animationsExpr && ts7.isArrayLiteralExpression(animationsExpr) ? animationsExpr : null,
     preserveWhitespaces: getBooleanProperty(args, "preserveWhitespaces") ?? projectDefaults.preserveWhitespaces ?? false,
     selector: getStringProperty(args, "selector"),
     standalone: getBooleanProperty(args, "standalone") ?? true,
@@ -20085,6 +20095,43 @@ var fail = (reason, detail, location) => ({
     h2 = h2 * 33 ^ s2.charCodeAt(i);
   }
   return (h2 >>> 0).toString(36);
+}, initializerShapeIsStructural = (node) => {
+  if (ts7.isArrowFunction(node) || ts7.isFunctionExpression(node) || ts7.isCallExpression(node) || ts7.isNewExpression(node)) {
+    return true;
+  }
+  if (ts7.isConditionalExpression(node)) {
+    return initializerShapeIsStructural(node.whenTrue) || initializerShapeIsStructural(node.whenFalse);
+  }
+  if (ts7.isParenthesizedExpression(node)) {
+    return initializerShapeIsStructural(node.expression);
+  }
+  if (ts7.isAsExpression(node) || ts7.isTypeAssertionExpression(node)) {
+    return initializerShapeIsStructural(node.expression);
+  }
+  if (ts7.isNonNullExpression(node)) {
+    return initializerShapeIsStructural(node.expression);
+  }
+  if (ts7.isObjectLiteralExpression(node)) {
+    for (const prop of node.properties) {
+      if (ts7.isPropertyAssignment(prop) && initializerShapeIsStructural(prop.initializer)) {
+        return true;
+      }
+      if (ts7.isShorthandPropertyAssignment(prop))
+        continue;
+      if (ts7.isSpreadAssignment(prop) && initializerShapeIsStructural(prop.expression)) {
+        return true;
+      }
+    }
+    return false;
+  }
+  if (ts7.isArrayLiteralExpression(node)) {
+    for (const el of node.elements) {
+      if (initializerShapeIsStructural(el))
+        return true;
+    }
+    return false;
+  }
+  return false;
 }, extractArrowFieldSig = (cls) => {
   const entries = [];
   for (const member of cls.members) {
@@ -20093,9 +20140,8 @@ var fail = (reason, detail, location) => ({
     const init = member.initializer;
     if (!init)
       continue;
-    if (!ts7.isArrowFunction(init) && !ts7.isFunctionExpression(init) && !ts7.isCallExpression(init) && !ts7.isNewExpression(init)) {
+    if (!initializerShapeIsStructural(init))
       continue;
-    }
     const name = member.name.getText();
     const bodyHash = djb2Hash(init.getText());
     entries.push(`${name}:${bodyHash}`);
@@ -20239,8 +20285,9 @@ var fail = (reason, detail, location) => ({
 }, extractPropertyFieldNames = (cls) => {
   const names = [];
   for (const member of cls.members) {
-    if (!ts7.isPropertyDeclaration(member))
+    if (!ts7.isPropertyDeclaration(member) && !ts7.isMethodDeclaration(member) && !ts7.isGetAccessorDeclaration(member) && !ts7.isSetAccessorDeclaration(member)) {
       continue;
+    }
     const name = member.name;
     if (name === undefined)
       continue;
@@ -20305,7 +20352,11 @@ var fail = (reason, detail, location) => ({
   const providerImportSig = extractProviderImportSig(decoratorMeta.importsExpr, sourceFile, componentDir);
   const topLevelImports = extractTopLevelImports(sourceFile);
   const propertyFieldNames = extractPropertyFieldNames(cls);
+  const importsArraySig = decoratorMeta.importsExpr ? djb2Hash(decoratorMeta.importsExpr.getText()) : "";
+  const hostDirectivesSig = decoratorMeta.hostDirectivesExpr ? djb2Hash(decoratorMeta.hostDirectivesExpr.getText()) : "";
+  const animationsArraySig = decoratorMeta.animationsExpr ? djb2Hash(decoratorMeta.animationsExpr.getText()) : "";
   return {
+    animationsArraySig,
     arrowFieldSig,
     changeDetection: decoratorMeta.changeDetection,
     className,
@@ -20313,6 +20364,8 @@ var fail = (reason, detail, location) => ({
     encapsulation: decoratorMeta.encapsulation,
     hasProviders: decoratorMeta.hasProviders,
     hasViewProviders: decoratorMeta.hasViewProviders,
+    hostDirectivesSig,
+    importsArraySig,
     inputs: inputNames,
     memberDecoratorSig,
     outputs: outputNames,
@@ -20498,7 +20551,8 @@ ${block}
       componentSource: sourceFile,
       fingerprintChanged: false,
       moduleText,
-      ok: true
+      ok: true,
+      rebootstrapRequired: false
     };
   }
   if (inheritsDecoratedClass(classNode, sourceFile, dirname20(componentFilePath), projectRoot)) {
@@ -20571,6 +20625,7 @@ ${block}
   const currentFingerprint = extractFingerprint(classNode, className, decoratorMeta, inputs, outputs, sourceFile, componentDir);
   const cachedFingerprint = fingerprintCache.get(fingerprintId);
   const fingerprintChanged = cachedFingerprint !== undefined && !fingerprintsEqual(cachedFingerprint, currentFingerprint);
+  const rebootstrapRequired = cachedFingerprint !== undefined && (cachedFingerprint.importsArraySig !== currentFingerprint.importsArraySig || cachedFingerprint.hostDirectivesSig !== currentFingerprint.hostDirectivesSig);
   const sourceFileObj = new compiler.ParseSourceFile(tsSource, componentFilePath);
   const zeroLoc = new compiler.ParseLocation(sourceFileObj, 0, 0, 0);
   const typeSourceSpan = new compiler.ParseSourceSpan(zeroLoc, zeroLoc);
@@ -20757,7 +20812,8 @@ ${block}
       componentSource: sourceFile,
       fingerprintChanged,
       moduleText,
-      ok: true
+      ok: true,
+      rebootstrapRequired
     };
   } catch (err) {
     return fail("unexpected-error", String(err));
@@ -21474,6 +21530,7 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, runSequent
   const queue = [];
   const queueIds = new Set;
   let anyFingerprintChanged = false;
+  let rebootstrapClassName = null;
   let totalResolveMs = 0;
   let totalCompileMs = 0;
   const { resolveDescendantsOfParent: resolveDescendantsOfParent2 } = await Promise.resolve().then(() => (init_resolveOwningComponents(), exports_resolveOwningComponents));
@@ -21542,6 +21599,9 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, runSequent
       if (result.fingerprintChanged) {
         anyFingerprintChanged = true;
       }
+      if (result.rebootstrapRequired && rebootstrapClassName === null) {
+        rebootstrapClassName = className;
+      }
       queueIds.add(id);
       queue.push({ className, id });
     }
@@ -21551,6 +21611,13 @@ var moduleServerPromise, getModuleServer = () => moduleServerPromise, runSequent
     resolveMs: Math.round(totalResolveMs),
     compileMs: Math.round(totalCompileMs)
   };
+  if (rebootstrapClassName !== null) {
+    return {
+      kind: "rebootstrap",
+      reason: `${rebootstrapClassName}: imports/hostDirectives array changed \u2014 directive matching can't be re-run on existing host elements`,
+      tier: 1
+    };
+  }
   if (anyFingerprintChanged) {
     return { breakdown, kind: "remount", queue, tier: 1 };
   }
@@ -32137,5 +32204,5 @@ export {
   ANGULAR_INIT_TIMEOUT_MS
 };
 
-//# debugId=8C6259234C5851DB64756E2164756E21
+//# debugId=1183B697C8DC280664756E2164756E21
 //# sourceMappingURL=index.js.map