-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Also added a feature to the test harness for testing optional features
- Loading branch information
1 parent
66260f4
commit 22fda11
Showing
6 changed files
with
261 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 14 additions & 8 deletions
22
packages/ember-template-compiler/lib/plugins/assert-reserved-named-arguments.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,31 @@ | ||
| import { assert } from 'ember-debug'; | ||
| import { EMBER_GLIMMER_NAMED_ARGUMENTS } from 'ember/features'; | ||
| import calculateLocationDisplay from '../system/calculate-location-display'; | ||
|
|
||
| const RESERVED = ['@arguments', '@args']; | ||
|
|
||
| let isReserved, assertMessage; | ||
|
|
||
| export default function assertReservedNamedArguments(env) { | ||
| let { moduleName } = env.meta; | ||
|
|
||
| return { | ||
| name: 'assert-reserved-named-arguments', | ||
|
|
||
| visitors: { | ||
| PathExpression(node) { | ||
| if (node.original[0] === '@') { | ||
| assert(assertMessage(moduleName, node)); | ||
| PathExpression({ original, loc }) { | ||
| if (isReserved(original)) { | ||
| assert(`${assertMessage(original)} ${calculateLocationDisplay(moduleName, loc)}`); | ||
| } | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| function assertMessage(moduleName, node) { | ||
| let path = node.original; | ||
| let source = calculateLocationDisplay(moduleName, node.loc); | ||
|
|
||
| return `'${path}' is not a valid path. ${source}`; | ||
| if (EMBER_GLIMMER_NAMED_ARGUMENTS) { | ||
| isReserved = name => RESERVED.indexOf(name) !== -1 || name.match(/^@[^a-z]/); | ||
| assertMessage = name => `'${name}' is reserved.`; | ||
| } else { | ||
| isReserved = name => name[0] === '@'; | ||
| assertMessage = name => `'${name}' is not a valid path.`; | ||
| } |
98 changes: 82 additions & 16 deletions
98
packages/ember-template-compiler/tests/plugins/assert-reserved-named-arguments-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,91 @@ | ||
| import { EMBER_GLIMMER_NAMED_ARGUMENTS } from 'ember/features'; | ||
| import { compile } from '../../index'; | ||
|
|
||
| QUnit.module('ember-template-compiler: assert-reserved-named-arguments'); | ||
|
|
||
| QUnit.test('Paths beginning with @ are not valid', function() { | ||
| expect(3); | ||
| if (EMBER_GLIMMER_NAMED_ARGUMENTS) { | ||
| let RESERVED = [ | ||
| '@arguments', | ||
| '@args', | ||
| // anything else that doesn't start with a lower case letter | ||
| '@Arguments', '@Args', | ||
| '@A', '@FOO', '@Foo', | ||
| '@.', '@_', '@-', '@$' | ||
| ]; | ||
|
|
||
| expectAssertion(() => { | ||
| compile('{{@foo}}', { | ||
| moduleName: 'baz/foo-bar' | ||
| }); | ||
| }, `'@foo' is not a valid path. ('baz/foo-bar' @ L1:C2) `); | ||
| RESERVED.forEach(name => { | ||
| QUnit.test(`'${name}' is reserved`, () => { | ||
| expect(3); | ||
|
|
||
| expectAssertion(() => { | ||
| compile(`{{${name}}}`, { | ||
| moduleName: 'baz/foo-bar' | ||
| }); | ||
| }, `'${name}' is reserved. ('baz/foo-bar' @ L1:C2) `); | ||
|
|
||
| expectAssertion(() => { | ||
| compile(`{{#if ${name}}}Yup{{/if}}`, { | ||
| moduleName: 'baz/foo-bar' | ||
| }); | ||
| }, `'${name}' is reserved. ('baz/foo-bar' @ L1:C6) `); | ||
|
|
||
| expectAssertion(() => { | ||
| compile('{{#if @foo}}Yup{{/if}}', { | ||
| moduleName: 'baz/foo-bar' | ||
| expectAssertion(() => { | ||
| compile(`{{input type=(if ${name} "bar" "baz")}}`, { | ||
| moduleName: 'baz/foo-bar' | ||
| }); | ||
| }, `'${name}' is reserved. ('baz/foo-bar' @ L1:C17) `); | ||
| }); | ||
| }, `'@foo' is not a valid path. ('baz/foo-bar' @ L1:C6) `); | ||
| }); | ||
|
|
||
| let DE_FACTO_RESERVED = [ | ||
| '@', | ||
| '@0', '@1', '@2', | ||
| '@@', '@!', '@=' | ||
| ]; | ||
|
|
||
| DE_FACTO_RESERVED.forEach(name => { | ||
| QUnit.test(`'${name}' is de facto reserved (parse error)`, assert => { | ||
| expect(3); | ||
|
|
||
| expectAssertion(() => { | ||
| compile('{{input type=(if @foo "bar" "baz")}}', { | ||
| moduleName: 'baz/foo-bar' | ||
| assert.throws(() => { | ||
| compile(`{{${name}}}`, { | ||
| moduleName: 'baz/foo-bar' | ||
| }); | ||
| }, /Expecting 'ID'/); | ||
|
|
||
| assert.throws(() => { | ||
| compile(`{{#if ${name}}}Yup{{/if}}`, { | ||
| moduleName: 'baz/foo-bar' | ||
| }); | ||
| }, /Expecting 'ID'/); | ||
|
|
||
| assert.throws(() => { | ||
| compile(`{{input type=(if ${name} "bar" "baz")}}`, { | ||
| moduleName: 'baz/foo-bar' | ||
| }); | ||
| }, /Expecting 'ID'/); | ||
| }); | ||
| }, `'@foo' is not a valid path. ('baz/foo-bar' @ L1:C17) `); | ||
| }); | ||
| }); | ||
| } else { | ||
| QUnit.test('Paths beginning with @ are not valid', () => { | ||
| expect(3); | ||
|
|
||
| expectAssertion(() => { | ||
| compile('{{@foo}}', { | ||
| moduleName: 'baz/foo-bar' | ||
| }); | ||
| }, `'@foo' is not a valid path. ('baz/foo-bar' @ L1:C2) `); | ||
|
|
||
| expectAssertion(() => { | ||
| compile('{{#if @foo}}Yup{{/if}}', { | ||
| moduleName: 'baz/foo-bar' | ||
| }); | ||
| }, `'@foo' is not a valid path. ('baz/foo-bar' @ L1:C6) `); | ||
|
|
||
| expectAssertion(() => { | ||
| compile('{{input type=(if @foo "bar" "baz")}}', { | ||
| moduleName: 'baz/foo-bar' | ||
| }); | ||
| }, `'@foo' is not a valid path. ('baz/foo-bar' @ L1:C17) `); | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters