cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ivy): quote dots in directive inputs and outputs (#31146)

Browse Source 
A temporary check is in place to determine whether a key in an object
literal needs to be quoted during emit. Previously, only the presence of
a dash caused a key to become quoted, this however is not sufficient for
@angular/flex-layout to compile properly as it has dots in its inputs.

This commit extends the check to also use quotes when a dot is present.

Fixes #30114

PR Close #31146
This commit is contained in:
JoostK 2019-06-19 21:28:50 +02:00 committed by Kara Erickson
parent 4c45aa39e4
commit 75ac724842
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/compiler-cli/test/ngtsc/ngtsc_spec.ts
View File

@ -2721,8 +2721,8 @@ describe('ngtsc behavioral tests', () => {
@Directive({ @Directive({
selector: '[somedir]', selector: '[somedir]',
inputs: ['track-type', 'track-name', 'inputTrackName'], inputs: ['track-type', 'track-name', 'inputTrackName', 'src.xl'],
outputs: ['output-track-type', 'output-track-name', 'outputTrackName'] outputs: ['output-track-type', 'output-track-name', 'outputTrackName', 'output.event']
}) })
export class SomeDir { export class SomeDir {
@Input('track-type') trackType: string; @Input('track-type') trackType: string;
@ -2737,13 +2737,15 @@ describe('ngtsc behavioral tests', () => {
"track-type": "track-type", "track-type": "track-type",
"track-name": "track-name", "track-name": "track-name",
inputTrackName: "inputTrackName", inputTrackName: "inputTrackName",
"src.xl": "src.xl",
trackType: ["track-type", "trackType"], trackType: ["track-type", "trackType"],
trackName: ["track-name", "trackName"] trackName: ["track-name", "trackName"]
}, },
outputs: { outputs: {
"output-track-type": "output-track-type", "output-track-type": "output-track-type",
"output-track-name": "output-track-name", "output-track-name": "output-track-name",
outputTrackName: "outputTrackName" outputTrackName: "outputTrackName",
"output.event": "output.event"
} }
`; `;
expect(trim(jsContents)).toContain(trim(inputsAndOutputs)); expect(trim(jsContents)).toContain(trim(inputsAndOutputs));

2
packages/compiler/src/render3/view/util.ts
View File

@ -21,7 +21,7 @@ import {isI18nAttribute} from './i18n/util';
* TODO(FW-1136): this is a temporary solution, we need to come up with a better way of working with * TODO(FW-1136): this is a temporary solution, we need to come up with a better way of working with
* inputs that contain potentially unsafe chars. * inputs that contain potentially unsafe chars.
*/ */
const UNSAFE_OBJECT_KEY_NAME_REGEXP = /-/; const UNSAFE_OBJECT_KEY_NAME_REGEXP = /[-.]/;
/** Name of the temporary to use during data binding */ /** Name of the temporary to use during data binding */
export const TEMPORARY_NAME = '_t'; export const TEMPORARY_NAME = '_t';