diff --git a/src/generators/dom/visitors/Element/meta/Window.ts b/src/generators/dom/visitors/Element/meta/Window.ts index 90bfff55c4..f5cfb23e80 100644 --- a/src/generators/dom/visitors/Element/meta/Window.ts +++ b/src/generators/dom/visitors/Element/meta/Window.ts @@ -83,10 +83,6 @@ export default function visitWindow( const associatedEvent = associatedEvents[attribute.name]; - if (!associatedEvent) { - throw new Error(`Cannot bind to ${attribute.name} on <:Window>`); - } - if (!events[associatedEvent]) events[associatedEvent] = []; events[associatedEvent].push( `${attribute.value.name}: this.${attribute.name}` diff --git a/src/generators/shared/utils/isChildOfComponent.ts b/src/generators/shared/utils/isChildOfComponent.ts index 3246d27d35..2de64c4860 100644 --- a/src/generators/shared/utils/isChildOfComponent.ts +++ b/src/generators/shared/utils/isChildOfComponent.ts @@ -7,7 +7,4 @@ export default function isChildOfComponent(node: Node, generator: Generator) { if (generator.components.has(node.name)) return true; if (/-/.test(node.name)) return false; } - - // TODO do this in validation - throw new Error(`Element with a slot='...' attribute must be a descendant of a component or custom element`); } \ No newline at end of file diff --git a/src/generators/shared/utils/wrapModule.ts b/src/generators/shared/utils/wrapModule.ts index 3492ba0a27..7e55996aa4 100644 --- a/src/generators/shared/utils/wrapModule.ts +++ b/src/generators/shared/utils/wrapModule.ts @@ -1,4 +1,5 @@ import deindent from '../../../utils/deindent'; +import list from '../../../utils/list'; import { CompileOptions, ModuleFormat, Node } from '../../../interfaces'; interface Dependency { @@ -65,7 +66,7 @@ export default function wrapModule( if (format === 'umd') return umd(code, name, options, banner, dependencies); if (format === 'eval') return expr(code, name, options, banner, dependencies); - throw new Error(`Not implemented: ${format}`); + throw new Error(`options.format is invalid (must be ${list(Object.keys(wrappers))})`); } function es( diff --git a/src/validate/utils/list.ts b/src/utils/list.ts similarity index 100% rename from src/validate/utils/list.ts rename to src/utils/list.ts diff --git a/src/validate/html/validateElement.ts b/src/validate/html/validateElement.ts index 461b5aa52f..0d67b8002d 100644 --- a/src/validate/html/validateElement.ts +++ b/src/validate/html/validateElement.ts @@ -1,6 +1,6 @@ import * as namespaces from '../../utils/namespaces'; import validateEventHandler from './validateEventHandler'; -import { Validator } from '../index'; +import validate, { Validator } from '../index'; import { Node } from '../../interfaces'; const svg = /^(?:altGlyph|altGlyphDef|altGlyphItem|animate|animateColor|animateMotion|animateTransform|circle|clipPath|color-profile|cursor|defs|desc|discard|ellipse|feBlend|feColorMatrix|feComponentTransfer|feComposite|feConvolveMatrix|feDiffuseLighting|feDisplacementMap|feDistantLight|feDropShadow|feFlood|feFuncA|feFuncB|feFuncG|feFuncR|feGaussianBlur|feImage|feMerge|feMergeNode|feMorphology|feOffset|fePointLight|feSpecularLighting|feSpotLight|feTile|feTurbulence|filter|font|font-face|font-face-format|font-face-name|font-face-src|font-face-uri|foreignObject|g|glyph|glyphRef|hatch|hatchpath|hkern|image|line|linearGradient|marker|mask|mesh|meshgradient|meshpatch|meshrow|metadata|missing-glyph|mpath|path|pattern|polygon|polyline|radialGradient|rect|set|solidcolor|stop|switch|symbol|text|textPath|title|tref|tspan|unknown|use|view|vkern)$/; @@ -191,22 +191,7 @@ export default function validateElement( } if (attribute.name === 'slot' && !isComponent) { - let i = stack.length; - while (i--) { - const parent = stack[i]; - if (parent.type === 'Element' && validator.components.has(parent.name)) break; - if (parent.type === 'IfBlock' || parent.type === 'EachBlock') { - const message = `Cannot place slotted elements inside an ${parent.type === 'IfBlock' ? 'if' : 'each'}-block`; - validator.error(message, attribute.start); - } - } - - if (isDynamic(attribute)) { - validator.error( - `slot attribute cannot have a dynamic value`, - attribute.start - ); - } + checkSlotAttribute(validator, node, attribute, stack); } } }); @@ -232,6 +217,32 @@ function checkTypeAttribute(validator: Validator, node: Node) { return attribute.value[0].data; } +function checkSlotAttribute(validator: Validator, node: Node, attribute: Node, stack: Node[]) { + if (isDynamic(attribute)) { + validator.error( + `slot attribute cannot have a dynamic value`, + attribute.start + ); + } + + let i = stack.length; + while (i--) { + const parent = stack[i]; + if (parent.type === 'Element') { + // if we're inside a component or a custom element, gravy + if (validator.components.has(parent.name)) return; + if (/-/.test(parent.name)) return; + } + + if (parent.type === 'IfBlock' || parent.type === 'EachBlock') { + const message = `Cannot place slotted elements inside an ${parent.type === 'IfBlock' ? 'if' : 'each'}-block`; + validator.error(message, attribute.start); + } + } + + validator.error(`Element with a slot='...' attribute must be a descendant of a component or custom element`, attribute.start); +} + function isDynamic(attribute: Node) { return attribute.value.length > 1 || attribute.value[0].type !== 'Text'; } diff --git a/src/validate/html/validateEventHandler.ts b/src/validate/html/validateEventHandler.ts index e2b6e405d7..2339f801d9 100644 --- a/src/validate/html/validateEventHandler.ts +++ b/src/validate/html/validateEventHandler.ts @@ -1,5 +1,5 @@ import flattenReference from '../../utils/flattenReference'; -import list from '../utils/list'; +import list from '../../utils/list'; import { Validator } from '../index'; import validCalleeObjects from '../../utils/validCalleeObjects'; import { Node } from '../../interfaces'; diff --git a/src/validate/html/validateWindow.ts b/src/validate/html/validateWindow.ts index 88f41ff5eb..3cfc80f6bc 100644 --- a/src/validate/html/validateWindow.ts +++ b/src/validate/html/validateWindow.ts @@ -1,6 +1,6 @@ import flattenReference from '../../utils/flattenReference'; import fuzzymatch from '../utils/fuzzymatch'; -import list from '../utils/list'; +import list from '../../utils/list'; import validateEventHandler from './validateEventHandler'; import { Validator } from '../index'; import { Node } from '../../interfaces'; diff --git a/src/validate/js/propValidators/components.ts b/src/validate/js/propValidators/components.ts index 7d46470d0b..943d4b005f 100644 --- a/src/validate/js/propValidators/components.ts +++ b/src/validate/js/propValidators/components.ts @@ -10,7 +10,6 @@ export default function components(validator: Validator, prop: Node) { `The 'components' property must be an object literal`, prop.start ); - return; } checkForDupes(validator, prop.value.properties); diff --git a/src/validate/js/propValidators/computed.ts b/src/validate/js/propValidators/computed.ts index 7456963e90..a54d7856b0 100644 --- a/src/validate/js/propValidators/computed.ts +++ b/src/validate/js/propValidators/computed.ts @@ -14,7 +14,6 @@ export default function computed(validator: Validator, prop: Node) { `The 'computed' property must be an object literal`, prop.start ); - return; } checkForDupes(validator, prop.value.properties); @@ -26,7 +25,6 @@ export default function computed(validator: Validator, prop: Node) { `Computed properties can be function expressions or arrow function expressions`, computation.value.start ); - return; } const params = computation.value.params; @@ -36,7 +34,6 @@ export default function computed(validator: Validator, prop: Node) { `A computed value must depend on at least one property`, computation.value.start ); - return; } params.forEach((param: Node) => { diff --git a/src/validate/js/propValidators/events.ts b/src/validate/js/propValidators/events.ts index 1bbf75d1e6..0f81fd7f4d 100644 --- a/src/validate/js/propValidators/events.ts +++ b/src/validate/js/propValidators/events.ts @@ -9,7 +9,6 @@ export default function events(validator: Validator, prop: Node) { `The 'events' property must be an object literal`, prop.start ); - return; } checkForDupes(validator, prop.value.properties); diff --git a/src/validate/js/propValidators/helpers.ts b/src/validate/js/propValidators/helpers.ts index d5d51c99ea..4345257e55 100644 --- a/src/validate/js/propValidators/helpers.ts +++ b/src/validate/js/propValidators/helpers.ts @@ -10,7 +10,6 @@ export default function helpers(validator: Validator, prop: Node) { `The 'helpers' property must be an object literal`, prop.start ); - return; } checkForDupes(validator, prop.value.properties); diff --git a/src/validate/js/propValidators/methods.ts b/src/validate/js/propValidators/methods.ts index 66fd27eea1..c5b9bc220f 100644 --- a/src/validate/js/propValidators/methods.ts +++ b/src/validate/js/propValidators/methods.ts @@ -14,7 +14,6 @@ export default function methods(validator: Validator, prop: Node) { `The 'methods' property must be an object literal`, prop.start ); - return; } checkForAccessors(validator, prop.value.properties, 'Methods'); diff --git a/src/validate/js/propValidators/transitions.ts b/src/validate/js/propValidators/transitions.ts index 6470beee6f..1bd8e677bc 100644 --- a/src/validate/js/propValidators/transitions.ts +++ b/src/validate/js/propValidators/transitions.ts @@ -9,7 +9,6 @@ export default function transitions(validator: Validator, prop: Node) { `The 'transitions' property must be an object literal`, prop.start ); - return; } checkForDupes(validator, prop.value.properties); diff --git a/test/formats/index.js b/test/formats/index.js index b69bde817a..dee4f2c1be 100644 --- a/test/formats/index.js +++ b/test/formats/index.js @@ -157,6 +157,51 @@ describe("formats", () => { return testIife(code, "Foo", { answer: 42 }, `
scrolled to {{y}}
\ No newline at end of file diff --git a/test/validator/samples/binding-input-type-boolean/errors.json b/test/validator/samples/binding-input-type-boolean/errors.json new file mode 100644 index 0000000000..feed6e0d5d --- /dev/null +++ b/test/validator/samples/binding-input-type-boolean/errors.json @@ -0,0 +1,8 @@ +[{ + "message": "'type' attribute must be specified", + "loc": { + "line": 1, + "column": 24 + }, + "pos": 24 +}] \ No newline at end of file diff --git a/test/validator/samples/binding-input-type-boolean/input.html b/test/validator/samples/binding-input-type-boolean/input.html new file mode 100644 index 0000000000..6277fd7484 --- /dev/null +++ b/test/validator/samples/binding-input-type-boolean/input.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/test/validator/samples/binding-input-static-type/errors.json b/test/validator/samples/binding-input-type-dynamic/errors.json similarity index 100% rename from test/validator/samples/binding-input-static-type/errors.json rename to test/validator/samples/binding-input-type-dynamic/errors.json diff --git a/test/validator/samples/binding-input-static-type/input.html b/test/validator/samples/binding-input-type-dynamic/input.html similarity index 100% rename from test/validator/samples/binding-input-static-type/input.html rename to test/validator/samples/binding-input-type-dynamic/input.html diff --git a/test/validator/samples/namespace-invalid-unguessable/errors.json b/test/validator/samples/namespace-invalid-unguessable/errors.json new file mode 100644 index 0000000000..5c5d55ad13 --- /dev/null +++ b/test/validator/samples/namespace-invalid-unguessable/errors.json @@ -0,0 +1,8 @@ +[{ + "message": "Invalid namespace 'lol'", + "pos": 29, + "loc": { + "line": 3, + "column": 2 + } +}] diff --git a/test/validator/samples/namespace-invalid-unguessable/input.html b/test/validator/samples/namespace-invalid-unguessable/input.html new file mode 100644 index 0000000000..26494e2112 --- /dev/null +++ b/test/validator/samples/namespace-invalid-unguessable/input.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/test/validator/samples/namespace-non-literal/errors.json b/test/validator/samples/namespace-non-literal/errors.json new file mode 100644 index 0000000000..75e1bd7712 --- /dev/null +++ b/test/validator/samples/namespace-non-literal/errors.json @@ -0,0 +1,8 @@ +[{ + "message": "The 'namespace' property must be a string literal representing a valid namespace", + "pos": 79, + "loc": { + "line": 5, + "column": 2 + } +}] diff --git a/test/validator/samples/namespace-non-literal/input.html b/test/validator/samples/namespace-non-literal/input.html new file mode 100644 index 0000000000..41bb790c37 --- /dev/null +++ b/test/validator/samples/namespace-non-literal/input.html @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/test/validator/samples/non-object-literal-components/errors.json b/test/validator/samples/non-object-literal-components/errors.json new file mode 100644 index 0000000000..3133a80e5d --- /dev/null +++ b/test/validator/samples/non-object-literal-components/errors.json @@ -0,0 +1,8 @@ +[{ + "message": "The 'components' property must be an object literal", + "loc": { + "line": 3, + "column": 2 + }, + "pos": 29 +}] \ No newline at end of file diff --git a/test/validator/samples/non-object-literal-components/input.html b/test/validator/samples/non-object-literal-components/input.html new file mode 100644 index 0000000000..1b863e97a9 --- /dev/null +++ b/test/validator/samples/non-object-literal-components/input.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/test/validator/samples/non-object-literal-events/errors.json b/test/validator/samples/non-object-literal-events/errors.json new file mode 100644 index 0000000000..b0ff728675 --- /dev/null +++ b/test/validator/samples/non-object-literal-events/errors.json @@ -0,0 +1,8 @@ +[{ + "message": "The 'events' property must be an object literal", + "loc": { + "line": 3, + "column": 2 + }, + "pos": 29 +}] \ No newline at end of file diff --git a/test/validator/samples/non-object-literal-events/input.html b/test/validator/samples/non-object-literal-events/input.html new file mode 100644 index 0000000000..51f0940c17 --- /dev/null +++ b/test/validator/samples/non-object-literal-events/input.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/test/validator/samples/non-object-literal-helpers/errors.json b/test/validator/samples/non-object-literal-helpers/errors.json new file mode 100644 index 0000000000..602f89ff96 --- /dev/null +++ b/test/validator/samples/non-object-literal-helpers/errors.json @@ -0,0 +1,8 @@ +[{ + "message": "The 'helpers' property must be an object literal", + "loc": { + "line": 3, + "column": 2 + }, + "pos": 29 +}] \ No newline at end of file diff --git a/test/validator/samples/non-object-literal-helpers/input.html b/test/validator/samples/non-object-literal-helpers/input.html new file mode 100644 index 0000000000..196ffa2018 --- /dev/null +++ b/test/validator/samples/non-object-literal-helpers/input.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/test/validator/samples/non-object-literal-methods/errors.json b/test/validator/samples/non-object-literal-methods/errors.json new file mode 100644 index 0000000000..7a7f107f1e --- /dev/null +++ b/test/validator/samples/non-object-literal-methods/errors.json @@ -0,0 +1,8 @@ +[{ + "message": "The 'methods' property must be an object literal", + "loc": { + "line": 3, + "column": 2 + }, + "pos": 29 +}] \ No newline at end of file diff --git a/test/validator/samples/non-object-literal-methods/input.html b/test/validator/samples/non-object-literal-methods/input.html new file mode 100644 index 0000000000..662dce59ba --- /dev/null +++ b/test/validator/samples/non-object-literal-methods/input.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/test/validator/samples/non-object-literal-transitions/errors.json b/test/validator/samples/non-object-literal-transitions/errors.json new file mode 100644 index 0000000000..640706b4ed --- /dev/null +++ b/test/validator/samples/non-object-literal-transitions/errors.json @@ -0,0 +1,8 @@ +[{ + "message": "The 'transitions' property must be an object literal", + "loc": { + "line": 3, + "column": 2 + }, + "pos": 29 +}] \ No newline at end of file diff --git a/test/validator/samples/non-object-literal-transitions/input.html b/test/validator/samples/non-object-literal-transitions/input.html new file mode 100644 index 0000000000..3acd31fc0f --- /dev/null +++ b/test/validator/samples/non-object-literal-transitions/input.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/test/validator/samples/slot-attribute-invalid/errors.json b/test/validator/samples/slot-attribute-invalid/errors.json new file mode 100644 index 0000000000..aea1fa7db1 --- /dev/null +++ b/test/validator/samples/slot-attribute-invalid/errors.json @@ -0,0 +1,8 @@ +[{ + "message": "Element with a slot='...' attribute must be a descendant of a component or custom element", + "loc": { + "line": 1, + "column": 5 + }, + "pos": 5 +}] diff --git a/test/validator/samples/slot-attribute-invalid/input.html b/test/validator/samples/slot-attribute-invalid/input.html new file mode 100644 index 0000000000..ed407bb894 --- /dev/null +++ b/test/validator/samples/slot-attribute-invalid/input.html @@ -0,0 +1 @@ +