diff --git a/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/components/test/template.marko b/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/components/test/template.marko new file mode 100644 index 000000000..b035b2ab2 --- /dev/null +++ b/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/components/test/template.marko @@ -0,0 +1,2 @@ +-- item: ${input.item.value} +<${input.renderBody}(2)/> diff --git a/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/expected.html b/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/expected.html new file mode 100644 index 000000000..ef32332a6 --- /dev/null +++ b/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/expected.html @@ -0,0 +1 @@ +item: 1param: 2 \ No newline at end of file diff --git a/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/template.marko b/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/template.marko new file mode 100644 index 000000000..321508293 --- /dev/null +++ b/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/template.marko @@ -0,0 +1,4 @@ + + <@item value=1/> + param: ${x} + diff --git a/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/test.js b/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/test.js new file mode 100644 index 000000000..c4013b344 --- /dev/null +++ b/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/test.js @@ -0,0 +1 @@ +exports.templateData = {}; diff --git a/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/vdom-expected.html b/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/vdom-expected.html new file mode 100644 index 000000000..1f48262a3 --- /dev/null +++ b/packages/marko/test/render/fixtures/nested-tag-with-render-body-params/vdom-expected.html @@ -0,0 +1 @@ +"item: 1param: 2" diff --git a/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/components/test/template.marko b/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/components/test/template.marko new file mode 100644 index 000000000..3e140ef95 --- /dev/null +++ b/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/components/test/template.marko @@ -0,0 +1,3 @@ + + ${item.value} + diff --git a/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/expected.html b/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/expected.html new file mode 100644 index 000000000..3cacc0b93 --- /dev/null +++ b/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/expected.html @@ -0,0 +1 @@ +12 \ No newline at end of file diff --git a/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/template.marko b/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/template.marko new file mode 100644 index 000000000..fc6174a71 --- /dev/null +++ b/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/template.marko @@ -0,0 +1,6 @@ + + $ let x = 1; + <@item value=x/> + $ x = 2; + <@item value=x/> + diff --git a/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/test.js b/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/test.js new file mode 100644 index 000000000..c4013b344 --- /dev/null +++ b/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/test.js @@ -0,0 +1 @@ +exports.templateData = {}; diff --git a/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/vdom-expected.html b/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/vdom-expected.html new file mode 100644 index 000000000..24a06cb3e --- /dev/null +++ b/packages/marko/test/render/fixtures/nested-tag-with-scriptlet/vdom-expected.html @@ -0,0 +1 @@ +"12" diff --git a/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/cjs-expected.js index 9f84fa96f..50f7b60d8 100644 --- a/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/cjs-expected.js @@ -3,8 +3,7 @@ exports.__esModule = true; exports.default = void 0; var _index = require("marko/src/runtime/html/index.js"); -var _repeatable = _interopRequireDefault(require("marko/src/runtime/helpers/repeatable.js")); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _index2 = _interopRequireDefault(require("./components/custom-tag/index.marko")); var _renderTag = _interopRequireDefault(require("marko/src/runtime/helpers/render-tag.js")); var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer.js")); @@ -14,19 +13,16 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tag-i var _default = exports.default = _marko_template; const _marko_component = {}; _marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state, $global) { - let _thing = null; - if (x) { - _thing = (0, _repeatable.default)(_thing, { - "x": 1, - "renderBody": out => { - out.w("Hello"); - }, - [Symbol.iterator]: _selfIterator.default - }); - } - (0, _renderTag.default)(_index2.default, { - "thing": _thing - }, out, _componentDef, "0"); + (0, _renderTag.default)(_index2.default, (0, _attrTag.i)(() => { + if (x) { + (0, _attrTag.a)("thing", { + "x": 1, + "renderBody": out => { + out.w("Hello"); + } + }); + } + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/html-expected.js index 650c66f19..03aa892ee 100644 --- a/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/html-expected.js @@ -2,26 +2,22 @@ import { t as _t } from "marko/src/runtime/html/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tag-inside-if-tag/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_repeatable from "marko/src/runtime/helpers/repeatable.js"; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _customTag from "./components/custom-tag/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - let _thing = null; - if (x) { - _thing = _marko_repeatable(_thing, { - "x": 1, - "renderBody": out => { - out.w("Hello"); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } - _marko_tag(_customTag, { - "thing": _thing - }, out, _componentDef, "0"); + _marko_tag(_customTag, _marko_render_input(() => { + if (x) { + _marko_repeatable_attr_tag("thing", { + "x": 1, + "renderBody": out => { + out.w("Hello"); + } + }); + } + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/htmlProduction-expected.js index 13eaa5190..6373f7db2 100644 --- a/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/htmlProduction-expected.js @@ -2,26 +2,22 @@ import { t as _t } from "marko/dist/runtime/html/index.js"; const _marko_componentType = "cY5vQoUJ", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_repeatable from "marko/dist/runtime/helpers/repeatable.js"; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _customTag from "./components/custom-tag/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - let _thing = null; - if (x) { - _thing = _marko_repeatable(_thing, { - "x": 1, - "renderBody": out => { - out.w("Hello"); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } - _marko_tag(_customTag, { - "thing": _thing - }, out, _componentDef, "0"); + _marko_tag(_customTag, _marko_render_input(() => { + if (x) { + _marko_repeatable_attr_tag("thing", { + "x": 1, + "renderBody": out => { + out.w("Hello"); + } + }); + } + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/vdom-expected.js index 7ef2ea131..1ffcda358 100644 --- a/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/vdom-expected.js @@ -2,8 +2,7 @@ import { t as _t } from "marko/src/runtime/vdom/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tag-inside-if-tag/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_repeatable from "marko/src/runtime/helpers/repeatable.js"; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _customTag from "./components/custom-tag/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; @@ -11,19 +10,16 @@ import { r as _marko_registerComponent } from "marko/src/runtime/components/regi _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - let _thing = null; - if (x) { - _thing = _marko_repeatable(_thing, { - "x": 1, - "renderBody": out => { - out.t("Hello", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } - _marko_tag(_customTag, { - "thing": _thing - }, out, _componentDef, "0"); + _marko_tag(_customTag, _marko_render_input(() => { + if (x) { + _marko_repeatable_attr_tag("thing", { + "x": 1, + "renderBody": out => { + out.t("Hello", _component); + } + }); + } + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/vdomProduction-expected.js index 8de97675b..f037d298d 100644 --- a/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tag-inside-if-tag/snapshots/vdomProduction-expected.js @@ -2,8 +2,7 @@ import { t as _t } from "marko/dist/runtime/vdom/index.js"; const _marko_componentType = "cY5vQoUJ", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_repeatable from "marko/dist/runtime/helpers/repeatable.js"; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _customTag from "./components/custom-tag/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; @@ -11,19 +10,16 @@ import { r as _marko_registerComponent } from "marko/dist/runtime/components/reg _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - let _thing = null; - if (x) { - _thing = _marko_repeatable(_thing, { - "x": 1, - "renderBody": out => { - out.t("Hello", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } - _marko_tag(_customTag, { - "thing": _thing - }, out, _componentDef, "0"); + _marko_tag(_customTag, _marko_render_input(() => { + if (x) { + _marko_repeatable_attr_tag("thing", { + "x": 1, + "renderBody": out => { + out.t("Hello", _component); + } + }); + } + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/cjs-expected.js index 9559bf3aa..c7ec9c94a 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/cjs-expected.js @@ -3,7 +3,7 @@ exports.__esModule = true; exports.default = void 0; var _index = require("marko/src/runtime/html/index.js"); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _index2 = _interopRequireDefault(require("./components/hello/index.marko")); var _renderTag = _interopRequireDefault(require("marko/src/runtime/helpers/render-tag.js")); var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer.js")); @@ -13,18 +13,12 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags- var _default = exports.default = _marko_template; const _marko_component = {}; _marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state, $global) { - const _items = []; - for (const a in b) { - _items.push({ - [Symbol.iterator]: _selfIterator.default - }); - } - (0, _renderTag.default)(_index2.default, { - "items": _items, - "other": { - [Symbol.iterator]: _selfIterator.default + (0, _renderTag.default)(_index2.default, (0, _attrTag.i)(() => { + for (const a in b) { + (0, _attrTag.r)("items", {}); } - }, out, _componentDef, "0"); + (0, _attrTag.a)("other", {}); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/html-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/html-expected.js index 06e723d44..56d6e394b 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/html-expected.js @@ -2,24 +2,18 @@ import { t as _t } from "marko/src/runtime/html/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags-dynamic-and-static/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { r as _marko_repeated_attr_tag, a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - const _items = []; - for (const a in b) { - _items.push({ - [Symbol.iterator]: _marko_self_iterator - }); - } - _marko_tag(_hello, { - "items": _items, - "other": { - [Symbol.iterator]: _marko_self_iterator + _marko_tag(_hello, _marko_render_input(() => { + for (const a in b) { + _marko_repeated_attr_tag("items", {}); } - }, out, _componentDef, "0"); + _marko_repeatable_attr_tag("other", {}); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/htmlProduction-expected.js index 9a1ba94b5..4dd9f7047 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/htmlProduction-expected.js @@ -2,24 +2,18 @@ import { t as _t } from "marko/dist/runtime/html/index.js"; const _marko_componentType = "EC7Wpjet", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { r as _marko_repeated_attr_tag, a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - const _items = []; - for (const a in b) { - _items.push({ - [Symbol.iterator]: _marko_self_iterator - }); - } - _marko_tag(_hello, { - "items": _items, - "other": { - [Symbol.iterator]: _marko_self_iterator + _marko_tag(_hello, _marko_render_input(() => { + for (const a in b) { + _marko_repeated_attr_tag("items", {}); } - }, out, _componentDef, "0"); + _marko_repeatable_attr_tag("other", {}); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/vdom-expected.js index fc92d8252..73fa19840 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/vdom-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/src/runtime/vdom/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags-dynamic-and-static/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { r as _marko_repeated_attr_tag, a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; @@ -10,18 +10,12 @@ import { r as _marko_registerComponent } from "marko/src/runtime/components/regi _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - const _items = []; - for (const a in b) { - _items.push({ - [Symbol.iterator]: _marko_self_iterator - }); - } - _marko_tag(_hello, { - "items": _items, - "other": { - [Symbol.iterator]: _marko_self_iterator + _marko_tag(_hello, _marko_render_input(() => { + for (const a in b) { + _marko_repeated_attr_tag("items", {}); } - }, out, _componentDef, "0"); + _marko_repeatable_attr_tag("other", {}); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/vdomProduction-expected.js index abe6382a4..1fb3206f8 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-and-static/snapshots/vdomProduction-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/dist/runtime/vdom/index.js"; const _marko_componentType = "EC7Wpjet", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { r as _marko_repeated_attr_tag, a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; @@ -10,18 +10,12 @@ import { r as _marko_registerComponent } from "marko/dist/runtime/components/reg _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - const _items = []; - for (const a in b) { - _items.push({ - [Symbol.iterator]: _marko_self_iterator - }); - } - _marko_tag(_hello, { - "items": _items, - "other": { - [Symbol.iterator]: _marko_self_iterator + _marko_tag(_hello, _marko_render_input(() => { + for (const a in b) { + _marko_repeated_attr_tag("items", {}); } - }, out, _componentDef, "0"); + _marko_repeatable_attr_tag("other", {}); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/cjs-expected.js index 45d4dd213..63593ea02 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/cjs-expected.js @@ -3,7 +3,7 @@ exports.__esModule = true; exports.default = void 0; var _index = require("marko/src/runtime/html/index.js"); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _dynamicTag = _interopRequireDefault(require("marko/src/runtime/helpers/dynamic-tag.js")); var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer.js")); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -12,24 +12,23 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags- var _default = exports.default = _marko_template; const _marko_component = {}; _marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state, $global) { - (0, _dynamicTag.default)(out, input.x, () => ({ - "header": { + (0, _dynamicTag.default)(out, input.x, () => (0, _attrTag.i)(() => { + (0, _attrTag.a)("header", { "class": "my-header", "renderBody": out => { out.w("Header content"); - }, - [Symbol.iterator]: _selfIterator.default - }, - "footer": { + } + }); + (0, _attrTag.a)("footer", { "class": "my-footer", "renderBody": out => { out.w("Footer content"); - }, - [Symbol.iterator]: _selfIterator.default - } - }), out => { - out.w("Body content"); - }, null, null, _componentDef, "0"); + } + }); + return out => { + out.w("Body content"); + }; + }), null, null, null, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/html-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/html-expected.js index 783081429..7f3552642 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/html-expected.js @@ -2,29 +2,28 @@ import { t as _t } from "marko/src/runtime/html/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_dynamic_tag(out, input.x, () => ({ - "header": { + _marko_dynamic_tag(out, input.x, () => _marko_render_input(() => { + _marko_repeatable_attr_tag("header", { "class": "my-header", "renderBody": out => { out.w("Header content"); - }, - [Symbol.iterator]: _marko_self_iterator - }, - "footer": { + } + }); + _marko_repeatable_attr_tag("footer", { "class": "my-footer", "renderBody": out => { out.w("Footer content"); - }, - [Symbol.iterator]: _marko_self_iterator - } - }), out => { - out.w("Body content"); - }, null, null, _componentDef, "0"); + } + }); + return out => { + out.w("Body content"); + }; + }), null, null, null, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/htmlProduction-expected.js index fac66ff36..71f63706e 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/htmlProduction-expected.js @@ -2,29 +2,28 @@ import { t as _t } from "marko/dist/runtime/html/index.js"; const _marko_componentType = "V8pzyNwe", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _marko_dynamic_tag from "marko/dist/runtime/helpers/dynamic-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_dynamic_tag(out, input.x, () => ({ - "header": { + _marko_dynamic_tag(out, input.x, () => _marko_render_input(() => { + _marko_repeatable_attr_tag("header", { "class": "my-header", "renderBody": out => { out.w("Header content"); - }, - [Symbol.iterator]: _marko_self_iterator - }, - "footer": { + } + }); + _marko_repeatable_attr_tag("footer", { "class": "my-footer", "renderBody": out => { out.w("Footer content"); - }, - [Symbol.iterator]: _marko_self_iterator - } - }), out => { - out.w("Body content"); - }, null, null, _componentDef, "0"); + } + }); + return out => { + out.w("Body content"); + }; + }), null, null, null, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/vdom-expected.js index e9e4841a1..15ce4669a 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/vdom-expected.js @@ -2,31 +2,30 @@ import { t as _t } from "marko/src/runtime/vdom/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; import { r as _marko_registerComponent } from "marko/src/runtime/components/registry.js"; _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_dynamic_tag(out, input.x, () => ({ - "header": { + _marko_dynamic_tag(out, input.x, () => _marko_render_input(() => { + _marko_repeatable_attr_tag("header", { "class": "my-header", "renderBody": out => { out.t("Header content", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }, - "footer": { + } + }); + _marko_repeatable_attr_tag("footer", { "class": "my-footer", "renderBody": out => { out.t("Footer content", _component); - }, - [Symbol.iterator]: _marko_self_iterator - } - }), out => { - out.t("Body content", _component); - }, null, null, _componentDef, "0"); + } + }); + return out => { + out.t("Body content", _component); + }; + }), null, null, null, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/vdomProduction-expected.js index 569edc21b..3877dedf8 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-tag-parent/snapshots/vdomProduction-expected.js @@ -2,31 +2,30 @@ import { t as _t } from "marko/dist/runtime/vdom/index.js"; const _marko_componentType = "V8pzyNwe", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _marko_dynamic_tag from "marko/dist/runtime/helpers/dynamic-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; import { r as _marko_registerComponent } from "marko/dist/runtime/components/registry.js"; _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_dynamic_tag(out, input.x, () => ({ - "header": { + _marko_dynamic_tag(out, input.x, () => _marko_render_input(() => { + _marko_repeatable_attr_tag("header", { "class": "my-header", "renderBody": out => { out.t("Header content", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }, - "footer": { + } + }); + _marko_repeatable_attr_tag("footer", { "class": "my-footer", "renderBody": out => { out.t("Footer content", _component); - }, - [Symbol.iterator]: _marko_self_iterator - } - }), out => { - out.t("Body content", _component); - }, null, null, _componentDef, "0"); + } + }); + return out => { + out.t("Body content", _component); + }; + }), null, null, null, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/cjs-expected.js index 72aea9314..50e85f8f6 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/cjs-expected.js @@ -4,8 +4,7 @@ exports.__esModule = true; exports.default = void 0; var _index = require("marko/src/runtime/html/index.js"); var _escapeXml = require("marko/src/runtime/html/helpers/escape-xml.js"); -var _repeatable = _interopRequireDefault(require("marko/src/runtime/helpers/repeatable.js")); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _index2 = _interopRequireDefault(require("./components/hello/index.marko")); var _renderTag = _interopRequireDefault(require("marko/src/runtime/helpers/render-tag.js")); var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer.js")); @@ -15,18 +14,15 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags- var _default = exports.default = _marko_template; const _marko_component = {}; _marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state, $global) { - let _item = null; - if (input.x) { - _item = (0, _repeatable.default)(_item, { - "renderBody": (out, y) => { - out.w((0, _escapeXml.x)(y)); - }, - [Symbol.iterator]: _selfIterator.default - }); - } - (0, _renderTag.default)(_index2.default, { - "item": _item - }, out, _componentDef, "0"); + (0, _renderTag.default)(_index2.default, (0, _attrTag.i)(() => { + if (input.x) { + (0, _attrTag.a)("item", { + "renderBody": (out, y) => { + out.w((0, _escapeXml.x)(y)); + } + }); + } + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/html-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/html-expected.js index bd45a6dee..198034299 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/html-expected.js @@ -3,25 +3,21 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags- _marko_template = _t(_marko_componentType); export default _marko_template; import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml.js"; -import _marko_repeatable from "marko/src/runtime/helpers/repeatable.js"; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - let _item = null; - if (input.x) { - _item = _marko_repeatable(_item, { - "renderBody": (out, y) => { - out.w(_marko_escapeXml(y)); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } - _marko_tag(_hello, { - "item": _item - }, out, _componentDef, "0"); + _marko_tag(_hello, _marko_render_input(() => { + if (input.x) { + _marko_repeatable_attr_tag("item", { + "renderBody": (out, y) => { + out.w(_marko_escapeXml(y)); + } + }); + } + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/htmlProduction-expected.js index 0e4d408f8..a0fb72a17 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/htmlProduction-expected.js @@ -3,25 +3,21 @@ const _marko_componentType = "OLo+Dwkn", _marko_template = _t(_marko_componentType); export default _marko_template; import { x as _marko_escapeXml } from "marko/dist/runtime/html/helpers/escape-xml.js"; -import _marko_repeatable from "marko/dist/runtime/helpers/repeatable.js"; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - let _item = null; - if (input.x) { - _item = _marko_repeatable(_item, { - "renderBody": (out, y) => { - out.w(_marko_escapeXml(y)); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } - _marko_tag(_hello, { - "item": _item - }, out, _componentDef, "0"); + _marko_tag(_hello, _marko_render_input(() => { + if (input.x) { + _marko_repeatable_attr_tag("item", { + "renderBody": (out, y) => { + out.w(_marko_escapeXml(y)); + } + }); + } + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/vdom-expected.js index 10dac1cad..ce4acef12 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/vdom-expected.js @@ -2,8 +2,7 @@ import { t as _t } from "marko/src/runtime/vdom/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags-dynamic-with-params/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_repeatable from "marko/src/runtime/helpers/repeatable.js"; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; @@ -11,18 +10,15 @@ import { r as _marko_registerComponent } from "marko/src/runtime/components/regi _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - let _item = null; - if (input.x) { - _item = _marko_repeatable(_item, { - "renderBody": (out, y) => { - out.t(y, _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } - _marko_tag(_hello, { - "item": _item - }, out, _componentDef, "0"); + _marko_tag(_hello, _marko_render_input(() => { + if (input.x) { + _marko_repeatable_attr_tag("item", { + "renderBody": (out, y) => { + out.t(y, _component); + } + }); + } + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/vdomProduction-expected.js index 468f1f6a3..89c9bca11 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic-with-params/snapshots/vdomProduction-expected.js @@ -2,8 +2,7 @@ import { t as _t } from "marko/dist/runtime/vdom/index.js"; const _marko_componentType = "OLo+Dwkn", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_repeatable from "marko/dist/runtime/helpers/repeatable.js"; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; @@ -11,18 +10,15 @@ import { r as _marko_registerComponent } from "marko/dist/runtime/components/reg _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - let _item = null; - if (input.x) { - _item = _marko_repeatable(_item, { - "renderBody": (out, y) => { - out.t(y, _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } - _marko_tag(_hello, { - "item": _item - }, out, _componentDef, "0"); + _marko_tag(_hello, _marko_render_input(() => { + if (input.x) { + _marko_repeatable_attr_tag("item", { + "renderBody": (out, y) => { + out.t(y, _component); + } + }); + } + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/cjs-expected.js index 3248f4481..a0783c5e8 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/cjs-expected.js @@ -3,7 +3,7 @@ exports.__esModule = true; exports.default = void 0; var _index = require("marko/src/runtime/html/index.js"); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _escapeXml = require("marko/src/runtime/html/helpers/escape-xml.js"); var _index2 = _interopRequireDefault(require("./components/hello/index.marko")); var _renderTag = _interopRequireDefault(require("marko/src/runtime/helpers/render-tag.js")); @@ -14,87 +14,72 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags- var _default = exports.default = _marko_template; const _marko_component = {}; _marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state, $global) { - const _cols = []; - const _items = []; - for (const color of input.colors || []) { - if (x) { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.w("foo"); - }, - [Symbol.iterator]: _selfIterator.default - }); - } else if (y) { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.w("bar"); - }, - [Symbol.iterator]: _selfIterator.default - }); - } else { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.w("baz"); - }, - [Symbol.iterator]: _selfIterator.default - }); + (0, _renderTag.default)(_index2.default, (0, _attrTag.i)(() => { + (0, _attrTag.a)("list", (0, _attrTag.i)(() => { + for (const color of input.colors || []) { + if (x) { + (0, _attrTag.r)("items", { + "style": { + color + }, + "renderBody": out => { + out.w("foo"); + } + }); + } else if (y) { + (0, _attrTag.r)("items", { + "style": { + color + }, + "renderBody": out => { + out.w("bar"); + } + }); + } else { + (0, _attrTag.r)("items", { + "style": { + color + }, + "renderBody": out => { + out.w("baz"); + } + }); + } + } + let i = 10; + while (i--) { + (0, _attrTag.r)("items", { + "renderBody": out => { + out.w((0, _escapeXml.x)(i)); + } + }); + } + })); + for (const col of input.table || []) { + (0, _attrTag.r)("cols", (0, _attrTag.i)(() => { + for (const row of col || []) { + (0, _attrTag.r)("rows", { + "row": row, + "renderBody": out => { + out.w((0, _escapeXml.x)(row)); + } + }); + } + }, { + "x": y + })); } - } - let i = 10; - while (i--) { - _items.push({ - "renderBody": out => { - out.w((0, _escapeXml.x)(i)); - }, - [Symbol.iterator]: _selfIterator.default - }); - } - for (const col of input.table || []) { - const _rows = []; - for (const row of col || []) { - _rows.push({ - "row": row, + (0, _attrTag.r)("cols", (0, _attrTag.i)(() => { + (0, _attrTag.r)("rows", { + "row": -1, "renderBody": out => { - out.w((0, _escapeXml.x)(row)); - }, - [Symbol.iterator]: _selfIterator.default + out.w("Outside"); + } }); - } - _cols.push({ - "x": y, - "rows": _rows, - [Symbol.iterator]: _selfIterator.default - }); - } - const _rows2 = []; - _rows2.push({ - "row": -1, - "renderBody": out => { - out.w("Outside"); - }, - [Symbol.iterator]: _selfIterator.default - }); - _cols.push({ - "outside": true, - "rows": _rows2, - [Symbol.iterator]: _selfIterator.default - }); - (0, _renderTag.default)(_index2.default, { - "list": { - "items": _items, - [Symbol.iterator]: _selfIterator.default - }, - "cols": _cols - }, out, _componentDef, "0"); + }, { + "outside": true + })); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/html-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/html-expected.js index ced875716..a9bfcaf52 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/html-expected.js @@ -2,94 +2,79 @@ import { t as _t } from "marko/src/runtime/html/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags-dynamic/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { r as _marko_repeated_attr_tag, a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - const _cols = []; - const _items = []; - for (const color of input.colors || []) { - if (x) { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.w("foo"); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } else if (y) { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.w("bar"); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } else { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.w("baz"); - }, - [Symbol.iterator]: _marko_self_iterator - }); + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("list", _marko_render_input(() => { + for (const color of input.colors || []) { + if (x) { + _marko_repeated_attr_tag("items", { + "style": { + color + }, + "renderBody": out => { + out.w("foo"); + } + }); + } else if (y) { + _marko_repeated_attr_tag("items", { + "style": { + color + }, + "renderBody": out => { + out.w("bar"); + } + }); + } else { + _marko_repeated_attr_tag("items", { + "style": { + color + }, + "renderBody": out => { + out.w("baz"); + } + }); + } + } + let i = 10; + while (i--) { + _marko_repeated_attr_tag("items", { + "renderBody": out => { + out.w(_marko_escapeXml(i)); + } + }); + } + })); + for (const col of input.table || []) { + _marko_repeated_attr_tag("cols", _marko_render_input(() => { + for (const row of col || []) { + _marko_repeated_attr_tag("rows", { + "row": row, + "renderBody": out => { + out.w(_marko_escapeXml(row)); + } + }); + } + }, { + "x": y + })); } - } - let i = 10; - while (i--) { - _items.push({ - "renderBody": out => { - out.w(_marko_escapeXml(i)); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } - for (const col of input.table || []) { - const _rows = []; - for (const row of col || []) { - _rows.push({ - "row": row, + _marko_repeated_attr_tag("cols", _marko_render_input(() => { + _marko_repeated_attr_tag("rows", { + "row": -1, "renderBody": out => { - out.w(_marko_escapeXml(row)); - }, - [Symbol.iterator]: _marko_self_iterator + out.w("Outside"); + } }); - } - _cols.push({ - "x": y, - "rows": _rows, - [Symbol.iterator]: _marko_self_iterator - }); - } - const _rows2 = []; - _rows2.push({ - "row": -1, - "renderBody": out => { - out.w("Outside"); - }, - [Symbol.iterator]: _marko_self_iterator - }); - _cols.push({ - "outside": true, - "rows": _rows2, - [Symbol.iterator]: _marko_self_iterator - }); - _marko_tag(_hello, { - "list": { - "items": _items, - [Symbol.iterator]: _marko_self_iterator - }, - "cols": _cols - }, out, _componentDef, "0"); + }, { + "outside": true + })); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/htmlProduction-expected.js index f729ce9c4..2775746da 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/htmlProduction-expected.js @@ -2,94 +2,79 @@ import { t as _t } from "marko/dist/runtime/html/index.js"; const _marko_componentType = "GuHig6zQ", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { r as _marko_repeated_attr_tag, a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import { x as _marko_escapeXml } from "marko/dist/runtime/html/helpers/escape-xml.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - const _cols = []; - const _items = []; - for (const color of input.colors || []) { - if (x) { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.w("foo"); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } else if (y) { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.w("bar"); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } else { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.w("baz"); - }, - [Symbol.iterator]: _marko_self_iterator - }); + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("list", _marko_render_input(() => { + for (const color of input.colors || []) { + if (x) { + _marko_repeated_attr_tag("items", { + "style": { + color + }, + "renderBody": out => { + out.w("foo"); + } + }); + } else if (y) { + _marko_repeated_attr_tag("items", { + "style": { + color + }, + "renderBody": out => { + out.w("bar"); + } + }); + } else { + _marko_repeated_attr_tag("items", { + "style": { + color + }, + "renderBody": out => { + out.w("baz"); + } + }); + } + } + let i = 10; + while (i--) { + _marko_repeated_attr_tag("items", { + "renderBody": out => { + out.w(_marko_escapeXml(i)); + } + }); + } + })); + for (const col of input.table || []) { + _marko_repeated_attr_tag("cols", _marko_render_input(() => { + for (const row of col || []) { + _marko_repeated_attr_tag("rows", { + "row": row, + "renderBody": out => { + out.w(_marko_escapeXml(row)); + } + }); + } + }, { + "x": y + })); } - } - let i = 10; - while (i--) { - _items.push({ - "renderBody": out => { - out.w(_marko_escapeXml(i)); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } - for (const col of input.table || []) { - const _rows = []; - for (const row of col || []) { - _rows.push({ - "row": row, + _marko_repeated_attr_tag("cols", _marko_render_input(() => { + _marko_repeated_attr_tag("rows", { + "row": -1, "renderBody": out => { - out.w(_marko_escapeXml(row)); - }, - [Symbol.iterator]: _marko_self_iterator + out.w("Outside"); + } }); - } - _cols.push({ - "x": y, - "rows": _rows, - [Symbol.iterator]: _marko_self_iterator - }); - } - const _rows2 = []; - _rows2.push({ - "row": -1, - "renderBody": out => { - out.w("Outside"); - }, - [Symbol.iterator]: _marko_self_iterator - }); - _cols.push({ - "outside": true, - "rows": _rows2, - [Symbol.iterator]: _marko_self_iterator - }); - _marko_tag(_hello, { - "list": { - "items": _items, - [Symbol.iterator]: _marko_self_iterator - }, - "cols": _cols - }, out, _componentDef, "0"); + }, { + "outside": true + })); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/vdom-expected.js index 04789a054..44fb3728d 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/vdom-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/src/runtime/vdom/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags-dynamic/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { r as _marko_repeated_attr_tag, a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; @@ -10,87 +10,72 @@ import { r as _marko_registerComponent } from "marko/src/runtime/components/regi _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - const _cols = []; - const _items = []; - for (const color of input.colors || []) { - if (x) { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.t("foo", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } else if (y) { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.t("bar", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } else { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.t("baz", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("list", _marko_render_input(() => { + for (const color of input.colors || []) { + if (x) { + _marko_repeated_attr_tag("items", { + "style": { + color + }, + "renderBody": out => { + out.t("foo", _component); + } + }); + } else if (y) { + _marko_repeated_attr_tag("items", { + "style": { + color + }, + "renderBody": out => { + out.t("bar", _component); + } + }); + } else { + _marko_repeated_attr_tag("items", { + "style": { + color + }, + "renderBody": out => { + out.t("baz", _component); + } + }); + } + } + let i = 10; + while (i--) { + _marko_repeated_attr_tag("items", { + "renderBody": out => { + out.t(i, _component); + } + }); + } + })); + for (const col of input.table || []) { + _marko_repeated_attr_tag("cols", _marko_render_input(() => { + for (const row of col || []) { + _marko_repeated_attr_tag("rows", { + "row": row, + "renderBody": out => { + out.t(row, _component); + } + }); + } + }, { + "x": y + })); } - } - let i = 10; - while (i--) { - _items.push({ - "renderBody": out => { - out.t(i, _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } - for (const col of input.table || []) { - const _rows = []; - for (const row of col || []) { - _rows.push({ - "row": row, + _marko_repeated_attr_tag("cols", _marko_render_input(() => { + _marko_repeated_attr_tag("rows", { + "row": -1, "renderBody": out => { - out.t(row, _component); - }, - [Symbol.iterator]: _marko_self_iterator + out.t("Outside", _component); + } }); - } - _cols.push({ - "x": y, - "rows": _rows, - [Symbol.iterator]: _marko_self_iterator - }); - } - const _rows2 = []; - _rows2.push({ - "row": -1, - "renderBody": out => { - out.t("Outside", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); - _cols.push({ - "outside": true, - "rows": _rows2, - [Symbol.iterator]: _marko_self_iterator - }); - _marko_tag(_hello, { - "list": { - "items": _items, - [Symbol.iterator]: _marko_self_iterator - }, - "cols": _cols - }, out, _componentDef, "0"); + }, { + "outside": true + })); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/vdomProduction-expected.js index 866c543f6..4c975e724 100644 --- a/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-dynamic/snapshots/vdomProduction-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/dist/runtime/vdom/index.js"; const _marko_componentType = "GuHig6zQ", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { r as _marko_repeated_attr_tag, a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; @@ -10,87 +10,72 @@ import { r as _marko_registerComponent } from "marko/dist/runtime/components/reg _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - const _cols = []; - const _items = []; - for (const color of input.colors || []) { - if (x) { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.t("foo", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } else if (y) { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.t("bar", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } else { - _items.push({ - "style": { - color - }, - "renderBody": out => { - out.t("baz", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("list", _marko_render_input(() => { + for (const color of input.colors || []) { + if (x) { + _marko_repeated_attr_tag("items", { + "style": { + color + }, + "renderBody": out => { + out.t("foo", _component); + } + }); + } else if (y) { + _marko_repeated_attr_tag("items", { + "style": { + color + }, + "renderBody": out => { + out.t("bar", _component); + } + }); + } else { + _marko_repeated_attr_tag("items", { + "style": { + color + }, + "renderBody": out => { + out.t("baz", _component); + } + }); + } + } + let i = 10; + while (i--) { + _marko_repeated_attr_tag("items", { + "renderBody": out => { + out.t(i, _component); + } + }); + } + })); + for (const col of input.table || []) { + _marko_repeated_attr_tag("cols", _marko_render_input(() => { + for (const row of col || []) { + _marko_repeated_attr_tag("rows", { + "row": row, + "renderBody": out => { + out.t(row, _component); + } + }); + } + }, { + "x": y + })); } - } - let i = 10; - while (i--) { - _items.push({ - "renderBody": out => { - out.t(i, _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); - } - for (const col of input.table || []) { - const _rows = []; - for (const row of col || []) { - _rows.push({ - "row": row, + _marko_repeated_attr_tag("cols", _marko_render_input(() => { + _marko_repeated_attr_tag("rows", { + "row": -1, "renderBody": out => { - out.t(row, _component); - }, - [Symbol.iterator]: _marko_self_iterator + out.t("Outside", _component); + } }); - } - _cols.push({ - "x": y, - "rows": _rows, - [Symbol.iterator]: _marko_self_iterator - }); - } - const _rows2 = []; - _rows2.push({ - "row": -1, - "renderBody": out => { - out.t("Outside", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }); - _cols.push({ - "outside": true, - "rows": _rows2, - [Symbol.iterator]: _marko_self_iterator - }); - _marko_tag(_hello, { - "list": { - "items": _items, - [Symbol.iterator]: _marko_self_iterator - }, - "cols": _cols - }, out, _componentDef, "0"); + }, { + "outside": true + })); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/cjs-expected.js index efd4b9b33..85f4ffc01 100644 --- a/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/cjs-expected.js @@ -3,7 +3,7 @@ exports.__esModule = true; exports.default = void 0; var _index = require("marko/src/runtime/html/index.js"); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _escapeXml = require("marko/src/runtime/html/helpers/escape-xml.js"); var _index2 = _interopRequireDefault(require("./components/hello/index.marko")); var _renderTag = _interopRequireDefault(require("marko/src/runtime/helpers/render-tag.js")); @@ -14,48 +14,39 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags- var _default = exports.default = _marko_template; const _marko_component = {}; _marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state, $global) { - (0, _renderTag.default)(_index2.default, { - "list": { - "items": _items, - [Symbol.iterator]: _selfIterator.default - }, - "renderBody": out => { - const _items = []; + (0, _renderTag.default)(_index2.default, (0, _attrTag.i)(() => { + (0, _attrTag.a)("list", (0, _attrTag.i)(() => { for (const color of input.colors || []) { if (x) { - _items.push({ + (0, _attrTag.r)("items", { "renderBody": out => { out.w("foo"); - }, - [Symbol.iterator]: _selfIterator.default + } }); } else if (y) { - _items.push({ + (0, _attrTag.r)("items", { "renderBody": out => { out.w("bar"); - }, - [Symbol.iterator]: _selfIterator.default + } }); } else { - _items.push({ + (0, _attrTag.r)("items", { "renderBody": out => { out.w("baz"); - }, - [Symbol.iterator]: _selfIterator.default + } }); } } let i = 10; while (i--) { - _items.push({ + (0, _attrTag.r)("items", { "renderBody": out => { out.w((0, _escapeXml.x)(i)); - }, - [Symbol.iterator]: _selfIterator.default + } }); } - } - }, out, _componentDef, "0"); + })); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/html-expected.js b/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/html-expected.js index 411f860a5..09937cccc 100644 --- a/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/html-expected.js @@ -2,55 +2,46 @@ import { t as _t } from "marko/src/runtime/html/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags-repeated-longhand/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { r as _marko_repeated_attr_tag, a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_hello, { - "list": { - "items": _items, - [Symbol.iterator]: _marko_self_iterator - }, - "renderBody": out => { - const _items = []; + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("list", _marko_render_input(() => { for (const color of input.colors || []) { if (x) { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.w("foo"); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } else if (y) { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.w("bar"); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } else { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.w("baz"); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } } let i = 10; while (i--) { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.w(_marko_escapeXml(i)); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } - } - }, out, _componentDef, "0"); + })); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/htmlProduction-expected.js index 150cc2477..375d5fb46 100644 --- a/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/htmlProduction-expected.js @@ -2,55 +2,46 @@ import { t as _t } from "marko/dist/runtime/html/index.js"; const _marko_componentType = "1bkLHbaD", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { r as _marko_repeated_attr_tag, a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import { x as _marko_escapeXml } from "marko/dist/runtime/html/helpers/escape-xml.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_hello, { - "list": { - "items": _items, - [Symbol.iterator]: _marko_self_iterator - }, - "renderBody": out => { - const _items = []; + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("list", _marko_render_input(() => { for (const color of input.colors || []) { if (x) { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.w("foo"); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } else if (y) { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.w("bar"); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } else { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.w("baz"); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } } let i = 10; while (i--) { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.w(_marko_escapeXml(i)); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } - } - }, out, _componentDef, "0"); + })); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/vdom-expected.js index 628f427d9..b6c15bf76 100644 --- a/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/vdom-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/src/runtime/vdom/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags-repeated-longhand/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { r as _marko_repeated_attr_tag, a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; @@ -10,48 +10,39 @@ import { r as _marko_registerComponent } from "marko/src/runtime/components/regi _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_hello, { - "list": { - "items": _items, - [Symbol.iterator]: _marko_self_iterator - }, - "renderBody": out => { - const _items = []; + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("list", _marko_render_input(() => { for (const color of input.colors || []) { if (x) { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.t("foo", _component); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } else if (y) { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.t("bar", _component); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } else { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.t("baz", _component); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } } let i = 10; while (i--) { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.t(i, _component); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } - } - }, out, _componentDef, "0"); + })); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/vdomProduction-expected.js index d5bd2edcb..63559e4a5 100644 --- a/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-repeated-longhand/snapshots/vdomProduction-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/dist/runtime/vdom/index.js"; const _marko_componentType = "1bkLHbaD", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { r as _marko_repeated_attr_tag, a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; @@ -10,48 +10,39 @@ import { r as _marko_registerComponent } from "marko/dist/runtime/components/reg _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_hello, { - "list": { - "items": _items, - [Symbol.iterator]: _marko_self_iterator - }, - "renderBody": out => { - const _items = []; + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("list", _marko_render_input(() => { for (const color of input.colors || []) { if (x) { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.t("foo", _component); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } else if (y) { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.t("bar", _component); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } else { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.t("baz", _component); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } } let i = 10; while (i--) { - _items.push({ + _marko_repeated_attr_tag("items", { "renderBody": out => { out.t(i, _component); - }, - [Symbol.iterator]: _marko_self_iterator + } }); } - } - }, out, _componentDef, "0"); + })); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/cjs-expected.js index 596d51ee2..ddfc1caed 100644 --- a/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/cjs-expected.js @@ -3,7 +3,7 @@ exports.__esModule = true; exports.default = void 0; var _index = require("marko/src/runtime/html/index.js"); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _index2 = _interopRequireDefault(require("./components/hello/index.marko")); var _renderTag = _interopRequireDefault(require("marko/src/runtime/helpers/render-tag.js")); var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer.js")); @@ -13,15 +13,14 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags- var _default = exports.default = _marko_template; const _marko_component = {}; _marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state, $global) { - (0, _renderTag.default)(_index2.default, { - "foo": { + (0, _renderTag.default)(_index2.default, (0, _attrTag.i)(() => { + (0, _attrTag.a)("foo", { "key": "foo", "renderBody": out => { out.w("Foo!"); - }, - [Symbol.iterator]: _selfIterator.default - } - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/html-expected.js b/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/html-expected.js index 09b698b7b..607bc0582 100644 --- a/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/html-expected.js @@ -2,21 +2,20 @@ import { t as _t } from "marko/src/runtime/html/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags-with-key/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_hello, { - "foo": { + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("foo", { "key": "foo", "renderBody": out => { out.w("Foo!"); - }, - [Symbol.iterator]: _marko_self_iterator - } - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/htmlProduction-expected.js index 76033f67d..223054f52 100644 --- a/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/htmlProduction-expected.js @@ -2,21 +2,20 @@ import { t as _t } from "marko/dist/runtime/html/index.js"; const _marko_componentType = "9N4Yuzi+", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_hello, { - "foo": { + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("foo", { "key": "foo", "renderBody": out => { out.w("Foo!"); - }, - [Symbol.iterator]: _marko_self_iterator - } - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/vdom-expected.js index 4b38309be..d6ffb17d8 100644 --- a/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/vdom-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/src/runtime/vdom/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags-with-key/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; @@ -10,15 +10,14 @@ import { r as _marko_registerComponent } from "marko/src/runtime/components/regi _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_hello, { - "foo": { + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("foo", { "key": "foo", "renderBody": out => { out.t("Foo!", _component); - }, - [Symbol.iterator]: _marko_self_iterator - } - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/vdomProduction-expected.js index c39434bac..a71a1e244 100644 --- a/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags-with-key/snapshots/vdomProduction-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/dist/runtime/vdom/index.js"; const _marko_componentType = "9N4Yuzi+", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; @@ -10,15 +10,14 @@ import { r as _marko_registerComponent } from "marko/dist/runtime/components/reg _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_hello, { - "foo": { + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("foo", { "key": "foo", "renderBody": out => { out.t("Foo!", _component); - }, - [Symbol.iterator]: _marko_self_iterator - } - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/at-tags/snapshots/cjs-expected.js index 0c9ef0623..9f60f6900 100644 --- a/packages/translator-default/test/fixtures/at-tags/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/at-tags/snapshots/cjs-expected.js @@ -3,7 +3,7 @@ exports.__esModule = true; exports.default = void 0; var _index = require("marko/src/runtime/html/index.js"); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _index2 = _interopRequireDefault(require("./components/hello/index.marko")); var _renderTag = _interopRequireDefault(require("marko/src/runtime/helpers/render-tag.js")); var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer.js")); @@ -13,14 +13,13 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags/ var _default = exports.default = _marko_template; const _marko_component = {}; _marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state, $global) { - (0, _renderTag.default)(_index2.default, { - "foo": { + (0, _renderTag.default)(_index2.default, (0, _attrTag.i)(() => { + (0, _attrTag.a)("foo", { "renderBody": out => { out.w("Foo!"); - }, - [Symbol.iterator]: _selfIterator.default - } - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags/snapshots/html-expected.js b/packages/translator-default/test/fixtures/at-tags/snapshots/html-expected.js index 7b88050f9..a4d574c22 100644 --- a/packages/translator-default/test/fixtures/at-tags/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/at-tags/snapshots/html-expected.js @@ -2,20 +2,19 @@ import { t as _t } from "marko/src/runtime/html/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_hello, { - "foo": { + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("foo", { "renderBody": out => { out.w("Foo!"); - }, - [Symbol.iterator]: _marko_self_iterator - } - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/at-tags/snapshots/htmlProduction-expected.js index b09af784c..f96ccd7aa 100644 --- a/packages/translator-default/test/fixtures/at-tags/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags/snapshots/htmlProduction-expected.js @@ -2,20 +2,19 @@ import { t as _t } from "marko/dist/runtime/html/index.js"; const _marko_componentType = "hNiObgtw", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_hello, { - "foo": { + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("foo", { "renderBody": out => { out.w("Foo!"); - }, - [Symbol.iterator]: _marko_self_iterator - } - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/at-tags/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/at-tags/snapshots/vdom-expected.js index 0e304a43a..9c221c580 100644 --- a/packages/translator-default/test/fixtures/at-tags/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/at-tags/snapshots/vdom-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/src/runtime/vdom/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/at-tags/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; @@ -10,14 +10,13 @@ import { r as _marko_registerComponent } from "marko/src/runtime/components/regi _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_hello, { - "foo": { + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("foo", { "renderBody": out => { out.t("Foo!", _component); - }, - [Symbol.iterator]: _marko_self_iterator - } - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/at-tags/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/at-tags/snapshots/vdomProduction-expected.js index 8249be115..a5d083870 100644 --- a/packages/translator-default/test/fixtures/at-tags/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/at-tags/snapshots/vdomProduction-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/dist/runtime/vdom/index.js"; const _marko_componentType = "hNiObgtw", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; @@ -10,14 +10,13 @@ import { r as _marko_registerComponent } from "marko/dist/runtime/components/reg _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_hello, { - "foo": { + _marko_tag(_hello, _marko_render_input(() => { + _marko_repeatable_attr_tag("foo", { "renderBody": out => { out.t("Foo!", _component); - }, - [Symbol.iterator]: _marko_self_iterator - } - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/attr-class/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/attr-class/snapshots/cjs-expected.js index 80b3ea7f7..c34ebc3b6 100644 --- a/packages/translator-default/test/fixtures/attr-class/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/attr-class/snapshots/cjs-expected.js @@ -7,7 +7,7 @@ var _classValue = _interopRequireDefault(require("marko/src/runtime/helpers/clas var _attr = _interopRequireDefault(require("marko/src/runtime/html/helpers/attr.js")); var _customTag2 = _interopRequireDefault(require("./components/custom-tag.marko")); var _renderTag = _interopRequireDefault(require("marko/src/runtime/helpers/render-tag.js")); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _dynamicTag = _interopRequireDefault(require("marko/src/runtime/helpers/dynamic-tag.js")); var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer.js")); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -31,21 +31,21 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, (0, _renderTag.default)(_customTag2.default, { "class": ["a", false, "b"] }, out, _componentDef, "4"); - (0, _dynamicTag.default)(out, input.test, () => ({ - "class": ["a", { - b: c, - d - }], - "test": { + (0, _dynamicTag.default)(out, input.test, () => (0, _attrTag.i)(() => { + (0, _attrTag.a)("test", { "class": ["a", { b: c, d }], "renderBody": out => { out.w("Hello"); - }, - [Symbol.iterator]: _selfIterator.default - } + } + }); + }, { + "class": ["a", { + b: c, + d + }] }), null, null, null, _componentDef, "5"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-class/snapshots/html-expected.js b/packages/translator-default/test/fixtures/attr-class/snapshots/html-expected.js index cef78457f..6ebcf95f2 100644 --- a/packages/translator-default/test/fixtures/attr-class/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/attr-class/snapshots/html-expected.js @@ -6,7 +6,7 @@ import _marko_class_merge from "marko/src/runtime/helpers/class-value.js"; import _marko_attr from "marko/src/runtime/html/helpers/attr.js"; import _customTag from "./components/custom-tag.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; const _marko_component = {}; @@ -26,21 +26,21 @@ _marko_template._ = _marko_renderer(function (input, out, _componentDef, _compon _marko_tag(_customTag, { "class": ["a", false, "b"] }, out, _componentDef, "4"); - _marko_dynamic_tag(out, input.test, () => ({ - "class": ["a", { - b: c, - d - }], - "test": { + _marko_dynamic_tag(out, input.test, () => _marko_render_input(() => { + _marko_repeatable_attr_tag("test", { "class": ["a", { b: c, d }], "renderBody": out => { out.w("Hello"); - }, - [Symbol.iterator]: _marko_self_iterator - } + } + }); + }, { + "class": ["a", { + b: c, + d + }] }), null, null, null, _componentDef, "5"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-class/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/attr-class/snapshots/htmlProduction-expected.js index 7adf2db21..4c87f1f47 100644 --- a/packages/translator-default/test/fixtures/attr-class/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-class/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ import _marko_class_merge from "marko/dist/runtime/helpers/class-value.js"; import _marko_attr from "marko/dist/runtime/html/helpers/attr.js"; import _customTag from "./components/custom-tag.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _marko_dynamic_tag from "marko/dist/runtime/helpers/dynamic-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; const _marko_component = {}; @@ -24,21 +24,21 @@ _marko_template._ = _marko_renderer(function (input, out, _componentDef, _compon _marko_tag(_customTag, { "class": ["a", false, "b"] }, out, _componentDef, "4"); - _marko_dynamic_tag(out, input.test, () => ({ - "class": ["a", { - b: c, - d - }], - "test": { + _marko_dynamic_tag(out, input.test, () => _marko_render_input(() => { + _marko_repeatable_attr_tag("test", { "class": ["a", { b: c, d }], "renderBody": out => { out.w("Hello"); - }, - [Symbol.iterator]: _marko_self_iterator - } + } + }); + }, { + "class": ["a", { + b: c, + d + }] }), null, null, null, _componentDef, "5"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-class/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/attr-class/snapshots/vdom-expected.js index 61bf8b11f..da3fb075c 100644 --- a/packages/translator-default/test/fixtures/attr-class/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/attr-class/snapshots/vdom-expected.js @@ -5,7 +5,7 @@ export default _marko_template; import _marko_class_merge from "marko/src/runtime/helpers/class-value.js"; import _customTag from "./components/custom-tag.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; import { r as _marko_registerComponent } from "marko/src/runtime/components/registry.js"; @@ -33,21 +33,21 @@ _marko_template._ = _marko_renderer(function (input, out, _componentDef, _compon _marko_tag(_customTag, { "class": ["a", false, "b"] }, out, _componentDef, "4"); - _marko_dynamic_tag(out, input.test, () => ({ - "class": ["a", { - b: c, - d - }], - "test": { + _marko_dynamic_tag(out, input.test, () => _marko_render_input(() => { + _marko_repeatable_attr_tag("test", { "class": ["a", { b: c, d }], "renderBody": out => { out.t("Hello", _component); - }, - [Symbol.iterator]: _marko_self_iterator - } + } + }); + }, { + "class": ["a", { + b: c, + d + }] }), null, null, null, _componentDef, "5"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-class/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/attr-class/snapshots/vdomProduction-expected.js index fb47c5496..6577ba27c 100644 --- a/packages/translator-default/test/fixtures/attr-class/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-class/snapshots/vdomProduction-expected.js @@ -12,7 +12,7 @@ const _marko_node2 = _marko_constElement("div", { }, 0); import _customTag from "./components/custom-tag.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _marko_dynamic_tag from "marko/dist/runtime/helpers/dynamic-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; import { r as _marko_registerComponent } from "marko/dist/runtime/components/registry.js"; @@ -36,21 +36,21 @@ _marko_template._ = _marko_renderer(function (input, out, _componentDef, _compon _marko_tag(_customTag, { "class": ["a", false, "b"] }, out, _componentDef, "4"); - _marko_dynamic_tag(out, input.test, () => ({ - "class": ["a", { - b: c, - d - }], - "test": { + _marko_dynamic_tag(out, input.test, () => _marko_render_input(() => { + _marko_repeatable_attr_tag("test", { "class": ["a", { b: c, d }], "renderBody": out => { out.t("Hello", _component); - }, - [Symbol.iterator]: _marko_self_iterator - } + } + }); + }, { + "class": ["a", { + b: c, + d + }] }), null, null, null, _componentDef, "5"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-style/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/attr-style/snapshots/cjs-expected.js index 3c7d83091..d68711e6f 100644 --- a/packages/translator-default/test/fixtures/attr-style/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/attr-style/snapshots/cjs-expected.js @@ -7,7 +7,7 @@ var _styleValue = _interopRequireDefault(require("marko/src/runtime/helpers/styl var _attr = _interopRequireDefault(require("marko/src/runtime/html/helpers/attr.js")); var _customTag2 = _interopRequireDefault(require("./components/custom-tag.marko")); var _renderTag = _interopRequireDefault(require("marko/src/runtime/helpers/render-tag.js")); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _dynamicTag = _interopRequireDefault(require("marko/src/runtime/helpers/dynamic-tag.js")); var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer.js")); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -34,18 +34,18 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, (0, _renderTag.default)(_customTag2.default, { "style": "color: green" }, out, _componentDef, "5"); - (0, _dynamicTag.default)(out, input.test, () => ({ - "style": { - color: "green" - }, - "test": { + (0, _dynamicTag.default)(out, input.test, () => (0, _attrTag.i)(() => { + (0, _attrTag.a)("test", { "style": { color: "green" }, "renderBody": out => { out.w("Hello"); - }, - [Symbol.iterator]: _selfIterator.default + } + }); + }, { + "style": { + color: "green" } }), null, null, null, _componentDef, "6"); }, { diff --git a/packages/translator-default/test/fixtures/attr-style/snapshots/html-expected.js b/packages/translator-default/test/fixtures/attr-style/snapshots/html-expected.js index 802dd675e..3558a2ea3 100644 --- a/packages/translator-default/test/fixtures/attr-style/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/attr-style/snapshots/html-expected.js @@ -6,7 +6,7 @@ import _marko_style_merge from "marko/src/runtime/helpers/style-value.js"; import _marko_attr from "marko/src/runtime/html/helpers/attr.js"; import _customTag from "./components/custom-tag.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; const _marko_component = {}; @@ -29,18 +29,18 @@ _marko_template._ = _marko_renderer(function (input, out, _componentDef, _compon _marko_tag(_customTag, { "style": "color: green" }, out, _componentDef, "5"); - _marko_dynamic_tag(out, input.test, () => ({ - "style": { - color: "green" - }, - "test": { + _marko_dynamic_tag(out, input.test, () => _marko_render_input(() => { + _marko_repeatable_attr_tag("test", { "style": { color: "green" }, "renderBody": out => { out.w("Hello"); - }, - [Symbol.iterator]: _marko_self_iterator + } + }); + }, { + "style": { + color: "green" } }), null, null, null, _componentDef, "6"); }, { diff --git a/packages/translator-default/test/fixtures/attr-style/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/attr-style/snapshots/htmlProduction-expected.js index 58eb2f943..e8099206d 100644 --- a/packages/translator-default/test/fixtures/attr-style/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-style/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ import _marko_style_merge from "marko/dist/runtime/helpers/style-value.js"; import _marko_attr from "marko/dist/runtime/html/helpers/attr.js"; import _customTag from "./components/custom-tag.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _marko_dynamic_tag from "marko/dist/runtime/helpers/dynamic-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; const _marko_component = {}; @@ -27,18 +27,18 @@ _marko_template._ = _marko_renderer(function (input, out, _componentDef, _compon _marko_tag(_customTag, { "style": "color: green" }, out, _componentDef, "5"); - _marko_dynamic_tag(out, input.test, () => ({ - "style": { - color: "green" - }, - "test": { + _marko_dynamic_tag(out, input.test, () => _marko_render_input(() => { + _marko_repeatable_attr_tag("test", { "style": { color: "green" }, "renderBody": out => { out.w("Hello"); - }, - [Symbol.iterator]: _marko_self_iterator + } + }); + }, { + "style": { + color: "green" } }), null, null, null, _componentDef, "6"); }, { diff --git a/packages/translator-default/test/fixtures/attr-style/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/attr-style/snapshots/vdom-expected.js index d1f3dec18..303b168fa 100644 --- a/packages/translator-default/test/fixtures/attr-style/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/attr-style/snapshots/vdom-expected.js @@ -5,7 +5,7 @@ export default _marko_template; import _marko_style_merge from "marko/src/runtime/helpers/style-value.js"; import _customTag from "./components/custom-tag.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; import { r as _marko_registerComponent } from "marko/src/runtime/components/registry.js"; @@ -36,18 +36,18 @@ _marko_template._ = _marko_renderer(function (input, out, _componentDef, _compon _marko_tag(_customTag, { "style": "color: green" }, out, _componentDef, "5"); - _marko_dynamic_tag(out, input.test, () => ({ - "style": { - color: "green" - }, - "test": { + _marko_dynamic_tag(out, input.test, () => _marko_render_input(() => { + _marko_repeatable_attr_tag("test", { "style": { color: "green" }, "renderBody": out => { out.t("Hello", _component); - }, - [Symbol.iterator]: _marko_self_iterator + } + }); + }, { + "style": { + color: "green" } }), null, null, null, _componentDef, "6"); }, { diff --git a/packages/translator-default/test/fixtures/attr-style/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/attr-style/snapshots/vdomProduction-expected.js index 37fd30159..6df6e773b 100644 --- a/packages/translator-default/test/fixtures/attr-style/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-style/snapshots/vdomProduction-expected.js @@ -12,7 +12,7 @@ const _marko_node2 = _marko_constElement("div", { }, 0); import _customTag from "./components/custom-tag.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _marko_dynamic_tag from "marko/dist/runtime/helpers/dynamic-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; import { r as _marko_registerComponent } from "marko/dist/runtime/components/registry.js"; @@ -39,18 +39,18 @@ _marko_template._ = _marko_renderer(function (input, out, _componentDef, _compon _marko_tag(_customTag, { "style": "color: green" }, out, _componentDef, "5"); - _marko_dynamic_tag(out, input.test, () => ({ - "style": { - color: "green" - }, - "test": { + _marko_dynamic_tag(out, input.test, () => _marko_render_input(() => { + _marko_repeatable_attr_tag("test", { "style": { color: "green" }, "renderBody": out => { out.t("Hello", _component); - }, - [Symbol.iterator]: _marko_self_iterator + } + }); + }, { + "style": { + color: "green" } }), null, null, null, _componentDef, "6"); }, { diff --git a/packages/translator-default/test/fixtures/await-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/await-tag/snapshots/cjs-expected.js index 35be1390d..7b956da31 100644 --- a/packages/translator-default/test/fixtures/await-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/await-tag/snapshots/cjs-expected.js @@ -4,7 +4,7 @@ exports.__esModule = true; exports.default = void 0; var _index = require("marko/src/runtime/html/index.js"); var _escapeXml = require("marko/src/runtime/html/helpers/escape-xml.js"); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _renderer = _interopRequireDefault(require("marko/src/core-tags/core/await/renderer.js")); var _renderTag = _interopRequireDefault(require("marko/src/runtime/helpers/render-tag.js")); var _renderer2 = _interopRequireDefault(require("marko/src/runtime/components/renderer.js")); @@ -14,16 +14,16 @@ const _marko_componentType = "packages/translator-default/test/fixtures/await-ta var _default = exports.default = _marko_template; const _marko_component = {}; _marko_template._ = (0, _renderer2.default)(function (input, out, _componentDef, _component, state, $global) { - (0, _renderTag.default)(_renderer.default, { - "_provider": promise, - "_name": "promise", - "then": { + (0, _renderTag.default)(_renderer.default, (0, _attrTag.i)(() => { + (0, _attrTag.a)("then", { "renderBody": (out, result) => { out.w((0, _escapeXml.x)(result)); - }, - [Symbol.iterator]: _selfIterator.default - } - }, out, _componentDef, "0"); + } + }); + }, { + "_provider": promise, + "_name": "promise" + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/await-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/await-tag/snapshots/html-expected.js index 7a3c533d0..7aced4d7e 100644 --- a/packages/translator-default/test/fixtures/await-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/await-tag/snapshots/html-expected.js @@ -3,22 +3,22 @@ const _marko_componentType = "packages/translator-default/test/fixtures/await-ta _marko_template = _t(_marko_componentType); export default _marko_template; import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml.js"; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _await from "marko/src/core-tags/core/await/renderer.js"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_await, { - "_provider": promise, - "_name": "promise", - "then": { + _marko_tag(_await, _marko_render_input(() => { + _marko_repeatable_attr_tag("then", { "renderBody": (out, result) => { out.w(_marko_escapeXml(result)); - }, - [Symbol.iterator]: _marko_self_iterator - } - }, out, _componentDef, "0"); + } + }); + }, { + "_provider": promise, + "_name": "promise" + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/await-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/await-tag/snapshots/htmlProduction-expected.js index 4822aced8..b5f93a37c 100644 --- a/packages/translator-default/test/fixtures/await-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/await-tag/snapshots/htmlProduction-expected.js @@ -3,22 +3,22 @@ const _marko_componentType = "8BXCo81d", _marko_template = _t(_marko_componentType); export default _marko_template; import { x as _marko_escapeXml } from "marko/dist/runtime/html/helpers/escape-xml.js"; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _await from "marko/dist/core-tags/core/await/renderer.js"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_await, { - "_provider": promise, - "_name": "promise", - "then": { + _marko_tag(_await, _marko_render_input(() => { + _marko_repeatable_attr_tag("then", { "renderBody": (out, result) => { out.w(_marko_escapeXml(result)); - }, - [Symbol.iterator]: _marko_self_iterator - } - }, out, _componentDef, "0"); + } + }); + }, { + "_provider": promise, + "_name": "promise" + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/await-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/await-tag/snapshots/vdom-expected.js index b33f73e84..8bd49b678 100644 --- a/packages/translator-default/test/fixtures/await-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/await-tag/snapshots/vdom-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/src/runtime/vdom/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/await-tag/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _await from "marko/src/core-tags/core/await/renderer.js"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; @@ -10,16 +10,16 @@ import { r as _marko_registerComponent } from "marko/src/runtime/components/regi _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_await, { - "_provider": promise, - "_name": "promise", - "then": { + _marko_tag(_await, _marko_render_input(() => { + _marko_repeatable_attr_tag("then", { "renderBody": (out, result) => { out.t(result, _component); - }, - [Symbol.iterator]: _marko_self_iterator - } - }, out, _componentDef, "0"); + } + }); + }, { + "_provider": promise, + "_name": "promise" + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/await-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/await-tag/snapshots/vdomProduction-expected.js index 1a4c1bfeb..be510841e 100644 --- a/packages/translator-default/test/fixtures/await-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/await-tag/snapshots/vdomProduction-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/dist/runtime/vdom/index.js"; const _marko_componentType = "8BXCo81d", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _await from "marko/dist/core-tags/core/await/renderer.js"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; @@ -10,16 +10,16 @@ import { r as _marko_registerComponent } from "marko/dist/runtime/components/reg _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_await, { - "_provider": promise, - "_name": "promise", - "then": { + _marko_tag(_await, _marko_render_input(() => { + _marko_repeatable_attr_tag("then", { "renderBody": (out, result) => { out.t(result, _component); - }, - [Symbol.iterator]: _marko_self_iterator - } - }, out, _componentDef, "0"); + } + }); + }, { + "_provider": promise, + "_name": "promise" + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/cjs-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/cjs-error-expected.txt new file mode 100644 index 000000000..a402cb964 --- /dev/null +++ b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/cjs-error-expected.txt @@ -0,0 +1,8 @@ +CompileError: + at packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/template.marko:2:5 + 1 | <${stuff}> + > 2 | + | ^ Cannot mix @tags with other content when under a control flow. + 3 | <@header class="my-header"> + 4 | Header content + 5 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/generated-expected.marko b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/generated-expected.marko new file mode 100644 index 000000000..3f1942c1d --- /dev/null +++ b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/generated-expected.marko @@ -0,0 +1,8 @@ +<${stuff}> + + <@header class="my-header"> + Header content + + Body content + + \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/html-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/html-error-expected.txt new file mode 100644 index 000000000..a402cb964 --- /dev/null +++ b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/html-error-expected.txt @@ -0,0 +1,8 @@ +CompileError: + at packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/template.marko:2:5 + 1 | <${stuff}> + > 2 | + | ^ Cannot mix @tags with other content when under a control flow. + 3 | <@header class="my-header"> + 4 | Header content + 5 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/htmlProduction-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/htmlProduction-error-expected.txt new file mode 100644 index 000000000..a402cb964 --- /dev/null +++ b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/htmlProduction-error-expected.txt @@ -0,0 +1,8 @@ +CompileError: + at packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/template.marko:2:5 + 1 | <${stuff}> + > 2 | + | ^ Cannot mix @tags with other content when under a control flow. + 3 | <@header class="my-header"> + 4 | Header content + 5 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/hydrate-expected.js b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/hydrate-expected.js new file mode 100644 index 000000000..e69de29bb diff --git a/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/vdom-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/vdom-error-expected.txt new file mode 100644 index 000000000..a402cb964 --- /dev/null +++ b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/vdom-error-expected.txt @@ -0,0 +1,8 @@ +CompileError: + at packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/template.marko:2:5 + 1 | <${stuff}> + > 2 | + | ^ Cannot mix @tags with other content when under a control flow. + 3 | <@header class="my-header"> + 4 | Header content + 5 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/vdomProduction-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/vdomProduction-error-expected.txt new file mode 100644 index 000000000..a402cb964 --- /dev/null +++ b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/snapshots/vdomProduction-error-expected.txt @@ -0,0 +1,8 @@ +CompileError: + at packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/template.marko:2:5 + 1 | <${stuff}> + > 2 | + | ^ Cannot mix @tags with other content when under a control flow. + 3 | <@header class="my-header"> + 4 | Header content + 5 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/template.marko b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/template.marko new file mode 100644 index 000000000..1076efe68 --- /dev/null +++ b/packages/translator-default/test/fixtures/error-at-tags-control-flow-mixed/template.marko @@ -0,0 +1,9 @@ +<${stuff}> + + <@header class="my-header"> + Header content + + + Body content + + diff --git a/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/cjs-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/cjs-error-expected.txt index 45088d7aa..8f80f0c67 100644 --- a/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/cjs-error-expected.txt +++ b/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/cjs-error-expected.txt @@ -1,9 +1,9 @@ CompileError: - at packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/template.marko:9:6 - 7 | Body content - 8 | - > 9 | <@footer class="my-footer"> - | ^^^^^^^ @tags must be within a custom element. - 10 | Footer content - 11 | - 12 | \ No newline at end of file + at packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/template.marko:3:6 + 1 |
+ 2 | + > 3 | <@header class="my-header"> + | ^^^^^^^ @tags must be nested within another element. + 4 | Header content + 5 | + 6 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/html-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/html-error-expected.txt index 45088d7aa..8f80f0c67 100644 --- a/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/html-error-expected.txt +++ b/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/html-error-expected.txt @@ -1,9 +1,9 @@ CompileError: - at packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/template.marko:9:6 - 7 | Body content - 8 | - > 9 | <@footer class="my-footer"> - | ^^^^^^^ @tags must be within a custom element. - 10 | Footer content - 11 | - 12 |
\ No newline at end of file + at packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/template.marko:3:6 + 1 |
+ 2 | + > 3 | <@header class="my-header"> + | ^^^^^^^ @tags must be nested within another element. + 4 | Header content + 5 | + 6 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/htmlProduction-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/htmlProduction-error-expected.txt index 45088d7aa..8f80f0c67 100644 --- a/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/htmlProduction-error-expected.txt +++ b/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/htmlProduction-error-expected.txt @@ -1,9 +1,9 @@ CompileError: - at packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/template.marko:9:6 - 7 | Body content - 8 | - > 9 | <@footer class="my-footer"> - | ^^^^^^^ @tags must be within a custom element. - 10 | Footer content - 11 | - 12 |
\ No newline at end of file + at packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/template.marko:3:6 + 1 |
+ 2 | + > 3 | <@header class="my-header"> + | ^^^^^^^ @tags must be nested within another element. + 4 | Header content + 5 | + 6 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/vdom-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/vdom-error-expected.txt index 45088d7aa..8f80f0c67 100644 --- a/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/vdom-error-expected.txt +++ b/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/vdom-error-expected.txt @@ -1,9 +1,9 @@ CompileError: - at packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/template.marko:9:6 - 7 | Body content - 8 | - > 9 | <@footer class="my-footer"> - | ^^^^^^^ @tags must be within a custom element. - 10 | Footer content - 11 | - 12 |
\ No newline at end of file + at packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/template.marko:3:6 + 1 |
+ 2 | + > 3 | <@header class="my-header"> + | ^^^^^^^ @tags must be nested within another element. + 4 | Header content + 5 | + 6 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/vdomProduction-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/vdomProduction-error-expected.txt index 45088d7aa..8f80f0c67 100644 --- a/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/vdomProduction-error-expected.txt +++ b/packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/snapshots/vdomProduction-error-expected.txt @@ -1,9 +1,9 @@ CompileError: - at packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/template.marko:9:6 - 7 | Body content - 8 | - > 9 | <@footer class="my-footer"> - | ^^^^^^^ @tags must be within a custom element. - 10 | Footer content - 11 | - 12 |
\ No newline at end of file + at packages/translator-default/test/fixtures/error-at-tags-native-tag-parent/template.marko:3:6 + 1 |
+ 2 | + > 3 | <@header class="my-header"> + | ^^^^^^^ @tags must be nested within another element. + 4 | Header content + 5 | + 6 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/cjs-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/cjs-error-expected.txt deleted file mode 100644 index 49b3ce9e6..000000000 --- a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/cjs-error-expected.txt +++ /dev/null @@ -1,8 +0,0 @@ -packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/template.marko(5,6): Only one "@header" tag is allowed here. - 3 | Header content - 4 | -> 5 | <@header class="my-header"> - | ^^^^^^^ - 6 | Header content - 7 | - 8 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/cjs-expected.js index a547ad387..ae202542a 100644 --- a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/cjs-expected.js @@ -3,7 +3,7 @@ exports.__esModule = true; exports.default = void 0; var _index = require("marko/src/runtime/html/index.js"); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _index2 = _interopRequireDefault(require("./components/some-tag/index.marko")); var _renderTag = _interopRequireDefault(require("marko/src/runtime/helpers/render-tag.js")); var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer.js")); @@ -13,21 +13,20 @@ const _marko_componentType = "packages/translator-default/test/fixtures/error-at var _default = exports.default = _marko_template; const _marko_component = {}; _marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state, $global) { - (0, _renderTag.default)(_index2.default, { - "header": [{ + (0, _renderTag.default)(_index2.default, (0, _attrTag.i)(() => { + (0, _attrTag.a)("header", { "class": "my-header", "renderBody": out => { out.w("Header content"); - }, - [Symbol.iterator]: _selfIterator.default - }, { + } + }); + (0, _attrTag.a)("header", { "class": "my-header", "renderBody": out => { out.w("Header content"); - }, - [Symbol.iterator]: _selfIterator.default - }] - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/html-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/html-error-expected.txt deleted file mode 100644 index 49b3ce9e6..000000000 --- a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/html-error-expected.txt +++ /dev/null @@ -1,8 +0,0 @@ -packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/template.marko(5,6): Only one "@header" tag is allowed here. - 3 | Header content - 4 | -> 5 | <@header class="my-header"> - | ^^^^^^^ - 6 | Header content - 7 | - 8 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/html-expected.js b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/html-expected.js index 170e78325..802cca015 100644 --- a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/html-expected.js @@ -2,27 +2,26 @@ import { t as _t } from "marko/src/runtime/html/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _someTag from "./components/some-tag/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_someTag, { - "header": [{ + _marko_tag(_someTag, _marko_render_input(() => { + _marko_repeatable_attr_tag("header", { "class": "my-header", "renderBody": out => { out.w("Header content"); - }, - [Symbol.iterator]: _marko_self_iterator - }, { + } + }); + _marko_repeatable_attr_tag("header", { "class": "my-header", "renderBody": out => { out.w("Header content"); - }, - [Symbol.iterator]: _marko_self_iterator - }] - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/htmlProduction-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/htmlProduction-error-expected.txt deleted file mode 100644 index 49b3ce9e6..000000000 --- a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/htmlProduction-error-expected.txt +++ /dev/null @@ -1,8 +0,0 @@ -packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/template.marko(5,6): Only one "@header" tag is allowed here. - 3 | Header content - 4 | -> 5 | <@header class="my-header"> - | ^^^^^^^ - 6 | Header content - 7 | - 8 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/htmlProduction-expected.js index 2497293df..8ea3dba20 100644 --- a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/htmlProduction-expected.js @@ -2,27 +2,26 @@ import { t as _t } from "marko/dist/runtime/html/index.js"; const _marko_componentType = "QmMQupx3", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _someTag from "./components/some-tag/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_someTag, { - "header": [{ + _marko_tag(_someTag, _marko_render_input(() => { + _marko_repeatable_attr_tag("header", { "class": "my-header", "renderBody": out => { out.w("Header content"); - }, - [Symbol.iterator]: _marko_self_iterator - }, { + } + }); + _marko_repeatable_attr_tag("header", { "class": "my-header", "renderBody": out => { out.w("Header content"); - }, - [Symbol.iterator]: _marko_self_iterator - }] - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdom-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdom-error-expected.txt deleted file mode 100644 index 49b3ce9e6..000000000 --- a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdom-error-expected.txt +++ /dev/null @@ -1,8 +0,0 @@ -packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/template.marko(5,6): Only one "@header" tag is allowed here. - 3 | Header content - 4 | -> 5 | <@header class="my-header"> - | ^^^^^^^ - 6 | Header content - 7 | - 8 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdom-expected.js index 2764e26bb..db835cf72 100644 --- a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdom-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/src/runtime/vdom/index.js"; const _marko_componentType = "packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/template.marko", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import _someTag from "./components/some-tag/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer.js"; @@ -10,21 +10,20 @@ import { r as _marko_registerComponent } from "marko/src/runtime/components/regi _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_someTag, { - "header": [{ + _marko_tag(_someTag, _marko_render_input(() => { + _marko_repeatable_attr_tag("header", { "class": "my-header", "renderBody": out => { out.t("Header content", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }, { + } + }); + _marko_repeatable_attr_tag("header", { "class": "my-header", "renderBody": out => { out.t("Header content", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }] - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdomProduction-error-expected.txt b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdomProduction-error-expected.txt deleted file mode 100644 index 49b3ce9e6..000000000 --- a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdomProduction-error-expected.txt +++ /dev/null @@ -1,8 +0,0 @@ -packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/template.marko(5,6): Only one "@header" tag is allowed here. - 3 | Header content - 4 | -> 5 | <@header class="my-header"> - | ^^^^^^^ - 6 | Header content - 7 | - 8 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdomProduction-expected.js index 180102098..fd036b493 100644 --- a/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/error-at-tags-repeated-not-allowed/snapshots/vdomProduction-expected.js @@ -2,7 +2,7 @@ import { t as _t } from "marko/dist/runtime/vdom/index.js"; const _marko_componentType = "QmMQupx3", _marko_template = _t(_marko_componentType); export default _marko_template; -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; import _someTag from "./components/some-tag/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer.js"; @@ -10,21 +10,20 @@ import { r as _marko_registerComponent } from "marko/dist/runtime/components/reg _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component = {}; _marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state, $global) { - _marko_tag(_someTag, { - "header": [{ + _marko_tag(_someTag, _marko_render_input(() => { + _marko_repeatable_attr_tag("header", { "class": "my-header", "renderBody": out => { out.t("Header content", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }, { + } + }); + _marko_repeatable_attr_tag("header", { "class": "my-header", "renderBody": out => { out.t("Header content", _component); - }, - [Symbol.iterator]: _marko_self_iterator - }] - }, out, _componentDef, "0"); + } + }); + }), out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/cjs-error-expected.txt b/packages/translator-default/test/fixtures/error-class-with-name/snapshots/cjs-error-expected.txt deleted file mode 100644 index cc1d3f512..000000000 --- a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/cjs-error-expected.txt +++ /dev/null @@ -1,7 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-class-with-name/template.marko:1:7 - > 1 | class Test { - | ^^^^ Component class cannot have a name. - 2 | onCreate() { - 3 | - 4 | } \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/generated-error-expected.txt b/packages/translator-default/test/fixtures/error-class-with-name/snapshots/generated-error-expected.txt deleted file mode 100644 index cc1d3f512..000000000 --- a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/generated-error-expected.txt +++ /dev/null @@ -1,7 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-class-with-name/template.marko:1:7 - > 1 | class Test { - | ^^^^ Component class cannot have a name. - 2 | onCreate() { - 3 | - 4 | } \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/html-error-expected.txt b/packages/translator-default/test/fixtures/error-class-with-name/snapshots/html-error-expected.txt deleted file mode 100644 index cc1d3f512..000000000 --- a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/html-error-expected.txt +++ /dev/null @@ -1,7 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-class-with-name/template.marko:1:7 - > 1 | class Test { - | ^^^^ Component class cannot have a name. - 2 | onCreate() { - 3 | - 4 | } \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/htmlProduction-error-expected.txt b/packages/translator-default/test/fixtures/error-class-with-name/snapshots/htmlProduction-error-expected.txt deleted file mode 100644 index cc1d3f512..000000000 --- a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/htmlProduction-error-expected.txt +++ /dev/null @@ -1,7 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-class-with-name/template.marko:1:7 - > 1 | class Test { - | ^^^^ Component class cannot have a name. - 2 | onCreate() { - 3 | - 4 | } \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/hydrate-error-expected.txt b/packages/translator-default/test/fixtures/error-class-with-name/snapshots/hydrate-error-expected.txt deleted file mode 100644 index cc1d3f512..000000000 --- a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/hydrate-error-expected.txt +++ /dev/null @@ -1,7 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-class-with-name/template.marko:1:7 - > 1 | class Test { - | ^^^^ Component class cannot have a name. - 2 | onCreate() { - 3 | - 4 | } \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/vdom-error-expected.txt b/packages/translator-default/test/fixtures/error-class-with-name/snapshots/vdom-error-expected.txt deleted file mode 100644 index cc1d3f512..000000000 --- a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/vdom-error-expected.txt +++ /dev/null @@ -1,7 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-class-with-name/template.marko:1:7 - > 1 | class Test { - | ^^^^ Component class cannot have a name. - 2 | onCreate() { - 3 | - 4 | } \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/vdomProduction-error-expected.txt b/packages/translator-default/test/fixtures/error-class-with-name/snapshots/vdomProduction-error-expected.txt deleted file mode 100644 index cc1d3f512..000000000 --- a/packages/translator-default/test/fixtures/error-class-with-name/snapshots/vdomProduction-error-expected.txt +++ /dev/null @@ -1,7 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-class-with-name/template.marko:1:7 - > 1 | class Test { - | ^^^^ Component class cannot have a name. - 2 | onCreate() { - 3 | - 4 | } \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-macro-invalid-attributes/snapshots/generated-error-expected.txt b/packages/translator-default/test/fixtures/error-macro-invalid-attributes/snapshots/generated-error-expected.txt deleted file mode 100644 index d0edaf3a0..000000000 --- a/packages/translator-default/test/fixtures/error-macro-invalid-attributes/snapshots/generated-error-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-macro-invalid-attributes/template.marko:1:28 - > 1 | - | ^^^ The "macro" tag can only have a "name" attribute. - 2 |
- 3 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-macro-invalid-attributes/snapshots/hydrate-error-expected.txt b/packages/translator-default/test/fixtures/error-macro-invalid-attributes/snapshots/hydrate-error-expected.txt deleted file mode 100644 index d0edaf3a0..000000000 --- a/packages/translator-default/test/fixtures/error-macro-invalid-attributes/snapshots/hydrate-error-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-macro-invalid-attributes/template.marko:1:28 - > 1 | - | ^^^ The "macro" tag can only have a "name" attribute. - 2 |
- 3 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-macro-invalid-name-attribute/snapshots/generated-error-expected.txt b/packages/translator-default/test/fixtures/error-macro-invalid-name-attribute/snapshots/generated-error-expected.txt deleted file mode 100644 index f0e83a336..000000000 --- a/packages/translator-default/test/fixtures/error-macro-invalid-name-attribute/snapshots/generated-error-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-macro-invalid-name-attribute/template.marko:1:20 - > 1 | - | ^ The "name" attribute for "macro" tags must be a string literal. - 2 |
- 3 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-macro-invalid-name-attribute/snapshots/hydrate-error-expected.txt b/packages/translator-default/test/fixtures/error-macro-invalid-name-attribute/snapshots/hydrate-error-expected.txt deleted file mode 100644 index f0e83a336..000000000 --- a/packages/translator-default/test/fixtures/error-macro-invalid-name-attribute/snapshots/hydrate-error-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-macro-invalid-name-attribute/template.marko:1:20 - > 1 | - | ^ The "name" attribute for "macro" tags must be a string literal. - 2 |
- 3 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-macro-missing-name/snapshots/generated-error-expected.txt b/packages/translator-default/test/fixtures/error-macro-missing-name/snapshots/generated-error-expected.txt deleted file mode 100644 index be1e1e3c7..000000000 --- a/packages/translator-default/test/fixtures/error-macro-missing-name/snapshots/generated-error-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-macro-missing-name/template.marko:1:2 - > 1 | - | ^^^^^ The "name" attribute is required on "macro" tags. - 2 |
- 3 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-macro-missing-name/snapshots/hydrate-error-expected.txt b/packages/translator-default/test/fixtures/error-macro-missing-name/snapshots/hydrate-error-expected.txt deleted file mode 100644 index be1e1e3c7..000000000 --- a/packages/translator-default/test/fixtures/error-macro-missing-name/snapshots/hydrate-error-expected.txt +++ /dev/null @@ -1,6 +0,0 @@ -CompileError - at packages/translator-default/test/fixtures/error-macro-missing-name/template.marko:1:2 - > 1 | - | ^^^^^ The "name" attribute is required on "macro" tags. - 2 |
- 3 | \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-missing-entry-marko-tag-json/snapshots/generated-error-expected.txt b/packages/translator-default/test/fixtures/error-missing-entry-marko-tag-json/snapshots/generated-error-expected.txt deleted file mode 100644 index 7dc1fa1e2..000000000 --- a/packages/translator-default/test/fixtures/error-missing-entry-marko-tag-json/snapshots/generated-error-expected.txt +++ /dev/null @@ -1,3 +0,0 @@ -Invalid tag file: packages/translator-default/test/fixtures/error-missing-entry-marko-tag-json/components/some-tag/marko-tag.json. Neither a renderer or a template was found for tag. { - "@a": "string" -} \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/error-missing-entry-marko-tag-json/snapshots/hydrate-error-expected.txt b/packages/translator-default/test/fixtures/error-missing-entry-marko-tag-json/snapshots/hydrate-error-expected.txt deleted file mode 100644 index 7dc1fa1e2..000000000 --- a/packages/translator-default/test/fixtures/error-missing-entry-marko-tag-json/snapshots/hydrate-error-expected.txt +++ /dev/null @@ -1,3 +0,0 @@ -Invalid tag file: packages/translator-default/test/fixtures/error-missing-entry-marko-tag-json/components/some-tag/marko-tag.json. Neither a renderer or a template was found for tag. { - "@a": "string" -} \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/sanity-check/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/sanity-check/snapshots/cjs-expected.js index 2cb593722..24ef496d5 100644 --- a/packages/translator-default/test/fixtures/sanity-check/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/sanity-check/snapshots/cjs-expected.js @@ -11,7 +11,7 @@ var _classValue = _interopRequireDefault(require("marko/src/runtime/helpers/clas var _dynamicTag = _interopRequireDefault(require("marko/src/runtime/helpers/dynamic-tag.js")); var _index2 = _interopRequireDefault(require("./components/other/index.marko")); var _renderTag = _interopRequireDefault(require("marko/src/runtime/helpers/render-tag.js")); -var _selfIterator = _interopRequireDefault(require("marko/src/runtime/helpers/self-iterator.js")); +var _attrTag = require("marko/src/runtime/helpers/attr-tag.js"); var _escapeXml = require("marko/src/runtime/html/helpers/escape-xml.js"); var _mergeAttrs = _interopRequireDefault(require("marko/src/runtime/html/helpers/merge-attrs.js")); var _attrs = _interopRequireDefault(require("marko/src/runtime/html/helpers/attrs.js")); @@ -71,31 +71,31 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, out.w("
"); } }, out, _componentDef, "12", [["click", "handleClick", false, [_b.default, b, ...d]]]); - (0, _renderTag.default)(_index2.default, { + (0, _renderTag.default)(_index2.default, (0, _attrTag.i)(() => { + (0, _attrTag.a)("c", (0, _attrTag.i)(() => { + (0, _attrTag.a)("d", { + "d": 1, + "renderBody": out => { + out.w("
"); + } + }); + return out => { + out.w("
"); + }; + }, { + "c": 1 + })); + return out => { + out.w("
"); + }; + }, { "x": 1, ...thing, "b": { a: 1 }, - ...c, - "c": { - "c": 1, - "d": { - "d": 1, - "renderBody": out => { - out.w("
"); - }, - [Symbol.iterator]: _selfIterator.default - }, - "renderBody": out => { - out.w("
"); - }, - [Symbol.iterator]: _selfIterator.default - }, - "renderBody": (out, b) => { - out.w("
"); - } - }, out, _componentDef, "14"); + ...c + }), out, _componentDef, "14"); out.w(`
-
diff --git a/packages/translator-default/test/fixtures/sanity-check/snapshots/html-expected.js b/packages/translator-default/test/fixtures/sanity-check/snapshots/html-expected.js index c14e8b836..7f7fd7e02 100644 --- a/packages/translator-default/test/fixtures/sanity-check/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/sanity-check/snapshots/html-expected.js @@ -15,7 +15,7 @@ import _marko_class_merge from "marko/src/runtime/helpers/class-value.js"; import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag.js"; import _other from "./components/other/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag.js"; -import _marko_self_iterator from "marko/src/runtime/helpers/self-iterator.js"; +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/src/runtime/helpers/attr-tag.js"; import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml.js"; import _marko_merge_attrs from "marko/src/runtime/html/helpers/merge-attrs.js"; import _marko_attrs from "marko/src/runtime/html/helpers/attrs.js"; @@ -66,31 +66,31 @@ _marko_template._ = _marko_renderer(function (input, out, _componentDef, _compon out.w("
"); } }, out, _componentDef, "12", [["click", "handleClick", false, [a, b, ...d]]]); - _marko_tag(_other, { + _marko_tag(_other, _marko_render_input(() => { + _marko_repeatable_attr_tag("c", _marko_render_input(() => { + _marko_repeatable_attr_tag("d", { + "d": 1, + "renderBody": out => { + out.w("
"); + } + }); + return out => { + out.w("
"); + }; + }, { + "c": 1 + })); + return out => { + out.w("
"); + }; + }, { "x": 1, ...thing, "b": { a: 1 }, - ...c, - "c": { - "c": 1, - "d": { - "d": 1, - "renderBody": out => { - out.w("
"); - }, - [Symbol.iterator]: _marko_self_iterator - }, - "renderBody": out => { - out.w("
"); - }, - [Symbol.iterator]: _marko_self_iterator - }, - "renderBody": (out, b) => { - out.w("
"); - } - }, out, _componentDef, "14"); + ...c + }), out, _componentDef, "14"); out.w(`
"); } }, out, _componentDef, "12", [["click", "handleClick", false, [a, b, ...d]]]); - _marko_tag(_other, { + _marko_tag(_other, _marko_render_input(() => { + _marko_repeatable_attr_tag("c", _marko_render_input(() => { + _marko_repeatable_attr_tag("d", { + "d": 1, + "renderBody": out => { + out.w("
"); + } + }); + return out => { + out.w("
"); + }; + }, { + "c": 1 + })); + return out => { + out.w("
"); + }; + }, { "x": 1, ...thing, "b": { a: 1 }, - ...c, - "c": { - "c": 1, - "d": { - "d": 1, - "renderBody": out => { - out.w("
"); - }, - [Symbol.iterator]: _marko_self_iterator - }, - "renderBody": out => { - out.w("
"); - }, - [Symbol.iterator]: _marko_self_iterator - }, - "renderBody": (out, b) => { - out.w("
"); - } - }, out, _componentDef, "14"); + ...c + }), out, _componentDef, "14"); out.w(` { + _marko_repeatable_attr_tag("c", _marko_render_input(() => { + _marko_repeatable_attr_tag("d", { + "d": 1, + "renderBody": out => { + out.e("div", null, "15", _component, 0, 0); + } + }); + return out => { + out.e("div", null, "16", _component, 0, 0); + }; + }, { + "c": 1 + })); + return out => { + out.e("div", null, "17", _component, 0, 0); + }; + }, { "x": 1, ...thing, "b": { a: 1 }, - ...c, - "c": { - "c": 1, - "d": { - "d": 1, - "renderBody": out => { - out.e("div", null, "17", _component, 0, 0); - }, - [Symbol.iterator]: _marko_self_iterator - }, - "renderBody": out => { - out.e("div", null, "16", _component, 0, 0); - }, - [Symbol.iterator]: _marko_self_iterator - }, - "renderBody": (out, b) => { - out.e("div", null, "15", _component, 0, 0); - } - }, out, _componentDef, "14"); + ...c + }), out, _componentDef, "14"); out.be("div", _marko_merge_attrs({ "class": "b c", "a": "{\"a\":1}", diff --git a/packages/translator-default/test/fixtures/sanity-check/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/sanity-check/snapshots/vdomProduction-expected.js index 213d04620..a57a1a526 100644 --- a/packages/translator-default/test/fixtures/sanity-check/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/sanity-check/snapshots/vdomProduction-expected.js @@ -19,9 +19,9 @@ const _marko_node3 = _marko_constElement("div", null, 0); import _other from "./components/other/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag.js"; const _marko_node4 = _marko_constElement("div", null, 0); +import { a as _marko_repeatable_attr_tag, i as _marko_render_input } from "marko/dist/runtime/helpers/attr-tag.js"; const _marko_node5 = _marko_constElement("div", null, 0); const _marko_node6 = _marko_constElement("div", null, 0); -import _marko_self_iterator from "marko/dist/runtime/helpers/self-iterator.js"; const _marko_node7 = _marko_constElement("div", { "c": "1" }, 0); @@ -100,31 +100,31 @@ _marko_template._ = _marko_renderer(function (input, out, _componentDef, _compon out.n(_marko_node3, _component); } }, out, _componentDef, "12", [["click", "handleClick", false, [a, b, ...d]]]); - _marko_tag(_other, { + _marko_tag(_other, _marko_render_input(() => { + _marko_repeatable_attr_tag("c", _marko_render_input(() => { + _marko_repeatable_attr_tag("d", { + "d": 1, + "renderBody": out => { + out.n(_marko_node4, _component); + } + }); + return out => { + out.n(_marko_node5, _component); + }; + }, { + "c": 1 + })); + return out => { + out.n(_marko_node6, _component); + }; + }, { "x": 1, ...thing, "b": { a: 1 }, - ...c, - "c": { - "c": 1, - "d": { - "d": 1, - "renderBody": out => { - out.n(_marko_node6, _component); - }, - [Symbol.iterator]: _marko_self_iterator - }, - "renderBody": out => { - out.n(_marko_node5, _component); - }, - [Symbol.iterator]: _marko_self_iterator - }, - "renderBody": (out, b) => { - out.n(_marko_node4, _component); - } - }, out, _componentDef, "14"); + ...c + }), out, _componentDef, "14"); out.be("div", _marko_merge_attrs({ "class": "b c", "a": "{\"a\":1}", diff --git a/packages/translator-default/test/fixtures/sanity-check/template.marko b/packages/translator-default/test/fixtures/sanity-check/template.marko index f185c01ff..da74c2bb5 100644 --- a/packages/translator-default/test/fixtures/sanity-check/template.marko +++ b/packages/translator-default/test/fixtures/sanity-check/template.marko @@ -61,7 +61,7 @@ $ let c = thing;
- +
<@c c=1>