Skip to content

Commit

Permalink
create using root and reference
Browse files Browse the repository at this point in the history
  • Loading branch information
@kbrsh
kbrsh committed Jul 1, 2018
1 parent 446d549 commit d7749e2
Show file tree
Hide file tree
Showing 11 changed files with 98 additions and 91 deletions.
93 changes: 48 additions & 45 deletions dist/moon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@

var whitespaceRE = /^\s+$/;

var isComponentType = function (type) { return type[0] === type[0].toUpperCase() && type[0] !== type[0].toLowerCase(); };

var valueEndRE = /[\s/>]/;

var parseAttributes = function (index, input, length, attributes) {
Expand Down Expand Up @@ -154,7 +156,7 @@
for (var i = 0; i < attributes.length;) {
var attribute = attributes[i];

if (attribute.key[0] === "#") {
if (isComponentType(attribute.key)) {
element = {
type: attribute.key,
attributes: [{
Expand Down Expand Up @@ -254,7 +256,7 @@

if (!whitespaceRE.test(content)) {
stack[stack.length - 1].children.push({
type: "#text",
type: "Text",
attributes: [{
key: "",
value: content.replace(escapeRE, function (match) { return escapeMap[match]; }),
Expand Down Expand Up @@ -284,7 +286,7 @@

var template = parseTemplate(expression);
stack[stack.length - 1].children.push({
type: "#text",
type: "Text",
attributes: [{
key: "",
value: template.expression,
Expand All @@ -302,8 +304,9 @@

var root = {
element: 0,
nextElement: 1,
type: "#root",
referenceElement: 1,
nextElement: 2,
type: "Root",
attributes: [],
children: []
};
Expand Down Expand Up @@ -359,14 +362,13 @@

var directiveFor = function (forIdentifiers, forValue, forReference, forPortion, forPortions, forLocals, forParent) { return ("m.df(" + forIdentifiers + "," + forValue + "," + (getElement(forReference)) + "," + (getElement(forPortion)) + "," + (getElement(forPortions)) + "," + (getElement(forLocals)) + "," + (getElement(forParent)) + ");"); };

var generateMount = function (element, parent, insert) { return insert === undefined ? appendChild(element, parent) : insertBefore(element, insert, parent); };
var generateMount = function (element, parent, reference) { return reference === null ? appendChild(element, parent) : insertBefore(element, reference, parent); };

var generateAll = function (element, parent, root, insert) {
var generateAll = function (element, parent, root, reference) {
switch (element.type) {
case "#if": {
element.ifState = root.nextElement++;
element.ifReference = root.nextElement++;

case "If": {
var ifState = root.nextElement++;
var ifReference = root.nextElement++;
var ifConditions = root.nextElement++;
var ifPortions = root.nextElement++;
var ifConditionsCode = "[";
Expand All @@ -376,16 +378,17 @@
var siblings = parent.children;
for (var i = siblings.indexOf(element); i < siblings.length; i++) {
var sibling = siblings[i];
if (sibling.type === "#if" || sibling.type === "#elseif" || sibling.type === "#else") {
ifConditionsCode += separator + (sibling.type === "#else" ? "true" : attributeValue(sibling.attributes[0]));
if (sibling.type === "If" || sibling.type === "ElseIf" || sibling.type === "Else") {
ifConditionsCode += separator + (sibling.type === "Else" ? "true" : attributeValue(sibling.attributes[0]));

ifPortionsCode += separator + "function(locals){" + generate({
element: root.nextElement,
nextElement: root.nextElement + 1,
type: "#root",
element: 0,
referenceElement: 1,
nextElement: 2,
type: "Root",
attributes: [],
children: sibling.children
}, element.ifReference) + "}({})";
}) + "}({})";

separator = ",";
} else {
Expand All @@ -394,21 +397,21 @@
}

return [
setElement(element.ifReference, createComment()) +
generateMount(element.ifReference, parent.element, insert) +
setElement(ifReference, createComment()) +
generateMount(ifReference, parent.element, reference) +
setElement(ifPortions, ifPortionsCode + "];"),

setElement(ifConditions, ifConditionsCode + "];") +
setElement(element.ifState, directiveIf(element.ifState, element.ifReference, ifConditions, ifPortions, parent.element)),
setElement(ifState, directiveIf(ifState, ifReference, ifConditions, ifPortions, parent.element)),

getElement(element.ifState) + "[2]();"
getElement(ifState) + "[2]();"
];
}
case "#elseif":
case "#else": {
case "ElseIf":
case "Else": {
return ["", "", ""];
}
case "#for": {
case "For": {
var forAttribute = attributeValue(element.attributes[0]);
var forIdentifiers = "[";
var forValue = "";
Expand Down Expand Up @@ -437,14 +440,15 @@

return [
setElement(forReference, createComment()) +
generateMount(forReference, parent.element, insert) +
generateMount(forReference, parent.element, reference) +
setElement(forPortion, "function(locals){" + generate({
element: root.nextElement,
nextElement: root.nextElement + 1,
type: "#root",
element: 0,
referenceElement: 1,
nextElement: 2,
type: "Root",
attributes: [],
children: element.children
}, forReference) + "};") +
}) + "};") +
setElement(forPortions, "[];") +
setElement(forLocals, "[];"),

Expand All @@ -453,7 +457,7 @@
directiveFor(forIdentifiers, "[]", forReference, forPortion, forPortions, forLocals, parent.element)
];
}
case "#text": {
case "Text": {
var textAttribute = element.attributes[0];
var textElement = root.nextElement++;

Expand All @@ -467,7 +471,7 @@
createCode += textCode;
}

return [createCode + generateMount(textElement, parent.element, insert), updateCode, removeChild(textElement, parent.element)];
return [createCode + generateMount(textElement, parent.element, reference), updateCode, removeChild(textElement, parent.element)];
}
default: {
var attributes = element.attributes;
Expand Down Expand Up @@ -508,36 +512,35 @@
}

for (var i$3 = 0; i$3 < children.length; i$3++) {
var childCode = generateAll(children[i$3], element, root);
var childCode = generateAll(children[i$3], element, root, null);
createCode$1 += childCode[0];
updateCode$1 += childCode[1];
}

return [createCode$1 + generateMount(element.element, parent.element, insert), updateCode$1, removeChild(element.element, parent.element)];
return [createCode$1 + generateMount(element.element, parent.element, reference), updateCode$1, removeChild(element.element, parent.element)];
}
}
};

var generate = function (tree, insert) {
var generate = function (tree) {
var children = tree.children;
var create = "";
var update = "";
var destroy = "";

for (var i = 0; i < children.length; i++) {
var generated = generateAll(children[i], tree, tree, insert);
var generated = generateAll(children[i], tree, tree, tree.referenceElement);

create += generated[0];
update += generated[1];
destroy += generated[2];
}

var prelude = "var m" + tree.element;
for (var i$1 = tree.element + 1; i$1 < tree.nextElement; i$1++) {
prelude += ",m" + i$1;
var prelude = "var " + (getElement(tree.element)) + "," + (getElement(tree.referenceElement));
for (var i$1 = tree.referenceElement + 1; i$1 < tree.nextElement; i$1++) {
prelude += "," + getElement(i$1);
}

return (prelude + ";return [function($_){" + (setElement(tree.element, "$_;")) + create + "},function(){" + update + "},function(){" + destroy + "}];");
return (prelude + ";return [function(_0,_1){" + (setElement(tree.element, "_0;")) + (setElement(tree.referenceElement, "_1;")) + create + "},function(){" + update + "},function(){" + destroy + "}];");
};

var compile = function (input) {
Expand Down Expand Up @@ -586,7 +589,7 @@
ifState[2]();
}

ifPortion[0](ifParent);
ifPortion[0](ifParent, ifReference);
ifPortion[1]();

ifState = ifPortion;
Expand Down Expand Up @@ -615,7 +618,7 @@
var newForPortion = forPortion(forLocal);
forPortions.push(newForPortion);

newForPortion[0](forParent);
newForPortion[0](forParent, forReference);
newForPortion[1]();
} else if (i >= nextLength) {
forPortions.pop()[2]();
Expand Down Expand Up @@ -643,8 +646,8 @@
df: directiveFor$1
};

var create = function(root) {
this._view[0](root);
var create = function(root, reference) {
this._view[0](root, reference);
this.emit("create");
};

Expand Down Expand Up @@ -788,7 +791,7 @@
var instanceComponent = component("", data);
var instance = new instanceComponent();

instance.create(root);
instance.create(root, null);
instance.update();

return instance;
Expand Down
Loading

0 comments on commit d7749e2

Please sign in to comment.