Skip to content

Commit

Permalink
feat(tags-api): custom tags from local variables must be PascalCase
Browse files Browse the repository at this point in the history
  • Loading branch information
LuLaValva committed Oct 17, 2024
1 parent 3ca55b9 commit ed94c05
Show file tree
Hide file tree
Showing 25 changed files with 91 additions and 75 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ const _params_2$defineBody = /* @__PURE__ */_value("_params_2", (_scope, _params
_c$defineBody(_scope, _params_2[2]);
});
const _defineBody = _register("packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<div><!>|<!>|<!></div>", /* next(1), replace, over(2), replace, over(2), replace */"D%c%c%", void 0, void 0, void 0, () => _params_2$defineBody));
const _myTag_input = _dynamicTagAttrs("#text/0", void 0, true);
const _MyTag_input = _dynamicTagAttrs("#text/0", void 0, true);
const _expr_Text_x = /* @__PURE__ */_intersection(2, _scope => {
const {
x
} = _scope;
_myTag_input(_scope, () => [1, "Hello", x]);
}, () => _myTag_input);
_MyTag_input(_scope, () => [1, "Hello", x]);
}, () => _MyTag_input);
const _dynamicTagName = /* @__PURE__ */_conditional("#text/0", null, () => _expr_Text_x);
const _onClick = _scope => {
const {
Expand All @@ -31,10 +31,10 @@ const _x = /* @__PURE__ */_value("x", (_scope, x) => {
_data(_scope["#text/2"], x);
_queueEffect(_scope, _x_effect);
}, () => _expr_Text_x);
const _myTag = /* @__PURE__ */_value("myTag", (_scope, myTag) => _dynamicTagName(_scope, myTag), () => _dynamicTagName);
const _MyTag = /* @__PURE__ */_value("MyTag", (_scope, MyTag) => _dynamicTagName(_scope, MyTag), () => _dynamicTagName);
export function _setup_(_scope) {
_x(_scope, 1);
_myTag(_scope, {
_MyTag(_scope, {
renderBody: /* @__PURE__ */_bindRenderer(_scope, _defineBody)
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _w
const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
const _scope0_id = _nextScopeId();
const x = 1;
const myTag = {
const MyTag = {
renderBody: _register(/* @__PURE__ */_createRenderer((a, b, c) => {
const _scope1_id = _nextScopeId();
_write(`<div>${_escapeXML(a)}${_markResumeNode(_scope1_id, "#text/0")}|<!>${_escapeXML(b)}${_markResumeNode(_scope1_id, "#text/1")}|<!>${_escapeXML(c)}${_markResumeNode(_scope1_id, "#text/2")}</div>`);
}), "packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/template.marko_1_renderer")
};
const _dynamicScope = _peekNextScope();
_dynamicTagArgs(_dynamicScope, myTag, [1, "Hello", x]);
_dynamicTagArgs(_dynamicScope, MyTag, [1, "Hello", x]);
_write(`${_markResumeControlEnd(_scope0_id, "#text/0")}<button>${_escapeXML(x)}${_markResumeNode(_scope0_id, "#text/2")}</button>${_markResumeNode(_scope0_id, "#button/1")}`);
_writeEffect(_scope0_id, "packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/template.marko_0_x");
_writeScope(_scope0_id, {
"x": x,
"#text/0!": _writeExistingScope(_dynamicScope),
"#text/0(": myTag
"#text/0(": MyTag
});
});
export default /* @__PURE__ */_createTemplate(_renderer, "packages/translator-tags/src/__tests__/fixtures/define-tag-render-args/template.marko");
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<let/x=1 />
<define/myTag|a, b, c|>
<define/MyTag|a, b, c|>
<div>${a}|${b}|${c}</div>
</define>

<myTag(1, "Hello", x) />
<MyTag(1, "Hello", x) />
<button onClick() { x++; }>
${x}
</button>
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ const _number$defineBody = /* @__PURE__ */_value("number", (_scope, number) => _
const _pattern_$defineBody = /* @__PURE__ */_value("_pattern_", (_scope, _pattern_) => _number$defineBody(_scope, _pattern_.number));
const _params_2$defineBody = /* @__PURE__ */_value("_params_2", (_scope, _params_2) => _pattern_$defineBody(_scope, _params_2[0]));
const _defineBody = _register("packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<div> </div>", /* next(1), get */"D ", void 0, void 0, void 0, () => _params_2$defineBody));
const _myTag_input = _dynamicTagAttrs("#text/0");
const _MyTag_input = _dynamicTagAttrs("#text/0");
const _expr_Text_x = /* @__PURE__ */_intersection(2, _scope => {
const {
x
} = _scope;
_myTag_input(_scope, () => ({
_MyTag_input(_scope, () => ({
number: x
}));
}, () => _myTag_input);
}, () => _MyTag_input);
const _dynamicTagName = /* @__PURE__ */_conditional("#text/0", null, () => _expr_Text_x);
const _onClick = _scope => {
const {
Expand All @@ -28,10 +28,10 @@ const _x = /* @__PURE__ */_value("x", (_scope, x) => {
_data(_scope["#text/2"], x);
_queueEffect(_scope, _x_effect);
}, () => _expr_Text_x);
const _myTag = /* @__PURE__ */_value("myTag", (_scope, myTag) => _dynamicTagName(_scope, myTag), () => _dynamicTagName);
const _MyTag = /* @__PURE__ */_value("MyTag", (_scope, MyTag) => _dynamicTagName(_scope, MyTag), () => _dynamicTagName);
export function _setup_(_scope) {
_x(_scope, 1);
_myTag(_scope, {
_MyTag(_scope, {
renderBody: /* @__PURE__ */_bindRenderer(_scope, _defineBody)
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _w
const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
const _scope0_id = _nextScopeId();
const x = 1;
const myTag = {
const MyTag = {
renderBody: _register(/* @__PURE__ */_createRenderer(({
number
}) => {
Expand All @@ -11,15 +11,15 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
}), "packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/template.marko_1_renderer")
};
const _dynamicScope = _peekNextScope();
_dynamicTagInput(_dynamicScope, myTag, {
_dynamicTagInput(_dynamicScope, MyTag, {
number: x
});
_write(`${_markResumeControlEnd(_scope0_id, "#text/0")}<button>${_escapeXML(x)}${_markResumeNode(_scope0_id, "#text/2")}</button>${_markResumeNode(_scope0_id, "#button/1")}`);
_writeEffect(_scope0_id, "packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/template.marko_0_x");
_writeScope(_scope0_id, {
"x": x,
"#text/0!": _writeExistingScope(_dynamicScope),
"#text/0(": myTag
"#text/0(": MyTag
});
});
export default /* @__PURE__ */_createTemplate(_renderer, "packages/translator-tags/src/__tests__/fixtures/define-tag-render-attr-signal/template.marko");
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<let/x=1 />
<define/myTag|{number}|>
<define/MyTag|{number}|>
<div>${number}</div>
</define>

<myTag number=x />
<MyTag number=x />
<button onClick() { x++; }>
${x}
</button>
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ const _x = /* @__PURE__ */_value("x", (_scope, x) => {
_data(_scope["#text/2"], x);
_queueEffect(_scope, _x_effect);
}, () => _dynamicSubscribers("x"));
const _myTag = /* @__PURE__ */_value("myTag", (_scope, myTag) => _dynamicTagName(_scope, myTag), () => _dynamicTagName);
const _MyTag = /* @__PURE__ */_value("MyTag", (_scope, MyTag) => _dynamicTagName(_scope, MyTag), () => _dynamicTagName);
export function _setup_(_scope) {
_x(_scope, 1);
_myTag(_scope, {
_MyTag(_scope, {
renderBody: /* @__PURE__ */_bindRenderer(_scope, _defineBody)
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _w
const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
const _scope0_id = _nextScopeId();
const x = 1;
const myTag = {
const MyTag = {
renderBody: _register(/* @__PURE__ */_createRenderer(() => {
const _scope1_id = _nextScopeId();
_write(`<div>${_escapeXML(x)}${_markResumeNode(_scope1_id, "#text/0")}</div>`);
Expand All @@ -13,13 +13,13 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
}), "packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_1_renderer", _scope0_id)
};
const _dynamicScope = _peekNextScope();
_dynamicTagInput(_dynamicScope, myTag, {});
_dynamicTagInput(_dynamicScope, MyTag, {});
_write(`${_markResumeControlEnd(_scope0_id, "#text/0")}<button>${_escapeXML(x)}${_markResumeNode(_scope0_id, "#text/2")}</button>${_markResumeNode(_scope0_id, "#button/1")}`);
_writeEffect(_scope0_id, "packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko_0_x");
_writeScope(_scope0_id, {
"x": x,
"#text/0!": _writeExistingScope(_dynamicScope),
"#text/0(": myTag
"#text/0(": MyTag
});
});
export default /* @__PURE__ */_createTemplate(_renderer, "packages/translator-tags/src/__tests__/fixtures/define-tag-render-closure/template.marko");
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<let/x=1 />
<define/myTag>
<define/MyTag>
<div>${x}</div>
</define>

<myTag />
<MyTag />
<button onClick() { x++; }>
${x}
</button>
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ const _setup$defineBody = _scope => {
_y$defineBody(_scope, 1);
};
const _defineBody = _register("packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_renderer", /* @__PURE__ */_createRenderer("<div>Hello <!> <!></div><button> </button>", /* next(1), over(1), replace, over(2), replace, out(1), get, next(1), get */"Db%c%l D ", _setup$defineBody, void 0, void 0, () => _params_2$defineBody));
const _myTag_input = _dynamicTagAttrs("#text/0");
const _dynamicTagName = /* @__PURE__ */_conditional("#text/0", _scope => _myTag_input(_scope, () => ({
const _MyTag_input = _dynamicTagAttrs("#text/0");
const _dynamicTagName = /* @__PURE__ */_conditional("#text/0", _scope => _MyTag_input(_scope, () => ({
name: "Ryan"
})), () => _myTag_input);
const _myTag = /* @__PURE__ */_value("myTag", (_scope, myTag) => _dynamicTagName(_scope, myTag), () => _dynamicTagName);
})), () => _MyTag_input);
const _MyTag = /* @__PURE__ */_value("MyTag", (_scope, MyTag) => _dynamicTagName(_scope, MyTag), () => _dynamicTagName);
export function _setup_(_scope) {
_myTag(_scope, {
_MyTag(_scope, {
renderBody: /* @__PURE__ */_bindRenderer(_scope, _defineBody)
});
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { escapeXML as _escapeXML, markResumeNode as _markResumeNode, write as _write, writeEffect as _writeEffect, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, register as _register, dynamicTagInput as _dynamicTagInput, peekNextScope as _peekNextScope, markResumeControlEnd as _markResumeControlEnd, writeExistingScope as _writeExistingScope, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
const _scope0_id = _nextScopeId();
const myTag = {
const MyTag = {
renderBody: _register(/* @__PURE__ */_createRenderer(({
name
}) => {
Expand All @@ -15,13 +15,13 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
}), "packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko_1_renderer")
};
const _dynamicScope = _peekNextScope();
_dynamicTagInput(_dynamicScope, myTag, {
_dynamicTagInput(_dynamicScope, MyTag, {
name: "Ryan"
});
_write(`${_markResumeControlEnd(_scope0_id, "#text/0")}`);
_writeScope(_scope0_id, {
"#text/0!": _writeExistingScope(_dynamicScope),
"#text/0(": myTag
"#text/0(": MyTag
});
});
export default /* @__PURE__ */_createTemplate(_renderer, "packages/translator-tags/src/__tests__/fixtures/define-tag-render/template.marko");
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<define/myTag|{name}|>
<define/MyTag|{name}|>
<let/y=1 />
<div>Hello ${name} ${y}</div>
<button onClick() { y++; }>
${y}
</button>
</define>

<myTag name="Ryan" />
<MyTag name="Ryan" />
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export const _template_ = `<!>${_bazComp_template}${_bazComp_template}<!>`;
export const _walks_ = /* beginChild, _bazComp_walks, endChild, beginChild, _bazComp_walks, endChild */`D/${_bazComp_walks}&/${_bazComp_walks}&D`;
import bazComp from "./components/baz.marko";
import { _setup_ as _bazComp, _template_ as _bazComp_template, _walks_ as _bazComp_walks } from "./components/baz.marko";
export const _template_ = `<!>${_BazComp_template}${_BazComp_template}<!>`;
export const _walks_ = /* beginChild, _BazComp_walks, endChild, beginChild, _BazComp_walks, endChild */`D/${_BazComp_walks}&/${_BazComp_walks}&D`;
import BazComp from "./components/baz.marko";
import { _setup_ as _BazComp, _template_ as _BazComp_template, _walks_ as _BazComp_walks } from "./components/baz.marko";
export function _setup_(_scope) {
_bazComp(_scope["#childScope/0"]);
_bazComp(_scope["#childScope/1"]);
_BazComp(_scope["#childScope/0"]);
_BazComp(_scope["#childScope/1"]);
}
import { createRenderer as _createRenderer, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
export default /* @__PURE__ */_createTemplate(/* @__PURE__ */_createRenderer(_template_, _walks_, _setup_), "packages/translator-tags/src/__tests__/fixtures/import-tag-shorthand/template.marko");
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import bazComp from "./components/baz.marko";
import BazComp from "./components/baz.marko";
import { peekNextScope as _peekNextScope, writeExistingScope as _writeExistingScope, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
const _scope0_id = _nextScopeId();
const _childScope = _peekNextScope();
bazComp._({});
BazComp._({});
const _childScope2 = _peekNextScope();
bazComp._({});
BazComp._({});
_writeScope(_scope0_id, {
"#childScope/0": _writeExistingScope(_childScope),
"#childScope/1": _writeExistingScope(_childScope2)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import bazComp from "<baz>";
<${bazComp}/>
<bazComp/>
import BazComp from "<baz>";
<${BazComp}/>
<BazComp/>
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
export const _template_ = `<!>${_bazComp_template}${_bazComp_template}${_bazComp_template}<!>`;
export const _walks_ = /* beginChild, _bazComp_walks, endChild, beginChild, _bazComp_walks, endChild, beginChild, _bazComp_walks, endChild, replace, over(1) */`D/${_bazComp_walks}&/${_bazComp_walks}&/${_bazComp_walks}&%b`;
export const _template_ = `<!>${_Baz_template}${_Baz_template}${_Baz_template}<!>`;
export const _walks_ = /* beginChild, _Baz_walks, endChild, beginChild, _Baz_walks, endChild, beginChild, _Baz_walks, endChild, replace, over(1) */`D/${_Baz_walks}&/${_Baz_walks}&/${_Baz_walks}&%b`;
import "./foo";
import { b as c } from "./bar";
import bazComp from "./components/baz.marko";
import { _setup_ as _bazComp, _template_ as _bazComp_template, _walks_ as _bazComp_walks } from "./components/baz.marko";
import Baz from "./components/baz.marko";
import { _setup_ as _Baz, _template_ as _Baz_template, _walks_ as _Baz_walks } from "./components/baz.marko";
import { data as _data, createRenderer as _createRenderer, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
export function _setup_(_scope) {
_bazComp(_scope["#childScope/0"]);
_bazComp(_scope["#childScope/1"]);
_bazComp(_scope["#childScope/2"]);
_Baz(_scope["#childScope/0"]);
_Baz(_scope["#childScope/1"]);
_Baz(_scope["#childScope/2"]);
_data(_scope["#text/3"], c);
}
export default /* @__PURE__ */_createTemplate(/* @__PURE__ */_createRenderer(_template_, _walks_, _setup_), "packages/translator-tags/src/__tests__/fixtures/import-tag/template.marko");
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import "./foo";
import { b as c } from "./bar";
import bazComp from "./components/baz.marko";
import Baz from "./components/baz.marko";
import { peekNextScope as _peekNextScope, writeExistingScope as _writeExistingScope, escapeXML as _escapeXML, write as _write, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
import _baz from "./components/baz.marko";
const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
const _scope0_id = _nextScopeId();
const _childScope = _peekNextScope();
bazComp._({});
Baz._({});
const _childScope2 = _peekNextScope();
bazComp._({});
Baz._({});
const _childScope3 = _peekNextScope();
_baz._({});
_write(`${_escapeXML(c)}`);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import "./foo";
import { b as c } from "./bar";
import bazComp from "./components/baz.marko";
<${bazComp}/>
<bazComp/>
import Baz from "./components/baz.marko";
<${Baz}/>
<Baz/>
<baz />
-- ${c}
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ export const _template_ = "<span></span>";
export const _walks_ = /* over(1) */"b";
export const _setup_ = () => {};
import { createRenderer as _createRenderer, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
export default /* @__PURE__ */_createTemplate(/* @__PURE__ */_createRenderer(_template_, _walks_, _setup_), "packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/components/baz.marko");
export default /* @__PURE__ */_createTemplate(/* @__PURE__ */_createRenderer(_template_, _walks_, _setup_), "packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/components/Baz.marko");
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export const _template_ = "<div></div><!>";
export const _walks_ = /* over(1), replace, over(1) */"b%b";
const div = "span";
const baz = "div";
const Baz = "div";
import { conditional as _conditional, createRenderer as _createRenderer, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/dom";
const _dynamicTagName = /* @__PURE__ */_conditional("#text/0");
export function _setup_(_scope) {
_dynamicTagName(_scope, baz);
_dynamicTagName(_scope, Baz);
}
export default /* @__PURE__ */_createTemplate(/* @__PURE__ */_createRenderer(_template_, _walks_, _setup_), "packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/template.marko");
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
const _scope0_id = _nextScopeId();
_write("<span></span>");
});
export default /* @__PURE__ */_createTemplate(_renderer, "packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/components/baz.marko");
export default /* @__PURE__ */_createTemplate(_renderer, "packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/components/Baz.marko");
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
const div = "span";
const baz = "div";
const Baz = "div";
import { write as _write, dynamicTagInput as _dynamicTagInput, peekNextScope as _peekNextScope, markResumeControlEnd as _markResumeControlEnd, writeExistingScope as _writeExistingScope, writeScope as _writeScope, nextScopeId as _nextScopeId, createRenderer as _createRenderer, createTemplate as _createTemplate } from "@marko/runtime-tags/debug/html";
const _renderer = /* @__PURE__ */_createRenderer((input, _tagVar) => {
const _scope0_id = _nextScopeId();
_write("<div></div>");
const _dynamicScope = _peekNextScope();
_dynamicTagInput(_dynamicScope, baz, {});
_dynamicTagInput(_dynamicScope, Baz, {});
_write(`${_markResumeControlEnd(_scope0_id, "#text/0")}`);
_writeScope(_scope0_id, {
"#text/0!": _writeExistingScope(_dynamicScope),
"#text/0(": baz
"#text/0(": Baz
});
});
export default /* @__PURE__ */_createTemplate(_renderer, "packages/translator-tags/src/__tests__/fixtures/tag-resolution-priority/template.marko");
Loading

0 comments on commit ed94c05

Please sign in to comment.