@angular/core 17.3.0-next.1 → 17.3.0-rc.0

package/schematics/ng-generate/standalone-migration/bundle.js

@@ -10542,13 +10542,10 @@ var ExpressionKind;
   ExpressionKind2[ExpressionKind2["EmptyExpr"] = 17] = "EmptyExpr";
   ExpressionKind2[ExpressionKind2["AssignTemporaryExpr"] = 18] = "AssignTemporaryExpr";
   ExpressionKind2[ExpressionKind2["ReadTemporaryExpr"] = 19] = "ReadTemporaryExpr";
-  ExpressionKind2[ExpressionKind2["SanitizerExpr"] = 20] = "SanitizerExpr";
-  ExpressionKind2[ExpressionKind2["TrustedValueFnExpr"] = 21] = "TrustedValueFnExpr";
-  ExpressionKind2[ExpressionKind2["SlotLiteralExpr"] = 22] = "SlotLiteralExpr";
-  ExpressionKind2[ExpressionKind2["ConditionalCase"] = 23] = "ConditionalCase";
-  ExpressionKind2[ExpressionKind2["DerivedRepeaterVar"] = 24] = "DerivedRepeaterVar";
-  ExpressionKind2[ExpressionKind2["ConstCollected"] = 25] = "ConstCollected";
-  ExpressionKind2[ExpressionKind2["TwoWayBindingSet"] = 26] = "TwoWayBindingSet";
+  ExpressionKind2[ExpressionKind2["SlotLiteralExpr"] = 20] = "SlotLiteralExpr";
+  ExpressionKind2[ExpressionKind2["ConditionalCase"] = 21] = "ConditionalCase";
+  ExpressionKind2[ExpressionKind2["ConstCollected"] = 22] = "ConstCollected";
+  ExpressionKind2[ExpressionKind2["TwoWayBindingSet"] = 23] = "TwoWayBindingSet";
 })(ExpressionKind || (ExpressionKind = {}));
 var VariableFlags;
 (function(VariableFlags2) {
@@ -10567,12 +10564,6 @@ var CompatibilityMode;
   CompatibilityMode2[CompatibilityMode2["Normal"] = 0] = "Normal";
   CompatibilityMode2[CompatibilityMode2["TemplateDefinitionBuilder"] = 1] = "TemplateDefinitionBuilder";
 })(CompatibilityMode || (CompatibilityMode = {}));
