Skip to content

Commit d941c13

Browse files
committed
fixup! refactor(compiler): emit instructions for foreign components
1 parent 14f2425 commit d941c13

6 files changed

Lines changed: 7 additions & 3 deletions

File tree

packages/compiler-cli/linker/src/file_linker/partial_linkers/partial_component_linker_1.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ export class PartialComponentLinkerVersion1<
254254
i18nUseExternalIds: false,
255255
declarations,
256256
hasDirectiveDependencies: !baseMeta.isStandalone || hasDirectiveDependencies,
257+
foreignImports: null,
257258
};
258259
}
259260

packages/compiler-cli/src/ngtsc/annotations/component/src/handler.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,6 +1024,7 @@ export class ComponentDecoratorHandler implements DecoratorHandler<
10241024
relativeContextFilePath,
10251025
rawImports: rawImports !== null ? new o.WrappedNodeExpr(rawImports) : undefined,
10261026
relativeTemplatePath,
1027+
foreignImports: null,
10271028
},
10281029
typeCheckMeta: extractDirectiveTypeCheckMeta(node, inputs, this.reflector),
10291030
classMetadata: this.includeClassMetadata

packages/compiler/src/jit_compiler_facade.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,7 @@ export class CompilerFacadeImpl implements CompilerFacade {
360360
relativeContextFilePath: '',
361361
i18nUseExternalIds: true,
362362
relativeTemplatePath: null,
363+
foreignImports: null,
363364
};
364365
const jitExpressionSourceMap = `ng:///${facade.name}.js`;
365366
return this.compileComponentFromMeta(angularCoreEnv, jitExpressionSourceMap, meta);
@@ -717,6 +718,7 @@ function convertDeclareComponentFacadeToMetadata(
717718
relativeTemplatePath: null,
718719
hasDirectiveDependencies,
719720
legacyOptionalChaining: decl.legacyOptionalChaining ?? LEGACY_OPTIONAL_CHAINING_DEFAULT,
721+
foreignImports: null,
720722
};
721723
}
722724

packages/compiler/src/render3/view/api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ export interface R3ComponentMetadata<
309309
/**
310310
* Foreign components imported by the component.
311311
*/
312-
foreignImports?: R3ForeignComponentMetadata[] | null;
312+
foreignImports: R3ForeignComponentMetadata[] | null;
313313
}
314314

315315
/**

packages/compiler/src/template/pipeline/src/compilation.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export class ComponentCompilationJob extends CompilationJob {
9090
readonly relativeTemplatePath: string | null,
9191
readonly enableDebugLocations: boolean,
9292
legacyOptionalChaining: boolean,
93-
readonly foreignImports?: R3ForeignComponentMetadata[] | null,
93+
readonly foreignImports: R3ForeignComponentMetadata[] | null,
9494
) {
9595
super(componentName, pool, mode, legacyOptionalChaining);
9696
this.root = new ViewCompilationUnit(this, this.allocateXrefId(), null);

packages/compiler/src/template/pipeline/src/ingest.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export function ingestComponent(
7070
relativeTemplatePath: string | null,
7171
enableDebugLocations: boolean,
7272
legacyOptionalChaining: boolean,
73-
foreignImports?: R3ForeignComponentMetadata[] | null,
73+
foreignImports: R3ForeignComponentMetadata[] | null,
7474
): ComponentCompilationJob {
7575
const job = new ComponentCompilationJob(
7676
componentName,

0 commit comments

Comments
 (0)