efront 4.23.0 → 4.23.4

package/coms/zimoli/render.js

@@ -1,5 +1,5 @@
 var hasOwnProperty = {}.hasOwnProperty;
-var renderElements = Object.create(null);
+var elementRenders = [];
 var presets = Object.create(null);
 var renderIds = new WeakMap;
 var copyAttribute = function (node, copys) {
@@ -68,44 +68,44 @@ presets.template = function (t) {
     return comment;
 };
 // <!--
-window.renderElements = renderElements;
+window.elementRenders = elementRenders;
 // -->
+var isLe = function (a, b) {
+    return a.id <= b.id;
+};
 var renderidOffset = 10;
 var renderidClosed = 0;
 var addRenderElement = function () {
     var element = this;
-    if (!isNode(element)) return;
-    buildFirst(element);
-    var renderid = renderIds.get(element);
-    if (renderid > 10) {
-        renderElements[renderid] = element;
+    var renders = $renders.get(element);
+    buildFirst(renders);
+    if (renders.id > 10) {
+        saveToOrderedArray(elementRenders, renders, isLe);
     }
 };
 var removeRenderElement = function () {
-    var element = this;
-    delete renderElements[renderIds.get(element)];
+    if (removing) {
+        removing.push(this);
+        return;
+    }
+    var renders = $renders.get(this);
+    var i = getIndexFromOrderedArray(elementRenders, renders, isLe);
+    if (elementRenders[i] === renders) elementRenders.splice(i, 1);
+};
+var buildI = function (renders) {
+    if (getTargetIn(this, renders.el)) rebuild(renders);
+};
+var buildO = function (renders) {
+    rebuild(renders);
 };
 function refresh(root) {
-    var rest = [];
-    var body = document.documentElement;
+    removing = [];
     if (root && $renders.has(root)) {
-        for (var k in renderElements) {
-            var element = renderElements[k];
-            if (
-                getTargetIn(root, element)
-            ) rebuild(element);
-        }
+        elementRenders.forEach(buildI, root);
     } else {
-        for (var k in renderElements) {
-            var element = renderElements[k];
-            rebuild(element);
-            if (!getTargetIn(body, element)) {
-                rest.push(element);
-            }
-        }
+        elementRenders.forEach(buildO);
     }
     callDigest();
-    if (rest.length) rest.forEach(a => removeRenderElement.call(a));
 }
 function fireChanges(element, changes) {
     var event = createEvent('changes');
@@ -113,55 +113,72 @@ function fireChanges(element, changes) {
     dispatch(event, element);
 }
 
-function buildFirst(element) {
-    rebuild(element, '$ready' in element);
+function buildFirst(renders) {
+    rebuild(renders, '$ready' in renders);
 }
 var digests = [];
+var removing = null;
+var digestA = a => a.$digest();
+var removeA = a => removeRenderElement.call(a);
+var addA = a => buildFirst(a);
 function callDigest() {
-    var d = digests;
+    var d;
+    d = digests;
     digests = [];
-    d.forEach(a => {
-        a.$digest();
-    });
+    d.forEach(digestA);
+    if (removing) {
+        d = removing;
+        removing = null;
+        d.forEach(removeA);
+    }
 }
-function getWatchData(element) {
-    var { $watches } = element;
+function getWatchData(element, w) {
     var props = {};
-    for (var key in $watches) {
+    for (var key in w) {
         var data = element[key];
         props[key] = data;
     }
     return props;
 }
-function rebuild(element, isFirstRender) {
-    if (isFirstRender) delete element.$ready;
-    if (element.$digest) digests.push(element);
-    if (!element.$needchanges) {
-        $renders.get(element).forEach(a => a.call(element));
+var buildThisA = function (f) {
+    f.call(this);
+};
+function rebuild(renders, isFirstRender) {
+    if (isFirstRender) delete renders.$ready;
+    var el = renders.el;
+    var w = $watches.get(el);
+    if (el.$digest) digests.push(el);
+    if (!w) {
+        renders.forEach(buildThisA, el);
         return;
     }
-    var props = getWatchData(isFirstRender ? { $watches: element.$watches } : element);
-    $renders.get(element).forEach(a => a.call(element));
+    var props = isFirstRender ? {} : getWatchData(el, w);
+    renders.forEach(buildThisA, el);
     var capture = null;
-    for (var k in props) {
-        var current = element[k];
+    for (var k in w) {
+        var current = el[k];
         var previous = props[k];
         if (isSame(current, previous)) continue;
         if (!capture) capture = {};
         capture[k] = { current, previous };
     }
-    if (capture) fireChanges(element, capture);
+    if (capture) fireChanges(el, capture);
 }
 var variableReg = /([^\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\s\[\]\(\)]|\?\s*\.(?=[^\d])|\s*\.\s*)+/g;
 var variableOnlyReg = new RegExp(`^${variableReg.source}$`);
-var getScopeList = function (element) {
-    var scopes = $parented.get(element);
-    var s = $scoped.get(element);
+var scopeList = null;
+var makeScopeList = function (s, scopes) {
     if (s) {
         if (scopes) scopes = scopes.slice(), scopes.push(s);
         else scopes = [s];
     }
     return scopes;
+}
+var getScopeList = function (element) {
+    var scopes = $parented.get(element);
+    var s = $scoped.get(element);
+    scopes = makeScopeList(s, scopes);
+    return scopes;
 };
 var toNull = () => null;
 var toUndefined = () => { };
@@ -187,7 +204,7 @@ var createGetter = function (target, search, isprop = true) {
             if (!search) return toUndefined;
             if (/^\{/.test(search)) search = `(${search})`;
             search = renderExpress(search);
-            if (isprop) var getter = $$eval.bind(target, search, getScopeList(target));
+            if (isprop) var getter = $$eval.bind(target, search, scopeList);
             else if (variableOnlyReg.test(search)) getter = $$eval.bind(target, search + "(event)");
             else getter = $$eval.bind(target, search);
             return getter;
@@ -197,9 +214,8 @@ var createGetter = function (target, search, isprop = true) {
     }
     return toUndefined;
 };
-var createComment = function (renders, type, expression) {
+var createComment = function (type, expression) {
     var comment = document.createComment(`${type} ${expression}`);
-    $renders.set(comment, renders);
     $scoped.set(comment, $scoped.get(this));
     $structed.set(comment, $structed.get(this));
     $parented.set(comment, $parented.get(this));
@@ -212,11 +228,11 @@ var createComment = function (renders, type, expression) {
     return comment;
 };
 
-var initialComment = function (comment) {
-    if ($structed.get(comment).once) {
-        renderIds.set(comment, 9);
-    }
-    renderlock.push(comment);
+var initialComment = function (el, renders, struct) {
+    renders.el = el;
+    if (struct.once) renders.r1 = true;
+    $renders.set(el, renders);
+    renderlock.push(renders);
 };
 
 class Repeater {
@@ -290,7 +306,8 @@ var getClonedElements = function (clones, repsrc) {
     return newmap;
 }
 var repeats = new WeakMap;
-var createRepeat = function (search, id = 0) {
+var currentScope = null;
+var createRepeat = function (search, id = 0, struct) {
     // 懒渲染
     // throw new Error("repeat is not supported! use list component instead");
     var expression = search;
@@ -300,17 +317,27 @@ var createRepeat = function (search, id = 0) {
     // 懒渲染
     var getter = createGetter(this, srcName);
     var element = this, clonedElements = [], savedValue, savedOrigin;
-    if ($structed.get(this).if) id = -7;
+    if (struct.if) id = -7;
+    var renderA = function (a, i) {
+        a = render(a);
+        repeats.set(a, this[i]);
+        return a;
+    };
+    var reps = [];
     var renders = [function () {
         var result = getter(this);
         var origin = result;
-        result = extend(result instanceof Array ? [] : {}, result);
+        var isArrayResult = origin instanceof Array;
+        result = extend(isArrayResult ? [] : {}, result);
         if (savedOrigin === origin && shallowEqual(savedValue, result)) return;
-        var changes = getChanges(result, savedValue);
-        if (!changes) return;
+        if (savedOrigin !== origin && isObject(origin) && isObject(savedOrigin)) {
+            var changed = getChanged(result, savedOrigin);
+            if (!changed.length) return;
+            var changes = Object.create(null);
+            changed.forEach(k => changes[k] = true);
+        }
         savedValue = result;
         savedOrigin = origin;
-        var isArrayResult = result instanceof Array;
         var keys = isArrayResult ? result.map((_, i) => i) : Object.keys(result);
         if (keys.length > 600) {
             throw new Error(i18n`数据量过大，取消绘制！`);
@@ -338,7 +365,7 @@ var createRepeat = function (search, id = 0) {
                         return c;
                     }
                 }
-                else {
+                else if (changes) {
                     var c = changes[k];
                     if (!c) c = clonedElements[k];
                     else c = null;
@@ -348,9 +375,8 @@ var createRepeat = function (search, id = 0) {
                     }
                 }
             }
-
+            reps[cx] = $scope;
             var clone = cloner(id, $scope);
-            repeats.set(clone, $scope);
             clonedElements1[k] = clone;
             return clone;
         }, this);
@@ -359,7 +385,7 @@ var createRepeat = function (search, id = 0) {
             if (a.previousSibling !== last) appendChild.after(last, a);
             last = a;
         }, this);
-        cloned.forEach(a => render(a));
+        clonedElements1 = cloned.map(renderA, reps);
         for (var k in clonedElements) {
             if (clonedElements1[k] !== clonedElements[k]) {
                 var selected = clonedElements[k].selected;
@@ -372,8 +398,8 @@ var createRepeat = function (search, id = 0) {
         clonedElements = clonedElements1;
         this.with = cloned;
     }];
-    var comment = createComment.call(this, renders, 'repeat', expression);
-    initialComment(comment);
+    var comment = createComment.call(this, 'repeat', expression);
+    initialComment(comment, renders, struct);
     return comment;
 };
 
@@ -407,18 +433,20 @@ var ifset = function (shouldMount) {
         }
     }
 };
-var createIf = function (search, id = 0) {
+var createIf = function (search, id = 0, struct) {
     // 懒渲染
     var getter = createGetter(this, search);
     var element = this;
     var elements = [element, getter];
     if_top.push(elements);
     elements.parent = this.parentNode;
-    if ($structed.get(this).repeat) id = -3;
-    var comment = elements[0] = createComment.call(element, [new Binder2(ifget, ifset)], 'if', search);
+    if (struct.repeat) id = -3;
+    var renders = [new Binder2(ifget, ifset)];
+    var comment = elements[0] = createComment.call(element, 'if', search);
     comment.$id = id;
     comment.$elements = elements;
-    initialComment(comment);
+    if (struct.once) renders.r1 = true;
+    initialComment(comment, renders, struct);
     return comment;
 };
 var parseIfWithRepeat = function (ifExpression, repeatExpression) {
@@ -491,14 +519,13 @@ var mountElementIds = function (scope, element, ids) {
         scope[id] = element;
     }
 }
-var renderStructure = function (element) {
-    var $struct = $structed.get(element);
+var renderStructure = function (element, $struct) {
     if ($struct.if) var { name: ifkey, key, value: ifexp } = $struct.if;
     if ($struct.repeat) var { value: repeat } = $struct.repeat;
-    if (!ifkey) return createRepeat.call(element, repeat);
+    if (!ifkey) return createRepeat.call(element, repeat, undefined, $struct);
     if (!ifexp || !repeat) {
         if (repeat) delete $struct.if;
-        return structures[key].call(element, ifexp);
+        return structures[key].call(element, ifexp, $struct);
     }
     var { before, after } = parseIfWithRepeat(ifexp, repeat);
     if (after.length) {
@@ -508,18 +535,18 @@ var renderStructure = function (element) {
         delete $struct.if;
     }
     if (before.length > 0) {
-        return createIf.call(element, before.join("&&"), null);
+        return createIf.call(element, before.join("&&"), null, $struct);
     } else {
         delete $struct.repeat;
         if (!repeat) debugger;
-        return createRepeat.call(element, repeat, null);
+        return createRepeat.call(element, repeat, null, $struct);
     }
 };
 
 var if_top = [];
 var structures = {
-    "if"(search) {
-        return createIf.call(this, search);
+    "if"(search, struct) {
+        return createIf.call(this, search, undefined, struct);
     },
     "else"(search) {
         for (var cx = if_top.length - 1; cx >= 0; cx--) {
@@ -531,31 +558,34 @@ var structures = {
         if (cx + 1 < if_top.length) if_top.splice(cx + 1, if_top.length - cx - 1);
         var top = if_top[cx];
         if (search) var getter = createGetter(this, search);
-        var comment = createComment.call(this, undefined, search ? 'elseif' : 'else', search);
+        var comment = createComment.call(this, search ? 'elseif' : 'else', search);
         top.push(comment, getter);
     },
-    repeat(search) {
-        return createRepeat.call(this, search);
+    repeat(search, struct) {
+        return createRepeat.call(this, search, undefined, struct);
     },
 };
 structures["else-if"] = structures.elseif = structures.else;
 structures["for-each"] = structures.foreach = structures.for = structures.each = structures.repeat;
+var callThis = function (f) {
+    return f(this);
+};
 var createMapper = function (write, mapper) {
     return function (search) {
+        var capValue = mapper();
+        var copyC = function (key) {
+            this[key] = capValue[key];
+        };
         var getter = isArray(search) ? search.map(s => createGetter(this, s)) : createGetter(this, search);
-        var oldValue = mapper();
-        var renders = $renders.get(this);
-        renders.push(function () {
-            var value = mapper(isArray(getter) ? getter.map(g => g(this)) : getter(this));
-            var changes = getChanges(value, oldValue);
-            if (!changes) return;
-            oldValue = value;
-            var targetValue = Object.create(null);
-            for (var k in changes) {
-                targetValue[k] = !isHandled(value[k]) ? "" : value[k];
-            }
+        return function () {
+            var value = mapper(isArray(getter) ? getter.map(callThis, this) : getter(this));
+            var changed = getChanged(value, capValue);
+            if (!changed.length) return;
+            capValue = value;
+            var targetValue = {};
+            changed.forEach(copyC, targetValue);
             write(this, targetValue);
-        });
+        };
     }
 }
 
@@ -593,7 +623,7 @@ var createBinder2 = function (write, read) {
     return function (search) {
         var getter = createGetter(this, search);
         var oldValue = isFunction(read) ? read.call(this) : undefined;
-        $renders.get(this).push(new Binder2(getter, write, oldValue));
+        return new Binder2(getter, write, oldValue);
     };
 }
 
@@ -604,7 +634,7 @@ var src2 = function (search) {
     // 非直传数组的数据源变动后，不再检查其所有属性是否相同，直接同步到组件，
     // 直传数组的数据源以数组中的子项是否变动为准，
     // 直传数组的判别标准为表达式以“[”开头以“]”结尾，且表达式中间不含“]”
-    $renders.get(this).push(function () {
+    return function () {
         var origin = getter(this);
         if (isArray(origin)) {
             if (isArray(savedValue)) {
@@ -630,7 +660,7 @@ var src2 = function (search) {
         if (!isHandled(origin) && !isHandled(this.src));
         else this.src = origin;
         cast(this, origin);
-    });
+    };
 }
 var gtValue = function () { return this.value };
 var stValue = function (v) { this.value = v };
@@ -683,7 +713,6 @@ class Model {
     }
     hook(elem, emit) {
         var binder = new Binder2(this.gs, this.target !== elem ? this.sv.bind(this.target) : this.sv);
-        $renders.get(elem).push(binder);
         binder.call(elem);
         this.bd = binder;
         if (emit !== false) {
@@ -696,7 +725,7 @@ class Model {
     }
 }
 var createSetter = function (elem, search) {
-    return $$eval.bind(elem, search + "=arguments[2]", getScopeList(elem), elem);
+    return $$eval.bind(elem, search + "=arguments[2]", scopeList, elem);
 };
 var directives = {
     text: createBinder2(function (value) {
@@ -745,10 +774,10 @@ var directives = {
         var getter = createGetter(this, search);
         var setter = createSetter(this, search);
         var model = new Model(getter, setter, target);
-        model.hook(this, change !== false);
+        return model.hook(this, change !== false);
     },
     value(search, target) {
-        directives.model.call(this, search, target, false);
+        return directives.model.call(this, search, target, false);
     },
 
 };
@@ -768,7 +797,6 @@ var binders = {
                 this[attr] = this[attr.replace(/\-[a-z]/g, a => a.toUpperCase())] = value;
             }
         };
-        $renders.get(this).push(hook);
         return hook;
     },
     ""(attr, search) {
@@ -788,7 +816,6 @@ var binders = {
                 }
             } else if (this.getAttribute(attr) !== value) this.setAttribute(attr, value);
         }
-        $renders.get(this).push(hook);
         return hook;
     }
 };
@@ -858,7 +885,7 @@ var createEmiter = function (on) {
         else {
             onkey = on(key);
         }
-        onkey(target, new Emitter(emit, getScopeList(this)));
+        onkey(target, new Emitter(emit, scopeList));
     };
 };
 var emiters = {
@@ -874,16 +901,18 @@ var keyAdapters = [
     key => key.replace(/\-+([a-z])/g, (_, w) => w.toUpperCase()),
     key => key.replace(/^([a-z])/g, (_, w) => w.toUpperCase())
 ];
+var foundScope = null;
 function getFromScopes(key, scope, parentScopes) {
+    foundScope = null;
     if (!isHandled(key)) return;
     for (var ka of keyAdapters) {
         key = ka(key);
-        if (scope && key in scope) return scope[key];
+        if (scope && key in scope) return foundScope = scope, scope[key];
         if (parentScopes) for (var cx = parentScopes.length - 1; cx >= 0; cx--) {
             var o = parentScopes[cx];
-            if (o && key in o) return o[key];
+            if (o && key in o) return foundScope = o, o[key];
         }
-        if (key in presets) return presets[key];
+        if (key in presets) return foundScope = presets, presets[key];
     }
 }
 function renderProp(elem, props) {
@@ -894,60 +923,61 @@ function renderProp(elem, props) {
     }
 }
 
-function renderBinds(element, binds) {
+function renderBinds(element, binds, renders) {
     var bind = binders._;
     for (var k in binds) {
         if (directives.hasOwnProperty(k)) continue;
         var h = bind.call(element, k, binds[k]);
         h.call(element);
+        renders.push(h);
     }
 }
-var getUserRenders = function (element) {
-    var renders = $renders.get(element);
+var getUserRenders = function (element, renders) {
     if (element.renders) {
-        if (!renders) renders = [];
         renders.push.apply(renders, element.renders);
         delete element.renders;
     }
     if (element.$renders) {
-        if (!renders) renders = [];
         renders.push.apply(renders, element.$renders);
         delete element.$renders;
     }
     return renders;
 }
-function renderDynamics(element, replacer, binds, attrs) {
-    var renders = getUserRenders(element);
-    var element_renders = [];
-    $renders.set(element, element_renders);
-    var bindWatch = !!element.$needchanges;
+function renderDynamics(element, replacer, binds, attrs, renders) {
+    getUserRenders(element, renders);
+    var watches = $watches.get(element);
     for (var k in binds) {
         if (k in directives) {
-            if (k !== 'src') directives[k].call(element, binds[k], replacer);
+            if (k !== 'src') {
+                var f = directives[k].call(element, binds[k], replacer);
+                if (f) renders.push(f);
+            }
         }
         else {
             if (element !== replacer) replacer[k] = element[k];
-            if (bindWatch) {
-                var watches = element.$watches;
-                if (!watches) watches = element.$watches = {};
+            if (watches) {
                 if (!watches[k]) watches[k] = true;
             }
         }
     }
+    var ba = binders[''];
     for (var k in attrs) {
-        binders[""].call(element, k, attrs[k]);
+        var f = ba.call(element, k, attrs[k]);
+        renders.push(f);
+    }
+    if (binds.src) {
+        var f = directives.src.call(element, binds.src);
+        renders.push(f);
     }
-    if (renders && renders.length) element_renders.push.apply(element_renders, renders);
-    if (binds.src) directives.src.call(element, binds.src);
 }
 
 function renderEmits(replacer, emits, on) {
     for (var k in emits) on.call(this, replacer, k, emits[k]);
 }
 
-function renderRest(element, struct, replacer = element) {
+function renderRest(renders, element, struct, replacer = element) {
     var { attrs, binds, emits, waits } = struct;
-    renderDynamics(element, replacer, binds, attrs);
+    renderDynamics(element, replacer, binds, attrs, renders);
     if (!isElement(replacer)) replacer = element;
     renderEmits.call(element, replacer, emits, emiters.on);
     renderEmits.call(element, replacer, waits, emiters.once);
@@ -969,7 +999,7 @@ function getChildren(element) {
     var children = element.children;
     if (!children || !children.length) return;
     var children = Array.prototype.filter.call(children, a => !renderIds.get(a));
-    return children
+    return children;
 }
 function renderElement(element, scope = $scoped.get(element), parentScopes = $parented.get(element), once) {
     if (isArrayLike(element)) {
@@ -978,6 +1008,7 @@ function renderElement(element, scope = $scoped.get(element), parentScopes = $pa
     if (!isElement(element)) {
         return element;
     }
+    var $struct;
     if (!renderIds.get(element)) {
         renderIds.set(element, 0);
         if (isHandled(parentScopes) && !isArray(parentScopes)) {
@@ -989,18 +1020,27 @@ function renderElement(element, scope = $scoped.get(element), parentScopes = $pa
                 throw new Error(i18n`父作用域链的长度必须相等着`);
             }
         }
-        var s = createStructure(element);
-        if (isEmpty(s.once)) s.once = once;
+        $struct = createStructure(element);
+        if ($struct && !isHandled($struct.once)) $struct.once = once;
+    }
+    else {
+        $struct = $structed.get(element);
     }
+    if (!parentScopes) parentScopes = [];
     $scoped.set(element, scope);
-    $parented.set(element, parentScopes || []);
-    if (renderIds.get(element) <= -1) element = renderStructure(element);
-    if (!element) return;
+    $parented.set(element, parentScopes);
+    var savedScopeList = scopeList;
+    scopeList = makeScopeList(scope, parentScopes);
+    if (renderIds.get(element) <= -1) element = renderStructure(element, $struct);
+    if (!element) {
+        scopeList = savedScopeList;
+        return;
+    }
     if (renderIds.get(element) < 0 || element.nodeType !== 1) {
+        scopeList = savedScopeList;
         return element;
     }
-    var $struct = $structed.get(element);
-    mountElementIds(scope, element, $struct.ids);
+    if ($struct) mountElementIds(scope, element, $struct.ids);
     var isFirstRender = !renderIds.get(element);
     if (isFirstRender) {
         var lockid = renderlock.length;
@@ -1010,55 +1050,74 @@ function renderElement(element, scope = $scoped.get(element), parentScopes = $pa
         if (parentNode) {
             if (renderIds.get(parentNode) > 1 || isMounted(parentNode)) renderIds.set(element, 2);
         }
-        var renders = getUserRenders(element) || [];
-        $renders.set(element, renders);
-        var { copys, binds, once, props } = $struct;
-        if (once) renderIds.set(element, 9);
-        if (binds.src) {
-            element.$src = parseRepeat(binds.src);
+        var renders = initRenders(element);
+        getUserRenders(element, renders);
+        if ($struct) {
+            var { copys, binds, once, props } = $struct;
+            if (once) renders.r1 = true;
+            if (binds.src) {
+                element.$src = parseRepeat(binds.src);
+            }
+            renderProp(element, props);
+            renderBinds(element, binds, renders);
         }
         var { tagName, parentNode, nextSibling } = element;
         // 替换元素
         var constructor = getFromScopes(tagName, scope, parentScopes);
-        renderProp(element, props);
-        renderBinds(element, binds);
+        var conScope = foundScope;
         if (isFunction(constructor)) {
-            var replacer = constructor.call(scope, element, scope, parentScopes);
+            var scopeList0 = scopeList;
+            var scope0 = scope;
+            var replacer = constructor.call(conScope, element, scope, parentScopes);
             if (element === replacer) {
                 var struct1 = createStructure(element, false);
-                renderRest(element, struct1);
-                $scoped.set(element, scope);
+                scope = $scoped.get(element) || scope;
+                parentScopes = $parented.get(element) || parentScopes;
+                scopeList = makeScopeList(scope, parentScopes);
+                if (struct1) renderRest(renders, element, struct1);
             }
             else if (isNode(replacer)) {
                 if (isElement(replacer) && !renderIds.get(replacer)) {
                     if (!$scoped.has(replacer)) $scoped.set(replacer, scope);
                     if (!$parented.has(replacer)) $parented.set(replacer, parentScopes);
-                    var struct = createStructure(replacer);
-                    renderRest(replacer, struct);
+                    var struct2 = createStructure(replacer);
+                    scope = $scoped.get(replacer) || scope;
+                    parentScopes = $parented.get(replacer) || parentScopes;
+                    scopeList = makeScopeList(scope, parentScopes);
+                    if (struct2) renderRest(renders, replacer, struct2);
+                }
+                if ($struct) {
+                    copyAttribute(replacer, copys);
+                    for (var id of $struct.ids) {
+                        scope0[id] = replacer;
+                    }
                 }
-                copyAttribute(replacer, copys);
                 if (nextSibling) appendChild.before(nextSibling, replacer);
                 else if (parentNode) appendChild(parentNode, replacer);
                 if (element.parentNode === parentNode) remove(element);
                 if (!renderIds.get(replacer)) renderIds.set(replacer, renderIds.get(element));
-                for (var id of $struct.ids) {
-                    scope[id] = replacer;
-                }
             }
+            scopeList = scopeList0;
         }
-        renderRest(element, $struct, replacer);
+        if ($struct) renderRest(renders, element, $struct, replacer);
         if (isNode(replacer) && replacer !== element) {
+            $renders.delete(element);
             var reprenders = initRenders(replacer);
-            reprenders.push.apply(reprenders, $renders.get(element));
+            reprenders.push.apply(reprenders, renders);
+            renders = reprenders;
             element = replacer;
+            scope = $scoped.get(element);
+            parentScopes = $parented.get(element);
         }
-        if (element.$digest || $renders.get(element).length) {
-            element.$ready = true;
-            renderlock[lockid] = element;
+        if (element.$digest || renders.length) {
+            if ($struct && $struct.once) renders.r1 = $struct.once;
+            renders.$ready = true;
+            renderlock[lockid] = renders;
         }
-        else if (renderlock.length === lockid) renderlock.pop();
+        else if (renderlock.length === lockid + 1) renderlock.pop(), $renders.delete(element);
     }
-    renderArray(getChildren(element), $scoped.get(element) || scope, $parented.get(element) || parentScopes, once);
+    renderArray(getChildren(element), scope, parentScopes, once);
+    scopeList = savedScopeList;
     return element;
 }
 var deepcontexts = [];
@@ -1173,16 +1232,19 @@ function createStructure(element, useExists) {
     var attr1 = {};
     var props = {};
     var ids = [];
+    var inc = 0;
     for (var attr of attrs) {
         var { name, value } = attr;
         if (/^\$/.test(name)) continue;
         if (name === 'elementid' || name === 'renderid' || name === 'id') {
             pushid(ids, value);
+            inc++;
             continue;
         }
         if (/^#/.test(name)) {
             pushid(ids, name.slice(1));
             element.removeAttribute(name);
+            inc++;
             continue;
         };
         if (/^\./.test(name) && !value) {
@@ -1196,6 +1258,7 @@ function createStructure(element, useExists) {
         }
         if (/^(?:class|style|src|\:|placeholder)$/i.test(name)) {
             copys.push(attr);
+            inc++;
             continue;
         }
         var key = name.replace(/^(ng|v|.*?)\-/i, "").toLowerCase();
@@ -1220,6 +1283,7 @@ function createStructure(element, useExists) {
             if (!renderIds.get(element)) renderIds.set(element, -1);
             else renderIds.set(element, -2);
             element.removeAttribute(name);
+            inc++
             continue;
         }
         // ng-html,ng-src,ng-text,ng-model,ng-style,ng-class,...
@@ -1247,6 +1311,7 @@ function createStructure(element, useExists) {
                         break;
                 }
             }
+            inc++;
             element.removeAttribute(name);
         }
         // ng-click on-click v-click @click @mousedown ...
@@ -1262,6 +1327,7 @@ function createStructure(element, useExists) {
                 else {
                     emits[key] = value;
                 }
+                inc++;
             }
         }
         // placeholder_ href_ checked_ ...
@@ -1292,6 +1358,7 @@ function createStructure(element, useExists) {
                 }
                 element.setAttribute(key.replace(/\./g, '-'), '');
             }
+            inc++;
             element.removeAttribute(name);
         }
         // title alt name type placeholder href checked ...
@@ -1306,35 +1373,47 @@ function createStructure(element, useExists) {
             else {
                 props[k] = element[k];
             }
+            inc++;
         }
     }
+    if (inc === 0) return;
     if (props["zimoli"] || props["fresh"] || props["once"]) once = true;
     else if (props["refresh"] || props["digest"] || props["mount"]) once = false;
     var s = new Struct(emits, waits, types, copys, binds, attr1, props, ids, once);
     $structed.set(element, s);
     return s;
 }
-function unlock(element) {
-    if (!element) return;
-    var rid = renderIds.get(element) || 0;
-    if (rid !== 9) {
-        if (rid < 10) renderIds.set(element, ++renderidOffset);
-        on("append")(element, addRenderElement);
-        onremove(element, removeRenderElement);
-        if (element.nodeType === 8);
-        else if (eagermount) buildFirst(element);
+function unlock(renders) {
+    if (!renders) return;
+    if (!isOnce(renders)) {
+        var node = renders.el;
+        var rid = renderIds.get(node) || 0;
+        if (rid < 10) {
+            rid = ++renderidOffset;
+            renders.id = rid;
+            renderIds.set(node, rid);
+        }
+        on("append")(node, addRenderElement);
+        onremove(node, removeRenderElement);
     }
     else {
-        buildFirst(element);
+        buildFirst(renders);
     }
 }
+var notNull = a => a;
+var isOnce = a => a.r1;
+var notComment = a => !isOnce(a) && a.el.nodeType !== 8;
 function renderUnlock(element) {
-    var locked = renderlock;
+    var locked = renderlock.filter(notNull);
     renderlock = null;
     locked.forEach(unlock);
+    var eagger = eagermount;
     eagermount = false;
     var parentNode = element.parentNode;
     if (parentNode && isMounted(parentNode)) appendChild.dispatch(element);
+    else if (eagger) {
+        locked.filter(notComment).forEach(buildFirst);
+    }
 }
 function renderLock(element) {
     if (!renderlock) {
@@ -1437,16 +1516,18 @@ render.mergeStruct = mergeStruct;
 render.Binder = Binder;
 render.Model = Model;
 render.attribute = function (target, attrs) {
-    return renderDynamics(target, target, null, attrs);
+    return renderDynamics(target, target, null, attrs, $renders.get(target));
 };
 render.dynamic = function (target, binds, attrs) {
-    renderBinds(target, binds);
-    renderDynamics(target, target, binds, attrs);
+    var renders = $renders.get(target);
+    renderBinds(target, binds, renders);
+    renderDynamics(target, target, binds, attrs, renders);
 };
 var initRenders = function (target) {
     var renders = $renders.get(target);
     if (!renders) {
         renders = [];
+        renders.el = target;
         $renders.set(target, renders);
     }
     return renders;
@@ -1468,7 +1549,6 @@ render.once = function (target, map) {
 render.eval = $eval;
 render.mount = unlock;
 render.getScopes = getScopeList;
-render.createCloner = createCloner;
 render.clone = function (template, id = renderIds.get(template)) {
     var clone = template.cloneNode(true);
     $structed.set(clone, $structed.get(template));