pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!

alxhub · 2026-05-11T23:43:28Z

Note: only really relevant for g3

attempt to statically evaluate @NgModule imports and exports in isolated declarations mode. if resolution succeeds, emit the resolved values as concrete references. if resolution fails, fall back to purely syntactic transforms, such as transforming calls to ReturnType<typeof ...>.

also add validation to ensure expressions falling back to typeof are valid entity names, producing a LOCAL_COMPILATION_UNSUPPORTED_EXPRESSION diagnostic otherwise.

this allows emitting correct type references in .d.ts files without needing full resolution of external references, while supporting common patterns like forRoot() and local evaluation where possible.

TAG=agy
CONV=51a2b6d6-5679-49cf-8fa6-61fbc69628be

@NgModule

…dDeclarations This commit adds support for compiling NgModules in isolated declarations mode. Key changes: - Removed the unnecessary @NgModule({id}) warning diagnostic in isolated declarations mode. - Set declarations to never in the generated .d.ts file for isolated NgModules. - Extracted closures to standalone functions in NgModuleDecoratorHandler to avoid capturing state. - Removed bootstrap and declarations from R3NgModuleMetadataIsolated as they are not used or always never. - Extended the foreign function mechanism in PartialEvaluator to handle foreign types like ModuleWithProviders. - Converted declaration-only compliance tests to use explicit goldens (*_isolated.golden.d.ts) and updated behavioral tests. These changes are internal refactorings to support isolated declarations and are not relevant to 3rd party Angular users.

alxhub · 2026-05-14T15:29:07Z

TGP is "green"

atscott · 2026-05-14T18:24:16Z

+    const rawDeclarations = ngModule.get('declarations') ?? null;
+    const rawImports = ngModule.get('imports') ?? null;
+    const rawExports = ngModule.get('exports') ?? null;
+    const rawBootstrap = ngModule.get('bootstrap') ?? null;


this is unused

atscott · 2026-05-14T18:24:34Z

@@ -116,6 +142,30 @@ export class DtsMetadataReader implements MetadataReader {
    };
  }

