From a36cfd1bbbc213ea7889b5f59aec61e94cc5598c Mon Sep 17 00:00:00 2001 From: Dylan Piercey Date: Thu, 10 Jun 2021 09:00:52 -0700 Subject: [PATCH] fix(translator-default): issue with user defined component var --- .../expected.js | 2 +- .../compileFileForBrowser.js/expected.js | 2 +- .../compileForBrowser-callback.js/expected.js | 2 +- .../fixtures/compileForBrowser.js/expected.js | 2 +- .../redefine-component-var/index.marko | 7 ++ .../fixtures/redefine-component-var/test.js | 6 ++ packages/translator-default/src/index.js | 11 ++- .../src/placeholder/index[vdom].js | 3 +- .../src/tag/native-tag[html]/index.js | 2 +- .../src/tag/native-tag[vdom]/index.js | 7 +- .../src/text/index[vdom].js | 2 +- .../src/util/optimize-vdom-create.js | 2 +- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 6 +- .../snapshots/vdomProduction-expected.js | 6 +- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 10 +- .../snapshots/vdomProduction-expected.js | 10 +- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 6 +- .../snapshots/vdomProduction-expected.js | 6 +- .../at-tags-dynamic/snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 16 ++-- .../snapshots/vdomProduction-expected.js | 16 ++-- .../at-tags/snapshots/cjs-expected.js | 4 +- .../at-tags/snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../at-tags/snapshots/vdom-expected.js | 6 +- .../snapshots/vdomProduction-expected.js | 6 +- .../attr-boolean/snapshots/cjs-expected.js | 2 +- .../attr-boolean/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../attr-boolean/snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../attr-class/snapshots/cjs-expected.js | 8 +- .../attr-class/snapshots/html-expected.js | 8 +- .../snapshots/htmlProduction-expected.js | 8 +- .../attr-class/snapshots/vdom-expected.js | 16 ++-- .../snapshots/vdomProduction-expected.js | 16 ++-- .../attr-escape/snapshots/cjs-expected.js | 2 +- .../attr-escape/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../attr-escape/snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../attr-falsey/snapshots/cjs-expected.js | 2 +- .../attr-falsey/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../attr-falsey/snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../attr-scoped/snapshots/cjs-expected.js | 4 +- .../attr-scoped/snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../attr-scoped/snapshots/vdom-expected.js | 8 +- .../snapshots/vdomProduction-expected.js | 8 +- .../attr-style/snapshots/cjs-expected.js | 10 +- .../attr-style/snapshots/html-expected.js | 10 +- .../snapshots/htmlProduction-expected.js | 10 +- .../attr-style/snapshots/vdom-expected.js | 18 ++-- .../snapshots/vdomProduction-expected.js | 18 ++-- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../await-tag/snapshots/cjs-expected.js | 4 +- .../await-tag/snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../await-tag/snapshots/vdom-expected.js | 6 +- .../snapshots/vdomProduction-expected.js | 6 +- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../fixtures/cdata/snapshots/cjs-expected.js | 2 +- .../fixtures/cdata/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../fixtures/cdata/snapshots/vdom-expected.js | 8 +- .../snapshots/vdomProduction-expected.js | 8 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../class-inline/snapshots/cjs-expected.js | 2 +- .../class-inline/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../class-inline/snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../comments/snapshots/cjs-expected.js | 2 +- .../comments/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../comments/snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../custom-tag-data/snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 16 ++-- .../snapshots/vdomProduction-expected.js | 16 ++-- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 6 +- .../snapshots/vdomProduction-expected.js | 6 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../custom-tag/snapshots/cjs-expected.js | 4 +- .../custom-tag/snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../custom-tag/snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 8 +- .../snapshots/vdomProduction-expected.js | 8 +- .../data-migration/snapshots/cjs-expected.js | 4 +- .../data-migration/snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../data-migration/snapshots/vdom-expected.js | 24 ++--- .../snapshots/vdomProduction-expected.js | 24 ++--- .../declaration/snapshots/cjs-expected.js | 2 +- .../declaration/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../declaration/snapshots/vdom-expected.js | 8 +- .../snapshots/vdomProduction-expected.js | 4 +- .../doctype/snapshots/cjs-expected.js | 8 +- .../doctype/snapshots/html-expected.js | 8 +- .../snapshots/htmlProduction-expected.js | 8 +- .../doctype/snapshots/vdom-expected.js | 14 +-- .../snapshots/vdomProduction-expected.js | 10 +- .../snapshots/cjs-expected.js | 26 ++--- .../snapshots/html-expected.js | 26 ++--- .../snapshots/htmlProduction-expected.js | 26 ++--- .../snapshots/vdom-expected.js | 38 ++++---- .../snapshots/vdomProduction-expected.js | 38 ++++---- .../entities/snapshots/cjs-expected.js | 2 +- .../entities/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../entities/snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 6 +- .../snapshots/vdomProduction-expected.js | 6 +- .../event-handlers/snapshots/cjs-expected.js | 20 ++-- .../event-handlers/snapshots/html-expected.js | 20 ++-- .../snapshots/htmlProduction-expected.js | 20 ++-- .../event-handlers/snapshots/vdom-expected.js | 20 ++-- .../snapshots/vdomProduction-expected.js | 20 ++-- .../for-tag/snapshots/cjs-expected.js | 24 ++--- .../for-tag/snapshots/html-expected.js | 24 ++--- .../snapshots/htmlProduction-expected.js | 14 +-- .../for-tag/snapshots/vdom-expected.js | 94 +++++++++---------- .../snapshots/vdomProduction-expected.js | 94 +++++++++---------- .../hello-dynamic/snapshots/cjs-expected.js | 2 +- .../hello-dynamic/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../hello-dynamic/snapshots/vdom-expected.js | 16 ++-- .../snapshots/vdomProduction-expected.js | 16 ++-- .../html-comment/snapshots/cjs-expected.js | 2 +- .../html-comment/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../html-comment/snapshots/vdom-expected.js | 2 +- .../snapshots/vdomProduction-expected.js | 2 +- .../html-entity/snapshots/cjs-expected.js | 2 +- .../html-entity/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../html-entity/snapshots/vdom-expected.js | 6 +- .../snapshots/vdomProduction-expected.js | 4 +- .../fixtures/if-tag/snapshots/cjs-expected.js | 2 +- .../if-tag/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../if-tag/snapshots/vdom-expected.js | 14 +-- .../snapshots/vdomProduction-expected.js | 14 +-- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 2 +- .../snapshots/vdomProduction-expected.js | 2 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 2 +- .../snapshots/vdomProduction-expected.js | 2 +- .../import-tag/snapshots/cjs-expected.js | 2 +- .../import-tag/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../import-tag/snapshots/vdom-expected.js | 2 +- .../snapshots/vdomProduction-expected.js | 2 +- .../macro-non-root/snapshots/cjs-expected.js | 2 +- .../macro-non-root/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../macro-non-root/snapshots/vdom-expected.js | 6 +- .../snapshots/vdomProduction-expected.js | 6 +- .../fixtures/macros/snapshots/cjs-expected.js | 6 +- .../macros/snapshots/html-expected.js | 6 +- .../snapshots/htmlProduction-expected.js | 6 +- .../macros/snapshots/vdom-expected.js | 16 ++-- .../snapshots/vdomProduction-expected.js | 16 ++-- .../snapshots/cjs-expected.js | 60 ++++++------ .../snapshots/html-expected.js | 60 ++++++------ .../snapshots/htmlProduction-expected.js | 60 ++++++------ .../snapshots/vdom-expected.js | 82 ++++++++-------- .../snapshots/vdomProduction-expected.js | 82 ++++++++-------- .../snapshots/cjs-expected.js | 6 +- .../snapshots/html-expected.js | 6 +- .../snapshots/htmlProduction-expected.js | 6 +- .../snapshots/vdom-expected.js | 8 +- .../snapshots/vdomProduction-expected.js | 8 +- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../placeholders/snapshots/cjs-expected.js | 2 +- .../placeholders/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../placeholders/snapshots/vdom-expected.js | 28 +++--- .../snapshots/vdomProduction-expected.js | 16 ++-- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../root-migration/snapshots/cjs-expected.js | 2 +- .../root-migration/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../root-migration/snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../root-transform/snapshots/cjs-expected.js | 2 +- .../root-transform/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../root-transform/snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../sanity-check/snapshots/cjs-expected.js | 12 +-- .../sanity-check/snapshots/html-expected.js | 12 +-- .../snapshots/htmlProduction-expected.js | 12 +-- .../sanity-check/snapshots/vdom-expected.js | 86 ++++++++--------- .../snapshots/vdomProduction-expected.js | 84 ++++++++--------- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 8 +- .../snapshots/vdomProduction-expected.js | 8 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 22 ++--- .../snapshots/vdomProduction-expected.js | 22 ++--- .../shorthand-id/snapshots/cjs-expected.js | 2 +- .../shorthand-id/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../shorthand-id/snapshots/vdom-expected.js | 8 +- .../snapshots/vdomProduction-expected.js | 8 +- .../snapshots/cjs-expected.js | 4 +- .../snapshots/html-expected.js | 4 +- .../snapshots/htmlProduction-expected.js | 4 +- .../snapshots/vdom-expected.js | 12 +-- .../snapshots/vdomProduction-expected.js | 12 +-- .../fixtures/simple/snapshots/cjs-expected.js | 2 +- .../simple/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../simple/snapshots/vdom-expected.js | 18 ++-- .../snapshots/vdomProduction-expected.js | 16 ++-- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../split-component/snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../static-tag/snapshots/cjs-expected.js | 2 +- .../static-tag/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../static-tag/snapshots/vdom-expected.js | 2 +- .../snapshots/vdomProduction-expected.js | 2 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../svg-tag/snapshots/cjs-expected.js | 2 +- .../svg-tag/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../svg-tag/snapshots/vdom-expected.js | 28 +++--- .../snapshots/vdomProduction-expected.js | 20 ++-- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 6 +- .../snapshots/vdomProduction-expected.js | 6 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 8 +- .../snapshots/vdomProduction-expected.js | 8 +- .../textarea-tag/snapshots/cjs-expected.js | 2 +- .../textarea-tag/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../textarea-tag/snapshots/vdom-expected.js | 6 +- .../snapshots/vdomProduction-expected.js | 4 +- .../top-level-text/snapshots/cjs-expected.js | 2 +- .../top-level-text/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../top-level-text/snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../while-tag/snapshots/cjs-expected.js | 2 +- .../while-tag/snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../while-tag/snapshots/vdom-expected.js | 4 +- .../snapshots/vdomProduction-expected.js | 4 +- .../snapshots/cjs-expected.js | 2 +- .../snapshots/html-expected.js | 2 +- .../snapshots/htmlProduction-expected.js | 2 +- .../snapshots/vdom-expected.js | 42 ++++----- .../snapshots/vdomProduction-expected.js | 18 ++-- 387 files changed, 1414 insertions(+), 1390 deletions(-) create mode 100644 packages/marko/test/components-browser/fixtures/redefine-component-var/index.marko create mode 100644 packages/marko/test/components-browser/fixtures/redefine-component-var/test.js diff --git a/packages/marko/test/api-compiler/fixtures/compileFileForBrowser-callback.js/expected.js b/packages/marko/test/api-compiler/fixtures/compileFileForBrowser-callback.js/expected.js index b7f8c48849..14637d3734 100644 --- a/packages/marko/test/api-compiler/fixtures/compileFileForBrowser-callback.js/expected.js +++ b/packages/marko/test/api-compiler/fixtures/compileFileForBrowser-callback.js/expected.js @@ -1 +1 @@ -"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _vdom = require("marko/src/runtime/vdom");var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer"));var _registry = require("marko/src/runtime/components/registry");var _defineComponent = _interopRequireDefault(require("marko/src/runtime/components/defineComponent"));const _marko_componentType = "packages/marko/test/api-compiler/fixtures/compileFileForBrowser-callback.js/template.marko",_marko_template = (0, _vdom.t)(_marko_componentType);var _default = _marko_template;exports.default = _default;(0, _registry.r)(_marko_componentType, () => _marko_template);const _marko_component = {};_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) {out.t("Hello ", component);out.t(input.name, component);out.t("!", component);}, { t: _marko_componentType, i: true, d: true }, _marko_component);_marko_template.Component = (0, _defineComponent.default)(_marko_component, _marko_template._); \ No newline at end of file +"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _vdom = require("marko/src/runtime/vdom");var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer"));var _registry = require("marko/src/runtime/components/registry");var _defineComponent = _interopRequireDefault(require("marko/src/runtime/components/defineComponent"));const _marko_componentType = "packages/marko/test/api-compiler/fixtures/compileFileForBrowser-callback.js/template.marko",_marko_template = (0, _vdom.t)(_marko_componentType);var _default = _marko_template;exports.default = _default;(0, _registry.r)(_marko_componentType, () => _marko_template);const _marko_component = {};_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) {out.t("Hello ", _component);out.t(input.name, _component);out.t("!", _component);}, { t: _marko_componentType, i: true, d: true }, _marko_component);_marko_template.Component = (0, _defineComponent.default)(_marko_component, _marko_template._); \ No newline at end of file diff --git a/packages/marko/test/api-compiler/fixtures/compileFileForBrowser.js/expected.js b/packages/marko/test/api-compiler/fixtures/compileFileForBrowser.js/expected.js index 6955c83b91..fb9c772a6c 100644 --- a/packages/marko/test/api-compiler/fixtures/compileFileForBrowser.js/expected.js +++ b/packages/marko/test/api-compiler/fixtures/compileFileForBrowser.js/expected.js @@ -1 +1 @@ -"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _vdom = require("marko/src/runtime/vdom");var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer"));var _registry = require("marko/src/runtime/components/registry");var _defineComponent = _interopRequireDefault(require("marko/src/runtime/components/defineComponent"));const _marko_componentType = "packages/marko/test/api-compiler/fixtures/compileFileForBrowser.js/template.marko",_marko_template = (0, _vdom.t)(_marko_componentType);var _default = _marko_template;exports.default = _default;(0, _registry.r)(_marko_componentType, () => _marko_template);const _marko_component = {};_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) {out.t("Hello ", component);out.t(input.name, component);out.t("!", component);}, { t: _marko_componentType, i: true, d: true }, _marko_component);_marko_template.Component = (0, _defineComponent.default)(_marko_component, _marko_template._); \ No newline at end of file +"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _vdom = require("marko/src/runtime/vdom");var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer"));var _registry = require("marko/src/runtime/components/registry");var _defineComponent = _interopRequireDefault(require("marko/src/runtime/components/defineComponent"));const _marko_componentType = "packages/marko/test/api-compiler/fixtures/compileFileForBrowser.js/template.marko",_marko_template = (0, _vdom.t)(_marko_componentType);var _default = _marko_template;exports.default = _default;(0, _registry.r)(_marko_componentType, () => _marko_template);const _marko_component = {};_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) {out.t("Hello ", _component);out.t(input.name, _component);out.t("!", _component);}, { t: _marko_componentType, i: true, d: true }, _marko_component);_marko_template.Component = (0, _defineComponent.default)(_marko_component, _marko_template._); \ No newline at end of file diff --git a/packages/marko/test/api-compiler/fixtures/compileForBrowser-callback.js/expected.js b/packages/marko/test/api-compiler/fixtures/compileForBrowser-callback.js/expected.js index 142283626c..ec08bfe801 100644 --- a/packages/marko/test/api-compiler/fixtures/compileForBrowser-callback.js/expected.js +++ b/packages/marko/test/api-compiler/fixtures/compileForBrowser-callback.js/expected.js @@ -1 +1 @@ -"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _vdom = require("marko/src/runtime/vdom");var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer"));var _registry = require("marko/src/runtime/components/registry");var _defineComponent = _interopRequireDefault(require("marko/src/runtime/components/defineComponent"));const _marko_componentType = "packages/marko/test/api-compiler/fixtures/compileForBrowser-callback.js/template.marko",_marko_template = (0, _vdom.t)(_marko_componentType);var _default = _marko_template;exports.default = _default;(0, _registry.r)(_marko_componentType, () => _marko_template);const _marko_component = {};_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) {out.t("Hello ", component);out.t(input.name, component);out.t("!", component);}, { t: _marko_componentType, i: true, d: true }, _marko_component);_marko_template.Component = (0, _defineComponent.default)(_marko_component, _marko_template._); \ No newline at end of file +"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _vdom = require("marko/src/runtime/vdom");var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer"));var _registry = require("marko/src/runtime/components/registry");var _defineComponent = _interopRequireDefault(require("marko/src/runtime/components/defineComponent"));const _marko_componentType = "packages/marko/test/api-compiler/fixtures/compileForBrowser-callback.js/template.marko",_marko_template = (0, _vdom.t)(_marko_componentType);var _default = _marko_template;exports.default = _default;(0, _registry.r)(_marko_componentType, () => _marko_template);const _marko_component = {};_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) {out.t("Hello ", _component);out.t(input.name, _component);out.t("!", _component);}, { t: _marko_componentType, i: true, d: true }, _marko_component);_marko_template.Component = (0, _defineComponent.default)(_marko_component, _marko_template._); \ No newline at end of file diff --git a/packages/marko/test/api-compiler/fixtures/compileForBrowser.js/expected.js b/packages/marko/test/api-compiler/fixtures/compileForBrowser.js/expected.js index ad10b41eff..6b7c42a2be 100644 --- a/packages/marko/test/api-compiler/fixtures/compileForBrowser.js/expected.js +++ b/packages/marko/test/api-compiler/fixtures/compileForBrowser.js/expected.js @@ -1 +1 @@ -"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _vdom = require("marko/src/runtime/vdom");var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer"));var _registry = require("marko/src/runtime/components/registry");var _defineComponent = _interopRequireDefault(require("marko/src/runtime/components/defineComponent"));const _marko_componentType = "packages/marko/test/api-compiler/fixtures/compileForBrowser.js/template.marko",_marko_template = (0, _vdom.t)(_marko_componentType);var _default = _marko_template;exports.default = _default;(0, _registry.r)(_marko_componentType, () => _marko_template);const _marko_component = {};_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) {out.t("Hello ", component);out.t(input.name, component);out.t("!", component);}, { t: _marko_componentType, i: true, d: true }, _marko_component);_marko_template.Component = (0, _defineComponent.default)(_marko_component, _marko_template._); \ No newline at end of file +"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _vdom = require("marko/src/runtime/vdom");var _renderer = _interopRequireDefault(require("marko/src/runtime/components/renderer"));var _registry = require("marko/src/runtime/components/registry");var _defineComponent = _interopRequireDefault(require("marko/src/runtime/components/defineComponent"));const _marko_componentType = "packages/marko/test/api-compiler/fixtures/compileForBrowser.js/template.marko",_marko_template = (0, _vdom.t)(_marko_componentType);var _default = _marko_template;exports.default = _default;(0, _registry.r)(_marko_componentType, () => _marko_template);const _marko_component = {};_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) {out.t("Hello ", _component);out.t(input.name, _component);out.t("!", _component);}, { t: _marko_componentType, i: true, d: true }, _marko_component);_marko_template.Component = (0, _defineComponent.default)(_marko_component, _marko_template._); \ No newline at end of file diff --git a/packages/marko/test/components-browser/fixtures/redefine-component-var/index.marko b/packages/marko/test/components-browser/fixtures/redefine-component-var/index.marko new file mode 100644 index 0000000000..f7b71ba394 --- /dev/null +++ b/packages/marko/test/components-browser/fixtures/redefine-component-var/index.marko @@ -0,0 +1,7 @@ +class {} + +$ const component = "World"; + +
+ Hello ${component} +
diff --git a/packages/marko/test/components-browser/fixtures/redefine-component-var/test.js b/packages/marko/test/components-browser/fixtures/redefine-component-var/test.js new file mode 100644 index 0000000000..79be826611 --- /dev/null +++ b/packages/marko/test/components-browser/fixtures/redefine-component-var/test.js @@ -0,0 +1,6 @@ +var expect = require("chai").expect; + +module.exports = function (helpers) { + var component = helpers.mount(require.resolve("./index"), {}); + expect(component.getEl("root")).to.exist; +}; diff --git a/packages/translator-default/src/index.js b/packages/translator-default/src/index.js index 96d6ed732f..83322574f5 100644 --- a/packages/translator-default/src/index.js +++ b/packages/translator-default/src/index.js @@ -166,6 +166,11 @@ export const translate = { MarkoScriptlet, MarkoClass, MarkoComment, + ReferencedIdentifier(path) { + if (path.node.name === "component" && !path.scope.hasBinding("component")) { + path.replaceWith(path.hub.file._componentInstanceIdentifier); + } + }, Program: { enter(path) { const { @@ -190,6 +195,10 @@ export const translate = { } file._componentDefIdentifier = path.scope.generateUidIdentifier( + "componentDef" + ); + + file._componentInstanceIdentifier = path.scope.generateUidIdentifier( "component" ); @@ -365,7 +374,7 @@ export const translate = { t.identifier("input"), t.identifier("out"), file._componentDefIdentifier, - t.identifier("component"), + file._componentInstanceIdentifier, t.identifier("state") ], renderBlock.node diff --git a/packages/translator-default/src/placeholder/index[vdom].js b/packages/translator-default/src/placeholder/index[vdom].js index 66361bf876..8e7a68e141 100644 --- a/packages/translator-default/src/placeholder/index[vdom].js +++ b/packages/translator-default/src/placeholder/index[vdom].js @@ -1,4 +1,3 @@ -import { types as t } from "@marko/compiler"; import write from "../util/vdom-out-write"; import withPreviousLocation from "../util/with-previous-location"; @@ -13,7 +12,7 @@ export default function (path) { } else { path.replaceWith( withPreviousLocation( - write(method, value, t.identifier("component")), + write(method, value, path.hub.file._componentInstanceIdentifier), node ) ); diff --git a/packages/translator-default/src/tag/native-tag[html]/index.js b/packages/translator-default/src/tag/native-tag[html]/index.js index bb0276571a..f241eff27c 100644 --- a/packages/translator-default/src/tag/native-tag[html]/index.js +++ b/packages/translator-default/src/tag/native-tag[html]/index.js @@ -152,7 +152,7 @@ export default function (path, isNullable) { t.memberExpression(t.identifier("out"), t.identifier("bf")), [ normalizeTemplateString`f_${key}`, - t.identifier("component"), + file._componentInstanceIdentifier, t.numericLiteral(1) ] ) diff --git a/packages/translator-default/src/tag/native-tag[vdom]/index.js b/packages/translator-default/src/tag/native-tag[vdom]/index.js index 839c88a504..d5c2ddb29e 100644 --- a/packages/translator-default/src/tag/native-tag[vdom]/index.js +++ b/packages/translator-default/src/tag/native-tag[vdom]/index.js @@ -67,7 +67,7 @@ export function tagArguments(path, isStatic) { name, attrsObj, !key && isStatic ? t.nullLiteral() : key, - isStatic ? t.nullLiteral() : t.identifier("component"), + isStatic ? t.nullLiteral() : file._componentInstanceIdentifier, isStatic ? t.numericLiteral(body.length) : body.length @@ -173,7 +173,10 @@ export default function (path, isNullable) { t.expressionStatement( t.callExpression( t.memberExpression(t.identifier("out"), t.identifier("bf")), - [normalizeTemplateString`f_${key}`, t.identifier("component")] + [ + normalizeTemplateString`f_${key}`, + path.hub.file._componentInstanceIdentifier + ] ) ) ); diff --git a/packages/translator-default/src/text/index[vdom].js b/packages/translator-default/src/text/index[vdom].js index 043ea659bb..92af03a247 100644 --- a/packages/translator-default/src/text/index[vdom].js +++ b/packages/translator-default/src/text/index[vdom].js @@ -11,7 +11,7 @@ export default function (path) { write( "t", t.stringLiteral(decode(node.value)), - t.identifier("component") + path.hub.file._componentInstanceIdentifier ), node ) diff --git a/packages/translator-default/src/util/optimize-vdom-create.js b/packages/translator-default/src/util/optimize-vdom-create.js index 9d82f41814..08b6f6a74b 100644 --- a/packages/translator-default/src/util/optimize-vdom-create.js +++ b/packages/translator-default/src/util/optimize-vdom-create.js @@ -133,7 +133,7 @@ export function optimizeStaticVDOM(path) { t.variableDeclarator(identifier, state.currentRoot) ]); file.path.node.body.push(d); - path.replaceWith(write("n", identifier, t.identifier("component"))); + path.replaceWith(write("n", identifier, file._componentInstanceIdentifier)); path.skip(); } 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 7cb6c8f3a5..1ca6eaeabb 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 @@ -19,7 +19,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tag-i var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { let _thing = null; if (x) { @@ -33,7 +33,7 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com (0, _renderTag.default)(_index.default, { "thing": _thing - }, out, _component, "0"); + }, 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 03dc9752d5..b3fb8663e1 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 @@ -8,7 +8,7 @@ import _customTag from "./components/custom-tag/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let _thing = null; if (x) { @@ -22,7 +22,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_customTag, { "thing": _thing - }, out, _component, "0"); + }, 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 6774d18f2f..2a44db1dcb 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 @@ -8,7 +8,7 @@ import _customTag from "./components/custom-tag/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let _thing = null; if (x) { @@ -22,7 +22,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_customTag, { "thing": _thing - }, out, _component, "0"); + }, 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 41a7163c13..205ca5e8e3 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 @@ -12,21 +12,21 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let _thing = null; if (x) { _thing = { "x": 1, "renderBody": out => { - out.t("Hello", component); + out.t("Hello", _component); } }; } _marko_tag(_customTag, { "thing": _thing - }, out, _component, "0"); + }, 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 5df5ffecd8..45433220ac 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 @@ -12,21 +12,21 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let _thing = null; if (x) { _thing = { "x": 1, "renderBody": out => { - out.t("Hello", component); + out.t("Hello", _component); } }; } _marko_tag(_customTag, { "thing": _thing - }, out, _component, "0"); + }, 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 f4952cccb2..35f030c191 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 @@ -19,7 +19,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags- var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { const _items = []; for (const a in b) { @@ -31,7 +31,7 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com (0, _renderTag.default)(_index.default, { "items": _items, "other": {} - }, out, _component, "0"); + }, 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 7a19d7335d..57ed97d3d4 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 @@ -8,7 +8,7 @@ import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { const _items = []; for (const a in b) { @@ -20,7 +20,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_hello, { "items": _items, "other": {} - }, out, _component, "0"); + }, 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 24c1750400..b0626b78f0 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 @@ -8,7 +8,7 @@ import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { const _items = []; for (const a in b) { @@ -20,7 +20,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_hello, { "items": _items, "other": {} - }, out, _component, "0"); + }, 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 eb9ce7ad8d..7884552b41 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 @@ -12,7 +12,7 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { const _items = []; for (const a in b) { @@ -24,7 +24,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_hello, { "items": _items, "other": {} - }, out, _component, "0"); + }, 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 c73d0739d5..4449036f00 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 @@ -12,7 +12,7 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { const _items = []; for (const a in b) { @@ -24,7 +24,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_hello, { "items": _items, "other": {} - }, out, _component, "0"); + }, 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 358be8d37b..9375681079 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 @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags- var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { (0, _dynamicTag.default)(out, input.x, () => ({ "header": { "class": "my-header", @@ -33,7 +33,7 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com } }), out => { out.w("Body content"); - }, null, null, _component, "0"); + }, 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 d7a2a2014a..3259d2f477 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 @@ -7,7 +7,7 @@ export default _marko_template; import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_dynamic_tag(out, input.x, () => ({ "header": { "class": "my-header", @@ -23,7 +23,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, } }), out => { out.w("Body content"); - }, null, null, _component, "0"); + }, 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 6f1a427027..a5f38f0ac3 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 @@ -7,7 +7,7 @@ export default _marko_template; import _marko_dynamic_tag from "marko/dist/runtime/helpers/dynamic-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_dynamic_tag(out, input.x, () => ({ "header": { "class": "my-header", @@ -23,7 +23,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, } }), out => { out.w("Body content"); - }, null, null, _component, "0"); + }, 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 e2fe667ad8..5ff932428b 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 @@ -11,23 +11,23 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_dynamic_tag(out, input.x, () => ({ "header": { "class": "my-header", "renderBody": out => { - out.t("Header content", component); + out.t("Header content", _component); } }, "footer": { "class": "my-footer", "renderBody": out => { - out.t("Footer content", component); + out.t("Footer content", _component); } } }), out => { - out.t("Body content", component); - }, null, null, _component, "0"); + out.t("Body content", _component); + }, 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 74b5328d4c..31478b9ad4 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 @@ -11,23 +11,23 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_dynamic_tag(out, input.x, () => ({ "header": { "class": "my-header", "renderBody": out => { - out.t("Header content", component); + out.t("Header content", _component); } }, "footer": { "class": "my-footer", "renderBody": out => { - out.t("Footer content", component); + out.t("Footer content", _component); } } }), out => { - out.t("Body content", component); - }, null, null, _component, "0"); + out.t("Body content", _component); + }, 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 cfa80e7643..eecab73575 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 @@ -21,7 +21,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags- var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { let _item = null; if (input.x) { @@ -34,7 +34,7 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com (0, _renderTag.default)(_index.default, { "item": _item - }, out, _component, "0"); + }, 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 213c166485..680f54cd15 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 @@ -9,7 +9,7 @@ import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let _item = null; if (input.x) { @@ -22,7 +22,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_hello, { "item": _item - }, out, _component, "0"); + }, 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 ce9d8af0b5..777f8e3b7a 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 @@ -9,7 +9,7 @@ import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let _item = null; if (input.x) { @@ -22,7 +22,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_hello, { "item": _item - }, out, _component, "0"); + }, 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 39ac8718fc..63d7a83dc8 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 @@ -12,20 +12,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let _item = null; if (input.x) { _item = { "renderBody": (out, y) => { - out.t(y, component); + out.t(y, _component); } }; } _marko_tag(_hello, { "item": _item - }, out, _component, "0"); + }, 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 7962e82149..e74e654bec 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 @@ -12,20 +12,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let _item = null; if (input.x) { _item = { "renderBody": (out, y) => { - out.t(y, component); + out.t(y, _component); } }; } _marko_tag(_hello, { "item": _item - }, out, _component, "0"); + }, 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 d9057f5b74..7d72ebffe2 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 @@ -21,7 +21,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags- var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { const _cols = []; const _items = []; let _keyValue = 0; @@ -115,7 +115,7 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com "items": _items }, "cols": _cols - }, out, _component, "0"); + }, 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 9dfe875fd9..01889d66c8 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 @@ -9,7 +9,7 @@ import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { const _cols = []; const _items = []; let _keyValue = 0; @@ -103,7 +103,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "items": _items }, "cols": _cols - }, out, _component, "0"); + }, 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 388f5c8898..853c2d9fae 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 @@ -9,7 +9,7 @@ import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { const _cols = []; const _items = []; let _keyValue = 0; @@ -103,7 +103,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "items": _items }, "cols": _cols - }, out, _component, "0"); + }, 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 c2885f581d..5307749031 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 @@ -12,7 +12,7 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { const _cols = []; const _items = []; let _keyValue = 0; @@ -26,7 +26,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, color }, "renderBody": out => { - out.t("foo", component); + out.t("foo", _component); } }); } else if (y) { @@ -35,7 +35,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, color }, "renderBody": out => { - out.t("bar", component); + out.t("bar", _component); } }); } else { @@ -44,7 +44,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, color }, "renderBody": out => { - out.t("baz", component); + out.t("baz", _component); } }); } @@ -58,7 +58,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _items.push({ "renderBody": out => { - out.t(i, component); + out.t(i, _component); } }); } @@ -76,7 +76,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _rows.push({ "row": row, "renderBody": out => { - out.t(row, component); + out.t(row, _component); } }); } @@ -92,7 +92,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _rows2.push({ "row": -1, "renderBody": out => { - out.t("Outside", component); + out.t("Outside", _component); } }); @@ -106,7 +106,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "items": _items }, "cols": _cols - }, out, _component, "0"); + }, 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 080db2c8c6..6bd0ad7f26 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 @@ -12,7 +12,7 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { const _cols = []; const _items = []; let _keyValue = 0; @@ -26,7 +26,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, color }, "renderBody": out => { - out.t("foo", component); + out.t("foo", _component); } }); } else if (y) { @@ -35,7 +35,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, color }, "renderBody": out => { - out.t("bar", component); + out.t("bar", _component); } }); } else { @@ -44,7 +44,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, color }, "renderBody": out => { - out.t("baz", component); + out.t("baz", _component); } }); } @@ -58,7 +58,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _items.push({ "renderBody": out => { - out.t(i, component); + out.t(i, _component); } }); } @@ -76,7 +76,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _rows.push({ "row": row, "renderBody": out => { - out.t(row, component); + out.t(row, _component); } }); } @@ -92,7 +92,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _rows2.push({ "row": -1, "renderBody": out => { - out.t("Outside", component); + out.t("Outside", _component); } }); @@ -106,7 +106,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "items": _items }, "cols": _cols - }, out, _component, "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 a9e910bb53..e79dfb39ca 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 @@ -19,14 +19,14 @@ const _marko_componentType = "packages/translator-default/test/fixtures/at-tags/ var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { (0, _renderTag.default)(_index.default, { "foo": { "renderBody": out => { out.w("Foo!"); } } - }, out, _component, "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 dfe80bbf76..14a6338a7c 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 @@ -8,14 +8,14 @@ import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_hello, { "foo": { "renderBody": out => { out.w("Foo!"); } } - }, out, _component, "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 a3effe71e7..37c5d05317 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 @@ -8,14 +8,14 @@ import _hello from "./components/hello/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_hello, { "foo": { "renderBody": out => { out.w("Foo!"); } } - }, out, _component, "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 01dc382acf..767e3d606e 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 @@ -12,14 +12,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_hello, { "foo": { "renderBody": out => { - out.t("Foo!", component); + out.t("Foo!", _component); } } - }, out, _component, "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 5ebb586f2b..a79cb8e3ce 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 @@ -12,14 +12,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_hello, { "foo": { "renderBody": out => { - out.t("Foo!", component); + out.t("Foo!", _component); } } - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/attr-boolean/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/attr-boolean/snapshots/cjs-expected.js index 49bd89badb..617d485eb7 100644 --- a/packages/translator-default/test/fixtures/attr-boolean/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/attr-boolean/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/attr-boo var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(""); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-boolean/snapshots/html-expected.js b/packages/translator-default/test/fixtures/attr-boolean/snapshots/html-expected.js index 055749579c..07592cfc04 100644 --- a/packages/translator-default/test/fixtures/attr-boolean/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/attr-boolean/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/attr-boo export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-boolean/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/attr-boolean/snapshots/htmlProduction-expected.js index f9335d44a8..7f8847b1d9 100644 --- a/packages/translator-default/test/fixtures/attr-boolean/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-boolean/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "CtqnD7TI", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-boolean/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/attr-boolean/snapshots/vdom-expected.js index 8abe8fba13..7579097624 100644 --- a/packages/translator-default/test/fixtures/attr-boolean/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/attr-boolean/snapshots/vdom-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("input", { "checked": "" - }, "0", component, 0, 0); + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/attr-boolean/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/attr-boolean/snapshots/vdomProduction-expected.js index 442eea39d0..c035ff73d1 100644 --- a/packages/translator-default/test/fixtures/attr-boolean/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-boolean/snapshots/vdomProduction-expected.js @@ -16,8 +16,8 @@ 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, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { 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 581a208b16..f3760375d1 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 @@ -25,7 +25,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/attr-cla var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(` ({ "class": ["a", { b: c, @@ -55,7 +55,7 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com out.w("Hello"); } } - }), null, null, null, _component, "5"); + }), null, null, null, _componentDef, "5"); }, { t: _marko_componentType, i: true, 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 c58e797193..641eb5178c 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 @@ -11,7 +11,7 @@ import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(` ({ "class": ["a", { @@ -44,7 +44,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, out.w("Hello"); } } - }), null, null, null, _component, "5"); + }), null, null, null, _componentDef, "5"); }, { t: _marko_componentType, i: true, 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 e065b8fff0..4b4e4391f4 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 @@ -11,7 +11,7 @@ import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_dynamic_tag from "marko/dist/runtime/helpers/dynamic-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(` ({ "class": ["a", { @@ -42,7 +42,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, out.w("Hello"); } } - }), null, null, null, _component, "5"); + }), null, null, null, _componentDef, "5"); }, { t: _marko_componentType, i: true 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 0a869b8f06..36818f649f 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 @@ -14,30 +14,30 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "class": _marko_class_merge(["a", { b: c, d }]) - }, "0", component, 0, 1); + }, "0", _component, 0, 1); out.e("div", { "class": "a b" - }, "1", component, 0, 1); + }, "1", _component, 0, 1); out.e("div", { "class": "a b c" - }, "2", component, 0, 1); + }, "2", _component, 0, 1); _marko_tag(_customTag, { "class": ["a", { b: c, d }] - }, out, _component, "3"); + }, out, _componentDef, "3"); _marko_tag(_customTag, { "class": ["a", false, "b"] - }, out, _component, "4"); + }, out, _componentDef, "4"); _marko_dynamic_tag(out, input.test, () => ({ "class": ["a", { @@ -50,10 +50,10 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, d }], "renderBody": out => { - out.t("Hello", component); + out.t("Hello", _component); } } - }), null, null, null, _component, "5"); + }), null, null, null, _componentDef, "5"); }, { t: _marko_componentType, i: true, 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 f8f3e79348..41072f5c3d 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 @@ -14,30 +14,30 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "class": _marko_class_merge(["a", { b: c, d }]) - }, "0", component, 0, 1); + }, "0", _component, 0, 1); out.e("div", { "class": "a b" - }, "1", component, 0, 1); + }, "1", _component, 0, 1); out.e("div", { "class": "a b c" - }, "2", component, 0, 1); + }, "2", _component, 0, 1); _marko_tag(_customTag, { "class": ["a", { b: c, d }] - }, out, _component, "3"); + }, out, _componentDef, "3"); _marko_tag(_customTag, { "class": ["a", false, "b"] - }, out, _component, "4"); + }, out, _componentDef, "4"); _marko_dynamic_tag(out, input.test, () => ({ "class": ["a", { @@ -50,10 +50,10 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, d }], "renderBody": out => { - out.t("Hello", component); + out.t("Hello", _component); } } - }), null, null, null, _component, "5"); + }), null, null, null, _componentDef, "5"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/attr-escape/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/attr-escape/snapshots/cjs-expected.js index 95b96ceb7b..cdb29b5cd7 100644 --- a/packages/translator-default/test/fixtures/attr-escape/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/attr-escape/snapshots/cjs-expected.js @@ -19,7 +19,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/attr-esc var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(``); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-escape/snapshots/html-expected.js b/packages/translator-default/test/fixtures/attr-escape/snapshots/html-expected.js index cee44de0b0..a8e1d7a5e9 100644 --- a/packages/translator-default/test/fixtures/attr-escape/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/attr-escape/snapshots/html-expected.js @@ -8,7 +8,7 @@ import _marko_class_merge from "marko/src/runtime/helpers/class-value"; import _marko_attr from "marko/src/runtime/html/helpers/attr"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(``); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-escape/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/attr-escape/snapshots/htmlProduction-expected.js index bb31211bea..3c13c396e5 100644 --- a/packages/translator-default/test/fixtures/attr-escape/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-escape/snapshots/htmlProduction-expected.js @@ -8,7 +8,7 @@ import _marko_class_merge from "marko/dist/runtime/helpers/class-value"; import _marko_attr from "marko/dist/runtime/html/helpers/attr"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(``); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-escape/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/attr-escape/snapshots/vdom-expected.js index a07a845342..52b05c3dd3 100644 --- a/packages/translator-default/test/fixtures/attr-escape/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/attr-escape/snapshots/vdom-expected.js @@ -11,12 +11,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "class": _marko_class_merge(input.className), "foo": 'a' + input.foo + 'b', "bar": `a ${input.foo} b` - }, "0", component, 0, 0); + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/attr-escape/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/attr-escape/snapshots/vdomProduction-expected.js index 6f198f39e6..e6d351e49a 100644 --- a/packages/translator-default/test/fixtures/attr-escape/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-escape/snapshots/vdomProduction-expected.js @@ -11,12 +11,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "class": _marko_class_merge(input.className), "foo": 'a' + input.foo + 'b', "bar": `a ${input.foo} b` - }, "0", component, 0, 0); + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/attr-falsey/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/attr-falsey/snapshots/cjs-expected.js index 975d228b2c..d7bdbf7d12 100644 --- a/packages/translator-default/test/fixtures/attr-falsey/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/attr-falsey/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/attr-fal var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-falsey/snapshots/html-expected.js b/packages/translator-default/test/fixtures/attr-falsey/snapshots/html-expected.js index ae699872ae..d34f17977a 100644 --- a/packages/translator-default/test/fixtures/attr-falsey/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/attr-falsey/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/attr-fal export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-falsey/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/attr-falsey/snapshots/htmlProduction-expected.js index 33dcc56e0a..20fcfd08ad 100644 --- a/packages/translator-default/test/fixtures/attr-falsey/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-falsey/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "9WNpCPpT", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-falsey/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/attr-falsey/snapshots/vdom-expected.js index b5eb8c593e..f1d1bc87bf 100644 --- a/packages/translator-default/test/fixtures/attr-falsey/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/attr-falsey/snapshots/vdom-expected.js @@ -10,11 +10,11 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "d": "0", "y": "1" - }, "0", component, 0, 0); + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/attr-falsey/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/attr-falsey/snapshots/vdomProduction-expected.js index 11065f3d74..41c9d163f3 100644 --- a/packages/translator-default/test/fixtures/attr-falsey/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-falsey/snapshots/vdomProduction-expected.js @@ -17,8 +17,8 @@ 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, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/attr-scoped/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/attr-scoped/snapshots/cjs-expected.js index 5e522d6030..b6fef2dbd0 100644 --- a/packages/translator-default/test/fixtures/attr-scoped/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/attr-scoped/snapshots/cjs-expected.js @@ -17,8 +17,8 @@ const _marko_componentType = "packages/translator-default/test/fixtures/attr-sco var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { - out.w(``); +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { + out.w(``); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/attr-scoped/snapshots/html-expected.js b/packages/translator-default/test/fixtures/attr-scoped/snapshots/html-expected.js index a3ccc57ddb..8037ef0660 100644 --- a/packages/translator-default/test/fixtures/attr-scoped/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/attr-scoped/snapshots/html-expected.js @@ -7,8 +7,8 @@ export default _marko_template; import _marko_attr from "marko/src/runtime/html/helpers/attr"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.w(``); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.w(``); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/attr-scoped/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/attr-scoped/snapshots/htmlProduction-expected.js index a87ab52e8a..f3d072cac7 100644 --- a/packages/translator-default/test/fixtures/attr-scoped/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-scoped/snapshots/htmlProduction-expected.js @@ -7,8 +7,8 @@ export default _marko_template; import _marko_attr from "marko/dist/runtime/html/helpers/attr"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.w(``); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.w(``); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/attr-scoped/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/attr-scoped/snapshots/vdom-expected.js index 985ad39e3b..88328835a5 100644 --- a/packages/translator-default/test/fixtures/attr-scoped/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/attr-scoped/snapshots/vdom-expected.js @@ -10,11 +10,11 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { - "id": _component.elId("1"), - "aria-described-by": _component.elId("b") - }, "0", component, 0, 0); + "id": _componentDef.elId("1"), + "aria-described-by": _componentDef.elId("b") + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/attr-scoped/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/attr-scoped/snapshots/vdomProduction-expected.js index 758556c934..b5b8e80ca0 100644 --- a/packages/translator-default/test/fixtures/attr-scoped/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-scoped/snapshots/vdomProduction-expected.js @@ -10,11 +10,11 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { - "id": _component.elId("1"), - "aria-described-by": _component.elId("b") - }, "0", component, 0, 0); + "id": _componentDef.elId("1"), + "aria-described-by": _componentDef.elId("b") + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true 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 a3343b9673..9edd8e3ee1 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 @@ -25,7 +25,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/attr-sty var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(``); @@ -35,15 +35,15 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com "style": { color: input.color } - }, out, _component, "3"); + }, out, _componentDef, "3"); (0, _renderTag.default)(_customTag2.default, { "style": { width: 100 } - }, out, _component, "4"); + }, out, _componentDef, "4"); (0, _renderTag.default)(_customTag2.default, { "style": "color: green" - }, out, _component, "5"); + }, out, _componentDef, "5"); (0, _dynamicTag.default)(out, input.test, () => ({ "style": { color: "green" @@ -56,7 +56,7 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com out.w("Hello"); } } - }), null, null, null, _component, "6"); + }), null, null, null, _componentDef, "6"); }, { t: _marko_componentType, i: true, 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 94ec551c27..651ebf394c 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 @@ -11,7 +11,7 @@ import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(``); @@ -22,17 +22,17 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "style": { color: input.color } - }, out, _component, "3"); + }, out, _componentDef, "3"); _marko_tag(_customTag, { "style": { width: 100 } - }, out, _component, "4"); + }, out, _componentDef, "4"); _marko_tag(_customTag, { "style": "color: green" - }, out, _component, "5"); + }, out, _componentDef, "5"); _marko_dynamic_tag(out, input.test, () => ({ "style": { @@ -46,7 +46,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, out.w("Hello"); } } - }), null, null, null, _component, "6"); + }), null, null, null, _componentDef, "6"); }, { t: _marko_componentType, i: true, 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 b4cb70877a..8e6e1a42de 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 @@ -11,7 +11,7 @@ import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_dynamic_tag from "marko/dist/runtime/helpers/dynamic-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(`
`); @@ -20,17 +20,17 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "style": { color: input.color } - }, out, _component, "3"); + }, out, _componentDef, "3"); _marko_tag(_customTag, { "style": { width: 100 } - }, out, _component, "4"); + }, out, _componentDef, "4"); _marko_tag(_customTag, { "style": "color: green" - }, out, _component, "5"); + }, out, _componentDef, "5"); _marko_dynamic_tag(out, input.test, () => ({ "style": { @@ -44,7 +44,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, out.w("Hello"); } } - }), null, null, null, _component, "6"); + }), null, null, null, _componentDef, "6"); }, { t: _marko_componentType, i: true 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 2a243589fa..f17f0d8b5a 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 @@ -14,34 +14,34 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "style": _marko_style_merge({ color: input.color }) - }, "0", component, 0, 1); + }, "0", _component, 0, 1); out.e("div", { "style": "width:100px;" - }, "1", component, 0, 1); + }, "1", _component, 0, 1); out.e("div", { "style": "color: green" - }, "2", component, 0, 1); + }, "2", _component, 0, 1); _marko_tag(_customTag, { "style": { color: input.color } - }, out, _component, "3"); + }, out, _componentDef, "3"); _marko_tag(_customTag, { "style": { width: 100 } - }, out, _component, "4"); + }, out, _componentDef, "4"); _marko_tag(_customTag, { "style": "color: green" - }, out, _component, "5"); + }, out, _componentDef, "5"); _marko_dynamic_tag(out, input.test, () => ({ "style": { @@ -52,10 +52,10 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, color: "green" }, "renderBody": out => { - out.t("Hello", component); + out.t("Hello", _component); } } - }), null, null, null, _component, "6"); + }), null, null, null, _componentDef, "6"); }, { t: _marko_componentType, i: true, 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 2e66b44549..25efd02e73 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 @@ -14,34 +14,34 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "style": _marko_style_merge({ color: input.color }) - }, "0", component, 0, 1); + }, "0", _component, 0, 1); out.e("div", { "style": "width:100px;" - }, "1", component, 0, 1); + }, "1", _component, 0, 1); out.e("div", { "style": "color: green" - }, "2", component, 0, 1); + }, "2", _component, 0, 1); _marko_tag(_customTag, { "style": { color: input.color } - }, out, _component, "3"); + }, out, _componentDef, "3"); _marko_tag(_customTag, { "style": { width: 100 } - }, out, _component, "4"); + }, out, _componentDef, "4"); _marko_tag(_customTag, { "style": "color: green" - }, out, _component, "5"); + }, out, _componentDef, "5"); _marko_dynamic_tag(out, input.test, () => ({ "style": { @@ -52,10 +52,10 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, color: "green" }, "renderBody": out => { - out.t("Hello", component); + out.t("Hello", _component); } } - }), null, null, null, _component, "6"); + }), null, null, null, _componentDef, "6"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/cjs-expected.js index 0e37822be8..7ba435b95b 100644 --- a/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/attr-tem var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(``); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/html-expected.js b/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/html-expected.js index 5447e3080f..25254bd7a4 100644 --- a/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_attr from "marko/src/runtime/html/helpers/attr"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(``); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/htmlProduction-expected.js index 029ecd9a09..b30e05d700 100644 --- a/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_attr from "marko/dist/runtime/html/helpers/attr"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(``); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/vdom-expected.js index 55bda9aa82..943bc7822e 100644 --- a/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/vdom-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "foo": `Hello ${input.name}` - }, "0", component, 0, 0); + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/vdomProduction-expected.js index 587ae1bcfe..62616b520d 100644 --- a/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/attr-template-literal-escape/snapshots/vdomProduction-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "foo": `Hello ${input.name}` - }, "0", component, 0, 0); + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true 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 9d3e59bfd6..eeb9078e15 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 @@ -21,7 +21,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/await-ta var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer2.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer2.default)(function (input, out, _componentDef, _component, state) { (0, _renderTag.default)(_renderer.default, { "_provider": promise, "_name": "promise", @@ -30,7 +30,7 @@ _marko_template._ = (0, _renderer2.default)(function (input, out, _component, co out.w((0, _escapeXml.x)(result)); } } - }, out, _component, "0"); + }, 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 6fcec16aac..28f937d8fe 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 @@ -9,7 +9,7 @@ import _await from "marko/src/core-tags/core/await/renderer.js"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_await, { "_provider": promise, "_name": "promise", @@ -18,7 +18,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, out.w(_marko_escapeXml(result)); } } - }, out, _component, "0"); + }, 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 bc8c0eb497..b11b7e86f8 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 @@ -9,7 +9,7 @@ import _await from "marko/dist/core-tags/core/await/renderer.js"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_await, { "_provider": promise, "_name": "promise", @@ -18,7 +18,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, out.w(_marko_escapeXml(result)); } } - }, out, _component, "0"); + }, 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 41f91be4b9..72679ff4ee 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 @@ -12,16 +12,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_await, { "_provider": promise, "_name": "promise", "then": { "renderBody": (out, result) => { - out.t(result, component); + out.t(result, _component); } } - }, out, _component, "0"); + }, 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 e6e0ed8b3b..481c645c07 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 @@ -12,16 +12,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_await, { "_provider": promise, "_name": "promise", "then": { "renderBody": (out, result) => { - out.t(result, component); + out.t(result, _component); } } - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/cjs-expected.js index 300417bd68..8741a80e98 100644 --- a/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/cjs-expected.js @@ -19,7 +19,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/camel-ca var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { (0, _renderTag.default)(_index.default, { "dataAttrA": true, "data-attr-b": true, @@ -28,7 +28,7 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com "dataAttrE": true, "preserve-attr-a": true, "notPreserveAttrA": true - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/html-expected.js b/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/html-expected.js index 4b2b5b61fb..ae044d190b 100644 --- a/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/html-expected.js @@ -8,7 +8,7 @@ import _customTag from "./components/custom-tag/index.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_customTag, { "dataAttrA": true, "data-attr-b": true, @@ -17,7 +17,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "dataAttrE": true, "preserve-attr-a": true, "notPreserveAttrA": true - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/htmlProduction-expected.js index 757daad10c..cc1170f7b5 100644 --- a/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/htmlProduction-expected.js @@ -8,7 +8,7 @@ import _customTag from "./components/custom-tag/index.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_customTag, { "dataAttrA": true, "data-attr-b": true, @@ -17,7 +17,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "dataAttrE": true, "preserve-attr-a": true, "notPreserveAttrA": true - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/vdom-expected.js index b22731c154..6cd1eeb12f 100644 --- a/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/vdom-expected.js @@ -12,7 +12,7 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_customTag, { "dataAttrA": true, "data-attr-b": true, @@ -21,7 +21,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "dataAttrE": true, "preserve-attr-a": true, "notPreserveAttrA": true - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/vdomProduction-expected.js index f89af8c666..3198b95996 100644 --- a/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/camel-case-attr-name-override/snapshots/vdomProduction-expected.js @@ -12,7 +12,7 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_customTag, { "dataAttrA": true, "data-attr-b": true, @@ -21,7 +21,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "dataAttrE": true, "preserve-attr-a": true, "notPreserveAttrA": true - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/cdata/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/cdata/snapshots/cjs-expected.js index 7f075d8dfb..38d8fdfe64 100644 --- a/packages/translator-default/test/fixtures/cdata/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/cdata/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/cdata/te var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
"); out.w("Here is a CDATA section: "); out.w(" & ]]>"); diff --git a/packages/translator-default/test/fixtures/cdata/snapshots/html-expected.js b/packages/translator-default/test/fixtures/cdata/snapshots/html-expected.js index 5a4a820400..b2d7195c31 100644 --- a/packages/translator-default/test/fixtures/cdata/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/cdata/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/cdata/te export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); out.w("Here is a CDATA section: "); out.w(" & ]]>"); diff --git a/packages/translator-default/test/fixtures/cdata/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/cdata/snapshots/htmlProduction-expected.js index 3679eb8ec1..1a60a65f62 100644 --- a/packages/translator-default/test/fixtures/cdata/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/cdata/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "EazLsc5m", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
Here is a CDATA section: & ]]> with all kinds of unescaped text.
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/cdata/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/cdata/snapshots/vdom-expected.js index 4448eed2b5..4b1953c816 100644 --- a/packages/translator-default/test/fixtures/cdata/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/cdata/snapshots/vdom-expected.js @@ -10,11 +10,11 @@ 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, _component, component, state) { - out.be("div", null, "0", component, null, 0); - out.t("Here is a CDATA section: ", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("div", null, "0", _component, null, 0); + out.t("Here is a CDATA section: ", _component); out.t(" < > & "); - out.t(" with all kinds of unescaped text.", component); + out.t(" with all kinds of unescaped text.", _component); out.ee(); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/cdata/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/cdata/snapshots/vdomProduction-expected.js index 57a6fa9522..2ced36778c 100644 --- a/packages/translator-default/test/fixtures/cdata/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/cdata/snapshots/vdomProduction-expected.js @@ -10,11 +10,11 @@ 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, _component, component, state) { - out.be("div", null, "0", component, null, 0); - out.t("Here is a CDATA section: ", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("div", null, "0", _component, null, 0); + out.t("Here is a CDATA section: ", _component); out.t(" < > & "); - out.t(" with all kinds of unescaped text.", component); + out.t(" with all kinds of unescaped text.", _component); out.ee(); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/class-external-component-index/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/class-external-component-index/snapshots/cjs-expected.js index 94e3039146..5a4861f64b 100644 --- a/packages/translator-default/test/fixtures/class-external-component-index/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/class-external-component-index/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/class-ex var _default = _marko_template; exports.default = _default; const _marko_component2 = _component2.default; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/class-external-component-index/snapshots/html-expected.js b/packages/translator-default/test/fixtures/class-external-component-index/snapshots/html-expected.js index 031b03e1e9..2410ac9f20 100644 --- a/packages/translator-default/test/fixtures/class-external-component-index/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/class-external-component-index/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_component from "./component.js"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/class-external-component-index/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/class-external-component-index/snapshots/htmlProduction-expected.js index 64306611b4..87907e60a6 100644 --- a/packages/translator-default/test/fixtures/class-external-component-index/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/class-external-component-index/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_component from "./component.js"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType diff --git a/packages/translator-default/test/fixtures/class-external-component-index/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/class-external-component-index/snapshots/vdom-expected.js index 33ceb28b04..75e50898fd 100644 --- a/packages/translator-default/test/fixtures/class-external-component-index/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/class-external-component-index/snapshots/vdom-expected.js @@ -11,8 +11,8 @@ import { r as _marko_registerComponent } from "marko/src/runtime/components/regi _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.e("div", null, "0", component, 0, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.e("div", null, "0", _component, 0, 0); }, { t: _marko_componentType, d: true diff --git a/packages/translator-default/test/fixtures/class-external-component-index/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/class-external-component-index/snapshots/vdomProduction-expected.js index 8bdf5038c3..e58aae9f38 100644 --- a/packages/translator-default/test/fixtures/class-external-component-index/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/class-external-component-index/snapshots/vdomProduction-expected.js @@ -15,8 +15,8 @@ import { r as _marko_registerComponent } from "marko/dist/runtime/components/reg _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType }, _marko_component2); diff --git a/packages/translator-default/test/fixtures/class-external-component/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/class-external-component/snapshots/cjs-expected.js index 08e6e43d63..003320ff93 100644 --- a/packages/translator-default/test/fixtures/class-external-component/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/class-external-component/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/class-ex var _default = _marko_template; exports.default = _default; const _marko_component2 = _templateComponent.default; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/class-external-component/snapshots/html-expected.js b/packages/translator-default/test/fixtures/class-external-component/snapshots/html-expected.js index 5413c4f3c1..880b0bc43f 100644 --- a/packages/translator-default/test/fixtures/class-external-component/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/class-external-component/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_component from "./template.component.js"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/class-external-component/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/class-external-component/snapshots/htmlProduction-expected.js index 8ff20373bb..a1ad2317f2 100644 --- a/packages/translator-default/test/fixtures/class-external-component/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/class-external-component/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_component from "./template.component.js"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType diff --git a/packages/translator-default/test/fixtures/class-external-component/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/class-external-component/snapshots/vdom-expected.js index dc60bd9143..6e83e7c73f 100644 --- a/packages/translator-default/test/fixtures/class-external-component/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/class-external-component/snapshots/vdom-expected.js @@ -11,8 +11,8 @@ import { r as _marko_registerComponent } from "marko/src/runtime/components/regi _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.e("div", null, "0", component, 0, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.e("div", null, "0", _component, 0, 0); }, { t: _marko_componentType, d: true diff --git a/packages/translator-default/test/fixtures/class-external-component/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/class-external-component/snapshots/vdomProduction-expected.js index 78a7911b33..7e44198031 100644 --- a/packages/translator-default/test/fixtures/class-external-component/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/class-external-component/snapshots/vdomProduction-expected.js @@ -15,8 +15,8 @@ import { r as _marko_registerComponent } from "marko/dist/runtime/components/reg _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType }, _marko_component2); diff --git a/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/cjs-expected.js index fa8d7812cf..8cd575ac08 100644 --- a/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/cjs-expected.js @@ -21,7 +21,7 @@ const _marko_component = { } }; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/html-expected.js b/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/html-expected.js index 3ffd4cfb30..bbd9ef2765 100644 --- a/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/html-expected.js @@ -12,7 +12,7 @@ const _marko_component = { } }; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/htmlProduction-expected.js index 2e0dda6333..c0e8586bd3 100644 --- a/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/htmlProduction-expected.js @@ -12,7 +12,7 @@ const _marko_component = { } }; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType diff --git a/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/vdom-expected.js index fc23df6cdb..1ce41979d2 100644 --- a/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/vdom-expected.js @@ -16,8 +16,8 @@ const _marko_component = { } }; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.e("div", null, "0", component, 0, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.e("div", null, "0", _component, 0, 0); }, { t: _marko_componentType, d: true diff --git a/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/vdomProduction-expected.js index b8424635f7..7f7a3f522c 100644 --- a/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/class-inline-class-props-without-on-create/snapshots/vdomProduction-expected.js @@ -20,8 +20,8 @@ const _marko_component = { } }; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType }, _marko_component); diff --git a/packages/translator-default/test/fixtures/class-inline/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/class-inline/snapshots/cjs-expected.js index 11b956aacb..2939fb4993 100644 --- a/packages/translator-default/test/fixtures/class-inline/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/class-inline/snapshots/cjs-expected.js @@ -22,7 +22,7 @@ const _marko_component = { } }; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/class-inline/snapshots/html-expected.js b/packages/translator-default/test/fixtures/class-inline/snapshots/html-expected.js index 5536122dba..1dceb04b70 100644 --- a/packages/translator-default/test/fixtures/class-inline/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/class-inline/snapshots/html-expected.js @@ -13,7 +13,7 @@ const _marko_component = { } }; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/class-inline/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/class-inline/snapshots/htmlProduction-expected.js index 51ae182d06..67e6292f8f 100644 --- a/packages/translator-default/test/fixtures/class-inline/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/class-inline/snapshots/htmlProduction-expected.js @@ -13,7 +13,7 @@ const _marko_component = { } }; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType diff --git a/packages/translator-default/test/fixtures/class-inline/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/class-inline/snapshots/vdom-expected.js index 250f4c8d5c..9484d9dafd 100644 --- a/packages/translator-default/test/fixtures/class-inline/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/class-inline/snapshots/vdom-expected.js @@ -17,8 +17,8 @@ const _marko_component = { } }; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.e("div", null, "0", component, 0, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.e("div", null, "0", _component, 0, 0); }, { t: _marko_componentType, d: true diff --git a/packages/translator-default/test/fixtures/class-inline/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/class-inline/snapshots/vdomProduction-expected.js index 7e9b60603a..593a725c8a 100644 --- a/packages/translator-default/test/fixtures/class-inline/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/class-inline/snapshots/vdomProduction-expected.js @@ -21,8 +21,8 @@ const _marko_component = { } }; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType }, _marko_component); diff --git a/packages/translator-default/test/fixtures/comments/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/comments/snapshots/cjs-expected.js index 0f1c2948f1..831a6c6878 100644 --- a/packages/translator-default/test/fixtures/comments/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/comments/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/comments var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
"); out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/comments/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/comments/snapshots/vdom-expected.js index a1e05351e8..2db3ce80a4 100644 --- a/packages/translator-default/test/fixtures/comments/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/comments/snapshots/vdom-expected.js @@ -10,8 +10,8 @@ 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, _component, component, state) { - out.e("div", null, "0", component, 0, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.e("div", null, "0", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/comments/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/comments/snapshots/vdomProduction-expected.js index 17b508dfa4..1804e17678 100644 --- a/packages/translator-default/test/fixtures/comments/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/comments/snapshots/vdomProduction-expected.js @@ -10,8 +10,8 @@ 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, _component, component, state) { - out.e("div", null, "0", component, 0, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.e("div", null, "0", _component, 0, 0); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-element-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/custom-element-tag/snapshots/cjs-expected.js index 9be7455d29..d223dced3a 100644 --- a/packages/translator-default/test/fixtures/custom-element-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/custom-element-tag/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-e var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(""); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/custom-element-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/custom-element-tag/snapshots/html-expected.js index 8df0959417..f49e8da498 100644 --- a/packages/translator-default/test/fixtures/custom-element-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/custom-element-tag/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-e export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/custom-element-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/custom-element-tag/snapshots/htmlProduction-expected.js index ea27c9c9f6..c1a0d15749 100644 --- a/packages/translator-default/test/fixtures/custom-element-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-element-tag/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "O83mlmop", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/custom-element-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/custom-element-tag/snapshots/vdom-expected.js index 842a34f488..a2276b4980 100644 --- a/packages/translator-default/test/fixtures/custom-element-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/custom-element-tag/snapshots/vdom-expected.js @@ -10,8 +10,8 @@ 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, _component, component, state) { - out.e("hello", null, "0", component, 0, 2); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.e("hello", null, "0", _component, 0, 2); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-element-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/custom-element-tag/snapshots/vdomProduction-expected.js index 6ac2174643..c2228caab5 100644 --- a/packages/translator-default/test/fixtures/custom-element-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-element-tag/snapshots/vdomProduction-expected.js @@ -14,8 +14,8 @@ 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, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/cjs-expected.js index 6cf4f42667..d44c228288 100644 --- a/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("Hello Frank"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/html-expected.js b/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/html-expected.js index 59eebdb347..adf09873c2 100644 --- a/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-t export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("Hello Frank"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/htmlProduction-expected.js index 901cdea613..3c15f2f785 100644 --- a/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "aA/l93YC", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("Hello Frank"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/vdom-expected.js index e51e217c49..0e01987e7b 100644 --- a/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/vdom-expected.js @@ -10,8 +10,8 @@ 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, _component, component, state) { - out.t("Hello Frank", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.t("Hello Frank", _component); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/vdomProduction-expected.js index f43f2debf5..f4b8d43443 100644 --- a/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-child-analyze/snapshots/vdomProduction-expected.js @@ -10,8 +10,8 @@ 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, _component, component, state) { - out.t("Hello Frank", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.t("Hello Frank", _component); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag-data/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/custom-tag-data/snapshots/cjs-expected.js index 0f248723af..817a459b62 100644 --- a/packages/translator-default/test/fixtures/custom-tag-data/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-data/snapshots/cjs-expected.js @@ -19,11 +19,11 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { (0, _renderTag.default)(_customTagDataTag.default, { "name": "Frank".toUpperCase(), "age": 32 - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-data/snapshots/html-expected.js b/packages/translator-default/test/fixtures/custom-tag-data/snapshots/html-expected.js index e906f39bc0..d639caf9e2 100644 --- a/packages/translator-default/test/fixtures/custom-tag-data/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-data/snapshots/html-expected.js @@ -8,11 +8,11 @@ import _customTagData from "./custom-tag-data-tag.js"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_customTagData, { "name": "Frank".toUpperCase(), "age": 32 - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-data/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-data/snapshots/htmlProduction-expected.js index 1b3b5d5ed2..3e7d5713a8 100644 --- a/packages/translator-default/test/fixtures/custom-tag-data/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-data/snapshots/htmlProduction-expected.js @@ -8,11 +8,11 @@ import _customTagData from "./custom-tag-data-tag.js"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_customTagData, { "name": "Frank".toUpperCase(), "age": 32 - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag-data/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/custom-tag-data/snapshots/vdom-expected.js index 1a885d7fb6..029c248e39 100644 --- a/packages/translator-default/test/fixtures/custom-tag-data/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-data/snapshots/vdom-expected.js @@ -12,11 +12,11 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_customTagData, { "name": "Frank".toUpperCase(), "age": 32 - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-data/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-data/snapshots/vdomProduction-expected.js index 79f3dc6e91..e8ba954882 100644 --- a/packages/translator-default/test/fixtures/custom-tag-data/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-data/snapshots/vdomProduction-expected.js @@ -12,11 +12,11 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_customTagData, { "name": "Frank".toUpperCase(), "age": 32 - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/cjs-expected.js index 7e01c2c6b2..ed754bdcba 100644 --- a/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/cjs-expected.js @@ -19,10 +19,10 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { (0, _renderTag.default)(_new2.default, { "b": "1" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/html-expected.js b/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/html-expected.js index 4932d48413..cff1126443 100644 --- a/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/html-expected.js @@ -8,10 +8,10 @@ import _new from "./new.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_new, { "b": "1" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/htmlProduction-expected.js index e7913e2895..2ea1603095 100644 --- a/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/htmlProduction-expected.js @@ -8,10 +8,10 @@ import _new from "./new.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_new, { "b": "1" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/vdom-expected.js index 600b8b95d5..b8d2e4b777 100644 --- a/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/vdom-expected.js @@ -12,10 +12,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_new, { "b": "1" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/vdomProduction-expected.js index 3d61125662..51c786f2d1 100644 --- a/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-migration/snapshots/vdomProduction-expected.js @@ -12,10 +12,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_new, { "b": "1" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/cjs-expected.js index 4fcfb68c53..be8b2adf3a 100644 --- a/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/cjs-expected.js @@ -21,7 +21,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { (0, _renderTag.default)(_customTag2.default, { "renderBody": (out, a, b, { c @@ -34,7 +34,7 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com out.w((0, _escapeXml.x)(c)); out.w("
"); } - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/html-expected.js b/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/html-expected.js index 058b887af8..5c0119e696 100644 --- a/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/html-expected.js @@ -9,7 +9,7 @@ import _customTag from "./components/custom-tag.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_customTag, { "renderBody": (out, a, b, { c @@ -22,7 +22,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, out.w(_marko_escapeXml(c)); out.w("
"); } - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/htmlProduction-expected.js index 182e2561da..bcd2454d95 100644 --- a/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/htmlProduction-expected.js @@ -9,14 +9,14 @@ import _customTag from "./components/custom-tag.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_customTag, { "renderBody": (out, a, b, { c }) => { out.w(`
${_marko_escapeXml(a)} ${_marko_escapeXml(b)} ${_marko_escapeXml(c)}
`); } - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/vdom-expected.js index a0ad636dfb..6c75b52a58 100644 --- a/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/vdom-expected.js @@ -12,20 +12,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_customTag, { "renderBody": (out, a, b, { c }) => { - out.be("div", null, "1", component, null, 0); - out.t(a, component); - out.t(" ", component); - out.t(b, component); - out.t(" ", component); - out.t(c, component); + out.be("div", null, "1", _component, null, 0); + out.t(a, _component); + out.t(" ", _component); + out.t(b, _component); + out.t(" ", _component); + out.t(c, _component); out.ee(); } - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/vdomProduction-expected.js index ff75ec61df..a96a2aabb2 100644 --- a/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-parameters/snapshots/vdomProduction-expected.js @@ -12,20 +12,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_customTag, { "renderBody": (out, a, b, { c }) => { - out.be("div", null, "1", component, null, 0); - out.t(a, component); - out.t(" ", component); - out.t(b, component); - out.t(" ", component); - out.t(c, component); + out.be("div", null, "1", _component, null, 0); + out.t(a, _component); + out.t(" ", _component); + out.t(b, _component); + out.t(" ", _component); + out.t(c, _component); out.ee(); } - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/cjs-expected.js index b99dd99d65..ec877c7041 100644 --- a/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/cjs-expected.js @@ -19,13 +19,13 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer2.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer2.default)(function (input, out, _componentDef, _component, state) { (0, _renderTag.default)(_renderer.default, { "name": "World", "renderBody": out => { out.w("This is the body content"); } - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/html-expected.js b/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/html-expected.js index c151cd4b5c..1a05d7c4eb 100644 --- a/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/html-expected.js @@ -8,13 +8,13 @@ import _testBodyFunction from "./tags/test-body-function/renderer.js"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_testBodyFunction, { "name": "World", "renderBody": out => { out.w("This is the body content"); } - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/htmlProduction-expected.js index 026e519237..ace9f96bb1 100644 --- a/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/htmlProduction-expected.js @@ -8,13 +8,13 @@ import _testBodyFunction from "./tags/test-body-function/renderer.js"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_testBodyFunction, { "name": "World", "renderBody": out => { out.w("This is the body content"); } - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/vdom-expected.js index 1f119c1cb1..8656298340 100644 --- a/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/vdom-expected.js @@ -12,13 +12,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_testBodyFunction, { "name": "World", "renderBody": out => { - out.t("This is the body content", component); + out.t("This is the body content", _component); } - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/vdomProduction-expected.js index 9671a1525f..883fd3a21f 100644 --- a/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-render-body/snapshots/vdomProduction-expected.js @@ -12,13 +12,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_testBodyFunction, { "name": "World", "renderBody": out => { - out.t("This is the body content", component); + out.t("This is the body content", _component); } - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/cjs-expected.js index 5cd98f0e5f..51f627d2e4 100644 --- a/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-t var _default = _marko_template; exports.default = _default; const _marko_component2 = _templateComponent.default; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/html-expected.js b/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/html-expected.js index 41a3a59b20..4b88a7072c 100644 --- a/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_component from "./template.component.js"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/htmlProduction-expected.js index 399b2a2d53..e9c5569e39 100644 --- a/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_component from "./template.component.js"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType diff --git a/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/vdom-expected.js index 2363e06523..ea5ac2be42 100644 --- a/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/vdom-expected.js @@ -11,8 +11,8 @@ import { r as _marko_registerComponent } from "marko/src/runtime/components/regi _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.e("div", null, "0", component, 0, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.e("div", null, "0", _component, 0, 0); }, { t: _marko_componentType, d: true diff --git a/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/vdomProduction-expected.js index f8b8036a8a..602c7f5188 100644 --- a/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-separate-assets/snapshots/vdomProduction-expected.js @@ -15,8 +15,8 @@ import { r as _marko_registerComponent } from "marko/dist/runtime/components/reg _marko_registerComponent(_marko_componentType, () => _marko_template); const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType }, _marko_component2); diff --git a/packages/translator-default/test/fixtures/custom-tag-template/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/custom-tag-template/snapshots/cjs-expected.js index 5e93a54800..096425ffb8 100644 --- a/packages/translator-default/test/fixtures/custom-tag-template/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-template/snapshots/cjs-expected.js @@ -19,10 +19,10 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { (0, _renderTag.default)(_hello2.default, { "name": "Frank" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-template/snapshots/html-expected.js b/packages/translator-default/test/fixtures/custom-tag-template/snapshots/html-expected.js index 5cee605bf6..81d3c7ad14 100644 --- a/packages/translator-default/test/fixtures/custom-tag-template/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-template/snapshots/html-expected.js @@ -8,10 +8,10 @@ import _hello from "./hello.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_hello, { "name": "Frank" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-template/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-template/snapshots/htmlProduction-expected.js index 8793ad76fe..d5f67b5a8d 100644 --- a/packages/translator-default/test/fixtures/custom-tag-template/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-template/snapshots/htmlProduction-expected.js @@ -8,10 +8,10 @@ import _hello from "./hello.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_hello, { "name": "Frank" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag-template/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/custom-tag-template/snapshots/vdom-expected.js index a200d51198..5c900fc4d9 100644 --- a/packages/translator-default/test/fixtures/custom-tag-template/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-template/snapshots/vdom-expected.js @@ -12,10 +12,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_hello, { "name": "Frank" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-template/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-template/snapshots/vdomProduction-expected.js index 7f56b778c0..4180ef53f4 100644 --- a/packages/translator-default/test/fixtures/custom-tag-template/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-template/snapshots/vdomProduction-expected.js @@ -12,10 +12,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_hello, { "name": "Frank" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/cjs-expected.js index 196b283e89..d3c19790b6 100644 --- a/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(""); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/html-expected.js b/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/html-expected.js index 16d36868be..bf795c7328 100644 --- a/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-t export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/htmlProduction-expected.js index 809f3a7a0e..eca0f56103 100644 --- a/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "5fhDZgMT", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/vdom-expected.js index 0b7b92bdfd..62351491e6 100644 --- a/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/vdom-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("span", { "style": "display:block" - }, "0", component, 0, 1); + }, "0", _component, 0, 1); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/vdomProduction-expected.js index eee3d6e0d7..56885873ae 100644 --- a/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag-transform/snapshots/vdomProduction-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("span", { "style": "display:block" - }, "0", component, 0, 1); + }, "0", _component, 0, 1); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/custom-tag/snapshots/cjs-expected.js index 35d6707dbc..d4bc2ff469 100644 --- a/packages/translator-default/test/fixtures/custom-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag/snapshots/cjs-expected.js @@ -19,10 +19,10 @@ const _marko_componentType = "packages/translator-default/test/fixtures/custom-t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer2.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer2.default)(function (input, out, _componentDef, _component, state) { (0, _renderTag.default)(_renderer.default, { "name": "World" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/custom-tag/snapshots/html-expected.js index 1aa9ee71f0..23f840cbd5 100644 --- a/packages/translator-default/test/fixtures/custom-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag/snapshots/html-expected.js @@ -8,10 +8,10 @@ import _testHello from "./tags/test-hello/renderer.js"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_testHello, { "name": "World" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag/snapshots/htmlProduction-expected.js index b4cb16153a..36db05f356 100644 --- a/packages/translator-default/test/fixtures/custom-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag/snapshots/htmlProduction-expected.js @@ -8,10 +8,10 @@ import _testHello from "./tags/test-hello/renderer.js"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_testHello, { "name": "World" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/custom-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/custom-tag/snapshots/vdom-expected.js index 065ba3480e..fd5580671e 100644 --- a/packages/translator-default/test/fixtures/custom-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag/snapshots/vdom-expected.js @@ -12,10 +12,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_testHello, { "name": "World" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/custom-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/custom-tag/snapshots/vdomProduction-expected.js index c0f12f22d2..f81275ade2 100644 --- a/packages/translator-default/test/fixtures/custom-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/custom-tag/snapshots/vdomProduction-expected.js @@ -12,10 +12,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_testHello, { "name": "World" - }, out, _component, "0"); + }, out, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/cjs-expected.js index 413f8a1293..fff9034686 100644 --- a/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/cjs-expected.js @@ -19,8 +19,8 @@ const _marko_componentType = "packages/translator-default/test/fixtures/data-mar var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { - out.w(``); out.w("Hello "); diff --git a/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/html-expected.js b/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/html-expected.js index 3c67216424..8ff839a55f 100644 --- a/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/html-expected.js @@ -8,8 +8,8 @@ import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml import _marko_props from "marko/src/runtime/html/helpers/data-marko"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.w(``); out.w("Hello "); diff --git a/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/htmlProduction-expected.js index bc8e0b24b4..1dd34122e9 100644 --- a/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/htmlProduction-expected.js @@ -8,8 +8,8 @@ import { x as _marko_escapeXml } from "marko/dist/runtime/html/helpers/escape-xm import _marko_props from "marko/dist/runtime/html/helpers/data-marko"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.w(`Hello ${_marko_escapeXml(input.name)}`); }, { diff --git a/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/vdom-expected.js index cb2ebdb1bd..3b73dedd87 100644 --- a/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/vdom-expected.js @@ -11,14 +11,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.be("div", { "class": "test" - }, "0", component, null, 0, { + }, "0", _component, null, 0, { pa: ["class"] }); - out.t("Hello ", component); - out.t(input.name, component); + out.t("Hello ", _component); + out.t(input.name, _component); out.ee(); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/vdomProduction-expected.js index 1075103fb0..b25a2c03cc 100644 --- a/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/data-marko-implicit-component/snapshots/vdomProduction-expected.js @@ -11,14 +11,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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.be("div", { "class": "test" - }, "0", component, null, 0, { + }, "0", _component, null, 0, { pa: ["class"] }); - out.t("Hello ", component); - out.t(input.name, component); + out.t("Hello ", _component); + out.t(input.name, _component); out.ee(); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/data-migration/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/data-migration/snapshots/cjs-expected.js index cb96f064fe..b5d2856ca0 100644 --- a/packages/translator-default/test/fixtures/data-migration/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/data-migration/snapshots/cjs-expected.js @@ -21,14 +21,14 @@ const _marko_componentType = "packages/translator-default/test/fixtures/data-mig var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { (0, _renderTag.default)(_test2.default, { "class": input.class, "renderBody": (out, data) => { out.w("Hello "); out.w((0, _escapeXml.x)(data.name)); } - }, out, _component, "0"); + }, out, _componentDef, "0"); out.w("
"); out.w("Hello "); out.w((0, _escapeXml.x)(input.name)); diff --git a/packages/translator-default/test/fixtures/data-migration/snapshots/html-expected.js b/packages/translator-default/test/fixtures/data-migration/snapshots/html-expected.js index c61b4a75af..e86295973a 100644 --- a/packages/translator-default/test/fixtures/data-migration/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/data-migration/snapshots/html-expected.js @@ -9,14 +9,14 @@ import _test from "./test.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_test, { "class": input.class, "renderBody": (out, data) => { out.w("Hello "); out.w(_marko_escapeXml(data.name)); } - }, out, _component, "0"); + }, out, _componentDef, "0"); out.w("
"); out.w("Hello "); diff --git a/packages/translator-default/test/fixtures/data-migration/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/data-migration/snapshots/htmlProduction-expected.js index 5bd088e616..a1e030047a 100644 --- a/packages/translator-default/test/fixtures/data-migration/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/data-migration/snapshots/htmlProduction-expected.js @@ -9,13 +9,13 @@ import _test from "./test.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_test, { "class": input.class, "renderBody": (out, data) => { out.w(`Hello ${_marko_escapeXml(data.name)}`); } - }, out, _component, "0"); + }, out, _componentDef, "0"); out.w(`
Hello ${_marko_escapeXml(input.name)}`); diff --git a/packages/translator-default/test/fixtures/data-migration/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/data-migration/snapshots/vdom-expected.js index 6498af2a1b..36af1ca092 100644 --- a/packages/translator-default/test/fixtures/data-migration/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/data-migration/snapshots/vdom-expected.js @@ -12,19 +12,19 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_test, { "class": input.class, "renderBody": (out, data) => { - out.t("Hello ", component); - out.t(data.name, component); + out.t("Hello ", _component); + out.t(data.name, _component); } - }, out, _component, "0"); + }, out, _componentDef, "0"); - out.be("div", null, "1", component, null, 0); - out.t("Hello ", component); - out.t(input.name, component); - out.be("span", null, "2", component, null, 0); + out.be("div", null, "1", _component, null, 0); + out.t("Hello ", _component); + out.t(input.name, _component); + out.be("span", null, "2", _component, null, 0); () => { data; @@ -32,14 +32,14 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, console.log(data); }; - out.t("Hello ", component); - out.t(input, component); + out.t("Hello ", _component); + out.t(input, _component); out.ee(); if (true) { const data = "bar"; - out.t("Hello ", component); - out.t(data, component); + out.t("Hello ", _component); + out.t(data, _component); } out.ee(); diff --git a/packages/translator-default/test/fixtures/data-migration/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/data-migration/snapshots/vdomProduction-expected.js index 7902e9b8c1..18842cdd1e 100644 --- a/packages/translator-default/test/fixtures/data-migration/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/data-migration/snapshots/vdomProduction-expected.js @@ -12,19 +12,19 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_test, { "class": input.class, "renderBody": (out, data) => { - out.t("Hello ", component); - out.t(data.name, component); + out.t("Hello ", _component); + out.t(data.name, _component); } - }, out, _component, "0"); + }, out, _componentDef, "0"); - out.be("div", null, "1", component, null, 0); - out.t("Hello ", component); - out.t(input.name, component); - out.be("span", null, "2", component, null, 0); + out.be("div", null, "1", _component, null, 0); + out.t("Hello ", _component); + out.t(input.name, _component); + out.be("span", null, "2", _component, null, 0); () => { data; @@ -32,14 +32,14 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, console.log(data); }; - out.t("Hello ", component); - out.t(input, component); + out.t("Hello ", _component); + out.t(input, _component); out.ee(); if (true) { const data = "bar"; - out.t("Hello ", component); - out.t(data, component); + out.t("Hello ", _component); + out.t(data, _component); } out.ee(); diff --git a/packages/translator-default/test/fixtures/declaration/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/declaration/snapshots/cjs-expected.js index e346a43ece..6c6290debc 100644 --- a/packages/translator-default/test/fixtures/declaration/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/declaration/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/declarat var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(""); out.w(""); out.w(""); diff --git a/packages/translator-default/test/fixtures/declaration/snapshots/html-expected.js b/packages/translator-default/test/fixtures/declaration/snapshots/html-expected.js index 25832d5b89..6866d529c8 100644 --- a/packages/translator-default/test/fixtures/declaration/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/declaration/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/declarat export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); out.w(""); out.w(""); diff --git a/packages/translator-default/test/fixtures/declaration/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/declaration/snapshots/htmlProduction-expected.js index 5330d5f408..b0054bb1fe 100644 --- a/packages/translator-default/test/fixtures/declaration/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/declaration/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "p0+/pj8a", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("Hello World"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/declaration/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/declaration/snapshots/vdom-expected.js index 9cd42242ef..cd995da51e 100644 --- a/packages/translator-default/test/fixtures/declaration/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/declaration/snapshots/vdom-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { - out.be("contact-info", null, "0", component, null, 0); - out.be("name", null, "1", component, null, 0); - out.t("Hello World", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("contact-info", null, "0", _component, null, 0); + out.be("name", null, "1", _component, null, 0); + out.t("Hello World", _component); out.ee(); out.ee(); }, { diff --git a/packages/translator-default/test/fixtures/declaration/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/declaration/snapshots/vdomProduction-expected.js index 9b925be1f8..87b5bd11a5 100644 --- a/packages/translator-default/test/fixtures/declaration/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/declaration/snapshots/vdomProduction-expected.js @@ -14,8 +14,8 @@ 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, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/doctype/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/doctype/snapshots/cjs-expected.js index 0e4a20c837..ffde7e4e66 100644 --- a/packages/translator-default/test/fixtures/doctype/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/doctype/snapshots/cjs-expected.js @@ -23,7 +23,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/doctype/ var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(""); out.w(""); out.w(""); @@ -33,9 +33,9 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com out.w(""); out.w(""); out.w("The content of the document......"); - (0, _renderTag.default)(_initComponentsTag.default, {}, out, _component, "4"); - (0, _renderTag.default)(_reordererRenderer.default, {}, out, _component, "5"); - (0, _renderTag.default)(_preferredScriptLocationTag.default, {}, out, _component, "6"); + (0, _renderTag.default)(_initComponentsTag.default, {}, out, _componentDef, "4"); + (0, _renderTag.default)(_reordererRenderer.default, {}, out, _componentDef, "5"); + (0, _renderTag.default)(_preferredScriptLocationTag.default, {}, out, _componentDef, "6"); out.w(""); out.w(""); }, { diff --git a/packages/translator-default/test/fixtures/doctype/snapshots/html-expected.js b/packages/translator-default/test/fixtures/doctype/snapshots/html-expected.js index cfbd1773d3..cc4cdcb8aa 100644 --- a/packages/translator-default/test/fixtures/doctype/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/doctype/snapshots/html-expected.js @@ -10,7 +10,7 @@ import _awaitReorderer from "marko/src/core-tags/core/await/reorderer-renderer.j import _preferredScriptLocation from "marko/src/core-tags/components/preferred-script-location-tag.js"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); out.w(""); out.w(""); @@ -21,11 +21,11 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, out.w(""); out.w("The content of the document......"); - _marko_tag(_initComponents, {}, out, _component, "4"); + _marko_tag(_initComponents, {}, out, _componentDef, "4"); - _marko_tag(_awaitReorderer, {}, out, _component, "5"); + _marko_tag(_awaitReorderer, {}, out, _componentDef, "5"); - _marko_tag(_preferredScriptLocation, {}, out, _component, "6"); + _marko_tag(_preferredScriptLocation, {}, out, _componentDef, "6"); out.w(""); out.w(""); diff --git a/packages/translator-default/test/fixtures/doctype/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/doctype/snapshots/htmlProduction-expected.js index af71d14bf9..79727f5244 100644 --- a/packages/translator-default/test/fixtures/doctype/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/doctype/snapshots/htmlProduction-expected.js @@ -10,14 +10,14 @@ import _awaitReorderer from "marko/dist/core-tags/core/await/reorderer-renderer. import _preferredScriptLocation from "marko/dist/core-tags/components/preferred-script-location-tag.js"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("Title of the documentThe content of the document......"); - _marko_tag(_initComponents, {}, out, _component, "4"); + _marko_tag(_initComponents, {}, out, _componentDef, "4"); - _marko_tag(_awaitReorderer, {}, out, _component, "5"); + _marko_tag(_awaitReorderer, {}, out, _componentDef, "5"); - _marko_tag(_preferredScriptLocation, {}, out, _component, "6"); + _marko_tag(_preferredScriptLocation, {}, out, _componentDef, "6"); out.w(""); }, { diff --git a/packages/translator-default/test/fixtures/doctype/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/doctype/snapshots/vdom-expected.js index dd76e4df7f..eeae527a9f 100644 --- a/packages/translator-default/test/fixtures/doctype/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/doctype/snapshots/vdom-expected.js @@ -10,15 +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, _component, component, state) { - out.be("html", null, "0", component, null, 0); - out.be("head", null, "1", component, null, 0); - out.be("title", null, "2", component, null, 0); - out.t("Title of the document", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("html", null, "0", _component, null, 0); + out.be("head", null, "1", _component, null, 0); + out.be("title", null, "2", _component, null, 0); + out.t("Title of the document", _component); out.ee(); out.ee(); - out.be("body", null, "3", component, null, 0); - out.t("The content of the document......", component); + out.be("body", null, "3", _component, null, 0); + out.t("The content of the document......", _component); out.ee(); out.ee(); }, { diff --git a/packages/translator-default/test/fixtures/doctype/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/doctype/snapshots/vdomProduction-expected.js index 5554874dda..1b3ca86737 100644 --- a/packages/translator-default/test/fixtures/doctype/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/doctype/snapshots/vdomProduction-expected.js @@ -14,11 +14,11 @@ 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, _component, component, state) { - out.be("html", null, "0", component, null, 0); - out.n(_marko_node, component); - out.be("body", null, "2", component, null, 0); - out.t("The content of the document......", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("html", null, "0", _component, null, 0); + out.n(_marko_node, _component); + out.be("body", null, "2", _component, null, 0); + out.t("The content of the document......", _component); out.ee(); out.ee(); }, { diff --git a/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/cjs-expected.js index 5e1cb57e83..be7e6893e6 100644 --- a/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/cjs-expected.js @@ -25,23 +25,23 @@ const _marko_componentType = "packages/translator-default/test/fixtures/dynamic- var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { (0, _dynamicTag.default)(out, input, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "0"); + }), null, null, null, _componentDef, "0"); (0, _dynamicTag.default)(out, input.x, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "1"); + }), null, null, null, _componentDef, "1"); const _tagName = input.show ? "div" : null; - if (_tagName) out.w(`<${_tagName} class="a b"${(0, _attr.default)("other", input.other)}>`);else out.bf("f_2", component, 1); + if (_tagName) out.w(`<${_tagName} class="a b"${(0, _attr.default)("other", input.other)}>`);else out.bf("f_2", _component, 1); const _tagName2 = input.show && "div"; - if (_tagName2) out.w(`<${_tagName2} class="a b"${(0, _attr.default)("other", input.other)}>`);else out.bf("f_3", component, 1); + if (_tagName2) out.w(`<${_tagName2} class="a b"${(0, _attr.default)("other", input.other)}>`);else out.bf("f_3", _component, 1); const _tagName3 = input.large ? "h1" : "h2"; @@ -54,14 +54,14 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com "other": input.other, "class": ["a", "b"], "other": input.other - }, out, _component, "5"); + }, out, _componentDef, "5"); const _tagName5 = input.showTagA && _index.default; if (_tagName5) (0, _renderTag.default)(_tagName5, { "class": ["a", "b"], "other": input.other - }, out, _component, "6"); + }, out, _componentDef, "6"); const _tagName6 = input.showTagA && _index.default; @@ -73,16 +73,16 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com "class": ["a", "b"], "other": input.other, "renderBody": _renderBody - }, out, _component, "7");else _renderBody(out); + }, out, _componentDef, "7");else _renderBody(out); (0, _dynamicTag.default)(out, input.tag || _index.default, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "8"); + }), null, null, null, _componentDef, "8"); const largeHeading = input.isLarge && "h1"; const _tagName7 = largeHeading || "h2"; - if (_tagName7) out.w(`<${_tagName7} class="a b"${(0, _attr.default)("other", input.other)}>`);else out.bf("f_9", component, 1); + if (_tagName7) out.w(`<${_tagName7} class="a b"${(0, _attr.default)("other", input.other)}>`);else out.bf("f_9", _component, 1); const _tagName8 = global.x = "a" + "b"; @@ -96,12 +96,12 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com const tagConstA = "a"; out.w(`<${tagConstA} class="a b"${(0, _attr.default)("other", input.other)}>`); const tagConstB = input.show ? "div" : null; - if (tagConstB) out.w(`<${tagConstB} class="a b"${(0, _attr.default)("other", input.other)}>`);else out.bf("f_14", component, 1); + if (tagConstB) out.w(`<${tagConstB} class="a b"${(0, _attr.default)("other", input.other)}>`);else out.bf("f_14", _component, 1); let tagLazyAssign; tagLazyAssign = "a"; - if (tagLazyAssign) out.w(`<${tagLazyAssign} class="a b"${(0, _attr.default)("other", input.other)}>`);else out.bf("f_15", component, 1); + if (tagLazyAssign) out.w(`<${tagLazyAssign} class="a b"${(0, _attr.default)("other", input.other)}>`);else out.bf("f_15", _component, 1); tagLazyAssign = input.show ? "div" : null; - if (tagLazyAssign) out.w(`<${tagLazyAssign} class="a b"${(0, _attr.default)("other", input.other)}>`);else out.bf("f_16", component, 1); + if (tagLazyAssign) out.w(`<${tagLazyAssign} class="a b"${(0, _attr.default)("other", input.other)}>`);else out.bf("f_16", _component, 1); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/html-expected.js b/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/html-expected.js index d12b53134e..151970d71f 100644 --- a/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/html-expected.js @@ -11,24 +11,24 @@ import _marko_attr from "marko/src/runtime/html/helpers/attr"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_dynamic_tag(out, input, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "0"); + }), null, null, null, _componentDef, "0"); _marko_dynamic_tag(out, input.x, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "1"); + }), null, null, null, _componentDef, "1"); const _tagName = input.show ? "div" : null; - if (_tagName) out.w(`<${_tagName} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_2", component, 1); + if (_tagName) out.w(`<${_tagName} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_2", _component, 1); const _tagName2 = input.show && "div"; - if (_tagName2) out.w(`<${_tagName2} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_3", component, 1); + if (_tagName2) out.w(`<${_tagName2} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_3", _component, 1); const _tagName3 = input.large ? "h1" : "h2"; @@ -41,14 +41,14 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "other": input.other, "class": ["a", "b"], "other": input.other - }, out, _component, "5"); + }, out, _componentDef, "5"); const _tagName5 = input.showTagA && tagA; if (_tagName5) _marko_tag(_tagName5, { "class": ["a", "b"], "other": input.other - }, out, _component, "6"); + }, out, _componentDef, "6"); const _tagName6 = input.showTagA && tagA; @@ -60,18 +60,18 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "class": ["a", "b"], "other": input.other, "renderBody": _renderBody - }, out, _component, "7");else _renderBody(out); + }, out, _componentDef, "7");else _renderBody(out); _marko_dynamic_tag(out, input.tag || tagA, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "8"); + }), null, null, null, _componentDef, "8"); const largeHeading = input.isLarge && "h1"; const _tagName7 = largeHeading || "h2"; - if (_tagName7) out.w(`<${_tagName7} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_9", component, 1); + if (_tagName7) out.w(`<${_tagName7} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_9", _component, 1); const _tagName8 = global.x = "a" + "b"; @@ -85,12 +85,12 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const tagConstA = "a"; out.w(`<${tagConstA} class="a b"${_marko_attr("other", input.other)}>`); const tagConstB = input.show ? "div" : null; - if (tagConstB) out.w(`<${tagConstB} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_14", component, 1); + if (tagConstB) out.w(`<${tagConstB} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_14", _component, 1); let tagLazyAssign; tagLazyAssign = "a"; - if (tagLazyAssign) out.w(`<${tagLazyAssign} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_15", component, 1); + if (tagLazyAssign) out.w(`<${tagLazyAssign} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_15", _component, 1); tagLazyAssign = input.show ? "div" : null; - if (tagLazyAssign) out.w(`<${tagLazyAssign} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_16", component, 1); + if (tagLazyAssign) out.w(`<${tagLazyAssign} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_16", _component, 1); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/htmlProduction-expected.js index 935dddfe45..fac514d865 100644 --- a/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/htmlProduction-expected.js @@ -11,24 +11,24 @@ import _marko_attr from "marko/dist/runtime/html/helpers/attr"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_dynamic_tag(out, input, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "0"); + }), null, null, null, _componentDef, "0"); _marko_dynamic_tag(out, input.x, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "1"); + }), null, null, null, _componentDef, "1"); const _tagName = input.show ? "div" : null; - if (_tagName) out.w(`<${_tagName} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_2", component, 1); + if (_tagName) out.w(`<${_tagName} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_2", _component, 1); const _tagName2 = input.show && "div"; - if (_tagName2) out.w(`<${_tagName2} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_3", component, 1); + if (_tagName2) out.w(`<${_tagName2} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_3", _component, 1); const _tagName3 = input.large ? "h1" : "h2"; @@ -41,14 +41,14 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "other": input.other, "class": ["a", "b"], "other": input.other - }, out, _component, "5"); + }, out, _componentDef, "5"); const _tagName5 = input.showTagA && tagA; if (_tagName5) _marko_tag(_tagName5, { "class": ["a", "b"], "other": input.other - }, out, _component, "6"); + }, out, _componentDef, "6"); const _tagName6 = input.showTagA && tagA; @@ -60,18 +60,18 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "class": ["a", "b"], "other": input.other, "renderBody": _renderBody - }, out, _component, "7");else _renderBody(out); + }, out, _componentDef, "7");else _renderBody(out); _marko_dynamic_tag(out, input.tag || tagA, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "8"); + }), null, null, null, _componentDef, "8"); const largeHeading = input.isLarge && "h1"; const _tagName7 = largeHeading || "h2"; - if (_tagName7) out.w(`<${_tagName7} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_9", component, 1); + if (_tagName7) out.w(`<${_tagName7} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_9", _component, 1); const _tagName8 = global.x = "a" + "b"; @@ -85,12 +85,12 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const tagConstA = "a"; out.w(`<${tagConstA} class="a b"${_marko_attr("other", input.other)}>`); const tagConstB = input.show ? "div" : null; - if (tagConstB) out.w(`<${tagConstB} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_14", component, 1); + if (tagConstB) out.w(`<${tagConstB} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_14", _component, 1); let tagLazyAssign; tagLazyAssign = "a"; - if (tagLazyAssign) out.w(`<${tagLazyAssign} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_15", component, 1); + if (tagLazyAssign) out.w(`<${tagLazyAssign} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_15", _component, 1); tagLazyAssign = input.show ? "div" : null; - if (tagLazyAssign) out.w(`<${tagLazyAssign} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_16", component, 1); + if (tagLazyAssign) out.w(`<${tagLazyAssign} class="a b"${_marko_attr("other", input.other)}>`);else out.bf("f_16", _component, 1); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/vdom-expected.js index 5ac12214a5..992dd9b913 100644 --- a/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/vdom-expected.js @@ -14,37 +14,37 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_dynamic_tag(out, input, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "0"); + }), null, null, null, _componentDef, "0"); _marko_dynamic_tag(out, input.x, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "1"); + }), null, null, null, _componentDef, "1"); const _tagName = input.show ? "div" : null; if (_tagName) out.e(_tagName, { "class": "a b", "other": input.other - }, "2", component, 0, 0);else out.bf("f_2", component); + }, "2", _component, 0, 0);else out.bf("f_2", _component); const _tagName2 = input.show && "div"; if (_tagName2) out.e(_tagName2, { "class": "a b", "other": input.other - }, "3", component, 0, 0);else out.bf("f_3", component); + }, "3", _component, 0, 0);else out.bf("f_3", _component); const _tagName3 = input.large ? "h1" : "h2"; out.e(_tagName3, { "class": "a b", "other": input.other - }, "4", component, 0, 0); + }, "4", _component, 0, 0); const _tagName4 = input.showTagA ? tagA : tagB; @@ -53,31 +53,31 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "other": input.other, "class": ["a", "b"], "other": input.other - }, out, _component, "5"); + }, out, _componentDef, "5"); const _tagName5 = input.showTagA && tagA; if (_tagName5) _marko_tag(_tagName5, { "class": ["a", "b"], "other": input.other - }, out, _component, "6"); + }, out, _componentDef, "6"); const _tagName6 = input.showTagA && tagA; const _renderBody = out => { - out.t("Body content", component); + out.t("Body content", _component); }; if (_tagName6) _marko_tag(_tagName6, { "class": ["a", "b"], "other": input.other, "renderBody": _renderBody - }, out, _component, "7");else _renderBody(out); + }, out, _componentDef, "7");else _renderBody(out); _marko_dynamic_tag(out, input.tag || tagA, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "8"); + }), null, null, null, _componentDef, "8"); const largeHeading = input.isLarge && "h1"; @@ -86,47 +86,47 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, if (_tagName7) out.e(_tagName7, { "class": "a b", "other": input.other - }, "9", component, 0, 0);else out.bf("f_9", component); + }, "9", _component, 0, 0);else out.bf("f_9", _component); const _tagName8 = global.x = "a" + "b"; out.e(_tagName8, { "class": "a b", "other": input.other - }, "10", component, 0, 0); + }, "10", _component, 0, 0); const _tagName9 = "h" + input.level; out.e(_tagName9, { "class": "a b", "other": input.other - }, "11", component, 0, 0); + }, "11", _component, 0, 0); const _tagName10 = `h${input.level}`; out.e(_tagName10, { "class": "a b", "other": input.other - }, "12", component, 0, 0); + }, "12", _component, 0, 0); const tagConstA = "a"; out.e(tagConstA, { "class": "a b", "other": input.other - }, "13", component, 0, 0); + }, "13", _component, 0, 0); const tagConstB = input.show ? "div" : null; if (tagConstB) out.e(tagConstB, { "class": "a b", "other": input.other - }, "14", component, 0, 0);else out.bf("f_14", component); + }, "14", _component, 0, 0);else out.bf("f_14", _component); let tagLazyAssign; tagLazyAssign = "a"; if (tagLazyAssign) out.e(tagLazyAssign, { "class": "a b", "other": input.other - }, "15", component, 0, 0);else out.bf("f_15", component); + }, "15", _component, 0, 0);else out.bf("f_15", _component); tagLazyAssign = input.show ? "div" : null; if (tagLazyAssign) out.e(tagLazyAssign, { "class": "a b", "other": input.other - }, "16", component, 0, 0);else out.bf("f_16", component); + }, "16", _component, 0, 0);else out.bf("f_16", _component); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/vdomProduction-expected.js index e6fd4cb780..42ce6eecfd 100644 --- a/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/dynamic-tag-name/snapshots/vdomProduction-expected.js @@ -14,37 +14,37 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_dynamic_tag(out, input, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "0"); + }), null, null, null, _componentDef, "0"); _marko_dynamic_tag(out, input.x, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "1"); + }), null, null, null, _componentDef, "1"); const _tagName = input.show ? "div" : null; if (_tagName) out.e(_tagName, { "class": "a b", "other": input.other - }, "2", component, 0, 0);else out.bf("f_2", component); + }, "2", _component, 0, 0);else out.bf("f_2", _component); const _tagName2 = input.show && "div"; if (_tagName2) out.e(_tagName2, { "class": "a b", "other": input.other - }, "3", component, 0, 0);else out.bf("f_3", component); + }, "3", _component, 0, 0);else out.bf("f_3", _component); const _tagName3 = input.large ? "h1" : "h2"; out.e(_tagName3, { "class": "a b", "other": input.other - }, "4", component, 0, 0); + }, "4", _component, 0, 0); const _tagName4 = input.showTagA ? tagA : tagB; @@ -53,31 +53,31 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "other": input.other, "class": ["a", "b"], "other": input.other - }, out, _component, "5"); + }, out, _componentDef, "5"); const _tagName5 = input.showTagA && tagA; if (_tagName5) _marko_tag(_tagName5, { "class": ["a", "b"], "other": input.other - }, out, _component, "6"); + }, out, _componentDef, "6"); const _tagName6 = input.showTagA && tagA; const _renderBody = out => { - out.t("Body content", component); + out.t("Body content", _component); }; if (_tagName6) _marko_tag(_tagName6, { "class": ["a", "b"], "other": input.other, "renderBody": _renderBody - }, out, _component, "7");else _renderBody(out); + }, out, _componentDef, "7");else _renderBody(out); _marko_dynamic_tag(out, input.tag || tagA, () => ({ "class": ["a", "b"], "other": input.other - }), null, null, null, _component, "8"); + }), null, null, null, _componentDef, "8"); const largeHeading = input.isLarge && "h1"; @@ -86,47 +86,47 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, if (_tagName7) out.e(_tagName7, { "class": "a b", "other": input.other - }, "9", component, 0, 0);else out.bf("f_9", component); + }, "9", _component, 0, 0);else out.bf("f_9", _component); const _tagName8 = global.x = "a" + "b"; out.e(_tagName8, { "class": "a b", "other": input.other - }, "10", component, 0, 0); + }, "10", _component, 0, 0); const _tagName9 = "h" + input.level; out.e(_tagName9, { "class": "a b", "other": input.other - }, "11", component, 0, 0); + }, "11", _component, 0, 0); const _tagName10 = `h${input.level}`; out.e(_tagName10, { "class": "a b", "other": input.other - }, "12", component, 0, 0); + }, "12", _component, 0, 0); const tagConstA = "a"; out.e(tagConstA, { "class": "a b", "other": input.other - }, "13", component, 0, 0); + }, "13", _component, 0, 0); const tagConstB = input.show ? "div" : null; if (tagConstB) out.e(tagConstB, { "class": "a b", "other": input.other - }, "14", component, 0, 0);else out.bf("f_14", component); + }, "14", _component, 0, 0);else out.bf("f_14", _component); let tagLazyAssign; tagLazyAssign = "a"; if (tagLazyAssign) out.e(tagLazyAssign, { "class": "a b", "other": input.other - }, "15", component, 0, 0);else out.bf("f_15", component); + }, "15", _component, 0, 0);else out.bf("f_15", _component); tagLazyAssign = input.show ? "div" : null; if (tagLazyAssign) out.e(tagLazyAssign, { "class": "a b", "other": input.other - }, "16", component, 0, 0);else out.bf("f_16", component); + }, "16", _component, 0, 0);else out.bf("f_16", _component); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/entities/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/entities/snapshots/cjs-expected.js index 3e1ea09db0..edfa2cb543 100644 --- a/packages/translator-default/test/fixtures/entities/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/entities/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/entities var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("Hello John & Suzy Invalid Entity: &b ; Valid Numeric Entity: " Valid Hexadecimal Entity: ¢"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/entities/snapshots/html-expected.js b/packages/translator-default/test/fixtures/entities/snapshots/html-expected.js index ffb895c30e..779588dfb9 100644 --- a/packages/translator-default/test/fixtures/entities/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/entities/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/entities export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("Hello John & Suzy Invalid Entity: &b ; Valid Numeric Entity: " Valid Hexadecimal Entity: ¢"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/entities/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/entities/snapshots/htmlProduction-expected.js index df1c36ffdf..9777482dd6 100644 --- a/packages/translator-default/test/fixtures/entities/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/entities/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "Q2oCYb3A", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("Hello John & Suzy Invalid Entity: &b ; Valid Numeric Entity: " Valid Hexadecimal Entity: ¢"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/entities/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/entities/snapshots/vdom-expected.js index 41698b598f..cddc45ca99 100644 --- a/packages/translator-default/test/fixtures/entities/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/entities/snapshots/vdom-expected.js @@ -10,8 +10,8 @@ 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, _component, component, state) { - out.t("Hello John & Suzy Invalid Entity: &b ; Valid Numeric Entity: \" Valid Hexadecimal Entity: \xA2", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.t("Hello John & Suzy Invalid Entity: &b ; Valid Numeric Entity: \" Valid Hexadecimal Entity: \xA2", _component); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/entities/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/entities/snapshots/vdomProduction-expected.js index 73fdabe575..493548386c 100644 --- a/packages/translator-default/test/fixtures/entities/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/entities/snapshots/vdomProduction-expected.js @@ -10,8 +10,8 @@ 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, _component, component, state) { - out.t("Hello John & Suzy Invalid Entity: &b ; Valid Numeric Entity: \" Valid Hexadecimal Entity: \xA2", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.t("Hello John & Suzy Invalid Entity: &b ; Valid Numeric Entity: \" Valid Hexadecimal Entity: \xA2", _component); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/cjs-expected.js index 1f493a93fe..9ff5e37de2 100644 --- a/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/error-bo var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/html-expected.js b/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/html-expected.js index 1a2514f040..149c87b122 100644 --- a/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/error-bo export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/htmlProduction-expected.js index d57a27c78a..292349bf75 100644 --- a/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "QPcOe9nt", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/vdom-expected.js index 782efda1e1..6dc87f8cfd 100644 --- a/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/vdom-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "body-only-if": "" - }, "0", component, 0, 0); + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/vdomProduction-expected.js index 9b12844a8f..3a55fc3f49 100644 --- a/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/error-body-only-if-no-condition/snapshots/vdomProduction-expected.js @@ -16,8 +16,8 @@ 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, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/cjs-expected.js index b089619d40..9cc4e6faf9 100644 --- a/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/cjs-expected.js @@ -17,10 +17,10 @@ const _marko_componentType = "packages/translator-default/test/fixtures/error-re var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { (0, _dynamicTag.default)(out, input.x, null, out => { out.w("Hello"); - }, null, null, _component, "0"); + }, null, null, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/html-expected.js index dcc556d5f7..fb231a81ad 100644 --- a/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/html-expected.js @@ -7,10 +7,10 @@ export default _marko_template; import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_dynamic_tag(out, input.x, null, out => { out.w("Hello"); - }, null, null, _component, "0"); + }, null, null, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/htmlProduction-expected.js index bdc34b7826..6aca28b636 100644 --- a/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/htmlProduction-expected.js @@ -7,10 +7,10 @@ export default _marko_template; import _marko_dynamic_tag from "marko/dist/runtime/helpers/dynamic-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_dynamic_tag(out, input.x, null, out => { out.w("Hello"); - }, null, null, _component, "0"); + }, null, null, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/vdom-expected.js index 0492ac590a..335c258cae 100644 --- a/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/vdom-expected.js @@ -11,10 +11,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_dynamic_tag(out, input.x, null, out => { - out.t("Hello", component); - }, null, null, _component, "0"); + out.t("Hello", _component); + }, null, null, _componentDef, "0"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/vdomProduction-expected.js index a67fe7a2ec..48b3fdcc99 100644 --- a/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/error-repeated-closing-dynamic-tag/snapshots/vdomProduction-expected.js @@ -11,10 +11,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_dynamic_tag(out, input.x, null, out => { - out.t("Hello", component); - }, null, null, _component, "0"); + out.t("Hello", _component); + }, null, null, _componentDef, "0"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/event-handlers/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/event-handlers/snapshots/cjs-expected.js index c87379dcdb..64ce669cdf 100644 --- a/packages/translator-default/test/fixtures/event-handlers/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/event-handlers/snapshots/cjs-expected.js @@ -21,19 +21,19 @@ const _marko_componentType = "packages/translator-default/test/fixtures/event-ha var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { - out.w(`
`); - out.w(`
`); - out.w(`
`); - (0, _renderTag.default)(_customTag2.default, {}, out, _component, "3", [["thing", "handleThing", false, [a, b, ...d]]]); - (0, _renderTag.default)(_customTag2.default, {}, out, _component, "4", [["Dashed-cased-Event", "handle", false]]); - (0, _renderTag.default)(_customTag2.default, {}, out, _component, "5", [["camelcasedEvent", "handle", false]]); + (0, _renderTag.default)(_customTag2.default, {}, out, _componentDef, "3", [["thing", "handleThing", false, [a, b, ...d]]]); + (0, _renderTag.default)(_customTag2.default, {}, out, _componentDef, "4", [["Dashed-cased-Event", "handle", false]]); + (0, _renderTag.default)(_customTag2.default, {}, out, _componentDef, "5", [["camelcasedEvent", "handle", false]]); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/event-handlers/snapshots/html-expected.js b/packages/translator-default/test/fixtures/event-handlers/snapshots/html-expected.js index 3a88ed19fe..bf4ec66ed4 100644 --- a/packages/translator-default/test/fixtures/event-handlers/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/event-handlers/snapshots/html-expected.js @@ -9,22 +9,22 @@ import _customTag from "./components/custom-tag.marko"; import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.w(``); - out.w(``); - out.w(``); - _marko_tag(_customTag, {}, out, _component, "3", [["thing", "handleThing", false, [a, b, ...d]]]); + _marko_tag(_customTag, {}, out, _componentDef, "3", [["thing", "handleThing", false, [a, b, ...d]]]); - _marko_tag(_customTag, {}, out, _component, "4", [["Dashed-cased-Event", "handle", false]]); + _marko_tag(_customTag, {}, out, _componentDef, "4", [["Dashed-cased-Event", "handle", false]]); - _marko_tag(_customTag, {}, out, _component, "5", [["camelcasedEvent", "handle", false]]); + _marko_tag(_customTag, {}, out, _componentDef, "5", [["camelcasedEvent", "handle", false]]); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/event-handlers/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/event-handlers/snapshots/htmlProduction-expected.js index c300457d66..a1d1142ab7 100644 --- a/packages/translator-default/test/fixtures/event-handlers/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/event-handlers/snapshots/htmlProduction-expected.js @@ -9,20 +9,20 @@ import _customTag from "./components/custom-tag.marko"; import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.w(``); - _marko_tag(_customTag, {}, out, _component, "3", [["thing", "handleThing", false, [a, b, ...d]]]); + _marko_tag(_customTag, {}, out, _componentDef, "3", [["thing", "handleThing", false, [a, b, ...d]]]); - _marko_tag(_customTag, {}, out, _component, "4", [["Dashed-cased-Event", "handle", false]]); + _marko_tag(_customTag, {}, out, _componentDef, "4", [["Dashed-cased-Event", "handle", false]]); - _marko_tag(_customTag, {}, out, _component, "5", [["camelcasedEvent", "handle", false]]); + _marko_tag(_customTag, {}, out, _componentDef, "5", [["camelcasedEvent", "handle", false]]); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/event-handlers/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/event-handlers/snapshots/vdom-expected.js index 7b5171a9c6..77c9171bee 100644 --- a/packages/translator-default/test/fixtures/event-handlers/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/event-handlers/snapshots/vdom-expected.js @@ -12,24 +12,24 @@ 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, _component, component, state) { - out.e("div", null, "0", component, 0, 0, { - "onclick": _component.d("click", "handleClick", false, [a, b, ...d]) +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.e("div", null, "0", _component, 0, 0, { + "onclick": _componentDef.d("click", "handleClick", false, [a, b, ...d]) }); - out.e("div", null, "1", component, 0, 0, { - "onDashed-cased-Event": _component.d("Dashed-cased-Event", "handle", false) + out.e("div", null, "1", _component, 0, 0, { + "onDashed-cased-Event": _componentDef.d("Dashed-cased-Event", "handle", false) }); out.e("div", { "onmouseout": "someStringHandler" - }, "2", component, 0, 0, { - "oncamelcasedevent": _component.d("camelcasedevent", "handle", false) + }, "2", _component, 0, 0, { + "oncamelcasedevent": _componentDef.d("camelcasedevent", "handle", false) }); - _marko_tag(_customTag, {}, out, _component, "3", [["thing", "handleThing", false, [a, b, ...d]]]); + _marko_tag(_customTag, {}, out, _componentDef, "3", [["thing", "handleThing", false, [a, b, ...d]]]); - _marko_tag(_customTag, {}, out, _component, "4", [["Dashed-cased-Event", "handle", false]]); + _marko_tag(_customTag, {}, out, _componentDef, "4", [["Dashed-cased-Event", "handle", false]]); - _marko_tag(_customTag, {}, out, _component, "5", [["camelcasedEvent", "handle", false]]); + _marko_tag(_customTag, {}, out, _componentDef, "5", [["camelcasedEvent", "handle", false]]); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/event-handlers/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/event-handlers/snapshots/vdomProduction-expected.js index 2940c0d27c..57ca81fb22 100644 --- a/packages/translator-default/test/fixtures/event-handlers/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/event-handlers/snapshots/vdomProduction-expected.js @@ -12,24 +12,24 @@ 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, _component, component, state) { - out.e("div", null, "0", component, 0, 0, { - "onclick": _component.d("click", "handleClick", false, [a, b, ...d]) +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.e("div", null, "0", _component, 0, 0, { + "onclick": _componentDef.d("click", "handleClick", false, [a, b, ...d]) }); - out.e("div", null, "1", component, 0, 0, { - "onDashed-cased-Event": _component.d("Dashed-cased-Event", "handle", false) + out.e("div", null, "1", _component, 0, 0, { + "onDashed-cased-Event": _componentDef.d("Dashed-cased-Event", "handle", false) }); out.e("div", { "onmouseout": "someStringHandler" - }, "2", component, 0, 0, { - "oncamelcasedevent": _component.d("camelcasedevent", "handle", false) + }, "2", _component, 0, 0, { + "oncamelcasedevent": _componentDef.d("camelcasedevent", "handle", false) }); - _marko_tag(_customTag, {}, out, _component, "3", [["thing", "handleThing", false, [a, b, ...d]]]); + _marko_tag(_customTag, {}, out, _componentDef, "3", [["thing", "handleThing", false, [a, b, ...d]]]); - _marko_tag(_customTag, {}, out, _component, "4", [["Dashed-cased-Event", "handle", false]]); + _marko_tag(_customTag, {}, out, _componentDef, "4", [["Dashed-cased-Event", "handle", false]]); - _marko_tag(_customTag, {}, out, _component, "5", [["camelcasedEvent", "handle", false]]); + _marko_tag(_customTag, {}, out, _componentDef, "5", [["camelcasedEvent", "handle", false]]); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/for-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/for-tag/snapshots/cjs-expected.js index 21592f6afb..e4ff39b784 100644 --- a/packages/translator-default/test/fixtures/for-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/for-tag/snapshots/cjs-expected.js @@ -19,7 +19,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/for-tag/ var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { let _i = 0; for (const val of arr) { @@ -62,13 +62,13 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com let i = _i2++; const _keyValue = `@${i}`, _keyScope4 = `[${_keyValue}]`; - out.w(``); + out.w(``); out.w((0, _escapeXml.x)(i)); out.w(": "); out.w((0, _escapeXml.x)(val)); out.w(""); out.w("
"); - out.w(``); + out.w(``); } let _i3 = 0; @@ -77,7 +77,7 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com for (const val of list) { let i = _i3++; const _keyValue2 = `@${i}`; - out.w(``); + out.w(``); out.w((0, _escapeXml.x)(list.length)); out.w(": "); out.w((0, _escapeXml.x)(val)); @@ -88,34 +88,34 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com const val = obj[key]; const _keyValue3 = `@${key}`, _keyScope5 = `[${_keyValue3}]`; - out.w(``); + out.w(``); out.w((0, _escapeXml.x)(key)); out.w(": "); out.w((0, _escapeXml.x)(val)); out.w(""); out.w("
"); - out.w(``); + out.w(``); } for (let _steps3 = (10 - 0) / 2, _step3 = 0; _step3 <= _steps3; _step3++) { const i = 0 + _step3 * 2; const _keyValue4 = `@${i}`, _keyScope6 = `[${_keyValue4}]`; - out.w(``); + out.w(``); out.w((0, _escapeXml.x)(i)); out.w(""); out.w("
"); - out.w(``); + out.w(``); for (let _steps2 = (10 - 0) / 2, _step2 = 0; _step2 <= _steps2; _step2++) { const i = 0 + _step2 * 2; const _keyValue5 = `@${i}`, _keyScope7 = `[${_keyValue5}]`; - out.w(``); + out.w(``); out.w((0, _escapeXml.x)(i)); out.w(""); out.w("
"); - out.w(``); + out.w(``); } } @@ -123,11 +123,11 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com const i = 10 + _step4 * -2; const _keyValue6 = `@${i}`, _keyScope8 = `[${_keyValue6}]`; - out.w(``); + out.w(``); out.w((0, _escapeXml.x)(i)); out.w(""); out.w("
"); - out.w(``); + out.w(``); } for (let _steps5 = (10 - 0) / 1, _step5 = 0; _step5 <= _steps5; _step5++) { diff --git a/packages/translator-default/test/fixtures/for-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/for-tag/snapshots/html-expected.js index 114944f1e5..00aeb47740 100644 --- a/packages/translator-default/test/fixtures/for-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/for-tag/snapshots/html-expected.js @@ -8,7 +8,7 @@ import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml import _marko_props from "marko/src/runtime/html/helpers/data-marko"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let _i = 0; for (const val of arr) { @@ -51,13 +51,13 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, let i = _i2++; const _keyValue = `@${i}`, _keyScope4 = `[${_keyValue}]`; - out.w(``); + out.w(``); out.w(_marko_escapeXml(i)); out.w(": "); out.w(_marko_escapeXml(val)); out.w(""); out.w("
"); - out.w(``); + out.w(``); } let _i3 = 0; @@ -66,7 +66,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, for (const val of list) { let i = _i3++; const _keyValue2 = `@${i}`; - out.w(``); + out.w(``); out.w(_marko_escapeXml(list.length)); out.w(": "); out.w(_marko_escapeXml(val)); @@ -77,34 +77,34 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const val = obj[key]; const _keyValue3 = `@${key}`, _keyScope5 = `[${_keyValue3}]`; - out.w(``); + out.w(``); out.w(_marko_escapeXml(key)); out.w(": "); out.w(_marko_escapeXml(val)); out.w(""); out.w("
"); - out.w(``); + out.w(``); } for (let _steps3 = (10 - 0) / 2, _step3 = 0; _step3 <= _steps3; _step3++) { const i = 0 + _step3 * 2; const _keyValue4 = `@${i}`, _keyScope6 = `[${_keyValue4}]`; - out.w(``); + out.w(``); out.w(_marko_escapeXml(i)); out.w(""); out.w("
"); - out.w(``); + out.w(``); for (let _steps2 = (10 - 0) / 2, _step2 = 0; _step2 <= _steps2; _step2++) { const i = 0 + _step2 * 2; const _keyValue5 = `@${i}`, _keyScope7 = `[${_keyValue5}]`; - out.w(``); + out.w(``); out.w(_marko_escapeXml(i)); out.w(""); out.w("
"); - out.w(``); + out.w(``); } } @@ -112,11 +112,11 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const i = 10 + _step4 * -2; const _keyValue6 = `@${i}`, _keyScope8 = `[${_keyValue6}]`; - out.w(``); + out.w(``); out.w(_marko_escapeXml(i)); out.w(""); out.w("
"); - out.w(``); + out.w(``); } for (let _steps5 = (10 - 0) / 1, _step5 = 0; _step5 <= _steps5; _step5++) { diff --git a/packages/translator-default/test/fixtures/for-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/for-tag/snapshots/htmlProduction-expected.js index da7c718d30..1cc80f2b50 100644 --- a/packages/translator-default/test/fixtures/for-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/for-tag/snapshots/htmlProduction-expected.js @@ -8,7 +8,7 @@ import { x as _marko_escapeXml } from "marko/dist/runtime/html/helpers/escape-xm import _marko_props from "marko/dist/runtime/html/helpers/data-marko"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let _i = 0; for (const val of arr) { @@ -35,7 +35,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, let i = _i2++; const _keyValue = `@${i}`, _keyScope4 = `[${_keyValue}]`; - out.w(`${_marko_escapeXml(i)}: ${_marko_escapeXml(val)}
`); + out.w(`${_marko_escapeXml(i)}: ${_marko_escapeXml(val)}
`); } let _i3 = 0; @@ -44,27 +44,27 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, for (const val of list) { let i = _i3++; const _keyValue2 = `@${i}`; - out.w(`${_marko_escapeXml(list.length)}: ${_marko_escapeXml(val)}`); + out.w(`${_marko_escapeXml(list.length)}: ${_marko_escapeXml(val)}`); } for (const key in obj) { const val = obj[key]; const _keyValue3 = `@${key}`, _keyScope5 = `[${_keyValue3}]`; - out.w(`${_marko_escapeXml(key)}: ${_marko_escapeXml(val)}
`); + out.w(`${_marko_escapeXml(key)}: ${_marko_escapeXml(val)}
`); } for (let _steps3 = (10 - 0) / 2, _step3 = 0; _step3 <= _steps3; _step3++) { const i = 0 + _step3 * 2; const _keyValue4 = `@${i}`, _keyScope6 = `[${_keyValue4}]`; - out.w(`${_marko_escapeXml(i)}
`); + out.w(`${_marko_escapeXml(i)}
`); for (let _steps2 = (10 - 0) / 2, _step2 = 0; _step2 <= _steps2; _step2++) { const i = 0 + _step2 * 2; const _keyValue5 = `@${i}`, _keyScope7 = `[${_keyValue5}]`; - out.w(`${_marko_escapeXml(i)}
`); + out.w(`${_marko_escapeXml(i)}
`); } } @@ -72,7 +72,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const i = 10 + _step4 * -2; const _keyValue6 = `@${i}`, _keyScope8 = `[${_keyValue6}]`; - out.w(`${_marko_escapeXml(i)}
`); + out.w(`${_marko_escapeXml(i)}
`); } for (let _steps5 = (10 - 0) / 1, _step5 = 0; _step5 <= _steps5; _step5++) { diff --git a/packages/translator-default/test/fixtures/for-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/for-tag/snapshots/vdom-expected.js index e90984b404..a375919ab6 100644 --- a/packages/translator-default/test/fixtures/for-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/for-tag/snapshots/vdom-expected.js @@ -10,41 +10,41 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let _i = 0; for (const val of arr) { let i = _i++; const _keyScope = `[${i}]`; - out.be("div", null, "0" + _keyScope, component, null, 0); - out.t(i, component); - out.t(": ", component); - out.t(val, component); + out.be("div", null, "0" + _keyScope, _component, null, 0); + out.t(i, _component); + out.t(": ", _component); + out.t(val, _component); out.ee(); - out.e("div", null, "1" + _keyScope, component, 0, 0); - out.e("div", null, "2" + _keyScope, component, 0, 0); + out.e("div", null, "1" + _keyScope, _component, 0, 0); + out.e("div", null, "2" + _keyScope, _component, 0, 0); } for (const key in obj) { const val = obj[key]; const _keyScope2 = `[${key}]`; - out.be("div", null, "3" + _keyScope2, component, null, 0); - out.t(key, component); - out.t(": ", component); - out.t(val, component); + out.be("div", null, "3" + _keyScope2, _component, null, 0); + out.t(key, _component); + out.t(": ", _component); + out.t(val, _component); out.ee(); - out.e("div", null, "4" + _keyScope2, component, 0, 0); - out.e("div", null, "5" + _keyScope2, component, 0, 0); + out.e("div", null, "4" + _keyScope2, _component, 0, 0); + out.e("div", null, "5" + _keyScope2, _component, 0, 0); } for (let _steps = (10 - 0) / 2, _step = 0; _step <= _steps; _step++) { const i = 0 + _step * 2; const _keyScope3 = `[${i}]`; - out.be("div", null, "6" + _keyScope3, component, null, 0); - out.t(i, component); + out.be("div", null, "6" + _keyScope3, _component, null, 0); + out.t(i, _component); out.ee(); - out.e("div", null, "7" + _keyScope3, component, 0, 0); - out.e("div", null, "8" + _keyScope3, component, 0, 0); + out.e("div", null, "7" + _keyScope3, _component, 0, 0); + out.e("div", null, "8" + _keyScope3, _component, 0, 0); } let _i2 = 0; @@ -53,13 +53,13 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, let i = _i2++; const _keyValue = `@${i}`, _keyScope4 = `[${_keyValue}]`; - out.be("div", null, _keyValue, component, null, 0); - out.t(i, component); - out.t(": ", component); - out.t(val, component); + out.be("div", null, _keyValue, _component, null, 0); + out.t(i, _component); + out.t(": ", _component); + out.t(val, _component); out.ee(); - out.e("div", null, "9" + _keyScope4, component, 0, 0); - out.e("div", null, `@other-${i}`, component, 0, 0); + out.e("div", null, "9" + _keyScope4, _component, 0, 0); + out.e("div", null, `@other-${i}`, _component, 0, 0); } let _i3 = 0; @@ -68,10 +68,10 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, for (const val of list) { let i = _i3++; const _keyValue2 = `@${i}`; - out.be("div", null, _keyValue2, component, null, 0); - out.t(list.length, component); - out.t(": ", component); - out.t(val, component); + out.be("div", null, _keyValue2, _component, null, 0); + out.t(list.length, _component); + out.t(": ", _component); + out.t(val, _component); out.ee(); } @@ -79,34 +79,34 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const val = obj[key]; const _keyValue3 = `@${key}`, _keyScope5 = `[${_keyValue3}]`; - out.be("div", null, _keyValue3, component, null, 0); - out.t(key, component); - out.t(": ", component); - out.t(val, component); + out.be("div", null, _keyValue3, _component, null, 0); + out.t(key, _component); + out.t(": ", _component); + out.t(val, _component); out.ee(); - out.e("div", null, "10" + _keyScope5, component, 0, 0); - out.e("div", null, `@other-${key}`, component, 0, 0); + out.e("div", null, "10" + _keyScope5, _component, 0, 0); + out.e("div", null, `@other-${key}`, _component, 0, 0); } for (let _steps3 = (10 - 0) / 2, _step3 = 0; _step3 <= _steps3; _step3++) { const i = 0 + _step3 * 2; const _keyValue4 = `@${i}`, _keyScope6 = `[${_keyValue4}]`; - out.be("div", null, _keyValue4, component, null, 0); - out.t(i, component); + out.be("div", null, _keyValue4, _component, null, 0); + out.t(i, _component); out.ee(); - out.e("div", null, "11" + _keyScope6, component, 0, 0); - out.e("div", null, `@other-${i}`, component, 0, 0); + out.e("div", null, "11" + _keyScope6, _component, 0, 0); + out.e("div", null, `@other-${i}`, _component, 0, 0); for (let _steps2 = (10 - 0) / 2, _step2 = 0; _step2 <= _steps2; _step2++) { const i = 0 + _step2 * 2; const _keyValue5 = `@${i}`, _keyScope7 = `[${_keyValue5}]`; - out.be("div", null, _keyValue5, component, null, 0); - out.t(i, component); + out.be("div", null, _keyValue5, _component, null, 0); + out.t(i, _component); out.ee(); - out.e("div", null, "12" + _keyScope7, component, 0, 0); - out.e("div", null, `@other-${i}`, component, 0, 0); + out.e("div", null, "12" + _keyScope7, _component, 0, 0); + out.e("div", null, `@other-${i}`, _component, 0, 0); } } @@ -114,19 +114,19 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const i = 10 + _step4 * -2; const _keyValue6 = `@${i}`, _keyScope8 = `[${_keyValue6}]`; - out.be("div", null, _keyValue6, component, null, 0); - out.t(i, component); + out.be("div", null, _keyValue6, _component, null, 0); + out.t(i, _component); out.ee(); - out.e("div", null, "13" + _keyScope8, component, 0, 0); - out.e("div", null, `@other-${i}`, component, 0, 0); + out.e("div", null, "13" + _keyScope8, _component, 0, 0); + out.e("div", null, `@other-${i}`, _component, 0, 0); } for (let _steps5 = (10 - 0) / 1, _step5 = 0; _step5 <= _steps5; _step5++) { - out.t("Hello", component); + out.t("Hello", _component); } for (let _steps6 = (10 - 0) / 1, _step6 = 0; _step6 <= _steps6; _step6++) { - out.t("Hello", component); + out.t("Hello", _component); } }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/for-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/for-tag/snapshots/vdomProduction-expected.js index ac03fb0a73..9e276093cb 100644 --- a/packages/translator-default/test/fixtures/for-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/for-tag/snapshots/vdomProduction-expected.js @@ -10,41 +10,41 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let _i = 0; for (const val of arr) { let i = _i++; const _keyScope = `[${i}]`; - out.be("div", null, "0" + _keyScope, component, null, 0); - out.t(i, component); - out.t(": ", component); - out.t(val, component); + out.be("div", null, "0" + _keyScope, _component, null, 0); + out.t(i, _component); + out.t(": ", _component); + out.t(val, _component); out.ee(); - out.e("div", null, "1" + _keyScope, component, 0, 0); - out.e("div", null, "2" + _keyScope, component, 0, 0); + out.e("div", null, "1" + _keyScope, _component, 0, 0); + out.e("div", null, "2" + _keyScope, _component, 0, 0); } for (const key in obj) { const val = obj[key]; const _keyScope2 = `[${key}]`; - out.be("div", null, "3" + _keyScope2, component, null, 0); - out.t(key, component); - out.t(": ", component); - out.t(val, component); + out.be("div", null, "3" + _keyScope2, _component, null, 0); + out.t(key, _component); + out.t(": ", _component); + out.t(val, _component); out.ee(); - out.e("div", null, "4" + _keyScope2, component, 0, 0); - out.e("div", null, "5" + _keyScope2, component, 0, 0); + out.e("div", null, "4" + _keyScope2, _component, 0, 0); + out.e("div", null, "5" + _keyScope2, _component, 0, 0); } for (let _steps = (10 - 0) / 2, _step = 0; _step <= _steps; _step++) { const i = 0 + _step * 2; const _keyScope3 = `[${i}]`; - out.be("div", null, "6" + _keyScope3, component, null, 0); - out.t(i, component); + out.be("div", null, "6" + _keyScope3, _component, null, 0); + out.t(i, _component); out.ee(); - out.e("div", null, "7" + _keyScope3, component, 0, 0); - out.e("div", null, "8" + _keyScope3, component, 0, 0); + out.e("div", null, "7" + _keyScope3, _component, 0, 0); + out.e("div", null, "8" + _keyScope3, _component, 0, 0); } let _i2 = 0; @@ -53,13 +53,13 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, let i = _i2++; const _keyValue = `@${i}`, _keyScope4 = `[${_keyValue}]`; - out.be("div", null, _keyValue, component, null, 0); - out.t(i, component); - out.t(": ", component); - out.t(val, component); + out.be("div", null, _keyValue, _component, null, 0); + out.t(i, _component); + out.t(": ", _component); + out.t(val, _component); out.ee(); - out.e("div", null, "9" + _keyScope4, component, 0, 0); - out.e("div", null, `@other-${i}`, component, 0, 0); + out.e("div", null, "9" + _keyScope4, _component, 0, 0); + out.e("div", null, `@other-${i}`, _component, 0, 0); } let _i3 = 0; @@ -68,10 +68,10 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, for (const val of list) { let i = _i3++; const _keyValue2 = `@${i}`; - out.be("div", null, _keyValue2, component, null, 0); - out.t(list.length, component); - out.t(": ", component); - out.t(val, component); + out.be("div", null, _keyValue2, _component, null, 0); + out.t(list.length, _component); + out.t(": ", _component); + out.t(val, _component); out.ee(); } @@ -79,34 +79,34 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const val = obj[key]; const _keyValue3 = `@${key}`, _keyScope5 = `[${_keyValue3}]`; - out.be("div", null, _keyValue3, component, null, 0); - out.t(key, component); - out.t(": ", component); - out.t(val, component); + out.be("div", null, _keyValue3, _component, null, 0); + out.t(key, _component); + out.t(": ", _component); + out.t(val, _component); out.ee(); - out.e("div", null, "10" + _keyScope5, component, 0, 0); - out.e("div", null, `@other-${key}`, component, 0, 0); + out.e("div", null, "10" + _keyScope5, _component, 0, 0); + out.e("div", null, `@other-${key}`, _component, 0, 0); } for (let _steps3 = (10 - 0) / 2, _step3 = 0; _step3 <= _steps3; _step3++) { const i = 0 + _step3 * 2; const _keyValue4 = `@${i}`, _keyScope6 = `[${_keyValue4}]`; - out.be("div", null, _keyValue4, component, null, 0); - out.t(i, component); + out.be("div", null, _keyValue4, _component, null, 0); + out.t(i, _component); out.ee(); - out.e("div", null, "11" + _keyScope6, component, 0, 0); - out.e("div", null, `@other-${i}`, component, 0, 0); + out.e("div", null, "11" + _keyScope6, _component, 0, 0); + out.e("div", null, `@other-${i}`, _component, 0, 0); for (let _steps2 = (10 - 0) / 2, _step2 = 0; _step2 <= _steps2; _step2++) { const i = 0 + _step2 * 2; const _keyValue5 = `@${i}`, _keyScope7 = `[${_keyValue5}]`; - out.be("div", null, _keyValue5, component, null, 0); - out.t(i, component); + out.be("div", null, _keyValue5, _component, null, 0); + out.t(i, _component); out.ee(); - out.e("div", null, "12" + _keyScope7, component, 0, 0); - out.e("div", null, `@other-${i}`, component, 0, 0); + out.e("div", null, "12" + _keyScope7, _component, 0, 0); + out.e("div", null, `@other-${i}`, _component, 0, 0); } } @@ -114,19 +114,19 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const i = 10 + _step4 * -2; const _keyValue6 = `@${i}`, _keyScope8 = `[${_keyValue6}]`; - out.be("div", null, _keyValue6, component, null, 0); - out.t(i, component); + out.be("div", null, _keyValue6, _component, null, 0); + out.t(i, _component); out.ee(); - out.e("div", null, "13" + _keyScope8, component, 0, 0); - out.e("div", null, `@other-${i}`, component, 0, 0); + out.e("div", null, "13" + _keyScope8, _component, 0, 0); + out.e("div", null, `@other-${i}`, _component, 0, 0); } for (let _steps5 = (10 - 0) / 1, _step5 = 0; _step5 <= _steps5; _step5++) { - out.t("Hello", component); + out.t("Hello", _component); } for (let _steps6 = (10 - 0) / 1, _step6 = 0; _step6 <= _steps6; _step6++) { - out.t("Hello", component); + out.t("Hello", _component); } }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/hello-dynamic/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/hello-dynamic/snapshots/cjs-expected.js index 5e829e7afa..d3d4ae3320 100644 --- a/packages/translator-default/test/fixtures/hello-dynamic/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/hello-dynamic/snapshots/cjs-expected.js @@ -19,7 +19,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/hello-dy var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("Hello "); out.w((0, _escapeXml.x)(input.name)); out.w("! Hello "); diff --git a/packages/translator-default/test/fixtures/hello-dynamic/snapshots/html-expected.js b/packages/translator-default/test/fixtures/hello-dynamic/snapshots/html-expected.js index de579e1171..74b3a81c05 100644 --- a/packages/translator-default/test/fixtures/hello-dynamic/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/hello-dynamic/snapshots/html-expected.js @@ -8,7 +8,7 @@ import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml import _marko_to_string from "marko/src/runtime/helpers/to-string"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("Hello "); out.w(_marko_escapeXml(input.name)); out.w("! Hello "); diff --git a/packages/translator-default/test/fixtures/hello-dynamic/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/hello-dynamic/snapshots/htmlProduction-expected.js index a5cfa278c0..00ae4cda83 100644 --- a/packages/translator-default/test/fixtures/hello-dynamic/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/hello-dynamic/snapshots/htmlProduction-expected.js @@ -8,7 +8,7 @@ import { x as _marko_escapeXml } from "marko/dist/runtime/html/helpers/escape-xm import _marko_to_string from "marko/dist/runtime/helpers/to-string"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(`Hello ${_marko_escapeXml(input.name)}! Hello ${_marko_to_string(input.name)}! Hello ${_marko_to_string(input.missing)}!`); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/hello-dynamic/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/hello-dynamic/snapshots/vdom-expected.js index 5e1025337f..429c15edf9 100644 --- a/packages/translator-default/test/fixtures/hello-dynamic/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/hello-dynamic/snapshots/vdom-expected.js @@ -10,14 +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, _component, component, state) { - out.t("Hello ", component); - out.t(input.name, component); - out.t("! Hello ", component); - out.h(input.name, component); - out.t("! Hello ", component); - out.h(input.missing, component); - out.t("!", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.t("Hello ", _component); + out.t(input.name, _component); + out.t("! Hello ", _component); + out.h(input.name, _component); + out.t("! Hello ", _component); + out.h(input.missing, _component); + out.t("!", _component); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/hello-dynamic/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/hello-dynamic/snapshots/vdomProduction-expected.js index aa25193d0d..dacae5690b 100644 --- a/packages/translator-default/test/fixtures/hello-dynamic/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/hello-dynamic/snapshots/vdomProduction-expected.js @@ -10,14 +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, _component, component, state) { - out.t("Hello ", component); - out.t(input.name, component); - out.t("! Hello ", component); - out.h(input.name, component); - out.t("! Hello ", component); - out.h(input.missing, component); - out.t("!", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.t("Hello ", _component); + out.t(input.name, _component); + out.t("! Hello ", _component); + out.h(input.name, _component); + out.t("! Hello ", _component); + out.h(input.missing, _component); + out.t("!", _component); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/html-comment/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/html-comment/snapshots/cjs-expected.js index 2b40851d51..120e67929f 100644 --- a/packages/translator-default/test/fixtures/html-comment/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/html-comment/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/html-com var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(""); diff --git a/packages/translator-default/test/fixtures/html-comment/snapshots/html-expected.js b/packages/translator-default/test/fixtures/html-comment/snapshots/html-expected.js index 995b120132..645c82d972 100644 --- a/packages/translator-default/test/fixtures/html-comment/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/html-comment/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/html-com export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); diff --git a/packages/translator-default/test/fixtures/html-comment/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/html-comment/snapshots/htmlProduction-expected.js index 686a25e75a..e01d0befd1 100644 --- a/packages/translator-default/test/fixtures/html-comment/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/html-comment/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "3DMKav/3", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/html-comment/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/html-comment/snapshots/vdom-expected.js index 62aa0c6878..fbd6998eed 100644 --- a/packages/translator-default/test/fixtures/html-comment/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/html-comment/snapshots/vdom-expected.js @@ -10,7 +10,7 @@ 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, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/html-comment/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/html-comment/snapshots/vdomProduction-expected.js index 318d792329..184e0554bc 100644 --- a/packages/translator-default/test/fixtures/html-comment/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/html-comment/snapshots/vdomProduction-expected.js @@ -10,7 +10,7 @@ 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, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true }, _marko_component); diff --git a/packages/translator-default/test/fixtures/html-entity/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/html-entity/snapshots/cjs-expected.js index b84811c960..ac7b241bf2 100644 --- a/packages/translator-default/test/fixtures/html-entity/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/html-entity/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/html-ent var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
"); out.w("<div>"); out.w("
"); diff --git a/packages/translator-default/test/fixtures/html-entity/snapshots/html-expected.js b/packages/translator-default/test/fixtures/html-entity/snapshots/html-expected.js index 5df88c21f6..b3aea4c039 100644 --- a/packages/translator-default/test/fixtures/html-entity/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/html-entity/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/html-ent export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); out.w("<div>"); out.w("
"); diff --git a/packages/translator-default/test/fixtures/html-entity/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/html-entity/snapshots/htmlProduction-expected.js index 7c6accbd7b..f254d8fcb5 100644 --- a/packages/translator-default/test/fixtures/html-entity/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/html-entity/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "PF20NQ88", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
<div>
"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/html-entity/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/html-entity/snapshots/vdom-expected.js index 9bfa3c8695..f441385498 100644 --- a/packages/translator-default/test/fixtures/html-entity/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/html-entity/snapshots/vdom-expected.js @@ -10,9 +10,9 @@ 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, _component, component, state) { - out.be("div", null, "0", component, null, 0); - out.t("
", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("div", null, "0", _component, null, 0); + out.t("
", _component); out.ee(); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/html-entity/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/html-entity/snapshots/vdomProduction-expected.js index 04384de681..ac50c4038b 100644 --- a/packages/translator-default/test/fixtures/html-entity/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/html-entity/snapshots/vdomProduction-expected.js @@ -14,8 +14,8 @@ 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, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/if-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/if-tag/snapshots/cjs-expected.js index 7a0b2e28ff..f4471c4a5e 100644 --- a/packages/translator-default/test/fixtures/if-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/if-tag/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/if-tag/t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { if (a + b) { out.w("Hello"); } diff --git a/packages/translator-default/test/fixtures/if-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/if-tag/snapshots/html-expected.js index b82f19dee5..1e02df7783 100644 --- a/packages/translator-default/test/fixtures/if-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/if-tag/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/if-tag/t export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { if (a + b) { out.w("Hello"); } diff --git a/packages/translator-default/test/fixtures/if-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/if-tag/snapshots/htmlProduction-expected.js index bec21872fc..823c956a6c 100644 --- a/packages/translator-default/test/fixtures/if-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/if-tag/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "y0rlhGQ3", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { if (a + b) { out.w("Hello"); } diff --git a/packages/translator-default/test/fixtures/if-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/if-tag/snapshots/vdom-expected.js index e85d1a66e0..3527d4cf10 100644 --- a/packages/translator-default/test/fixtures/if-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/if-tag/snapshots/vdom-expected.js @@ -10,23 +10,23 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { if (a + b) { - out.t("Hello", component); + out.t("Hello", _component); } if (a, b) { - out.t("World", component); + out.t("World", _component); } - out.be("div", null, "0", component, null, 0); + out.be("div", null, "0", _component, null, 0); if (x) { - out.t("A", component); + out.t("A", _component); } else if (y) { - out.t("B", component); + out.t("B", _component); } else { - out.t("C", component); + out.t("C", _component); } out.ee(); diff --git a/packages/translator-default/test/fixtures/if-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/if-tag/snapshots/vdomProduction-expected.js index fa2b85acf8..b7598f9093 100644 --- a/packages/translator-default/test/fixtures/if-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/if-tag/snapshots/vdomProduction-expected.js @@ -10,23 +10,23 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { if (a + b) { - out.t("Hello", component); + out.t("Hello", _component); } if (a, b) { - out.t("World", component); + out.t("World", _component); } - out.be("div", null, "0", component, null, 0); + out.be("div", null, "0", _component, null, 0); if (x) { - out.t("A", component); + out.t("A", _component); } else if (y) { - out.t("B", component); + out.t("B", _component); } else { - out.t("C", component); + out.t("C", _component); } out.ee(); diff --git a/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/cjs-expected.js index 3f9d5888a6..4072c05788 100644 --- a/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/cjs-expected.js @@ -23,7 +23,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/import-h var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) {}, { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/html-expected.js b/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/html-expected.js index 39515c7139..7f0d032e5b 100644 --- a/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/html-expected.js @@ -8,7 +8,7 @@ import bar, { f as foo } from "./bar"; import "./foo.css"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/htmlProduction-expected.js index 55bc17528f..c07f218f2b 100644 --- a/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/htmlProduction-expected.js @@ -8,7 +8,7 @@ import bar, { f as foo } from "./bar"; import "./foo.css"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true }, _marko_component); \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/vdom-expected.js index 89ee4d30c2..62fde63b65 100644 --- a/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/vdom-expected.js @@ -12,7 +12,7 @@ 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, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/vdomProduction-expected.js index a427db0a4e..fb305302c2 100644 --- a/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/import-hydrate-include/snapshots/vdomProduction-expected.js @@ -12,7 +12,7 @@ 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, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true }, _marko_component); diff --git a/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/cjs-expected.js index a186f4b21c..f1b0ffde6b 100644 --- a/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/cjs-expected.js @@ -19,7 +19,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/import-t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) {}, { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/html-expected.js b/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/html-expected.js index 8a271528b9..43d23e4176 100644 --- a/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/html-expected.js @@ -8,7 +8,7 @@ import { asset as test } from "./test1/asset"; import { asset } from "./test2/asset"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/htmlProduction-expected.js index d1ee9249fb..7721a535e9 100644 --- a/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/htmlProduction-expected.js @@ -8,7 +8,7 @@ import { asset as test } from "./test1/asset"; import { asset } from "./test2/asset"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true }, _marko_component); \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/vdom-expected.js index 45f5ebaae8..29b16e6104 100644 --- a/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/vdom-expected.js @@ -12,7 +12,7 @@ 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, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/vdomProduction-expected.js index 45be460578..91454e336a 100644 --- a/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/import-tag-conflict/snapshots/vdomProduction-expected.js @@ -12,7 +12,7 @@ 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, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true }, _marko_component); diff --git a/packages/translator-default/test/fixtures/import-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/import-tag/snapshots/cjs-expected.js index 1ce8542626..cba7b63a7b 100644 --- a/packages/translator-default/test/fixtures/import-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/import-tag/snapshots/cjs-expected.js @@ -25,7 +25,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/import-t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) {}, { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/import-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/import-tag/snapshots/html-expected.js index 8a8588600d..20e23c026b 100644 --- a/packages/translator-default/test/fixtures/import-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/import-tag/snapshots/html-expected.js @@ -9,7 +9,7 @@ import "./foo"; import baz from "./components/baz.marko"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/import-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/import-tag/snapshots/htmlProduction-expected.js index 2c8331dcbe..4cce2e953c 100644 --- a/packages/translator-default/test/fixtures/import-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/import-tag/snapshots/htmlProduction-expected.js @@ -9,7 +9,7 @@ import "./foo"; import baz from "./components/baz.marko"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true }, _marko_component); \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/import-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/import-tag/snapshots/vdom-expected.js index 4dcc03a0f1..b5ad1dae71 100644 --- a/packages/translator-default/test/fixtures/import-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/import-tag/snapshots/vdom-expected.js @@ -13,7 +13,7 @@ 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, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/import-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/import-tag/snapshots/vdomProduction-expected.js index 2d29ab46b7..ad62cba00d 100644 --- a/packages/translator-default/test/fixtures/import-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/import-tag/snapshots/vdomProduction-expected.js @@ -13,7 +13,7 @@ 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, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true }, _marko_component); diff --git a/packages/translator-default/test/fixtures/macro-non-root/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/macro-non-root/snapshots/cjs-expected.js index 67d402ec94..a5cc8754a0 100644 --- a/packages/translator-default/test/fixtures/macro-non-root/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/macro-non-root/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/macro-no var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
"); function _stuff(out, x) { diff --git a/packages/translator-default/test/fixtures/macro-non-root/snapshots/html-expected.js b/packages/translator-default/test/fixtures/macro-non-root/snapshots/html-expected.js index a90fcb6b5a..0d9d556b97 100644 --- a/packages/translator-default/test/fixtures/macro-non-root/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/macro-non-root/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/macro-no export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); function _stuff(out, x) { diff --git a/packages/translator-default/test/fixtures/macro-non-root/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/macro-non-root/snapshots/htmlProduction-expected.js index 6818c61da8..fe653c5ee4 100644 --- a/packages/translator-default/test/fixtures/macro-non-root/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/macro-non-root/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "R6eF4gGA", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
"); function _stuff(out, x) { diff --git a/packages/translator-default/test/fixtures/macro-non-root/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/macro-non-root/snapshots/vdom-expected.js index 00bb3f2e5a..1f63942234 100644 --- a/packages/translator-default/test/fixtures/macro-non-root/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/macro-non-root/snapshots/vdom-expected.js @@ -10,11 +10,11 @@ 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, _component, component, state) { - out.be("div", null, "0", component, null, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("div", null, "0", _component, null, 0); function _stuff(out, x) { - out.e("div", null, "2", component, 0, 0); + out.e("div", null, "2", _component, 0, 0); } out.ee(); diff --git a/packages/translator-default/test/fixtures/macro-non-root/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/macro-non-root/snapshots/vdomProduction-expected.js index c74733d61c..6543a0023e 100644 --- a/packages/translator-default/test/fixtures/macro-non-root/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/macro-non-root/snapshots/vdomProduction-expected.js @@ -14,11 +14,11 @@ 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, _component, component, state) { - out.be("div", null, "0", component, null, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("div", null, "0", _component, null, 0); function _stuff(out, x) { - out.n(_marko_node, component); + out.n(_marko_node, _component); } out.ee(); diff --git a/packages/translator-default/test/fixtures/macros/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/macros/snapshots/cjs-expected.js index 47ee74b0b7..610039bab3 100644 --- a/packages/translator-default/test/fixtures/macros/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/macros/snapshots/cjs-expected.js @@ -19,7 +19,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/macros/t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { function _renderTree(out, node) { out.w("Name: "); out.w((0, _escapeXml.x)(node.name)); @@ -33,7 +33,7 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com for (const child of node.children) { const _keyScope = `[${_keyValue++}]`; out.w("
  • "); - (0, _dynamicTag.default)(out, _renderTree, () => child, null, null, null, _component, "3" + _keyScope); + (0, _dynamicTag.default)(out, _renderTree, () => child, null, null, null, _componentDef, "3" + _keyScope); out.w("
    • "); } } @@ -41,7 +41,7 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com } } - (0, _dynamicTag.default)(out, _renderTree, () => input.node, null, null, null, _component, "4"); + (0, _dynamicTag.default)(out, _renderTree, () => input.node, null, null, null, _componentDef, "4"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/macros/snapshots/html-expected.js b/packages/translator-default/test/fixtures/macros/snapshots/html-expected.js index 97b0cccfc0..7175b12131 100644 --- a/packages/translator-default/test/fixtures/macros/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/macros/snapshots/html-expected.js @@ -8,7 +8,7 @@ import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml import _marko_dynamic_tag from "marko/src/runtime/helpers/dynamic-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { function _renderTree(out, node) { out.w("Name: "); out.w(_marko_escapeXml(node.name)); @@ -23,7 +23,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const _keyScope = `[${_keyValue++}]`; out.w("
  • "); - _marko_dynamic_tag(out, _renderTree, () => child, null, null, null, _component, "3" + _keyScope); + _marko_dynamic_tag(out, _renderTree, () => child, null, null, null, _componentDef, "3" + _keyScope); out.w("
    • "); } @@ -32,7 +32,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, } } - _marko_dynamic_tag(out, _renderTree, () => input.node, null, null, null, _component, "4"); + _marko_dynamic_tag(out, _renderTree, () => input.node, null, null, null, _componentDef, "4"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/macros/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/macros/snapshots/htmlProduction-expected.js index 5a9a310f41..7e06b4df62 100644 --- a/packages/translator-default/test/fixtures/macros/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/macros/snapshots/htmlProduction-expected.js @@ -8,7 +8,7 @@ import { x as _marko_escapeXml } from "marko/dist/runtime/html/helpers/escape-xm import _marko_dynamic_tag from "marko/dist/runtime/helpers/dynamic-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { function _renderTree(out, node) { out.w(`Name: ${_marko_escapeXml(node.name)} Children: `); @@ -21,7 +21,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const _keyScope = `[${_keyValue++}]`; out.w("
  • "); - _marko_dynamic_tag(out, _renderTree, () => child, null, null, null, _component, "3" + _keyScope); + _marko_dynamic_tag(out, _renderTree, () => child, null, null, null, _componentDef, "3" + _keyScope); out.w("
    • "); } @@ -30,7 +30,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, } } - _marko_dynamic_tag(out, _renderTree, () => input.node, null, null, null, _component, "4"); + _marko_dynamic_tag(out, _renderTree, () => input.node, null, null, null, _componentDef, "4"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/macros/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/macros/snapshots/vdom-expected.js index 640eb633ce..aadf88d80a 100644 --- a/packages/translator-default/test/fixtures/macros/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/macros/snapshots/vdom-expected.js @@ -11,22 +11,22 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { function _renderTree(out, node) { - out.t("Name: ", component); - out.t(node.name, component); - out.t(" Children: ", component); + out.t("Name: ", _component); + out.t(node.name, _component); + out.t(" Children: ", _component); if (node.children) { - out.be("ul", null, "1", component, null, 0); + out.be("ul", null, "1", _component, null, 0); { let _keyValue = 0; for (const child of node.children) { const _keyScope = `[${_keyValue++}]`; - out.be("li", null, "2" + _keyScope, component, null, 0); + out.be("li", null, "2" + _keyScope, _component, null, 0); - _marko_dynamic_tag(out, _renderTree, () => child, null, null, null, _component, "3" + _keyScope); + _marko_dynamic_tag(out, _renderTree, () => child, null, null, null, _componentDef, "3" + _keyScope); out.ee(); } @@ -35,7 +35,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, } } - _marko_dynamic_tag(out, _renderTree, () => input.node, null, null, null, _component, "4"); + _marko_dynamic_tag(out, _renderTree, () => input.node, null, null, null, _componentDef, "4"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/macros/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/macros/snapshots/vdomProduction-expected.js index 6a6388adce..b816cceadb 100644 --- a/packages/translator-default/test/fixtures/macros/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/macros/snapshots/vdomProduction-expected.js @@ -11,22 +11,22 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { function _renderTree(out, node) { - out.t("Name: ", component); - out.t(node.name, component); - out.t(" Children: ", component); + out.t("Name: ", _component); + out.t(node.name, _component); + out.t(" Children: ", _component); if (node.children) { - out.be("ul", null, "1", component, null, 0); + out.be("ul", null, "1", _component, null, 0); { let _keyValue = 0; for (const child of node.children) { const _keyScope = `[${_keyValue++}]`; - out.be("li", null, "2" + _keyScope, component, null, 0); + out.be("li", null, "2" + _keyScope, _component, null, 0); - _marko_dynamic_tag(out, _renderTree, () => child, null, null, null, _component, "3" + _keyScope); + _marko_dynamic_tag(out, _renderTree, () => child, null, null, null, _componentDef, "3" + _keyScope); out.ee(); } @@ -35,7 +35,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, } } - _marko_dynamic_tag(out, _renderTree, () => input.node, null, null, null, _component, "4"); + _marko_dynamic_tag(out, _renderTree, () => input.node, null, null, null, _componentDef, "4"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/no-update-directives/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/no-update-directives/snapshots/cjs-expected.js index 74f2c27028..7967ac922e 100644 --- a/packages/translator-default/test/fixtures/no-update-directives/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/no-update-directives/snapshots/cjs-expected.js @@ -21,17 +21,17 @@ const _marko_componentType = "packages/translator-default/test/fixtures/no-updat var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { (0, _renderTag.default)(_preserveTag.default, { "renderBody": out => { (0, _renderTag.default)(_index.default, { "renderBody": out => { - (0, _renderTag.default)(_index.default, {}, out, _component, "1"); + (0, _renderTag.default)(_index.default, {}, out, _componentDef, "1"); out.w("
    "); } - }, out, _component, "0"); + }, out, _componentDef, "0"); } - }, out, _component, "p_0"); + }, out, _componentDef, "p_0"); (0, _renderTag.default)(_preserveTag.default, { "i": x, "renderBody": out => { @@ -40,24 +40,24 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com (0, _renderTag.default)(_preserveTag.default, { "i": (a, b), "renderBody": out => { - (0, _renderTag.default)(_index.default, {}, out, _component, "4"); + (0, _renderTag.default)(_index.default, {}, out, _componentDef, "4"); } - }, out, _component, "p_4"); + }, out, _componentDef, "p_4"); out.w("
    "); } - }, out, _component, "3"); + }, out, _componentDef, "3"); } - }, out, _component, "p_3"); + }, out, _componentDef, "p_3"); (0, _renderTag.default)(_index.default, { "renderBody": out => { (0, _renderTag.default)(_preserveTag.default, { "renderBody": out => { - (0, _renderTag.default)(_index.default, {}, out, _component, "7"); + (0, _renderTag.default)(_index.default, {}, out, _componentDef, "7"); out.w("
    "); } - }, out, _component, "p_6"); + }, out, _componentDef, "p_6"); } - }, out, _component, "6"); + }, out, _componentDef, "6"); (0, _renderTag.default)(_index.default, { "renderBody": out => { (0, _renderTag.default)(_preserveTag.default, { @@ -70,24 +70,24 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com "renderBody": out => { out.w("Again"); } - }, out, _component, "p_10"); + }, out, _componentDef, "p_10"); } - }, out, _component, "10"); + }, out, _componentDef, "10"); out.w("
    "); } - }, out, _component, "p_9"); + }, out, _componentDef, "p_9"); } - }, out, _component, "9"); + }, out, _componentDef, "9"); (0, _renderTag.default)(_preserveTag.default, { "renderBody": out => { (0, _renderTag.default)(_index.default, { "renderBody": out => { - (0, _renderTag.default)(_index.default, {}, out, _component, "12"); + (0, _renderTag.default)(_index.default, {}, out, _componentDef, "12"); out.w("
    "); } - }, out, _component, "@a"); + }, out, _componentDef, "@a"); } - }, out, _component, "p_@a"); + }, out, _componentDef, "p_@a"); (0, _renderTag.default)(_preserveTag.default, { "i": x, "renderBody": out => { @@ -96,24 +96,24 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com (0, _renderTag.default)(_preserveTag.default, { "i": (a, b), "renderBody": out => { - (0, _renderTag.default)(_index.default, {}, out, _component, "@c"); + (0, _renderTag.default)(_index.default, {}, out, _componentDef, "@c"); } - }, out, _component, "p_@c"); + }, out, _componentDef, "p_@c"); out.w("
    "); } - }, out, _component, "@b"); + }, out, _componentDef, "@b"); } - }, out, _component, "p_@b"); + }, out, _componentDef, "p_@b"); (0, _renderTag.default)(_index.default, { "renderBody": out => { (0, _renderTag.default)(_preserveTag.default, { "renderBody": out => { - (0, _renderTag.default)(_index.default, {}, out, _component, "15"); + (0, _renderTag.default)(_index.default, {}, out, _componentDef, "15"); out.w("
    "); } - }, out, _component, "p_@d"); + }, out, _componentDef, "p_@d"); } - }, out, _component, "@d"); + }, out, _componentDef, "@d"); (0, _renderTag.default)(_index.default, { "renderBody": out => { (0, _renderTag.default)(_preserveTag.default, { @@ -126,20 +126,20 @@ _marko_template._ = (0, _renderer.default)(function (input, out, _component, com "renderBody": out => { out.w("Again"); } - }, out, _component, "p_@f"); + }, out, _componentDef, "p_@f"); } - }, out, _component, "@f"); + }, out, _componentDef, "@f"); out.w("
    "); } - }, out, _component, "p_@e"); + }, out, _componentDef, "p_@e"); } - }, out, _component, "@e"); + }, out, _componentDef, "@e"); (0, _renderTag.default)(_preserveTag.default, { "n": true, "renderBody": out => { out.w("
    "); } - }, out, _component, "18"); + }, out, _componentDef, "18"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/no-update-directives/snapshots/html-expected.js b/packages/translator-default/test/fixtures/no-update-directives/snapshots/html-expected.js index a8068c1a5d..41cd0ed6a5 100644 --- a/packages/translator-default/test/fixtures/no-update-directives/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/no-update-directives/snapshots/html-expected.js @@ -9,18 +9,18 @@ import _marko_tag from "marko/src/runtime/helpers/render-tag"; import _preserve from "marko/src/core-tags/components/preserve-tag"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_preserve, { "renderBody": out => { _marko_tag(_hello, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "1"); + _marko_tag(_hello, {}, out, _componentDef, "1"); out.w("
    "); } - }, out, _component, "0"); + }, out, _componentDef, "0"); } - }, out, _component, "p_0"); + }, out, _componentDef, "p_0"); _marko_tag(_preserve, { "i": x, @@ -30,27 +30,27 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_preserve, { "i": (a, b), "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "4"); + _marko_tag(_hello, {}, out, _componentDef, "4"); } - }, out, _component, "p_4"); + }, out, _componentDef, "p_4"); out.w("
    "); } - }, out, _component, "3"); + }, out, _componentDef, "3"); } - }, out, _component, "p_3"); + }, out, _componentDef, "p_3"); _marko_tag(_hello, { "renderBody": out => { _marko_tag(_preserve, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "7"); + _marko_tag(_hello, {}, out, _componentDef, "7"); out.w("
    "); } - }, out, _component, "p_6"); + }, out, _componentDef, "p_6"); } - }, out, _component, "6"); + }, out, _componentDef, "6"); _marko_tag(_hello, { "renderBody": out => { @@ -64,27 +64,27 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "renderBody": out => { out.w("Again"); } - }, out, _component, "p_10"); + }, out, _componentDef, "p_10"); } - }, out, _component, "10"); + }, out, _componentDef, "10"); out.w("
    "); } - }, out, _component, "p_9"); + }, out, _componentDef, "p_9"); } - }, out, _component, "9"); + }, out, _componentDef, "9"); _marko_tag(_preserve, { "renderBody": out => { _marko_tag(_hello, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "12"); + _marko_tag(_hello, {}, out, _componentDef, "12"); out.w("
    "); } - }, out, _component, "@a"); + }, out, _componentDef, "@a"); } - }, out, _component, "p_@a"); + }, out, _componentDef, "p_@a"); _marko_tag(_preserve, { "i": x, @@ -94,27 +94,27 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_preserve, { "i": (a, b), "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "@c"); + _marko_tag(_hello, {}, out, _componentDef, "@c"); } - }, out, _component, "p_@c"); + }, out, _componentDef, "p_@c"); out.w("
    "); } - }, out, _component, "@b"); + }, out, _componentDef, "@b"); } - }, out, _component, "p_@b"); + }, out, _componentDef, "p_@b"); _marko_tag(_hello, { "renderBody": out => { _marko_tag(_preserve, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "15"); + _marko_tag(_hello, {}, out, _componentDef, "15"); out.w("
    "); } - }, out, _component, "p_@d"); + }, out, _componentDef, "p_@d"); } - }, out, _component, "@d"); + }, out, _componentDef, "@d"); _marko_tag(_hello, { "renderBody": out => { @@ -128,22 +128,22 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "renderBody": out => { out.w("Again"); } - }, out, _component, "p_@f"); + }, out, _componentDef, "p_@f"); } - }, out, _component, "@f"); + }, out, _componentDef, "@f"); out.w("
    "); } - }, out, _component, "p_@e"); + }, out, _componentDef, "p_@e"); } - }, out, _component, "@e"); + }, out, _componentDef, "@e"); _marko_tag(_preserve, { "n": true, "renderBody": out => { out.w("
    "); } - }, out, _component, "18"); + }, out, _componentDef, "18"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/no-update-directives/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/no-update-directives/snapshots/htmlProduction-expected.js index b452bc621e..e469529852 100644 --- a/packages/translator-default/test/fixtures/no-update-directives/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/no-update-directives/snapshots/htmlProduction-expected.js @@ -9,18 +9,18 @@ import _marko_tag from "marko/dist/runtime/helpers/render-tag"; import _preserve from "marko/dist/core-tags/components/preserve-tag"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_preserve, { "renderBody": out => { _marko_tag(_hello, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "1"); + _marko_tag(_hello, {}, out, _componentDef, "1"); out.w("
    "); } - }, out, _component, "0"); + }, out, _componentDef, "0"); } - }, out, _component, "p_0"); + }, out, _componentDef, "p_0"); _marko_tag(_preserve, { "i": x, @@ -30,27 +30,27 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_preserve, { "i": (a, b), "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "4"); + _marko_tag(_hello, {}, out, _componentDef, "4"); } - }, out, _component, "p_4"); + }, out, _componentDef, "p_4"); out.w("
    "); } - }, out, _component, "3"); + }, out, _componentDef, "3"); } - }, out, _component, "p_3"); + }, out, _componentDef, "p_3"); _marko_tag(_hello, { "renderBody": out => { _marko_tag(_preserve, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "7"); + _marko_tag(_hello, {}, out, _componentDef, "7"); out.w("
    "); } - }, out, _component, "p_6"); + }, out, _componentDef, "p_6"); } - }, out, _component, "6"); + }, out, _componentDef, "6"); _marko_tag(_hello, { "renderBody": out => { @@ -64,27 +64,27 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "renderBody": out => { out.w("Again"); } - }, out, _component, "p_10"); + }, out, _componentDef, "p_10"); } - }, out, _component, "10"); + }, out, _componentDef, "10"); out.w("
    "); } - }, out, _component, "p_9"); + }, out, _componentDef, "p_9"); } - }, out, _component, "9"); + }, out, _componentDef, "9"); _marko_tag(_preserve, { "renderBody": out => { _marko_tag(_hello, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "12"); + _marko_tag(_hello, {}, out, _componentDef, "12"); out.w("
    "); } - }, out, _component, "@a"); + }, out, _componentDef, "@a"); } - }, out, _component, "p_@a"); + }, out, _componentDef, "p_@a"); _marko_tag(_preserve, { "i": x, @@ -94,27 +94,27 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_preserve, { "i": (a, b), "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "@c"); + _marko_tag(_hello, {}, out, _componentDef, "@c"); } - }, out, _component, "p_@c"); + }, out, _componentDef, "p_@c"); out.w("
    "); } - }, out, _component, "@b"); + }, out, _componentDef, "@b"); } - }, out, _component, "p_@b"); + }, out, _componentDef, "p_@b"); _marko_tag(_hello, { "renderBody": out => { _marko_tag(_preserve, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "15"); + _marko_tag(_hello, {}, out, _componentDef, "15"); out.w("
    "); } - }, out, _component, "p_@d"); + }, out, _componentDef, "p_@d"); } - }, out, _component, "@d"); + }, out, _componentDef, "@d"); _marko_tag(_hello, { "renderBody": out => { @@ -128,22 +128,22 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "renderBody": out => { out.w("Again"); } - }, out, _component, "p_@f"); + }, out, _componentDef, "p_@f"); } - }, out, _component, "@f"); + }, out, _componentDef, "@f"); out.w("
    "); } - }, out, _component, "p_@e"); + }, out, _componentDef, "p_@e"); } - }, out, _component, "@e"); + }, out, _componentDef, "@e"); _marko_tag(_preserve, { "n": true, "renderBody": out => { out.w("
    "); } - }, out, _component, "18"); + }, out, _componentDef, "18"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/no-update-directives/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/no-update-directives/snapshots/vdom-expected.js index e2246cdfd1..382478a0a5 100644 --- a/packages/translator-default/test/fixtures/no-update-directives/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/no-update-directives/snapshots/vdom-expected.js @@ -13,18 +13,18 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_preserve, { "renderBody": out => { _marko_tag(_hello, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "1"); + _marko_tag(_hello, {}, out, _componentDef, "1"); - out.e("div", null, "2", component, 0, 0); + out.e("div", null, "2", _component, 0, 0); } - }, out, _component, "0"); + }, out, _componentDef, "0"); } - }, out, _component, "p_0"); + }, out, _componentDef, "p_0"); _marko_tag(_preserve, { "i": x, @@ -34,27 +34,27 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_preserve, { "i": (a, b), "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "4"); + _marko_tag(_hello, {}, out, _componentDef, "4"); } - }, out, _component, "p_4"); + }, out, _componentDef, "p_4"); - out.e("div", null, "5", component, 0, 0); + out.e("div", null, "5", _component, 0, 0); } - }, out, _component, "3"); + }, out, _componentDef, "3"); } - }, out, _component, "p_3"); + }, out, _componentDef, "p_3"); _marko_tag(_hello, { "renderBody": out => { _marko_tag(_preserve, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "7"); + _marko_tag(_hello, {}, out, _componentDef, "7"); - out.e("div", null, "8", component, 0, 0); + out.e("div", null, "8", _component, 0, 0); } - }, out, _component, "p_6"); + }, out, _componentDef, "p_6"); } - }, out, _component, "6"); + }, out, _componentDef, "6"); _marko_tag(_hello, { "renderBody": out => { @@ -66,29 +66,29 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_preserve, { "i": (a, b), "renderBody": out => { - out.t("Again", component); + out.t("Again", _component); } - }, out, _component, "p_10"); + }, out, _componentDef, "p_10"); } - }, out, _component, "10"); + }, out, _componentDef, "10"); - out.e("div", null, "11", component, 0, 0); + out.e("div", null, "11", _component, 0, 0); } - }, out, _component, "p_9"); + }, out, _componentDef, "p_9"); } - }, out, _component, "9"); + }, out, _componentDef, "9"); _marko_tag(_preserve, { "renderBody": out => { _marko_tag(_hello, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "12"); + _marko_tag(_hello, {}, out, _componentDef, "12"); - out.e("div", null, "13", component, 0, 0); + out.e("div", null, "13", _component, 0, 0); } - }, out, _component, "@a"); + }, out, _componentDef, "@a"); } - }, out, _component, "p_@a"); + }, out, _componentDef, "p_@a"); _marko_tag(_preserve, { "i": x, @@ -98,27 +98,27 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_preserve, { "i": (a, b), "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "@c"); + _marko_tag(_hello, {}, out, _componentDef, "@c"); } - }, out, _component, "p_@c"); + }, out, _componentDef, "p_@c"); - out.e("div", null, "14", component, 0, 0); + out.e("div", null, "14", _component, 0, 0); } - }, out, _component, "@b"); + }, out, _componentDef, "@b"); } - }, out, _component, "p_@b"); + }, out, _componentDef, "p_@b"); _marko_tag(_hello, { "renderBody": out => { _marko_tag(_preserve, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "15"); + _marko_tag(_hello, {}, out, _componentDef, "15"); - out.e("div", null, "16", component, 0, 0); + out.e("div", null, "16", _component, 0, 0); } - }, out, _component, "p_@d"); + }, out, _componentDef, "p_@d"); } - }, out, _component, "@d"); + }, out, _componentDef, "@d"); _marko_tag(_hello, { "renderBody": out => { @@ -130,26 +130,26 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_preserve, { "i": (a, b), "renderBody": out => { - out.t("Again", component); + out.t("Again", _component); } - }, out, _component, "p_@f"); + }, out, _componentDef, "p_@f"); } - }, out, _component, "@f"); + }, out, _componentDef, "@f"); - out.e("div", null, "17", component, 0, 0); + out.e("div", null, "17", _component, 0, 0); } - }, out, _component, "p_@e"); + }, out, _componentDef, "p_@e"); } - }, out, _component, "@e"); + }, out, _componentDef, "@e"); _marko_tag(_preserve, { "n": true, "renderBody": out => { out.e("div", { "class": "test" - }, "18", component, 0, 1); + }, "18", _component, 0, 1); } - }, out, _component, "18"); + }, out, _componentDef, "18"); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/no-update-directives/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/no-update-directives/snapshots/vdomProduction-expected.js index 5e4736bbfe..20ce47d824 100644 --- a/packages/translator-default/test/fixtures/no-update-directives/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/no-update-directives/snapshots/vdomProduction-expected.js @@ -32,18 +32,18 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { _marko_tag(_preserve, { "renderBody": out => { _marko_tag(_hello, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "1"); + _marko_tag(_hello, {}, out, _componentDef, "1"); - out.n(_marko_node, component); + out.n(_marko_node, _component); } - }, out, _component, "0"); + }, out, _componentDef, "0"); } - }, out, _component, "p_0"); + }, out, _componentDef, "p_0"); _marko_tag(_preserve, { "i": x, @@ -53,27 +53,27 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_preserve, { "i": (a, b), "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "4"); + _marko_tag(_hello, {}, out, _componentDef, "4"); } - }, out, _component, "p_4"); + }, out, _componentDef, "p_4"); - out.n(_marko_node2, component); + out.n(_marko_node2, _component); } - }, out, _component, "3"); + }, out, _componentDef, "3"); } - }, out, _component, "p_3"); + }, out, _componentDef, "p_3"); _marko_tag(_hello, { "renderBody": out => { _marko_tag(_preserve, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "7"); + _marko_tag(_hello, {}, out, _componentDef, "7"); - out.n(_marko_node3, component); + out.n(_marko_node3, _component); } - }, out, _component, "p_6"); + }, out, _componentDef, "p_6"); } - }, out, _component, "6"); + }, out, _componentDef, "6"); _marko_tag(_hello, { "renderBody": out => { @@ -85,29 +85,29 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_preserve, { "i": (a, b), "renderBody": out => { - out.t("Again", component); + out.t("Again", _component); } - }, out, _component, "p_10"); + }, out, _componentDef, "p_10"); } - }, out, _component, "10"); + }, out, _componentDef, "10"); - out.n(_marko_node4, component); + out.n(_marko_node4, _component); } - }, out, _component, "p_9"); + }, out, _componentDef, "p_9"); } - }, out, _component, "9"); + }, out, _componentDef, "9"); _marko_tag(_preserve, { "renderBody": out => { _marko_tag(_hello, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "12"); + _marko_tag(_hello, {}, out, _componentDef, "12"); - out.n(_marko_node5, component); + out.n(_marko_node5, _component); } - }, out, _component, "@a"); + }, out, _componentDef, "@a"); } - }, out, _component, "p_@a"); + }, out, _componentDef, "p_@a"); _marko_tag(_preserve, { "i": x, @@ -117,27 +117,27 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_preserve, { "i": (a, b), "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "@c"); + _marko_tag(_hello, {}, out, _componentDef, "@c"); } - }, out, _component, "p_@c"); + }, out, _componentDef, "p_@c"); - out.n(_marko_node6, component); + out.n(_marko_node6, _component); } - }, out, _component, "@b"); + }, out, _componentDef, "@b"); } - }, out, _component, "p_@b"); + }, out, _componentDef, "p_@b"); _marko_tag(_hello, { "renderBody": out => { _marko_tag(_preserve, { "renderBody": out => { - _marko_tag(_hello, {}, out, _component, "15"); + _marko_tag(_hello, {}, out, _componentDef, "15"); - out.n(_marko_node7, component); + out.n(_marko_node7, _component); } - }, out, _component, "p_@d"); + }, out, _componentDef, "p_@d"); } - }, out, _component, "@d"); + }, out, _componentDef, "@d"); _marko_tag(_hello, { "renderBody": out => { @@ -149,26 +149,26 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, _marko_tag(_preserve, { "i": (a, b), "renderBody": out => { - out.t("Again", component); + out.t("Again", _component); } - }, out, _component, "p_@f"); + }, out, _componentDef, "p_@f"); } - }, out, _component, "@f"); + }, out, _componentDef, "@f"); - out.n(_marko_node8, component); + out.n(_marko_node8, _component); } - }, out, _component, "p_@e"); + }, out, _componentDef, "p_@e"); } - }, out, _component, "@e"); + }, out, _componentDef, "@e"); _marko_tag(_preserve, { "n": true, "renderBody": out => { out.e("div", { "class": "test" - }, "18", component, 0, 1); + }, "18", _component, 0, 1); } - }, out, _component, "18"); + }, out, _componentDef, "18"); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/cjs-expected.js index 1f1f1a2482..6f068c4782 100644 --- a/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/cjs-expected.js @@ -19,12 +19,12 @@ const _marko_componentType = "packages/translator-default/test/fixtures/no-updat var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
    "); - out.w(``); - out.w(``); out.w("
    "); diff --git a/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/html-expected.js b/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/html-expected.js index 27f7a3f859..80b10a1290 100644 --- a/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/html-expected.js @@ -8,12 +8,12 @@ import _marko_props from "marko/src/runtime/html/helpers/data-marko"; import _marko_attr from "marko/src/runtime/html/helpers/attr"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); - out.w(``); - out.w(``); out.w("
    "); diff --git a/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/htmlProduction-expected.js index 6be352e36e..a76cce016a 100644 --- a/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/htmlProduction-expected.js @@ -8,10 +8,10 @@ import _marko_props from "marko/dist/runtime/html/helpers/data-marko"; import _marko_attr from "marko/dist/runtime/html/helpers/attr"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.w(`
    `); }, { diff --git a/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/vdom-expected.js index 3fe57ba4cc..1cb92bb219 100644 --- a/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/vdom-expected.js @@ -11,18 +11,18 @@ 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, _component, component, state) { - out.be("div", null, "0", component, null, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("div", null, "0", _component, null, 0); out.e("input", { "value": input.defaultValue - }, "1", component, 0, 0, { + }, "1", _component, 0, 0, { pa: ["value"] }); out.e("input", { "type": "checkbox", "value": input.defaultValue, "checked": input.checked - }, "2", component, 0, 0, { + }, "2", _component, 0, 0, { pa: ["value", "checked"] }); out.ee(); diff --git a/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/vdomProduction-expected.js index 8a586d6794..839b3cdf5c 100644 --- a/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/no-update-modifier-multiple/snapshots/vdomProduction-expected.js @@ -11,18 +11,18 @@ 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, _component, component, state) { - out.be("div", null, "0", component, null, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("div", null, "0", _component, null, 0); out.e("input", { "value": input.defaultValue - }, "1", component, 0, 0, { + }, "1", _component, 0, 0, { pa: ["value"] }); out.e("input", { "type": "checkbox", "value": input.defaultValue, "checked": input.checked - }, "2", component, 0, 0, { + }, "2", _component, 0, 0, { pa: ["value", "checked"] }); out.ee(); diff --git a/packages/translator-default/test/fixtures/no-update-modifier/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/no-update-modifier/snapshots/cjs-expected.js index 094ed79add..dec07f8942 100644 --- a/packages/translator-default/test/fixtures/no-update-modifier/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/no-update-modifier/snapshots/cjs-expected.js @@ -19,8 +19,8 @@ const _marko_componentType = "packages/translator-default/test/fixtures/no-updat var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { - out.w(``); }, { diff --git a/packages/translator-default/test/fixtures/no-update-modifier/snapshots/html-expected.js b/packages/translator-default/test/fixtures/no-update-modifier/snapshots/html-expected.js index 3d43b9f777..523a70fed2 100644 --- a/packages/translator-default/test/fixtures/no-update-modifier/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/no-update-modifier/snapshots/html-expected.js @@ -8,8 +8,8 @@ import _marko_props from "marko/src/runtime/html/helpers/data-marko"; import _marko_attr from "marko/src/runtime/html/helpers/attr"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.w(``); }, { diff --git a/packages/translator-default/test/fixtures/no-update-modifier/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/no-update-modifier/snapshots/htmlProduction-expected.js index 837239a45f..1a7a4fbd11 100644 --- a/packages/translator-default/test/fixtures/no-update-modifier/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/no-update-modifier/snapshots/htmlProduction-expected.js @@ -8,8 +8,8 @@ import _marko_props from "marko/dist/runtime/html/helpers/data-marko"; import _marko_attr from "marko/dist/runtime/html/helpers/attr"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.w(``); }, { diff --git a/packages/translator-default/test/fixtures/no-update-modifier/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/no-update-modifier/snapshots/vdom-expected.js index c244365d00..9b5dda63d8 100644 --- a/packages/translator-default/test/fixtures/no-update-modifier/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/no-update-modifier/snapshots/vdom-expected.js @@ -11,10 +11,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("input", { "value": input.defaultValue - }, "0", component, 0, 0, { + }, "0", _component, 0, 0, { pa: ["value"] }); }, { diff --git a/packages/translator-default/test/fixtures/no-update-modifier/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/no-update-modifier/snapshots/vdomProduction-expected.js index 663dcae948..d3dad25859 100644 --- a/packages/translator-default/test/fixtures/no-update-modifier/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/no-update-modifier/snapshots/vdomProduction-expected.js @@ -11,10 +11,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("input", { "value": input.defaultValue - }, "0", component, 0, 0, { + }, "0", _component, 0, 0, { pa: ["value"] }); }, { diff --git a/packages/translator-default/test/fixtures/placeholders/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/placeholders/snapshots/cjs-expected.js index 61ffeb630c..01cc3dc7be 100644 --- a/packages/translator-default/test/fixtures/placeholders/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/placeholders/snapshots/cjs-expected.js @@ -19,7 +19,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/placehol var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
    "); out.w((0, _escapeXml.x)(input.x)); out.w("Hello world <a/>"); diff --git a/packages/translator-default/test/fixtures/placeholders/snapshots/html-expected.js b/packages/translator-default/test/fixtures/placeholders/snapshots/html-expected.js index 660178efb8..084559269b 100644 --- a/packages/translator-default/test/fixtures/placeholders/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/placeholders/snapshots/html-expected.js @@ -8,7 +8,7 @@ import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml import _marko_to_string from "marko/src/runtime/helpers/to-string"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); out.w(_marko_escapeXml(input.x)); out.w("Hello world <a/>"); diff --git a/packages/translator-default/test/fixtures/placeholders/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/placeholders/snapshots/htmlProduction-expected.js index 06604d58c9..1dcd4ca4bb 100644 --- a/packages/translator-default/test/fixtures/placeholders/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/placeholders/snapshots/htmlProduction-expected.js @@ -8,7 +8,7 @@ import { x as _marko_escapeXml } from "marko/dist/runtime/html/helpers/escape-xm import _marko_to_string from "marko/dist/runtime/helpers/to-string"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(`
    ${_marko_escapeXml(input.x)}Hello world <a/>${_marko_to_string(input.x)}Hello world
    `); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/placeholders/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/placeholders/snapshots/vdom-expected.js index 24cd9a3c28..0274b25e11 100644 --- a/packages/translator-default/test/fixtures/placeholders/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/placeholders/snapshots/vdom-expected.js @@ -10,21 +10,21 @@ 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, _component, component, state) { - out.be("div", null, "0", component, null, 0); - out.t(input.x, component); - out.t("Hello world ", component); - out.h(input.x, component); - out.h("Hello world ", component); - out.be("script", null, "1", component, null, 0); - out.t("\n ", component); - out.t("Hello ", component); - out.t("\n ", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("div", null, "0", _component, null, 0); + out.t(input.x, _component); + out.t("Hello world ", _component); + out.h(input.x, _component); + out.h("Hello world ", _component); + out.be("script", null, "1", _component, null, 0); + out.t("\n ", _component); + out.t("Hello ", _component); + out.t("\n ", _component); out.ee(); - out.be("style", null, "2", component, null, 0); - out.t("\n ", component); - out.t("Hello ", component); - out.t("\n ", component); + out.be("style", null, "2", _component, null, 0); + out.t("\n ", _component); + out.t("Hello ", _component); + out.t("\n ", _component); out.ee(); out.ee(); }, { diff --git a/packages/translator-default/test/fixtures/placeholders/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/placeholders/snapshots/vdomProduction-expected.js index 77d54c640a..33aaf599b9 100644 --- a/packages/translator-default/test/fixtures/placeholders/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/placeholders/snapshots/vdomProduction-expected.js @@ -16,14 +16,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, _component, component, state) { - out.be("div", null, "0", component, null, 0); - out.t(input.x, component); - out.t("Hello world ", component); - out.h(input.x, component); - out.h("Hello world ", component); - out.n(_marko_node, component); - out.n(_marko_node2, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("div", null, "0", _component, null, 0); + out.t(input.x, _component); + out.t("Hello world ", _component); + out.h(input.x, _component); + out.h("Hello world ", _component); + out.n(_marko_node, _component); + out.n(_marko_node2, _component); out.ee(); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/cjs-expected.js index 5a98ab801a..bad13ae411 100644 --- a/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/prevent- var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component2, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component2, state) { const _component = "test"; out.w("
    "); }, { diff --git a/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/html-expected.js b/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/html-expected.js index d02acab77a..76b79b2436 100644 --- a/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/prevent- export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component2, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component2, state) { const _component = "test"; out.w("
    "); }, { diff --git a/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/htmlProduction-expected.js index bef3c08cae..580f0bffc7 100644 --- a/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "AWlOZ9B/", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component2, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component2, state) { const _component = "test"; out.w("
    "); }, { diff --git a/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/vdom-expected.js index e1a30c7ba8..fc7eaf2616 100644 --- a/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/vdom-expected.js @@ -10,9 +10,9 @@ 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, _component2, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component2, state) { const _component = "test"; - out.e("div", null, "0", component, 0, 0); + out.e("div", null, "0", _component2, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/vdomProduction-expected.js index c40d1ebcf1..5f8e4966f4 100644 --- a/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/prevent-override-component-def/snapshots/vdomProduction-expected.js @@ -14,9 +14,9 @@ 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, _component2, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component2, state) { const _component = "test"; - out.n(_marko_node, component); + out.n(_marko_node, _component2); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/root-migration/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/root-migration/snapshots/cjs-expected.js index f7c66e007c..3194a82139 100644 --- a/packages/translator-default/test/fixtures/root-migration/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/root-migration/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/root-mig var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(`
    `); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/root-migration/snapshots/html-expected.js b/packages/translator-default/test/fixtures/root-migration/snapshots/html-expected.js index 6c5faba68d..d7502d9459 100644 --- a/packages/translator-default/test/fixtures/root-migration/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/root-migration/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_attr from "marko/src/runtime/html/helpers/attr"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(`
    `); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/root-migration/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/root-migration/snapshots/htmlProduction-expected.js index b1c0ce98c5..aec2b43867 100644 --- a/packages/translator-default/test/fixtures/root-migration/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/root-migration/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_attr from "marko/dist/runtime/html/helpers/attr"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(`
    `); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/root-migration/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/root-migration/snapshots/vdom-expected.js index 204e7a7884..17cede2d33 100644 --- a/packages/translator-default/test/fixtures/root-migration/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/root-migration/snapshots/vdom-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "a": new - }, "0", component, 0, 0); + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/root-migration/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/root-migration/snapshots/vdomProduction-expected.js index 92f9f224de..203f02070b 100644 --- a/packages/translator-default/test/fixtures/root-migration/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/root-migration/snapshots/vdomProduction-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "a": new - }, "0", component, 0, 0); + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/root-transform/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/root-transform/snapshots/cjs-expected.js index 5794cb7b2a..0df9107080 100644 --- a/packages/translator-default/test/fixtures/root-transform/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/root-transform/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/root-tra var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(`
    `); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/root-transform/snapshots/html-expected.js b/packages/translator-default/test/fixtures/root-transform/snapshots/html-expected.js index 778577e87b..addeaeb156 100644 --- a/packages/translator-default/test/fixtures/root-transform/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/root-transform/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_attr from "marko/src/runtime/html/helpers/attr"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(`
    `); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/root-transform/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/root-transform/snapshots/htmlProduction-expected.js index 31229fb45d..9ee6929de4 100644 --- a/packages/translator-default/test/fixtures/root-transform/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/root-transform/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_attr from "marko/dist/runtime/html/helpers/attr"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(`
    `); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/root-transform/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/root-transform/snapshots/vdom-expected.js index 16c516e973..b6b78e24b9 100644 --- a/packages/translator-default/test/fixtures/root-transform/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/root-transform/snapshots/vdom-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "a": after - }, "0", component, 0, 0); + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/root-transform/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/root-transform/snapshots/vdomProduction-expected.js index fdd12b1cd5..93fafd5387 100644 --- a/packages/translator-default/test/fixtures/root-transform/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/root-transform/snapshots/vdomProduction-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "a": after - }, "0", component, 0, 0); + }, "0", _component, 0, 0); }, { t: _marko_componentType, i: true 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 0a45b49093..a097fce08d 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 @@ -47,7 +47,7 @@ const _marko_component = { } }; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("`); function _thing(out, stuff) { @@ -43,24 +43,24 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, let e = thing; out.w(`
    `); } - out.w(`
    `); _marko_dynamic_tag(out, a, null, out => { out.w("
    "); - }, null, null, _component, "@x"); + }, null, null, _componentDef, "@x"); _marko_dynamic_tag(out, _thing, () => ({ "x": 1 - }), null, null, null, _component, "11"); + }), null, null, null, _componentDef, "11"); _marko_tag(_other, { "renderBody": (out, a) => { out.w("
    "); } - }, out, _component, "12", [["click", "handleClick", false, [a, b, ...d]]]); + }, out, _componentDef, "12", [["click", "handleClick", false, [a, b, ...d]]]); _marko_tag(_other, { "x": 1, @@ -84,7 +84,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "renderBody": (out, b) => { out.w("
    "); } - }, out, _component, "14"); + }, out, _componentDef, "14"); out.w(` { - out.e("div", null, "10", component, 0, 0); - }, null, null, _component, "@x"); + out.e("div", null, "10", _component, 0, 0); + }, null, null, _componentDef, "@x"); _marko_dynamic_tag(out, _thing, () => ({ "x": 1 - }), null, null, null, _component, "11"); + }), null, null, null, _componentDef, "11"); _marko_tag(_other, { "renderBody": (out, a) => { - out.e("div", null, "13", component, 0, 0); + out.e("div", null, "13", _component, 0, 0); } - }, out, _component, "12", [["click", "handleClick", false, [a, b, ...d]]]); + }, out, _componentDef, "12", [["click", "handleClick", false, [a, b, ...d]]]); _marko_tag(_other, { "x": 1, @@ -106,17 +106,17 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "d": { "d": 1, "renderBody": out => { - out.e("div", null, "19", component, 0, 0); + out.e("div", null, "19", _component, 0, 0); } }, "renderBody": out => { - out.e("div", null, "17", component, 0, 0); + out.e("div", null, "17", _component, 0, 0); } }, "renderBody": (out, b) => { - out.e("div", null, "15", component, 0, 0); + out.e("div", null, "15", _component, 0, 0); } - }, out, _component, "14"); + }, out, _componentDef, "14"); out.be("div", _marko_attrs({ "class": "b c", @@ -125,36 +125,36 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, ...e, ...f(), "id": "a" - }), "20", component, null, 4); - out.t(a, component); + }), "20", _component, null, 4); + out.t(a, _component); out.e("div", { "c": "1" - }, "21", component, 0, 0); + }, "21", _component, 0, 0); out.e("div", { "d": "1" - }, "22", component, 0, 0); + }, "22", _component, 0, 0); if (x === a) { - out.t("a ", component); - out.t(b, component); + out.t("a ", _component); + out.t(b, _component); } else if (x === 2) { - out.t("b", component); + out.t("b", _component); } else { - out.t("c", component); + out.t("c", _component); } out.ee(); out.e("div", { "b": "1" - }, "23", component, 0, 0); - out.be("div", null, "24", component, null, 0); - out.t("123 abc 123", component); + }, "23", _component, 0, 0); + out.be("div", null, "24", _component, null, 0); + out.t("123 abc 123", _component); out.ee(); - out.e("span", _marko_attrs(abc), "25", component, 0, 4); + out.e("span", _marko_attrs(abc), "25", _component, 0, 4); if (cond) { - out.t("Hello ", component); - out.t(planet, component); + out.t("Hello ", _component); + out.t(planet, _component); } for (let _steps = (10 - 0) / 2, _step = 0; _step <= _steps; _step++) { @@ -162,7 +162,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const _keyScope = `[${i}]`; out.e("div", { "c": "1" - }, "26" + _keyScope, component, 0, 0); + }, "26" + _keyScope, _component, 0, 0); } for (const key in obj) { @@ -170,7 +170,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const _keyScope2 = `[${key}]`; out.e("div", { "c": "1" - }, "27" + _keyScope2, component, 0, 0); + }, "27" + _keyScope2, _component, 0, 0); } }, { t: _marko_componentType, 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 ffd6300901..0f9038fc3e 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 @@ -61,24 +61,24 @@ const _marko_component = { } }; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.be("style", { "id": "css" - }, "0", component, null, 1); - out.t("\n div {\n color: ", component); - out.t(x, component); - out.t(";\n }\n", component); + }, "0", _component, null, 1); + out.t("\n div {\n color: ", _component); + out.t(x, _component); + out.t(";\n }\n", _component); out.ee(); - out.be("script", null, "1", component, null, 0); - out.t("\n var y = ", component); - out.t(x, component); - out.t(";\n", component); + out.be("script", null, "1", _component, null, 0); + out.t("\n var y = ", _component); + out.t(x, _component); + out.t(";\n", _component); out.ee(); function _thing(out, stuff) { out.e("div", { "x": stuff.x - }, "3", component, 0, 0); + }, "3", _component, 0, 0); } var b = thing; @@ -86,44 +86,44 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, out.be("div", { "b": b, "c": c - }, "4", component, null, 0); + }, "4", _component, null, 0); { var d = thing; let e = thing; out.e("div", { "d": d, "e": e - }, "5", component, 0, 0); + }, "5", _component, 0, 0); } out.ee(); - out.e("div", null, "6", component, 0, 0, { - "onclick": _component.d("click", "handleClick", false, [a, b, ...d]) + out.e("div", null, "6", _component, 0, 0, { + "onclick": _componentDef.d("click", "handleClick", false, [a, b, ...d]) }); out.e("div", { - "id": _component.elId("1") - }, "7", component, 0, 1); + "id": _componentDef.elId("1") + }, "7", _component, 0, 1); out.e("div", { "class": _marko_class_merge(["a", { b: c, d }]), "style": "a:b;" - }, "8", component, 0, 1); - out.n(_marko_node, component); + }, "8", _component, 0, 1); + out.n(_marko_node, _component); _marko_dynamic_tag(out, a, null, out => { - out.n(_marko_node2, component); - }, null, null, _component, "@x"); + out.n(_marko_node2, _component); + }, null, null, _componentDef, "@x"); _marko_dynamic_tag(out, _thing, () => ({ "x": 1 - }), null, null, null, _component, "11"); + }), null, null, null, _componentDef, "11"); _marko_tag(_other, { "renderBody": (out, a) => { - out.n(_marko_node3, component); + out.n(_marko_node3, _component); } - }, out, _component, "12", [["click", "handleClick", false, [a, b, ...d]]]); + }, out, _componentDef, "12", [["click", "handleClick", false, [a, b, ...d]]]); _marko_tag(_other, { "x": 1, @@ -137,17 +137,17 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "d": { "d": 1, "renderBody": out => { - out.n(_marko_node6, component); + out.n(_marko_node6, _component); } }, "renderBody": out => { - out.n(_marko_node5, component); + out.n(_marko_node5, _component); } }, "renderBody": (out, b) => { - out.n(_marko_node4, component); + out.n(_marko_node4, _component); } - }, out, _component, "14"); + }, out, _componentDef, "14"); out.be("div", _marko_attrs({ "class": "b c", @@ -156,28 +156,28 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, ...e, ...f(), "id": "a" - }), "20", component, null, 4); - out.t(a, component); - out.n(_marko_node7, component); - out.n(_marko_node8, component); + }), "20", _component, null, 4); + out.t(a, _component); + out.n(_marko_node7, _component); + out.n(_marko_node8, _component); if (x === a) { - out.t("a ", component); - out.t(b, component); + out.t("a ", _component); + out.t(b, _component); } else if (x === 2) { - out.t("b", component); + out.t("b", _component); } else { - out.t("c", component); + out.t("c", _component); } out.ee(); - out.n(_marko_node9, component); - out.n(_marko_node10, component); - out.e("span", _marko_attrs(abc), "25", component, 0, 4); + out.n(_marko_node9, _component); + out.n(_marko_node10, _component); + out.e("span", _marko_attrs(abc), "25", _component, 0, 4); if (cond) { - out.t("Hello ", component); - out.t(planet, component); + out.t("Hello ", _component); + out.t(planet, _component); } for (let _steps = (10 - 0) / 2, _step = 0; _step <= _steps; _step++) { @@ -185,7 +185,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const _keyScope = `[${i}]`; out.e("div", { "c": "1" - }, "26" + _keyScope, component, 0, 0); + }, "26" + _keyScope, _component, 0, 0); } for (const key in obj) { @@ -193,7 +193,7 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, const _keyScope2 = `[${key}]`; out.e("div", { "c": "1" - }, "27" + _keyScope2, component, 0, 0); + }, "27" + _keyScope2, _component, 0, 0); } }, { t: _marko_componentType diff --git a/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/cjs-expected.js index 634f995582..98809a25cc 100644 --- a/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/scriptle var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { var foo = 123; function bar() {} diff --git a/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/html-expected.js b/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/html-expected.js index 8b1cefb7d2..8569f61e9b 100644 --- a/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { var foo = 123; function bar() {} diff --git a/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/htmlProduction-expected.js index e29b6be4e1..8618c07eb6 100644 --- a/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import { x as _marko_escapeXml } from "marko/dist/runtime/html/helpers/escape-xml"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { var foo = 123; function bar() {} diff --git a/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/vdom-expected.js index 9efa0e7852..1d2f9a92a7 100644 --- a/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/vdom-expected.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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { var foo = 123; function bar() {} var baz = 456; - out.be("div", null, "0", component, null, 0); + out.be("div", null, "0", _component, null, 0); console.log('foo'); - out.t("Hello there ", component); - out.t(name, component); + out.t("Hello there ", _component); + out.t(name, _component); out.ee(); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/vdomProduction-expected.js index c601783d7d..7e1443ebca 100644 --- a/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/scriptlet-line-block/snapshots/vdomProduction-expected.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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { var foo = 123; function bar() {} var baz = 456; - out.be("div", null, "0", component, null, 0); + out.be("div", null, "0", _component, null, 0); console.log('foo'); - out.t("Hello there ", component); - out.t(name, component); + out.t("Hello there ", _component); + out.t(name, _component); out.ee(); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/shorthand-classname/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/shorthand-classname/snapshots/cjs-expected.js index 61507efec4..c9a222f3f9 100644 --- a/packages/translator-default/test/fixtures/shorthand-classname/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/shorthand-classname/snapshots/cjs-expected.js @@ -19,7 +19,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/shorthan var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
    "); out.w("
    "); out.w("
    "); diff --git a/packages/translator-default/test/fixtures/shorthand-classname/snapshots/html-expected.js b/packages/translator-default/test/fixtures/shorthand-classname/snapshots/html-expected.js index 03bb7c7f74..4fbd12bc8a 100644 --- a/packages/translator-default/test/fixtures/shorthand-classname/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/shorthand-classname/snapshots/html-expected.js @@ -8,7 +8,7 @@ import _marko_class_merge from "marko/src/runtime/helpers/class-value"; import _marko_attr from "marko/src/runtime/html/helpers/attr"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); out.w("
    "); out.w("
    "); diff --git a/packages/translator-default/test/fixtures/shorthand-classname/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/shorthand-classname/snapshots/htmlProduction-expected.js index 4fe78801a9..ef605b9b39 100644 --- a/packages/translator-default/test/fixtures/shorthand-classname/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/shorthand-classname/snapshots/htmlProduction-expected.js @@ -8,7 +8,7 @@ import _marko_class_merge from "marko/dist/runtime/helpers/class-value"; import _marko_attr from "marko/dist/runtime/html/helpers/attr"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(`
    `); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/shorthand-classname/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/shorthand-classname/snapshots/vdom-expected.js index 850584c890..ff3db436aa 100644 --- a/packages/translator-default/test/fixtures/shorthand-classname/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/shorthand-classname/snapshots/vdom-expected.js @@ -11,37 +11,37 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "class": "shorthand" - }, "0", component, 0, 1); + }, "0", _component, 0, 1); out.e("div", { "class": "shorthand1 shorthand2" - }, "1", component, 0, 1); + }, "1", _component, 0, 1); out.e("div", { "class": "shorthand1 shorthand2 inline" - }, "2", component, 0, 1); + }, "2", _component, 0, 1); out.e("div", { "class": _marko_class_merge(["shorthand1 shorthand2", dynamic1]) - }, "3", component, 0, 1); + }, "3", _component, 0, 1); out.e("div", { "class": _marko_class_merge([dynamic1, "inline"]) - }, "4", component, 0, 1); + }, "4", _component, 0, 1); out.e("div", { "class": _marko_class_merge([dynamic1, "shorthand2", "inline"]) - }, "5", component, 0, 1); + }, "5", _component, 0, 1); out.e("div", { "class": _marko_class_merge([dynamic1, "shorthand2", dynamic2]) - }, "6", component, 0, 1); + }, "6", _component, 0, 1); out.e("div", { "class": _marko_class_merge([dynamic2, dynamic3, dynamic1, "shorthand2"]) - }, "7", component, 0, 1); + }, "7", _component, 0, 1); out.e("div", { "class": _marko_class_merge([dynamic1, dynamic2, "shorthand"]) - }, "8", component, 0, 1); + }, "8", _component, 0, 1); out.e("div", { "class": _marko_class_merge(["partially-" + dynamic1, "shorthand2", dynamic2]) - }, "9", component, 0, 1); + }, "9", _component, 0, 1); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/shorthand-classname/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/shorthand-classname/snapshots/vdomProduction-expected.js index e206c792e2..29e2e5c9c7 100644 --- a/packages/translator-default/test/fixtures/shorthand-classname/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/shorthand-classname/snapshots/vdomProduction-expected.js @@ -11,37 +11,37 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "class": "shorthand" - }, "0", component, 0, 1); + }, "0", _component, 0, 1); out.e("div", { "class": "shorthand1 shorthand2" - }, "1", component, 0, 1); + }, "1", _component, 0, 1); out.e("div", { "class": "shorthand1 shorthand2 inline" - }, "2", component, 0, 1); + }, "2", _component, 0, 1); out.e("div", { "class": _marko_class_merge(["shorthand1 shorthand2", dynamic1]) - }, "3", component, 0, 1); + }, "3", _component, 0, 1); out.e("div", { "class": _marko_class_merge([dynamic1, "inline"]) - }, "4", component, 0, 1); + }, "4", _component, 0, 1); out.e("div", { "class": _marko_class_merge([dynamic1, "shorthand2", "inline"]) - }, "5", component, 0, 1); + }, "5", _component, 0, 1); out.e("div", { "class": _marko_class_merge([dynamic1, "shorthand2", dynamic2]) - }, "6", component, 0, 1); + }, "6", _component, 0, 1); out.e("div", { "class": _marko_class_merge([dynamic2, dynamic3, dynamic1, "shorthand2"]) - }, "7", component, 0, 1); + }, "7", _component, 0, 1); out.e("div", { "class": _marko_class_merge([dynamic1, dynamic2, "shorthand"]) - }, "8", component, 0, 1); + }, "8", _component, 0, 1); out.e("div", { "class": _marko_class_merge(["partially-" + dynamic1, "shorthand2", dynamic2]) - }, "9", component, 0, 1); + }, "9", _component, 0, 1); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/shorthand-id/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/shorthand-id/snapshots/cjs-expected.js index fc8d6ed43c..319e6f37a9 100644 --- a/packages/translator-default/test/fixtures/shorthand-id/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/shorthand-id/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/shorthan var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
    "); out.w(``); out.w(``); diff --git a/packages/translator-default/test/fixtures/shorthand-id/snapshots/html-expected.js b/packages/translator-default/test/fixtures/shorthand-id/snapshots/html-expected.js index 605846dac5..a93513c836 100644 --- a/packages/translator-default/test/fixtures/shorthand-id/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/shorthand-id/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_attr from "marko/src/runtime/html/helpers/attr"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); out.w(``); out.w(``); diff --git a/packages/translator-default/test/fixtures/shorthand-id/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/shorthand-id/snapshots/htmlProduction-expected.js index 64fc03b95b..6a98c760e7 100644 --- a/packages/translator-default/test/fixtures/shorthand-id/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/shorthand-id/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_attr from "marko/dist/runtime/html/helpers/attr"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(`
    `); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/shorthand-id/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/shorthand-id/snapshots/vdom-expected.js index c1d1ed360c..a015064590 100644 --- a/packages/translator-default/test/fixtures/shorthand-id/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/shorthand-id/snapshots/vdom-expected.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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "id": "shorthand" - }, "0", component, 0, 1); + }, "0", _component, 0, 1); out.e("div", { "id": dynamic - }, "1", component, 0, 1); + }, "1", _component, 0, 1); out.e("div", { "id": "partial-" + dynamic - }, "2", component, 0, 1); + }, "2", _component, 0, 1); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/shorthand-id/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/shorthand-id/snapshots/vdomProduction-expected.js index ff22111756..c0884983f8 100644 --- a/packages/translator-default/test/fixtures/shorthand-id/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/shorthand-id/snapshots/vdomProduction-expected.js @@ -16,14 +16,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, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); out.e("div", { "id": dynamic - }, "1", component, 0, 1); + }, "1", _component, 0, 1); out.e("div", { "id": "partial-" + dynamic - }, "2", component, 0, 1); + }, "2", _component, 0, 1); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/cjs-expected.js index 3bece6514b..3710e19a83 100644 --- a/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/cjs-expected.js @@ -17,11 +17,11 @@ const _marko_componentType = "packages/translator-default/test/fixtures/simple-a var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
    "); out.w("
    "); out.w("
    "); - out.w(``); out.w("
    "); diff --git a/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/html-expected.js index 1f218c55d8..de4b784853 100644 --- a/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/html-expected.js @@ -7,11 +7,11 @@ export default _marko_template; import _marko_props from "marko/src/runtime/html/helpers/data-marko"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); out.w("
    "); out.w("
    "); - out.w(``); out.w("
    "); diff --git a/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/htmlProduction-expected.js index c8124c702a..066c18a1e3 100644 --- a/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/htmlProduction-expected.js @@ -7,8 +7,8 @@ export default _marko_template; import _marko_props from "marko/dist/runtime/html/helpers/data-marko"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.w(`
    `); }, { diff --git a/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/vdom-expected.js index 582e5980eb..45fca69103 100644 --- a/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/vdom-expected.js @@ -11,28 +11,28 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "style": "c:1px;", "class": "b", "id": "a" - }, "0", component, 0, 1); + }, "0", _component, 0, 1); out.e("div", { "style": "c:1px;", "id": "a" - }, "1", component, 0, 1); + }, "1", _component, 0, 1); out.e("div", { "style": "c:1px;" - }, "2", component, 0, 1); + }, "2", _component, 0, 1); out.e("div", { "style": "c:1px;" - }, "3", component, 0, 0, { + }, "3", _component, 0, 0, { pa: ["style"] }); out.e("div", { "a": "1", "style": "c:1px;" - }, "4", component, 0, 0); + }, "4", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/vdomProduction-expected.js index 54ea28b52e..3809fe976f 100644 --- a/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/simple-attrs-tag/snapshots/vdomProduction-expected.js @@ -11,28 +11,28 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "style": "c:1px;", "class": "b", "id": "a" - }, "0", component, 0, 1); + }, "0", _component, 0, 1); out.e("div", { "style": "c:1px;", "id": "a" - }, "1", component, 0, 1); + }, "1", _component, 0, 1); out.e("div", { "style": "c:1px;" - }, "2", component, 0, 1); + }, "2", _component, 0, 1); out.e("div", { "style": "c:1px;" - }, "3", component, 0, 0, { + }, "3", _component, 0, 0, { pa: ["style"] }); out.e("div", { "a": "1", "style": "c:1px;" - }, "4", component, 0, 0); + }, "4", _component, 0, 0); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/simple/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/simple/snapshots/cjs-expected.js index ba58fe96d5..5210dde378 100644 --- a/packages/translator-default/test/fixtures/simple/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/simple/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/simple/t var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("Hello "); out.w((0, _escapeXml.x)(input.name)); out.w("! "); diff --git a/packages/translator-default/test/fixtures/simple/snapshots/html-expected.js b/packages/translator-default/test/fixtures/simple/snapshots/html-expected.js index b9d0c44597..650e23f69c 100644 --- a/packages/translator-default/test/fixtures/simple/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/simple/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("Hello "); out.w(_marko_escapeXml(input.name)); out.w("! "); diff --git a/packages/translator-default/test/fixtures/simple/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/simple/snapshots/htmlProduction-expected.js index 6c6a2793dd..a3847643b2 100644 --- a/packages/translator-default/test/fixtures/simple/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/simple/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import { x as _marko_escapeXml } from "marko/dist/runtime/html/helpers/escape-xml"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(`Hello ${_marko_escapeXml(input.name)}! `); if (input.colors.length) { diff --git a/packages/translator-default/test/fixtures/simple/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/simple/snapshots/vdom-expected.js index 6a69b91890..b6e316346c 100644 --- a/packages/translator-default/test/fixtures/simple/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/simple/snapshots/vdom-expected.js @@ -10,27 +10,27 @@ 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, _component, component, state) { - out.t("Hello ", component); - out.t(input.name, component); - out.t("! ", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.t("Hello ", _component); + out.t(input.name, _component); + out.t("! ", _component); if (input.colors.length) { - out.be("ul", null, "0", component, null, 0); + out.be("ul", null, "0", _component, null, 0); { let _keyValue = 0; for (const color of input.colors) { const _keyScope = `[${_keyValue++}]`; - out.be("li", null, "1" + _keyScope, component, null, 0); - out.t(color, component); + out.be("li", null, "1" + _keyScope, _component, null, 0); + out.t(color, _component); out.ee(); } } out.ee(); } else { - out.be("div", null, "2", component, null, 0); - out.t("No colors!", component); + out.be("div", null, "2", _component, null, 0); + out.t("No colors!", _component); out.ee(); } }, { diff --git a/packages/translator-default/test/fixtures/simple/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/simple/snapshots/vdomProduction-expected.js index 544691b4dc..fc2a1abccd 100644 --- a/packages/translator-default/test/fixtures/simple/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/simple/snapshots/vdomProduction-expected.js @@ -14,26 +14,26 @@ 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, _component, component, state) { - out.t("Hello ", component); - out.t(input.name, component); - out.t("! ", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.t("Hello ", _component); + out.t(input.name, _component); + out.t("! ", _component); if (input.colors.length) { - out.be("ul", null, "0", component, null, 0); + out.be("ul", null, "0", _component, null, 0); { let _keyValue = 0; for (const color of input.colors) { const _keyScope = `[${_keyValue++}]`; - out.be("li", null, "1" + _keyScope, component, null, 0); - out.t(color, component); + out.be("li", null, "1" + _keyScope, _component, null, 0); + out.t(color, _component); out.ee(); } } out.ee(); } else { - out.n(_marko_node, component); + out.n(_marko_node, _component); } }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/split-component-with-component/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/split-component-with-component/snapshots/cjs-expected.js index 876689d760..c2c1c0e82e 100644 --- a/packages/translator-default/test/fixtures/split-component-with-component/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/split-component-with-component/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/split-co var _default = _marko_template; exports.default = _default; const _marko_component2 = _templateComponent.default; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
    "); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/split-component-with-component/snapshots/html-expected.js b/packages/translator-default/test/fixtures/split-component-with-component/snapshots/html-expected.js index 6da556804f..ef6fda9247 100644 --- a/packages/translator-default/test/fixtures/split-component-with-component/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/split-component-with-component/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_component from "./template.component.js"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/split-component-with-component/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/split-component-with-component/snapshots/htmlProduction-expected.js index a361eb147c..e9d02a50c8 100644 --- a/packages/translator-default/test/fixtures/split-component-with-component/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/split-component-with-component/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_component from "./template.component.js"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/split-component-with-component/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/split-component-with-component/snapshots/vdom-expected.js index 4f46af8a54..b8f40ebccf 100644 --- a/packages/translator-default/test/fixtures/split-component-with-component/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/split-component-with-component/snapshots/vdom-expected.js @@ -12,8 +12,8 @@ import _marko_split_component from "./template.component-browser.js"; _marko_registerComponent(_marko_componentType, () => _marko_split_component); const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.e("div", null, "0", component, 0, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.e("div", null, "0", _component, 0, 0); }, { t: _marko_componentType, s: true, diff --git a/packages/translator-default/test/fixtures/split-component-with-component/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/split-component-with-component/snapshots/vdomProduction-expected.js index d9baafe1c8..8aab1c2f9e 100644 --- a/packages/translator-default/test/fixtures/split-component-with-component/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/split-component-with-component/snapshots/vdomProduction-expected.js @@ -16,8 +16,8 @@ import _marko_split_component from "./template.component-browser.js"; _marko_registerComponent(_marko_componentType, () => _marko_split_component); const _marko_component2 = _marko_component; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType, s: true diff --git a/packages/translator-default/test/fixtures/split-component/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/split-component/snapshots/cjs-expected.js index 195c886ce9..a8fddb3671 100644 --- a/packages/translator-default/test/fixtures/split-component/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/split-component/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/split-co var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
    "); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/split-component/snapshots/html-expected.js b/packages/translator-default/test/fixtures/split-component/snapshots/html-expected.js index da899cb8f3..d7686fc48a 100644 --- a/packages/translator-default/test/fixtures/split-component/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/split-component/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/split-co export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/split-component/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/split-component/snapshots/htmlProduction-expected.js index bf4d18a8cb..9591f6f9be 100644 --- a/packages/translator-default/test/fixtures/split-component/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/split-component/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "tgVjO8nX", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/split-component/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/split-component/snapshots/vdom-expected.js index bf3d94c4fe..665f94b050 100644 --- a/packages/translator-default/test/fixtures/split-component/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/split-component/snapshots/vdom-expected.js @@ -11,8 +11,8 @@ import _marko_split_component from "./template.component-browser.js"; _marko_registerComponent(_marko_componentType, () => _marko_split_component); const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.e("div", null, "0", component, 0, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.e("div", null, "0", _component, 0, 0); }, { t: _marko_componentType, s: true, diff --git a/packages/translator-default/test/fixtures/split-component/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/split-component/snapshots/vdomProduction-expected.js index 63e2c94889..1a3d1a1c44 100644 --- a/packages/translator-default/test/fixtures/split-component/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/split-component/snapshots/vdomProduction-expected.js @@ -15,8 +15,8 @@ import _marko_split_component from "./template.component-browser.js"; _marko_registerComponent(_marko_componentType, () => _marko_split_component); const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType, s: true diff --git a/packages/translator-default/test/fixtures/static-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/static-tag/snapshots/cjs-expected.js index ecf6b1c892..1ba4e9d4c0 100644 --- a/packages/translator-default/test/fixtures/static-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/static-tag/snapshots/cjs-expected.js @@ -20,7 +20,7 @@ function bar() {} var baz = 456; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) {}, { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/static-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/static-tag/snapshots/html-expected.js index df35ce7dcc..60f78f33af 100644 --- a/packages/translator-default/test/fixtures/static-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/static-tag/snapshots/html-expected.js @@ -11,7 +11,7 @@ function bar() {} var baz = 456; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/static-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/static-tag/snapshots/htmlProduction-expected.js index ca289b899f..78d562b1ca 100644 --- a/packages/translator-default/test/fixtures/static-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/static-tag/snapshots/htmlProduction-expected.js @@ -11,7 +11,7 @@ function bar() {} var baz = 456; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true }, _marko_component); \ No newline at end of file diff --git a/packages/translator-default/test/fixtures/static-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/static-tag/snapshots/vdom-expected.js index 7871623088..c9c84d3aca 100644 --- a/packages/translator-default/test/fixtures/static-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/static-tag/snapshots/vdom-expected.js @@ -15,7 +15,7 @@ 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, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true, d: true diff --git a/packages/translator-default/test/fixtures/static-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/static-tag/snapshots/vdomProduction-expected.js index 7f5667d123..d378c56258 100644 --- a/packages/translator-default/test/fixtures/static-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/static-tag/snapshots/vdomProduction-expected.js @@ -15,7 +15,7 @@ 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, _component, component, state) {}, { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) {}, { t: _marko_componentType, i: true }, _marko_component); diff --git a/packages/translator-default/test/fixtures/style-block-empty/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/style-block-empty/snapshots/cjs-expected.js index e3dca63e5d..d77f341f25 100644 --- a/packages/translator-default/test/fixtures/style-block-empty/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/style-block-empty/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/style-bl var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
    "); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/style-block-empty/snapshots/html-expected.js b/packages/translator-default/test/fixtures/style-block-empty/snapshots/html-expected.js index 5acdb82100..2511ad2b91 100644 --- a/packages/translator-default/test/fixtures/style-block-empty/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/style-block-empty/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/style-bl export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/style-block-empty/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/style-block-empty/snapshots/htmlProduction-expected.js index 358e1b1fce..c228c4f766 100644 --- a/packages/translator-default/test/fixtures/style-block-empty/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/style-block-empty/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "iTWeM9Hv", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/style-block-empty/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/style-block-empty/snapshots/vdom-expected.js index c89fb5340e..37b0b32007 100644 --- a/packages/translator-default/test/fixtures/style-block-empty/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/style-block-empty/snapshots/vdom-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "class": "test" - }, "0", component, 0, 1); + }, "0", _component, 0, 1); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/style-block-empty/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/style-block-empty/snapshots/vdomProduction-expected.js index e63d4a0f80..983f07019c 100644 --- a/packages/translator-default/test/fixtures/style-block-empty/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/style-block-empty/snapshots/vdomProduction-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "class": "test" - }, "0", component, 0, 1); + }, "0", _component, 0, 1); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/cjs-expected.js index 507a95f975..2bc3f1b470 100644 --- a/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/style-bl var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
    "); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/html-expected.js b/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/html-expected.js index 7e0791b925..c8b54bb0f6 100644 --- a/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/style-bl export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/htmlProduction-expected.js index ff91a2c336..3db6450b41 100644 --- a/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "ZsW3uNOB", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/vdom-expected.js index d7f8aaaf29..39ddad9b9b 100644 --- a/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/vdom-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "class": "test" - }, "0", component, 0, 1); + }, "0", _component, 0, 1); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/vdomProduction-expected.js index bcc668e5ca..de6a6db73d 100644 --- a/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/style-block-with-styles/snapshots/vdomProduction-expected.js @@ -10,10 +10,10 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "class": "test" - }, "0", component, 0, 1); + }, "0", _component, 0, 1); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/svg-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/svg-tag/snapshots/cjs-expected.js index 337ee930cd..69d19c597e 100644 --- a/packages/translator-default/test/fixtures/svg-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/svg-tag/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/svg-tag/ var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(""); out.w(""); out.w(""); diff --git a/packages/translator-default/test/fixtures/svg-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/svg-tag/snapshots/html-expected.js index 42f906dbf0..db2fab673f 100644 --- a/packages/translator-default/test/fixtures/svg-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/svg-tag/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/svg-tag/ export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); out.w(""); out.w(""); diff --git a/packages/translator-default/test/fixtures/svg-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/svg-tag/snapshots/htmlProduction-expected.js index bef55622b3..fdb8840506 100644 --- a/packages/translator-default/test/fixtures/svg-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/svg-tag/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "LOy6P2CY", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("TestMDN Web Docs"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/svg-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/svg-tag/snapshots/vdom-expected.js index 9fd50274b2..9a82695412 100644 --- a/packages/translator-default/test/fixtures/svg-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/svg-tag/snapshots/vdom-expected.js @@ -10,11 +10,11 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.be("svg", { "height": "100", "width": "100" - }, "0", component, null, 0); + }, "0", _component, null, 0); out.e("circle", { "cx": "50", "cy": "50", @@ -22,29 +22,29 @@ _marko_template._ = _marko_renderer(function (input, out, _component, component, "stroke": "black", "stroke-width": "3", "fill": "red" - }, "1", component, 0, 0); - out.e("a", null, "2", component, 0, 0); - out.be("style", null, "3", component, null, 0); - out.t("div { color: green }", component); + }, "1", _component, 0, 0); + out.e("a", null, "2", _component, 0, 0); + out.be("style", null, "3", _component, null, 0); + out.t("div { color: green }", _component); out.ee(); - out.be("script", null, "4", component, null, 0); - out.t("alert(\"Hello\");", component); + out.be("script", null, "4", _component, null, 0); + out.t("alert(\"Hello\");", _component); out.ee(); - out.be("title", null, "5", component, null, 0); - out.t("Test", component); + out.be("title", null, "5", _component, null, 0); + out.t("Test", _component); out.ee(); out.be("a", { "xlink:href": "https://developer.mozilla.org/" - }, "6", component, null, 0); + }, "6", _component, null, 0); out.be("text", { "x": "10", "y": "25" - }, "7", component, null, 0); - out.t("MDN Web Docs", component); + }, "7", _component, null, 0); + out.t("MDN Web Docs", _component); out.ee(); out.ee(); out.ee(); - out.e("a", null, "8", component, 0, 0); + out.e("a", null, "8", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/svg-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/svg-tag/snapshots/vdomProduction-expected.js index 547b0e0cca..b51d6083ce 100644 --- a/packages/translator-default/test/fixtures/svg-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/svg-tag/snapshots/vdomProduction-expected.js @@ -36,23 +36,23 @@ 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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.be("svg", { "height": "100", "width": "100" - }, "0", component, null, 0); - out.n(_marko_node, component); - out.n(_marko_node2, component); - out.n(_marko_node3, component); - out.n(_marko_node4, component); - out.n(_marko_node5, component); + }, "0", _component, null, 0); + out.n(_marko_node, _component); + out.n(_marko_node2, _component); + out.n(_marko_node3, _component); + out.n(_marko_node4, _component); + out.n(_marko_node5, _component); out.be("a", { "xlink:href": "https://developer.mozilla.org/" - }, "6", component, null, 0); - out.n(_marko_node6, component); + }, "6", _component, null, 0); + out.n(_marko_node6, _component); out.ee(); out.ee(); - out.n(_marko_node7, component); + out.n(_marko_node7, _component); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/cjs-expected.js index 3fae66d03d..4ddea3aded 100644 --- a/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/tag-bloc var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { var b = thing; let c = thing; out.w(``); diff --git a/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/html-expected.js b/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/html-expected.js index 8f78231c52..9e2a0017de 100644 --- a/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_attr from "marko/src/runtime/html/helpers/attr"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { var b = thing; let c = thing; out.w(``); diff --git a/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/htmlProduction-expected.js index 7feba4df07..692b22e544 100644 --- a/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_attr from "marko/dist/runtime/html/helpers/attr"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { var b = thing; let c = thing; out.w(``); diff --git a/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/vdom-expected.js index fece622db8..514d28c7d0 100644 --- a/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/vdom-expected.js @@ -10,20 +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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { var b = thing; let c = thing; out.be("div", { "b": b, "c": c - }, "0", component, null, 0); + }, "0", _component, null, 0); { var d = thing; let e = thing; out.e("div", { "d": d, "e": e - }, "1", component, 0, 0); + }, "1", _component, 0, 0); } out.ee(); }, { diff --git a/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/vdomProduction-expected.js index ec167edb93..e5d18b4ca3 100644 --- a/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/tag-block-scoping/snapshots/vdomProduction-expected.js @@ -10,20 +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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { var b = thing; let c = thing; out.be("div", { "b": b, "c": c - }, "0", component, null, 0); + }, "0", _component, null, 0); { var d = thing; let e = thing; out.e("div", { "d": d, "e": e - }, "1", component, 0, 0); + }, "1", _component, 0, 0); } out.ee(); }, { diff --git a/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/cjs-expected.js index 60b5f79893..366e596c93 100644 --- a/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/tag-with var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
    "); out.w("
    "); out.w(``); diff --git a/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/html-expected.js b/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/html-expected.js index 3080fb5b33..056a6a8cb3 100644 --- a/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_attr from "marko/src/runtime/html/helpers/attr"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); out.w("
    "); out.w(``); diff --git a/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/htmlProduction-expected.js index 43031ea00e..06a39514d2 100644 --- a/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import _marko_attr from "marko/dist/runtime/html/helpers/attr"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(`
    `); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/vdom-expected.js index 912ae20df9..57175a8381 100644 --- a/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/vdom-expected.js @@ -10,14 +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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.e("div", { "default": "" - }, "0", component, 0, 0); - out.e("div", null, "1", component, 0, 0); + }, "0", _component, 0, 0); + out.e("div", null, "1", _component, 0, 0); out.e("div", { "default": abc - }, "2", component, 0, 0); + }, "2", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/vdomProduction-expected.js index a8b319c7fe..b5df23667a 100644 --- a/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/tag-with-default-attr/snapshots/vdomProduction-expected.js @@ -18,12 +18,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, _component, component, state) { - out.n(_marko_node, component); - out.n(_marko_node2, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); + out.n(_marko_node2, _component); out.e("div", { "default": abc - }, "2", component, 0, 0); + }, "2", _component, 0, 0); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/textarea-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/textarea-tag/snapshots/cjs-expected.js index 04990f9f72..752cfbafd3 100644 --- a/packages/translator-default/test/fixtures/textarea-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/textarea-tag/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/textarea var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w(""); diff --git a/packages/translator-default/test/fixtures/textarea-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/textarea-tag/snapshots/html-expected.js index c79e3a0e7a..ac6beb0146 100644 --- a/packages/translator-default/test/fixtures/textarea-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/textarea-tag/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/textarea export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); diff --git a/packages/translator-default/test/fixtures/textarea-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/textarea-tag/snapshots/htmlProduction-expected.js index 96c47ba8bc..32e6fb237d 100644 --- a/packages/translator-default/test/fixtures/textarea-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/textarea-tag/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "or1T1BHP", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w(""); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/textarea-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/textarea-tag/snapshots/vdom-expected.js index dc9ad9be6c..fbd19c7cba 100644 --- a/packages/translator-default/test/fixtures/textarea-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/textarea-tag/snapshots/vdom-expected.js @@ -10,9 +10,9 @@ 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, _component, component, state) { - out.be("textarea", null, "0", component, null, 0); - out.t("\n hello world\n", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("textarea", null, "0", _component, null, 0); + out.t("\n hello world\n", _component); out.ee(); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/textarea-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/textarea-tag/snapshots/vdomProduction-expected.js index 9e2d2efd57..7b70442833 100644 --- a/packages/translator-default/test/fixtures/textarea-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/textarea-tag/snapshots/vdomProduction-expected.js @@ -14,8 +14,8 @@ 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, _component, component, state) { - out.n(_marko_node, component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/top-level-text/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/top-level-text/snapshots/cjs-expected.js index 0dace140cf..b3af6727f5 100644 --- a/packages/translator-default/test/fixtures/top-level-text/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/top-level-text/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/top-leve var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("Hello John"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/top-level-text/snapshots/html-expected.js b/packages/translator-default/test/fixtures/top-level-text/snapshots/html-expected.js index e86ac2a79d..fa3da1ed25 100644 --- a/packages/translator-default/test/fixtures/top-level-text/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/top-level-text/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/top-leve export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("Hello John"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/top-level-text/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/top-level-text/snapshots/htmlProduction-expected.js index 89c8c2e588..3c03bfe7c0 100644 --- a/packages/translator-default/test/fixtures/top-level-text/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/top-level-text/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "L6x2qKS4", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("Hello John"); }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/top-level-text/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/top-level-text/snapshots/vdom-expected.js index 2cd04be1fc..ad504be1a9 100644 --- a/packages/translator-default/test/fixtures/top-level-text/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/top-level-text/snapshots/vdom-expected.js @@ -10,8 +10,8 @@ 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, _component, component, state) { - out.t("Hello John", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.t("Hello John", _component); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/top-level-text/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/top-level-text/snapshots/vdomProduction-expected.js index a0142f7e0a..c36a409281 100644 --- a/packages/translator-default/test/fixtures/top-level-text/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/top-level-text/snapshots/vdomProduction-expected.js @@ -10,8 +10,8 @@ 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, _component, component, state) { - out.t("Hello John", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.t("Hello John", _component); }, { t: _marko_componentType, i: true diff --git a/packages/translator-default/test/fixtures/while-tag/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/while-tag/snapshots/cjs-expected.js index 1e252a445e..fe671fad1e 100644 --- a/packages/translator-default/test/fixtures/while-tag/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/while-tag/snapshots/cjs-expected.js @@ -15,7 +15,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/while-ta var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { let i = 0; let _keyValue = 0; diff --git a/packages/translator-default/test/fixtures/while-tag/snapshots/html-expected.js b/packages/translator-default/test/fixtures/while-tag/snapshots/html-expected.js index a6612b9207..9b928b90c2 100644 --- a/packages/translator-default/test/fixtures/while-tag/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/while-tag/snapshots/html-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/while-ta export default _marko_template; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let i = 0; let _keyValue = 0; diff --git a/packages/translator-default/test/fixtures/while-tag/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/while-tag/snapshots/htmlProduction-expected.js index 94361b8191..a9f1f771f2 100644 --- a/packages/translator-default/test/fixtures/while-tag/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/while-tag/snapshots/htmlProduction-expected.js @@ -6,7 +6,7 @@ const _marko_componentType = "R2kcOR51", export default _marko_template; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let i = 0; let _keyValue = 0; diff --git a/packages/translator-default/test/fixtures/while-tag/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/while-tag/snapshots/vdom-expected.js index 5a18352996..db1c75f07b 100644 --- a/packages/translator-default/test/fixtures/while-tag/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/while-tag/snapshots/vdom-expected.js @@ -10,14 +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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let i = 0; let _keyValue = 0; while (i < 10) { const _keyScope = `[${_keyValue++}]`; i++; - out.e("div", null, "0" + _keyScope, component, 0, 0); + out.e("div", null, "0" + _keyScope, _component, 0, 0); } }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/while-tag/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/while-tag/snapshots/vdomProduction-expected.js index a1c34de90f..50a5bb541e 100644 --- a/packages/translator-default/test/fixtures/while-tag/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/while-tag/snapshots/vdomProduction-expected.js @@ -10,14 +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, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { let i = 0; let _keyValue = 0; while (i < 10) { const _keyScope = `[${_keyValue++}]`; i++; - out.e("div", null, "0" + _keyScope, component, 0, 0); + out.e("div", null, "0" + _keyScope, _component, 0, 0); } }, { t: _marko_componentType, diff --git a/packages/translator-default/test/fixtures/white-space-test/snapshots/cjs-expected.js b/packages/translator-default/test/fixtures/white-space-test/snapshots/cjs-expected.js index 9604a559c6..dc1ed5233d 100644 --- a/packages/translator-default/test/fixtures/white-space-test/snapshots/cjs-expected.js +++ b/packages/translator-default/test/fixtures/white-space-test/snapshots/cjs-expected.js @@ -17,7 +17,7 @@ const _marko_componentType = "packages/translator-default/test/fixtures/white-sp var _default = _marko_template; exports.default = _default; const _marko_component = {}; -_marko_template._ = (0, _renderer.default)(function (input, out, _component, component, state) { +_marko_template._ = (0, _renderer.default)(function (input, out, _componentDef, _component, state) { out.w("
    "); out.w("
    "); out.w("Hello "); diff --git a/packages/translator-default/test/fixtures/white-space-test/snapshots/html-expected.js b/packages/translator-default/test/fixtures/white-space-test/snapshots/html-expected.js index 3e1e096cdc..3119d49d56 100644 --- a/packages/translator-default/test/fixtures/white-space-test/snapshots/html-expected.js +++ b/packages/translator-default/test/fixtures/white-space-test/snapshots/html-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import { x as _marko_escapeXml } from "marko/src/runtime/html/helpers/escape-xml"; import _marko_renderer from "marko/src/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    "); out.w("
    "); out.w("Hello "); diff --git a/packages/translator-default/test/fixtures/white-space-test/snapshots/htmlProduction-expected.js b/packages/translator-default/test/fixtures/white-space-test/snapshots/htmlProduction-expected.js index 6b6fa47685..22f2fc9897 100644 --- a/packages/translator-default/test/fixtures/white-space-test/snapshots/htmlProduction-expected.js +++ b/packages/translator-default/test/fixtures/white-space-test/snapshots/htmlProduction-expected.js @@ -7,7 +7,7 @@ export default _marko_template; import { x as _marko_escapeXml } from "marko/dist/runtime/html/helpers/escape-xml"; import _marko_renderer from "marko/dist/runtime/components/renderer"; const _marko_component = {}; -_marko_template._ = _marko_renderer(function (input, out, _component, component, state) { +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { out.w("
    Hello
    World
    Hello
    \n    This should  \n      be preserved\n
    Hello
    "); scriptletA(); scriptletB(); diff --git a/packages/translator-default/test/fixtures/white-space-test/snapshots/vdom-expected.js b/packages/translator-default/test/fixtures/white-space-test/snapshots/vdom-expected.js index 474d70209a..bee74a2e4b 100644 --- a/packages/translator-default/test/fixtures/white-space-test/snapshots/vdom-expected.js +++ b/packages/translator-default/test/fixtures/white-space-test/snapshots/vdom-expected.js @@ -10,39 +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, _component, component, state) { - out.be("div", null, "0", component, null, 0); - out.be("div", null, "1", component, null, 0); - out.t("Hello ", component); - out.be("div", null, "2", component, null, 0); - out.t(" ", component); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.be("div", null, "0", _component, null, 0); + out.be("div", null, "1", _component, null, 0); + out.t("Hello ", _component); + out.be("div", null, "2", _component, null, 0); + out.t(" ", _component); out.ee(); - out.t(" World", component); + out.t(" World", _component); out.ee(); - out.be("div", null, "3", component, null, 0); - out.t(" Hello", component); + out.be("div", null, "3", _component, null, 0); + out.t(" Hello", _component); out.ee(); - out.be("pre", null, "4", component, null, 0); - out.t("\n This should \n be preserved\n ", component); + out.be("pre", null, "4", _component, null, 0); + out.t("\n This should \n be preserved\n ", _component); out.ee(); - out.be("div", null, "5", component, null, 0); - out.be("div", null, "6", component, null, 0); - out.t("Hello ", component); + out.be("div", null, "5", _component, null, 0); + out.be("div", null, "6", _component, null, 0); + out.t("Hello ", _component); out.ee(); out.ee(); out.ee(); - out.be("div", null, "7", component, null, 0); + out.be("div", null, "7", _component, null, 0); scriptletA(); scriptletB(); - out.t("Hello ", component); + out.t("Hello ", _component); scriptletC(); - out.t("World", component); + out.t("World", _component); scriptletD(); out.ee(); - out.t(" Hello World! ", component); - out.t(a, component); - out.t(b, component); - out.e("div", null, "8", component, 0, 0); + out.t(" Hello World! ", _component); + out.t(a, _component); + out.t(b, _component); + out.e("div", null, "8", _component, 0, 0); }, { t: _marko_componentType, i: true, diff --git a/packages/translator-default/test/fixtures/white-space-test/snapshots/vdomProduction-expected.js b/packages/translator-default/test/fixtures/white-space-test/snapshots/vdomProduction-expected.js index f3b6d2d0e7..993d96ba6a 100644 --- a/packages/translator-default/test/fixtures/white-space-test/snapshots/vdomProduction-expected.js +++ b/packages/translator-default/test/fixtures/white-space-test/snapshots/vdomProduction-expected.js @@ -16,20 +16,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, _component, component, state) { - out.n(_marko_node, component); - out.be("div", null, "1", component, null, 0); +_marko_template._ = _marko_renderer(function (input, out, _componentDef, _component, state) { + out.n(_marko_node, _component); + out.be("div", null, "1", _component, null, 0); scriptletA(); scriptletB(); - out.t("Hello ", component); + out.t("Hello ", _component); scriptletC(); - out.t("World", component); + out.t("World", _component); scriptletD(); out.ee(); - out.t(" Hello World! ", component); - out.t(a, component); - out.t(b, component); - out.n(_marko_node2, component); + out.t(" Hello World! ", _component); + out.t(a, _component); + out.t(b, _component); + out.n(_marko_node2, _component); }, { t: _marko_componentType, i: true