-var DeferSecondaryKind;
-(function(DeferSecondaryKind2) {
-  DeferSecondaryKind2[DeferSecondaryKind2["Loading"] = 0] = "Loading";
-  DeferSecondaryKind2[DeferSecondaryKind2["Placeholder"] = 1] = "Placeholder";
-  DeferSecondaryKind2[DeferSecondaryKind2["Error"] = 2] = "Error";
-})(DeferSecondaryKind || (DeferSecondaryKind = {}));
 var BindingKind;
 (function(BindingKind2) {
   BindingKind2[BindingKind2["Attribute"] = 0] = "Attribute";
@@ -10646,10 +10637,6 @@ var TRAIT_DEPENDS_ON_SLOT_CONTEXT = {
 var TRAIT_CONSUMES_VARS = {
   [ConsumesVarsTrait]: true
 };
-var TRAIT_USES_VAR_OFFSET = {
-  [UsesVarOffset]: true,
-  varOffset: null
-};
 function hasConsumesSlotTrait(op) {
   return op[ConsumesSlot] === true;
 }
@@ -12914,7 +12901,7 @@ var ElementAttributes = class {
     this.propertyBindings = null;
     this.projectAs = null;
   }
-  isKnown(kind, name, value) {
+  isKnown(kind, name) {
     var _a2;
     const nameToValue = (_a2 = this.known.get(kind)) != null ? _a2 : /* @__PURE__ */ new Set();
     this.known.set(kind, nameToValue);
@@ -12927,7 +12914,7 @@ var ElementAttributes = class {
   add(kind, name, value, namespace, trustedValueFn) {
     var _a2;
     const allowDuplicates = this.compatibility === CompatibilityMode.TemplateDefinitionBuilder && (kind === BindingKind.Attribute || kind === BindingKind.ClassName || kind === BindingKind.StyleProperty);
-    if (!allowDuplicates && this.isKnown(kind, name, value)) {
+    if (!allowDuplicates && this.isKnown(kind, name)) {
       return;
     }
     if (name === "ngProjectAs") {
@@ -13527,7 +13514,7 @@ function createI18nMessage(job, context, messagePlaceholder) {
 }
 function formatIcuPlaceholder(op) {
   if (op.strings.length !== op.expressionPlaceholders.length + 1) {
-    throw Error(`AsserionError: Invalid ICU placeholder with ${op.strings.length} strings and ${op.expressionPlaceholders.length} expressions`);
+    throw Error(`AssertionError: Invalid ICU placeholder with ${op.strings.length} strings and ${op.expressionPlaceholders.length} expressions`);
   }
   const values = op.expressionPlaceholders.map(formatValue);
   return op.strings.flatMap((str, i) => [str, values[i] || ""]).join("");
@@ -20132,7 +20119,7 @@ function addNamesToView(unit, baseName, state, compatibility) {
         }
         if (op.emptyView !== null) {
           const emptyView = unit.job.views.get(op.emptyView);
-          addNamesToView(emptyView, `${baseName}_${`${op.functionNameSuffix}Empty`}_${op.handle.slot + 2}`, state, compatibility);
+          addNamesToView(emptyView, `${baseName}_${op.functionNameSuffix}Empty_${op.handle.slot + 2}`, state, compatibility);
         }
         addNamesToView(unit.job.views.get(op.xref), `${baseName}_${op.functionNameSuffix}_${op.handle.slot + 1}`, state, compatibility);
         break;
@@ -20553,7 +20540,7 @@ function propagateI18nBlocksToTemplates(unit, subTemplateIndex) {
         break;
       case OpKind.RepeaterCreate:
         const forView = unit.job.views.get(op.xref);
-        subTemplateIndex = propagateI18nBlocksForView(unit.job.views.get(op.xref), i18nBlock, op.i18nPlaceholder, subTemplateIndex);
+        subTemplateIndex = propagateI18nBlocksForView(forView, i18nBlock, op.i18nPlaceholder, subTemplateIndex);
         if (op.emptyView !== null) {
           subTemplateIndex = propagateI18nBlocksForView(unit.job.views.get(op.emptyView), i18nBlock, op.emptyI18nPlaceholder, subTemplateIndex);
         }
@@ -21653,11 +21640,11 @@ function processLexicalScope(view, ops) {
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/resolve_dollar_event.mjs
 function resolveDollarEvent(job) {
   for (const unit of job.units) {
-    transformDollarEvent(unit, unit.create);
-    transformDollarEvent(unit, unit.update);
+    transformDollarEvent(unit.create);
+    transformDollarEvent(unit.update);
   }
 }
-function transformDollarEvent(unit, ops) {
+function transformDollarEvent(ops) {
   for (const op of ops) {
     if (op.kind === OpKind.Listener || op.kind === OpKind.TwoWayListener) {
       transformExpressionsInOp(op, (expr) => {
@@ -21828,7 +21815,7 @@ function recordTemplateStart(job, view, slot, i18nPlaceholder, i18nContext, i18n
   addParam(i18nContext.params, startName, slot, getSubTemplateIndexForTemplateTag(job, i18nBlock, view), flags);
 }
 function recordTemplateClose(job, view, slot, i18nPlaceholder, i18nContext, i18nBlock, structuralDirective) {
-  const { startName, closeName } = i18nPlaceholder;
+  const { closeName } = i18nPlaceholder;
   const flags = I18nParamValueFlags.TemplateTag | I18nParamValueFlags.CloseTag;
   if (closeName) {
     addParam(i18nContext.params, closeName, slot, getSubTemplateIndexForTemplateTag(job, i18nBlock, view), flags);
@@ -21855,14 +21842,14 @@ function addParam(params, placeholder, value, subTemplateIndex, flags) {
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/template/pipeline/src/phases/resolve_i18n_expression_placeholders.mjs
 function resolveI18nExpressionPlaceholders(job) {
   var _a2;
-  const subTemplateIndicies = /* @__PURE__ */ new Map();
+  const subTemplateIndices = /* @__PURE__ */ new Map();
   const i18nContexts = /* @__PURE__ */ new Map();
   const icuPlaceholders = /* @__PURE__ */ new Map();
   for (const unit of job.units) {
     for (const op of unit.create) {
       switch (op.kind) {
         case OpKind.I18nStart:
-          subTemplateIndicies.set(op.xref, op.subTemplateIndex);
+          subTemplateIndices.set(op.xref, op.subTemplateIndex);
           break;
         case OpKind.I18nContext:
           i18nContexts.set(op.xref, op);
@@ -21879,7 +21866,7 @@ function resolveI18nExpressionPlaceholders(job) {
     for (const op of unit.update) {
       if (op.kind === OpKind.I18nExpression) {
         const index = expressionIndices.get(referenceIndex(op)) || 0;
-        const subTemplateIndex = (_a2 = subTemplateIndicies.get(op.i18nOwner)) != null ? _a2 : null;
+        const subTemplateIndex = (_a2 = subTemplateIndices.get(op.i18nOwner)) != null ? _a2 : null;
         const value = {
           value: index,
           subTemplateIndex,
@@ -21943,7 +21930,7 @@ function processLexicalScope2(unit, ops, savedView) {
     if (op.kind == OpKind.Listener || op.kind === OpKind.TwoWayListener) {
       continue;
     }
-    transformExpressionsInOp(op, (expr, flags) => {
+    transformExpressionsInOp(op, (expr) => {
       if (expr instanceof LexicalReadExpr) {
         if (scope.has(expr.name)) {
           return new ReadVariableExpr(scope.get(expr.name));
@@ -22545,7 +22532,6 @@ function optimizeVariablesInOpList(ops, compatibility) {
   const toInline = [];
   for (const [id, count] of varUsages) {
     const decl = varDecls.get(id);
-    const varInfo = opMap.get(decl);
     const isAlwaysInline = !!(decl.flags & VariableFlags.AlwaysInline);
     if (count !== 1 || isAlwaysInline) {
       continue;
@@ -23248,7 +23234,6 @@ function ingestIcu(unit, icu) {
   var _a2;
   if (icu.i18n instanceof Message && isSingleI18nIcu(icu.i18n)) {
     const xref = unit.job.allocateXrefId();
-    const icuNode = icu.i18n.nodes[0];
     unit.create.push(createIcuStartOp(xref, icu.i18n, icuFromI18nMessage(icu.i18n).name, null));
     for (const [placeholder, text2] of Object.entries(__spreadValues(__spreadValues({}, icu.vars), icu.placeholders))) {
       if (text2 instanceof BoundText) {
@@ -29344,7 +29329,7 @@ function publishFacade(global) {
 }
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/version.mjs
-var VERSION2 = new Version("17.3.0-next.1");
+var VERSION2 = new Version("17.3.0-rc.0");
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler/src/i18n/extractor_merger.mjs
 var _I18N_ATTR = "i18n";
@@ -30410,7 +30395,7 @@ var MINIMUM_PARTIAL_LINKER_VERSION = "12.0.0";
 function compileDeclareClassMetadata(metadata) {
   const definitionMap = new DefinitionMap();
   definitionMap.set("minVersion", literal(MINIMUM_PARTIAL_LINKER_VERSION));
-  definitionMap.set("version", literal("17.3.0-next.1"));
+  definitionMap.set("version", literal("17.3.0-rc.0"));
   definitionMap.set("ngImport", importExpr(Identifiers.core));
   definitionMap.set("type", metadata.type);
   definitionMap.set("decorators", metadata.decorators);
@@ -30479,7 +30464,7 @@ function createDirectiveDefinitionMap(meta) {
   const definitionMap = new DefinitionMap();
   const minVersion = getMinimumVersionForPartialOutput(meta);
   definitionMap.set("minVersion", literal(minVersion));
-  definitionMap.set("version", literal("17.3.0-next.1"));
+  definitionMap.set("version", literal("17.3.0-rc.0"));
   definitionMap.set("type", meta.type.value);
   if (meta.isStandalone) {
     definitionMap.set("isStandalone", literal(meta.isStandalone));
@@ -30778,7 +30763,7 @@ var MINIMUM_PARTIAL_LINKER_VERSION2 = "12.0.0";
 function compileDeclareFactoryFunction(meta) {
   const definitionMap = new DefinitionMap();
   definitionMap.set("minVersion", literal(MINIMUM_PARTIAL_LINKER_VERSION2));
-  definitionMap.set("version", literal("17.3.0-next.1"));
+  definitionMap.set("version", literal("17.3.0-rc.0"));
   definitionMap.set("ngImport", importExpr(Identifiers.core));
   definitionMap.set("type", meta.type.value);
   definitionMap.set("deps", compileDependencies(meta.deps));
@@ -30801,7 +30786,7 @@ function compileDeclareInjectableFromMetadata(meta) {
 function createInjectableDefinitionMap(meta) {
   const definitionMap = new DefinitionMap();
   definitionMap.set("minVersion", literal(MINIMUM_PARTIAL_LINKER_VERSION3));
-  definitionMap.set("version", literal("17.3.0-next.1"));
+  definitionMap.set("version", literal("17.3.0-rc.0"));
   definitionMap.set("ngImport", importExpr(Identifiers.core));
   definitionMap.set("type", meta.type.value);
   if (meta.providedIn !== void 0) {
@@ -30839,7 +30824,7 @@ function compileDeclareInjectorFromMetadata(meta) {
 function createInjectorDefinitionMap(meta) {
   const definitionMap = new DefinitionMap();
   definitionMap.set("minVersion", literal(MINIMUM_PARTIAL_LINKER_VERSION4));
-  definitionMap.set("version", literal("17.3.0-next.1"));
+  definitionMap.set("version", literal("17.3.0-rc.0"));
   definitionMap.set("ngImport", importExpr(Identifiers.core));
   definitionMap.set("type", meta.type.value);
   definitionMap.set("providers", meta.providers);
@@ -30863,7 +30848,7 @@ function createNgModuleDefinitionMap(meta) {
     throw new Error("Invalid path! Local compilation mode should not get into the partial compilation path");
   }
   definitionMap.set("minVersion", literal(MINIMUM_PARTIAL_LINKER_VERSION5));
-  definitionMap.set("version", literal("17.3.0-next.1"));
+  definitionMap.set("version", literal("17.3.0-rc.0"));
   definitionMap.set("ngImport", importExpr(Identifiers.core));
   definitionMap.set("type", meta.type.value);
   if (meta.bootstrap.length > 0) {
@@ -30898,7 +30883,7 @@ function compileDeclarePipeFromMetadata(meta) {
 function createPipeDefinitionMap(meta) {
   const definitionMap = new DefinitionMap();
   definitionMap.set("minVersion", literal(MINIMUM_PARTIAL_LINKER_VERSION6));
-  definitionMap.set("version", literal("17.3.0-next.1"));
+  definitionMap.set("version", literal("17.3.0-rc.0"));
   definitionMap.set("ngImport", importExpr(Identifiers.core));
   definitionMap.set("type", meta.type.value);
   if (meta.isStandalone) {
@@ -30915,7 +30900,7 @@ function createPipeDefinitionMap(meta) {
 publishFacade(_global);
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler-cli/src/version.mjs
-var VERSION3 = new Version("17.3.0-next.1");
+var VERSION3 = new Version("17.3.0-rc.0");
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler-cli/src/ngtsc/imports/src/emitter.mjs
 var import_typescript5 = __toESM(require("typescript"), 1);
@@ -38002,58 +37987,71 @@ var import_typescript55 = __toESM(require("typescript"), 1);
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler-cli/src/ngtsc/annotations/directive/src/initializer_functions.mjs
 var import_typescript52 = __toESM(require("typescript"), 1);
-function tryParseInitializerApiMember(fnNames, member, reflector, importTracker) {
+function tryParseInitializerApiMember(functions, member, reflector, importTracker) {
   if (member.value === null || !import_typescript52.default.isCallExpression(member.value)) {
     return null;
   }
   const call2 = member.value;
-  const staticResult = parseTopLevelCall(call2, fnNames, importTracker) || parseTopLevelRequiredCall(call2, fnNames, importTracker) || parseTopLevelCallFromNamespace(call2, fnNames, importTracker);
+  const staticResult = parseTopLevelCall(call2, functions, importTracker) || parseTopLevelRequiredCall(call2, functions, importTracker) || parseTopLevelCallFromNamespace(call2, functions, importTracker);
   if (staticResult === null) {
     return null;
   }
-  const resolvedImport = reflector.getImportOfIdentifier(staticResult.node);
-  if (resolvedImport === null || !fnNames.includes(resolvedImport.name)) {
+  const resolvedImport = reflector.getImportOfIdentifier(staticResult.apiReference);
+  if (resolvedImport === null || staticResult.api.functionName !== resolvedImport.name || staticResult.api.owningModule !== resolvedImport.from) {
     return null;
   }
   return {
+    api: staticResult.api,
     call: call2,
-    isRequired: staticResult.isRequired,
-    apiName: resolvedImport.name
+    isRequired: staticResult.isRequired
   };
 }
-function parseTopLevelCall(call2, fnNames, importTracker) {
+function parseTopLevelCall(call2, functions, importTracker) {
   const node = call2.expression;
   if (!import_typescript52.default.isIdentifier(node)) {
     return null;
   }
-  return fnNames.some((name) => importTracker.isPotentialReferenceToNamedImport(node, name, CORE_MODULE2)) ? { node, isRequired: false } : null;
+  const matchingApi = functions.find((fn2) => importTracker.isPotentialReferenceToNamedImport(node, fn2.functionName, fn2.owningModule));
+  if (matchingApi === void 0) {
+    return null;
+  }
+  return { api: matchingApi, apiReference: node, isRequired: false };
 }
-function parseTopLevelRequiredCall(call2, fnNames, importTracker) {
+function parseTopLevelRequiredCall(call2, functions, importTracker) {
   const node = call2.expression;
   if (!import_typescript52.default.isPropertyAccessExpression(node) || !import_typescript52.default.isIdentifier(node.expression) || node.name.text !== "required") {
     return null;
   }
   const expression = node.expression;
-  const matchesCoreApi = fnNames.some((name) => importTracker.isPotentialReferenceToNamedImport(expression, name, CORE_MODULE2));
-  return matchesCoreApi ? { node: expression, isRequired: true } : null;
+  const matchingApi = functions.find((fn2) => importTracker.isPotentialReferenceToNamedImport(expression, fn2.functionName, fn2.owningModule));
+  if (matchingApi === void 0) {
+    return null;
+  }
+  return { api: matchingApi, apiReference: expression, isRequired: true };
 }
-function parseTopLevelCallFromNamespace(call2, fnNames, importTracker) {
+function parseTopLevelCallFromNamespace(call2, functions, importTracker) {
   const node = call2.expression;
   if (!import_typescript52.default.isPropertyAccessExpression(node)) {
     return null;
   }
   let apiReference = null;
+  let matchingApi = void 0;
   let isRequired = false;
-  if (import_typescript52.default.isIdentifier(node.expression) && import_typescript52.default.isIdentifier(node.name) && importTracker.isPotentialReferenceToNamespaceImport(node.expression, CORE_MODULE2)) {
+  if (import_typescript52.default.isIdentifier(node.expression) && import_typescript52.default.isIdentifier(node.name)) {
+    const namespaceRef = node.expression;
     apiReference = node.name;
-  } else if (import_typescript52.default.isPropertyAccessExpression(node.expression) && import_typescript52.default.isIdentifier(node.expression.expression) && import_typescript52.default.isIdentifier(node.expression.name) && importTracker.isPotentialReferenceToNamespaceImport(node.expression.expression, CORE_MODULE2) && node.name.text === "required") {
+    matchingApi = functions.find((fn2) => node.name.text === fn2.functionName && importTracker.isPotentialReferenceToNamespaceImport(namespaceRef, fn2.owningModule));
+  } else if (import_typescript52.default.isPropertyAccessExpression(node.expression) && import_typescript52.default.isIdentifier(node.expression.expression) && import_typescript52.default.isIdentifier(node.expression.name) && node.name.text === "required") {
+    const potentialName = node.expression.name.text;
+    const namespaceRef = node.expression.expression;
     apiReference = node.expression.name;
+    matchingApi = functions.find((fn2) => fn2.functionName === potentialName && importTracker.isPotentialReferenceToNamespaceImport(namespaceRef, fn2.owningModule));
     isRequired = true;
   }
-  if (apiReference === null || !fnNames.includes(apiReference.text)) {
+  if (matchingApi === void 0 || apiReference === null) {
     return null;
   }
-  return { node: apiReference, isRequired };
+  return { api: matchingApi, apiReference, isRequired };
 }
 
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler-cli/src/ngtsc/annotations/directive/src/input_output_parse_options.mjs
@@ -38077,7 +38075,7 @@ function parseAndValidateInputAndOutputOptions(optionsNode) {
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler-cli/src/ngtsc/annotations/directive/src/input_function.mjs
 function tryParseSignalInputMapping(member, reflector, importTracker) {
   var _a2;
-  const signalInput = tryParseInitializerApiMember(["input"], member, reflector, importTracker);
+  const signalInput = tryParseInitializerApiMember([{ functionName: "input", owningModule: "@angular/core" }], member, reflector, importTracker);
   if (signalInput === null) {
     return null;
   }
@@ -38096,7 +38094,7 @@ function tryParseSignalInputMapping(member, reflector, importTracker) {
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler-cli/src/ngtsc/annotations/directive/src/model_function.mjs
 function tryParseSignalModelMapping(member, reflector, importTracker) {
   var _a2;
-  const model = tryParseInitializerApiMember(["model"], member, reflector, importTracker);
+  const model = tryParseInitializerApiMember([{ functionName: "model", owningModule: "@angular/core" }], member, reflector, importTracker);
   if (model === null) {
     return null;
   }
@@ -38124,14 +38122,17 @@ function tryParseSignalModelMapping(member, reflector, importTracker) {
 // bazel-out/darwin_arm64-fastbuild/bin/packages/compiler-cli/src/ngtsc/annotations/directive/src/output_function.mjs
 function tryParseInitializerBasedOutput(member, reflector, importTracker) {
   var _a2;
-  const output = tryParseInitializerApiMember(["output", "\u0275output"], member, reflector, importTracker);
+  const output = tryParseInitializerApiMember([
+    { functionName: "output", owningModule: "@angular/core" },
+    { functionName: "outputFromObservable", owningModule: "@angular/core/rxjs-interop" }
+  ], member, reflector, importTracker);
   if (output === null) {
     return null;
   }
   if (output.isRequired) {
     throw new FatalDiagnosticError(ErrorCode.INITIALIZER_API_NO_REQUIRED_FUNCTION, output.call, `Output does not support ".required()".`);
   }
-  const optionsNode = output.call.arguments[0];
+  const optionsNode = output.api.functionName === "output" ? output.call.arguments[0] : output.call.arguments[1];
   const options = optionsNode !== void 0 ? parseAndValidateInputAndOutputOptions(optionsNode) : null;
   const classPropertyName = member.name;
   return {
@@ -38149,11 +38150,13 @@ var import_typescript54 = __toESM(require("typescript"), 1);
 var queryFunctionNames = ["viewChild", "viewChildren", "contentChild", "contentChildren"];
 var defaultDescendantsValue = (type) => type !== "contentChildren";
 function tryParseSignalQueryFromInitializer(member, reflector, importTracker) {
-  const query = tryParseInitializerApiMember(queryFunctionNames, member, reflector, importTracker);
+  const initializerFns = queryFunctionNames.map((fnName) => ({ functionName: fnName, owningModule: "@angular/core" }));
+  const query = tryParseInitializerApiMember(initializerFns, member, reflector, importTracker);
   if (query === null) {
     return null;
   }
-  const isSingleQuery = query.apiName === "viewChild" || query.apiName === "contentChild";
+  const { functionName } = query.api;
+  const isSingleQuery = functionName === "viewChild" || functionName === "contentChild";
   const predicateNode = query.call.arguments[0];
   if (predicateNode === void 0) {
     throw new FatalDiagnosticError(ErrorCode.VALUE_HAS_WRONG_TYPE, query.call, "No locator specified.");
@@ -38164,9 +38167,9 @@ function tryParseSignalQueryFromInitializer(member, reflector, importTracker) {
   }
   const options = optionsNode && reflectObjectLiteral(optionsNode);
   const read = (options == null ? void 0 : options.has("read")) ? parseReadOption(options.get("read")) : null;
-  const descendants = (options == null ? void 0 : options.has("descendants")) ? parseDescendantsOption(options.get("descendants")) : defaultDescendantsValue(query.apiName);
+  const descendants = (options == null ? void 0 : options.has("descendants")) ? parseDescendantsOption(options.get("descendants")) : defaultDescendantsValue(functionName);
   return {
-    name: query.apiName,
+    name: functionName,
     call: query.call,
     metadata: {
       isSignal: true,
@@ -38191,6 +38194,9 @@ function parseLocator(expression, reflector) {
   return createMayBeForwardRefExpression(new output_ast_exports.WrappedNodeExpr(expression), unwrappedExpression !== null ? 2 : 0);
 }
 function parseReadOption(value) {
+  if (import_typescript54.default.isExpressionWithTypeArguments(value) || import_typescript54.default.isParenthesizedExpression(value) || import_typescript54.default.isAsExpression(value)) {
+    return parseReadOption(value.expression);
+  }
   if (import_typescript54.default.isPropertyAccessExpression(value) && import_typescript54.default.isIdentifier(value.expression) || import_typescript54.default.isIdentifier(value)) {
     return new output_ast_exports.WrappedNodeExpr(value);
   }
@@ -39312,7 +39318,12 @@ function createModuleWithProvidersResolver(reflector, isCore) {
       if (import_typescript56.default.isTypeLiteralNode(t)) {
         for (const m of t.members) {
           const ngModuleType = import_typescript56.default.isPropertySignature(m) && import_typescript56.default.isIdentifier(m.name) && m.name.text === "ngModule" && m.type || null;
-          const ngModuleExpression = ngModuleType && typeNodeToValueExpr(ngModuleType);
+          let ngModuleExpression = null;
+          if (ngModuleType !== null && import_typescript56.default.isTypeQueryNode(ngModuleType)) {
+            ngModuleExpression = entityNameToValue(ngModuleType.exprName);
+          } else if (ngModuleType !== null) {
+            ngModuleExpression = typeNodeToValueExpr(ngModuleType);
+          }
           if (ngModuleExpression) {
             return ngModuleExpression;
           }