+  private extractReferencesFromResolvedValue(
+    value: ResolvedValue,
+    bestGuessOwningModule: OwningModule | null,


This is unused

atscott · 2026-05-14T18:26:38Z

+    const rawImports = ngModule.get('imports') ?? null;
+    const rawExports = ngModule.get('exports') ?? null;
+    const rawBootstrap = ngModule.get('bootstrap') ?? null;
+    const rawProviders = ngModule.has('providers') ? ngModule.get('providers')! : null;


Suggested change

const rawProviders = ngModule.has('providers') ? ngModule.get('providers')! : null;

const rawProviders = ngModule.get('providers') ?? null;

atscott · 2026-05-14T18:27:50Z

+      const idExpr = ngModule.get('id')!;
+      if (!isModuleIdExpression(idExpr)) {
+        id = new WrappedNodeExpr(idExpr);
+      }


Should we have an else case with WARN_NGMODULE_ID_UNNECESSARY?

atscott · 2026-05-14T18:29:16Z

+  const forwardRefUnwrapped = tryUnwrapForwardRef(el, reflector);
+  if (forwardRefUnwrapped !== null) {
+    return transformToTypeTupleElement(forwardRefUnwrapped, reflector, diagnostics);
+  }


nit: maybe use a loop instead of recursion

atscott · 2026-05-14T18:33:43Z

+  }
+  if (ts.isPropertyAccessExpression(expr) && ts.isIdentifier(expr.name)) {
+    const left = expressionToEntityName(expr.expression);
+    return left === null ? null : ts.factory.createQualifiedName(left, expr.name.text);


Suggested change

return left === null ? null : ts.factory.createQualifiedName(left, expr.name.text);

return left === null ? null : ts.factory.createQualifiedName(left, expr.name);

nit

Also this looks quite similar to the existing getEntityTypeFromExpression?

atscott · 2026-05-14T18:35:01Z

+    const declarations = this.extractReferencesFromResolvedValue(
+      declarationMetadata.kind === ts.SyntaxKind.NeverKeyword
+        ? []
+        : this.evaluator.evaluateType(
+            declarationMetadata,
+            ref.bestGuessOwningModule,
+            undefined,
+            foreignTypeResolver,
+          ),
      ref.bestGuessOwningModule,
    );
-    const exports = extractReferencesFromType(
-      this.checker,
-      exportMetadata,
+    const exports = this.extractReferencesFromResolvedValue(
+      exportMetadata.kind === ts.SyntaxKind.NeverKeyword
+        ? []
+        : this.evaluator.evaluateType(
+            exportMetadata,
+            ref.bestGuessOwningModule,
+            undefined,
+            foreignTypeResolver,
+          ),
      ref.bestGuessOwningModule,
    );
-    const imports = extractReferencesFromType(
-      this.checker,
-      importMetadata,
+    const imports = this.extractReferencesFromResolvedValue(
+      importMetadata.kind === ts.SyntaxKind.NeverKeyword
+        ? []
+        : this.evaluator.evaluateType(
+            importMetadata,
+            ref.bestGuessOwningModule,
+            undefined,
+            foreignTypeResolver,
+          ),


Suggested change

const declarations = this.extractReferencesFromResolvedValue(

declarationMetadata.kind === ts.SyntaxKind.NeverKeyword

? []

: this.evaluator.evaluateType(

declarationMetadata,

ref.bestGuessOwningModule,

undefined,

foreignTypeResolver,

),

ref.bestGuessOwningModule,

);

const exports = extractReferencesFromType(

this.checker,

exportMetadata,

const exports = this.extractReferencesFromResolvedValue(

exportMetadata.kind === ts.SyntaxKind.NeverKeyword

? []

: this.evaluator.evaluateType(

exportMetadata,

ref.bestGuessOwningModule,

undefined,

foreignTypeResolver,

),

ref.bestGuessOwningModule,

);

const imports = extractReferencesFromType(

this.checker,

importMetadata,

const imports = this.extractReferencesFromResolvedValue(

importMetadata.kind === ts.SyntaxKind.NeverKeyword

? []

: this.evaluator.evaluateType(

importMetadata,

ref.bestGuessOwningModule,

undefined,

foreignTypeResolver,

),

const evaluateMetadata = (metadataNode: ts.TypeNode) => {

return metadataNode.kind === ts.SyntaxKind.NeverKeyword

? []

: this.evaluator.evaluateType(

metadataNode,

ref.bestGuessOwningModule,

undefined,

foreignTypeResolver,

);

};

const declarations = this.extractReferencesFromResolvedValue(

evaluateMetadata(declarationMetadata),

ref.bestGuessOwningModule,

);

const exports = this.extractReferencesFromResolvedValue(

evaluateMetadata(exportMetadata),

ref.bestGuessOwningModule,

);

const imports = this.extractReferencesFromResolvedValue(

evaluateMetadata(importMetadata),

ref.bestGuessOwningModule,

);

atscott · 2026-05-14T18:37:53Z

+    return null;
+  }
+  const name = ts.isQualifiedName(type.typeName) ? type.typeName.right : type.typeName;
+  if (!ts.isIdentifier(name) || name.text !== 'ModuleWithProviders') {


Suggested change

if (!ts.isIdentifier(name) || name.text !== 'ModuleWithProviders') {

if (name.text !== 'ModuleWithProviders') {

Types guarantee this is an identifier

atscott · 2026-05-14T18:39:22Z

+          const typeArguments = node.typeArguments
+            ? ts.factory.createNodeArray(
+                node.typeArguments.map(
+                  (arg) => ts.visitNode(arg, visit, ts.isTypeNode) as ts.TypeNode,
+                ),
+              )
+            : undefined;


Suggested change

const typeArguments = node.typeArguments

? ts.factory.createNodeArray(

node.typeArguments.map(

(arg) => ts.visitNode(arg, visit, ts.isTypeNode) as ts.TypeNode,

),

)

: undefined;

const typeArguments = node.typeArguments

? ts.visitNodes(node.typeArguments, visit, ts.isTypeNode)

: undefined;

angular-robot Bot added detected: feature PR contains a feature commit area: compiler Issues related to `ngc`, Angular's template compiler labels May 11, 2026

ngbot Bot added this to the Backlog milestone May 11, 2026

alxhub force-pushed the iso-decl branch 3 times, most recently from 179ab9b to 38c8d71 Compare May 12, 2026 21:40

alxhub changed the title ~~feat(compiler-cli): support partial evaluation and ReturnType in isolated declarations~~ refactor(compiler): add support for compiling NgModules under isolatedDeclarations May 12, 2026

alxhub force-pushed the iso-decl branch from 38c8d71 to 4f839cf Compare May 12, 2026 23:26

alxhub marked this pull request as ready for review May 13, 2026 20:34

alxhub added area: testing Issues related to Angular testing features, such as TestBed target: patch This PR is targeted for the next patch release labels May 14, 2026

alxhub added target: rc This PR is targeted for the next release-candidate and removed target: patch This PR is targeted for the next patch release labels May 14, 2026

atscott requested changes May 14, 2026

View reviewed changes

pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor(compiler): add support for compiling NgModules under isolatedDeclarations#68680

refactor(compiler): add support for compiling NgModules under isolatedDeclarations#68680
alxhub wants to merge 1 commit into
angular:mainfrom
alxhub:iso-decl

alxhub commented May 11, 2026

Uh oh!

alxhub commented May 14, 2026

Uh oh!

atscott May 14, 2026

Uh oh!

atscott May 14, 2026

Uh oh!

atscott May 14, 2026

Uh oh!

atscott May 14, 2026

Uh oh!

atscott May 14, 2026

Uh oh!

atscott May 14, 2026

Uh oh!

atscott May 14, 2026

Uh oh!

atscott May 14, 2026

Uh oh!

atscott May 14, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.

	const rawProviders = ngModule.has('providers') ? ngModule.get('providers')! : null;
	const rawProviders = ngModule.get('providers') ?? null;

	return left === null ? null : ts.factory.createQualifiedName(left, expr.name.text);
	return left === null ? null : ts.factory.createQualifiedName(left, expr.name);

	if (!ts.isIdentifier(name) \|\| name.text !== 'ModuleWithProviders') {
	if (name.text !== 'ModuleWithProviders') {

Conversation

alxhub commented May 11, 2026

Uh oh!

alxhub commented May 14, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.