Skip to content

fix(compiler): inputs/outputs incorrectly parsed in jit mode #46813

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
crisbeto wants to merge 1 commit into from
Closed

fix(compiler): inputs/outputs incorrectly parsed in jit mode #46813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions packages/compiler/src/jit_compiler_facade.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,10 +637,10 @@ function isOutput(value: any): value is Output {
}

function parseInputOutputs(values: string[]): StringMap {
return values.reduce((map, value) => {
const [field, property] = value.split(',').map(piece => piece.trim());
map[field] = property || field;
return map;
return values.reduce((results, value) => {
const [field, property] = value.split(':', 2).map(str => str.trim());
results[field] = property || field;
return results;
}, {} as StringMap);
}

Expand Down
10 changes: 3 additions & 7 deletions packages/compiler/src/render3/view/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ function mapToExpression(
map: {[key: string]: string|string[]}, keepDeclared?: boolean): o.Expression {
return o.literalMap(Object.getOwnPropertyNames(map).map(key => {
// canonical syntax: `dirProp: publicProp`
// if there is no `:`, use dirProp = elProp
const value = map[key];
let declaredName: string;
let publicName: string;
Expand All @@ -186,12 +185,9 @@ function mapToExpression(
minifiedName = key;
needsDeclaredName = publicName !== declaredName;
} else {
[declaredName, publicName] = splitAtColon(key, [key, value]);
minifiedName = declaredName;
// Only include the declared name if extracted from the key, i.e. the key contains a colon.
// Otherwise the declared name should be omitted even if it is different from the public name,
// as it may have already been minified.
needsDeclaredName = publicName !== declaredName && key.includes(':');
minifiedName = declaredName = key;
publicName = value;
needsDeclaredName = false;
}
return {
key: minifiedName,
Expand Down
18 changes: 13 additions & 5 deletions packages/upgrade/src/dynamic/src/upgrade_ng1_adapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@ const INITIAL_VALUE = {
};
const NOT_SUPPORTED: any = 'NOT_SUPPORTED';

function getInputPropertyMapName(name: string): string {
return `input_${name}`;
}

function getOutputPropertyMapName(name: string): string {
return `output_${name}`;
}

export class UpgradeNg1ComponentAdapterBuilder {
// TODO(issue/24571): remove '!'.
Expand All @@ -33,7 +40,7 @@ export class UpgradeNg1ComponentAdapterBuilder {
propertyMap: {[name: string]: string} = {};
directive: IDirective|null = null;
// TODO(issue/24571): remove '!'.
template !: string;
template!: string;

constructor(public name: string) {
const selector =
Expand Down Expand Up @@ -76,9 +83,9 @@ export class UpgradeNg1ComponentAdapterBuilder {

// QUESTION: What about `=*`? Ignore? Throw? Support?

const inputName = `input_${attrName}`;
const inputName = getInputPropertyMapName(attrName);
const inputNameRename = `${inputName}: ${attrName}`;
const outputName = `output_${attrName}`;
const outputName = getOutputPropertyMapName(attrName);
const outputNameRename = `${outputName}: ${attrName}`;
const outputNameRenameChange = `${outputNameRename}Change`;

Expand Down Expand Up @@ -225,8 +232,9 @@ class UpgradeNg1ComponentAdapter implements OnInit, OnChanges, DoCheck {
const ng1Changes: any = {};
Object.keys(changes).forEach(name => {
const change: SimpleChange = changes[name];
this.setComponentProperty(name, change.currentValue);
ng1Changes[this.propertyMap[name]] = change;
const propertyMapName = getInputPropertyMapName(name);
this.setComponentProperty(propertyMapName, change.currentValue);
ng1Changes[this.propertyMap[propertyMapName]] = change;
});

if (isFunction(this.destinationObj!.$onChanges)) {
Expand Down