render-core 1.0.36 → 1.0.38

package/class/{apiController.d.ts → controller/apiController.d.ts}

@@ -1,4 +1,4 @@
-import ApiComponent from "./apiComponent";
+import ApiComponent from "../component/apiComponent";
 import { Controller } from "./controller";
 export declare class ApiController {
     root: ParentNode;

package/class/{controller.d.ts → controller/controller.d.ts}

@@ -1,4 +1,4 @@
-import { Component } from "./component";
+import { Component } from "../component/component";
 export declare class Controller {
     root: ParentNode;
     proto: Component;

package/core/cmd/v-if.d.ts

@@ -0,0 +1 @@
+export declare function v_if(nodes: HTMLCollection, data: {}): void;

package/core/cmd/v-if.js

@@ -0,0 +1,2 @@
+export function v_if(nodes, data) {
+}

package/core/cmd/v-show.js

@@ -7,13 +7,16 @@ export function resolver_show(elements, data) {
             if (data[dataName] instanceof Boolean) {
                 if (data[dataName] === true) {
                     // @ts-ignore
-                    elements[i].style.visibility = true;
+                    elements[i].style.visibility = "visible";
                 }
                 else {
                     // @ts-ignore
-                    elements[i].style.visibility = false;
+                    elements[i].style.visibility = "hidden";
                 }
             }
+            else {
+                console.log("v-show instruct should be used with boolean!");
+            }
         }
         var subElements = elements[i].children;
         resolver_show(subElements, data);

package/{library → core}/inject/inject.d.ts

@@ -1,7 +1,7 @@
-import { Controller } from "../../class/controller";
-import { Component } from "../../class/component";
+import { Controller } from "../../class/controller/controller";
+import { Component } from "../../class/component/component";
 export declare function inject(controller: Controller, tagTemplate: Element): void;
-export declare function injectProps(controller: Controller, tagTemplate: Element): void;
+export declare function injectRefs(controller: Controller, tagTemplate: Element): void;
 export declare function injectMethod(controller: Controller, proto: Component): void;
 export declare function injectWatcher(controller: Controller, proto: Component): void;
 export declare function injectComputed(controller: Controller, proto: Component): void;

package/{library → core}/inject/inject.js

@@ -1,14 +1,14 @@
-import { getCodeSpaceForProps, getCodeSpaceForQuery, getCodeSpaceForRef, } from "../../core/utility/injectUtility";
-import { resolveProps } from "../../core/resolver/props";
-import { resolve_Queries } from "../../core/resolver/query";
-import { resolver_Refs } from "../../core/cmd/v-ref";
+import { getCodeSpaceForProps, getCodeSpaceForQuery, getCodeSpaceForRef, } from "../utility/injectUtility";
+import { resolveProps } from "../resolver/props";
+import { resolve_Queries } from "../resolver/query";
+import { resolver_Refs } from "../cmd/v-ref";
 export function inject(controller, tagTemplate) {
     //注入props
     getCodeSpaceForProps(controller.raw_data, resolveProps(Reflect.get(window, "context").crtTag, controller.proto.getProps()));
     //注入query
     getCodeSpaceForQuery(controller.raw_data, resolve_Queries());
 }
-export function injectProps(controller, tagTemplate) {
+export function injectRefs(controller, tagTemplate) {
     var refs = new Map();
     resolver_Refs(controller.root.children, refs);
     getCodeSpaceForRef(controller.raw_data, refs);

package/core/proxy/getProxy.d.ts

@@ -1,2 +1,13 @@
-import { Controller } from "../../class/controller";
+import { Controller } from "../../class/controller/controller";
+/**
+ * 获取data对象的代理对象
+ * @param obj
+ * @param updater
+ */
 export declare function getProxyObject(obj: {}, updater: Controller): any;
+/**
+ * 获取setter代理函数
+ * @param data
+ * @param updater
+ */
+export declare function getSetter(data: {}, updater: Controller): any;

package/core/proxy/getProxy.js

@@ -1,4 +1,9 @@
-import { getSetter } from "../../library/setter/setter";
+import { update_Render } from "../render/updateRender";
+/**
+ * 获取data对象的代理对象
+ * @param obj
+ * @param updater
+ */
 export function getProxyObject(obj, updater) {
     //定义代理方法对象
     var handel = {};
@@ -7,3 +12,22 @@ export function getProxyObject(obj, updater) {
     //返回代理对象
     return new Proxy(obj, handel);
 }
+/**
+ * 获取setter代理函数
+ * @param data
+ * @param updater
+ */
+export function getSetter(data, updater) {
+    var setter = function (obj, prop, value) {
+        //更新值
+        obj[prop] = value;
+        //更新前操作
+        this.proto.getBeforeUpdate();
+        //执行更新
+        update_Render(this);
+        //更新后操作
+        this.proto.getAfterUpdate();
+        return true;
+    };
+    return setter.bind(updater);
+}

package/core/render/PostRender.d.ts

@@ -0,0 +1,13 @@
+import { Component } from "../../class/component/component";
+import { Controller } from "../../class/controller/controller";
+import { ApiController } from "../../class/controller/apiController";
+import { PageController } from "../../class/controller/pageController";
+/**
+ * 该函数用于初次渲染需要记录状态的组件
+ * @param proto
+ * @param parent
+ * @param child
+ * @param link
+ * @param tagTemplate
+ */
+export declare function post_render(proto: Component, parent: ParentNode, child: Element, link: Controller | ApiController | PageController, tagTemplate: Element): void;

package/core/render/PostRender.js

@@ -0,0 +1,39 @@
+import { Controller } from "../../class/controller/controller";
+import { controllerCycleTypeTwo } from "../../library/lifecycle/controllerCycle";
+import { cmd } from "../../library/cmd/cmd";
+import { mount } from "../../library/lifecycle/mount";
+import { injectRefs } from "../inject/inject";
+import { afterMethodsTypeOne } from "../../library/lifecycle/afterMethods";
+import { findComponent } from "./delivery";
+/**
+ * 该函数用于初次渲染需要记录状态的组件
+ * @param proto
+ * @param parent
+ * @param child
+ * @param link
+ * @param tagTemplate
+ */
+export function post_render(proto, parent, child, link, tagTemplate) {
+    //获取控制对象
+    var controller = new Controller();
+    //控制对象预处理
+    controllerCycleTypeTwo(controller, proto, child, link, tagTemplate);
+    //beforeRender
+    var beforeRender = proto.getBeforeRender().bind(controller.raw_data);
+    beforeRender();
+    //解析指令
+    cmd(tagTemplate, proto, controller);
+    //beforeMount
+    var beforeMount = proto.getBeforeMount().bind(controller.raw_data);
+    beforeMount();
+    //mount
+    mount(controller, proto, parent, child, tagTemplate);
+    injectRefs(controller, tagTemplate);
+    //afterRender
+    var afterRender = proto.getAfterRender().bind(controller.raw_data);
+    afterRender();
+    //后处理
+    afterMethodsTypeOne(controller, child, link);
+    //深度渲染
+    findComponent(controller.root.children, controller);
+}

package/core/render/delivery.d.ts

@@ -0,0 +1,6 @@
+import { Controller } from "../../class/controller/controller";
+import { Component } from "../../class/component/component";
+import { ApiController } from "../../class/controller/apiController";
+import { PageController } from "../../class/controller/pageController";
+export declare function Render(proto: Component, parent: ParentNode, child: Element, link: Controller | ApiController | PageController): void;
+export declare function findComponent(collection: HTMLCollection, link: Controller | ApiController | PageController): void;

package/core/render/delivery.js

@@ -0,0 +1,42 @@
+import { isUnKnown } from "../utility/checkUtility";
+import { init_render } from "./initRender";
+import { post_render } from "./PostRender";
+import { raw_render } from "./rawRender";
+import { getTemplate } from "../utility/templateUtility";
+import { styleResolve } from "../utility/styleUtility";
+//渲染自定义标签
+export function Render(proto, parent, child, link) {
+    //获得模板元素
+    var tagTemplate = getTemplate(proto);
+    //注册当前解析元素
+    Reflect.get(window, "context").crtTag = child;
+    //解析样式
+    styleResolve(proto.getName());
+    //两种渲染方式
+    if (child.hasAttribute("name")) {
+        //需要保持状态的渲染
+        if (link.link.has(child.getAttribute("name"))) {
+            //该name元素存在旧数据，是更新渲染
+            init_render(proto, parent, child, link, tagTemplate);
+        }
+        else {
+            //该name元素不存在旧数据，是第一次渲染
+            post_render(proto, parent, child, link, tagTemplate);
+        }
+    }
+    else {
+        //不需要保持状态的渲染
+        raw_render(proto, parent, child, link, tagTemplate);
+    }
+}
+//拓展标签深度渲染
+export function findComponent(collection, link) {
+    for (var i = 0; i < collection.length; i++) {
+        if (isUnKnown(collection[i].nodeName)) {
+            Render(Reflect.get(window, "tagLib").get(collection[i].nodeName.toUpperCase()), collection[i].parentNode, collection[i], link);
+        }
+        else {
+            findComponent(collection[i].children, link);
+        }
+    }
+}

package/core/render/initRender.d.ts

@@ -1,6 +1,13 @@
-import { Controller } from "../../class/controller";
-import { Component } from "../../class/component";
-import { ApiController } from "../../class/apiController";
-import { PageController } from "../../class/pageController";
-export declare function Render(proto: Component, parent: ParentNode, child: Element, link: Controller | ApiController | PageController): void;
-export declare function findComponent(collection: HTMLCollection, link: Controller | ApiController | PageController): void;
+import { Component } from "../../class/component/component";
+import { Controller } from "../../class/controller/controller";
+import { ApiController } from "../../class/controller/apiController";
+import { PageController } from "../../class/controller/pageController";
+/**
+ * 该函数用于处理需要更更新时候，需要从父组件提取数据状态的渲染操作
+ * @param proto
+ * @param parent
+ * @param child
+ * @param link
+ * @param tagTemplate
+ */
+export declare function init_render(proto: Component, parent: ParentNode, child: Element, link: Controller | ApiController | PageController, tagTemplate: Element): void;

package/core/render/initRender.js

@@ -1,40 +1,40 @@
-import { isUnKnown } from "../utility/checkUtility";
-import { getTemplate } from "../../library/template/template";
-import { styleResolve } from "../../library/style/style";
-import { init_render, post_render, raw_render } from "../../library/render/render";
-//渲染自定义标签
-export function Render(proto, parent, child, link) {
-    //获得模板元素
-    var tagTemplate = getTemplate(proto);
-    //注册当前解析元素
-    Reflect.get(window, "context").crtTag = child;
-    //解析样式
-    styleResolve(proto.getName());
-    //两种渲染方式
-    if (child.hasAttribute("name")) {
-        //需要保持状态的渲染
-        if (link.link.has(child.getAttribute("name"))) {
-            //该name元素存在旧数据，是更新渲染
-            init_render(proto, parent, child, link, tagTemplate);
-        }
-        else {
-            //该name元素不存在旧数据，是第一次渲染
-            post_render(proto, parent, child, link, tagTemplate);
-        }
-    }
-    else {
-        //不需要保持状态的渲染
-        raw_render(proto, parent, child, link, tagTemplate);
-    }
-}
-//拓展标签深度渲染
-export function findComponent(collection, link) {
-    for (var i = 0; i < collection.length; i++) {
-        if (isUnKnown(collection[i].nodeName)) {
-            Render(Reflect.get(window, "tagLib").get(collection[i].nodeName.toUpperCase()), collection[i].parentNode, collection[i], link);
-        }
-        else {
-            findComponent(collection[i].children, link);
-        }
-    }
+import { Controller } from "../../class/controller/controller";
+import { controllerCycleTypeOne } from "../../library/lifecycle/controllerCycle";
+import { cmd } from "../../library/cmd/cmd";
+import { mount } from "../../library/lifecycle/mount";
+import { injectRefs } from "../inject/inject";
+import { afterMethodsTypeOne } from "../../library/lifecycle/afterMethods";
+import { findComponent } from "./delivery";
+/**
+ * 该函数用于处理需要更更新时候，需要从父组件提取数据状态的渲染操作
+ * @param proto
+ * @param parent
+ * @param child
+ * @param link
+ * @param tagTemplate
+ */
+export function init_render(proto, parent, child, link, tagTemplate) {
+    //获取控制对象
+    var controller = new Controller();
+    //控制对象预处理
+    controllerCycleTypeOne(controller, proto, child, link, tagTemplate);
+    //beforeRender
+    var beforeRender = proto.getBeforeRender().bind(controller.raw_data);
+    beforeRender();
+    //内存中数据渲染
+    cmd(tagTemplate, proto, controller);
+    //beforeMount
+    var beforeMount = proto.getBeforeMount().bind(controller.raw_data);
+    beforeMount();
+    //mount
+    mount(controller, proto, parent, child, tagTemplate);
+    //获取
+    injectRefs(controller, tagTemplate);
+    //afterRender
+    var afterRender = proto.getAfterRender().bind(controller.proxyForMethods);
+    afterRender();
+    //后处理
+    afterMethodsTypeOne(controller, child, link);
+    //深度渲染
+    findComponent(tagTemplate.children, controller);
 }

package/core/render/rawRender.d.ts

@@ -0,0 +1,13 @@
+import { Component } from "../../class/component/component";
+import { Controller } from "../../class/controller/controller";
+import { ApiController } from "../../class/controller/apiController";
+import { PageController } from "../../class/controller/pageController";
+/**
+ * 该函数用于渲染不需要记录状态的组件
+ * @param proto
+ * @param parent
+ * @param child
+ * @param link
+ * @param tagTemplate
+ */
+export declare function raw_render(proto: Component, parent: ParentNode, child: Element, link: Controller | ApiController | PageController, tagTemplate: Element): void;

package/core/render/rawRender.js

@@ -0,0 +1,39 @@
+import { Controller } from "../../class/controller/controller";
+import { controllerCycleTypeTwo } from "../../library/lifecycle/controllerCycle";
+import { cmd } from "../../library/cmd/cmd";
+import { mount } from "../../library/lifecycle/mount";
+import { injectRefs } from "../inject/inject";
+import { afterMethodsTypeTwo } from "../../library/lifecycle/afterMethods";
+import { findComponent } from "./delivery";
+/**
+ * 该函数用于渲染不需要记录状态的组件
+ * @param proto
+ * @param parent
+ * @param child
+ * @param link
+ * @param tagTemplate
+ */
+export function raw_render(proto, parent, child, link, tagTemplate) {
+    //获取控制对象
+    var controller = new Controller();
+    //控制对象预处理
+    controllerCycleTypeTwo(controller, proto, child, link, tagTemplate);
+    //beforeRender
+    var beforeRender = proto.getBeforeRender().bind(controller.raw_data);
+    beforeRender();
+    //解析指令
+    cmd(tagTemplate, proto, controller);
+    //beforeMount
+    var beforeMount = proto.getBeforeMount().bind(controller.raw_data);
+    beforeMount();
+    //mount
+    mount(controller, proto, parent, child, tagTemplate);
+    injectRefs(controller, tagTemplate);
+    //afterRender
+    var afterRender = proto.getAfterRender().bind(controller.raw_data);
+    afterRender();
+    //后处理
+    afterMethodsTypeTwo(controller, child, link);
+    //深度渲染
+    findComponent(controller.root.children, controller);
+}

package/core/render/updateRender.d.ts

@@ -1,2 +1,6 @@
-import { Controller } from "../../class/controller";
-export declare function updateRender(controller: Controller): void;
+import { Controller } from "../../class/controller/controller";
+/**
+ * 更新渲染方法
+ * @param controller
+ */
+export declare function update_Render(controller: Controller): void;

package/core/render/updateRender.js

@@ -1,9 +1,13 @@
 import { bindModelForUpdater } from "../utility/miscUtility";
-import { findComponent } from "./initRender";
-import { getTemplate } from "../../library/template/template";
 import { cmdForUpdate } from "../../library/cmd/cmd";
-import { injectProps } from "../../library/inject/inject";
-export function updateRender(controller) {
+import { injectRefs } from "../inject/inject";
+import { findComponent } from "./delivery";
+import { getTemplate } from "../utility/templateUtility";
+/**
+ * 更新渲染方法
+ * @param controller
+ */
+export function update_Render(controller) {
     //生成DOM
     var tagTemplate = getTemplate(controller.proto);
     //清除保存的发布对象
@@ -27,10 +31,10 @@ export function updateRender(controller) {
     while (tagTemplate.hasChildNodes()) {
         controller.root.appendChild(tagTemplate.firstChild);
     }
+    injectRefs(controller, tagTemplate);
     //afterRender
     var afterRender = controller.proto.getAfterRender().bind(controller.raw_data);
     afterRender();
-    injectProps(controller, tagTemplate);
     //获取定位
     bindModelForUpdater(controller.root.children, controller.proxyForMethods);
     //深度渲染

package/core/utility/injectUtility.d.ts

@@ -1,6 +1,6 @@
-import { Controller } from "../../class/controller";
-import { ApiController } from "../../class/apiController";
-import { PageController } from "../../class/pageController";
+import { Controller } from "../../class/controller/controller";
+import { ApiController } from "../../class/controller/apiController";
+import { PageController } from "../../class/controller/pageController";
 export declare function getCodeSpaceForProps(data: {}, $props: Map<string, object>): void;
 export declare function getCodeSpaceForQuery(data: {}, $query: Map<string, any>): void;
 export declare function getCodeSpaceForRef(data: {}, $ref: Map<string, Element>): void;

package/core/utility/miscUtility.d.ts

@@ -1,2 +1,7 @@
+/**
+ * 给组件元素添加cpn标签
+ * @param nodes
+ * @param component
+ */
 export declare function addLabel(nodes: HTMLCollection, component: string): void;
 export declare function bindModelForUpdater(nodes: HTMLCollection, data: {}): void;

package/core/utility/miscUtility.js

@@ -1,3 +1,8 @@
+/**
+ * 给组件元素添加cpn标签
+ * @param nodes
+ * @param component
+ */
 export function addLabel(nodes, component) {
     for (var i = 0; i < nodes.length; i++) {
         nodes[i].setAttribute("cpn", component);

package/core/utility/styleUtility.d.ts

@@ -1,3 +1,5 @@
-import { Component } from "../../class/component";
+import { Component } from "../../class/component/component";
 export declare function checkStyleLabel(tag: string): boolean;
 export declare function themeStyle(component: Component, styleLib: Map<string, object>): void;
+export declare function styleResolve(tag: string): void;
+export declare function reloadStyle(theme: string): void;

package/core/utility/styleUtility.js

@@ -1,3 +1,6 @@
+import { loadStyle } from "../../library/loader/loader";
+// @ts-ignore
+import { sessionStorageEngin_read } from "render-status/read/read";
 export function checkStyleLabel(tag) {
     //获取所有的style标签
     var styles = document.getElementsByTagName("style");
@@ -21,3 +24,28 @@ export function themeStyle(component, styleLib) {
     }
     styleLib.set(component.getName().toUpperCase(), kk);
 }
+export function styleResolve(tag) {
+    var theme = sessionStorageEngin_read("theme");
+    if (Reflect.get(window, "styleLib").get(tag.toUpperCase()).get(theme) === undefined) {
+        console.log("tag:" + tag + " has no theme " + theme);
+    }
+    else {
+        loadStyle(tag, theme, Reflect.get(window, "styleLib").get(tag.toUpperCase()).get(theme));
+    }
+}
+export function reloadStyle(theme) {
+    Reflect.get(window, "styleLib").forEach(function (value, key) {
+        var styles = document.getElementsByTagName("style");
+        for (var i = 0; i < styles.length; i++) {
+            if (styles[i].getAttribute("tag") === key) {
+                var style = document.createElement('style');
+                var text = document.createTextNode(value.get(theme));
+                style.appendChild(text);
+                style.setAttribute("tag", key.toUpperCase());
+                style.setAttribute("theme", theme);
+                var head = document.getElementsByTagName('head')[0];
+                head.replaceChild(style, styles[i]);
+            }
+        }
+    });
+}

package/core/utility/templateUtility.d.ts

@@ -0,0 +1,3 @@
+import { Component } from "../../class/component/component";
+import ApiComponent from "../../class/component/apiComponent";
+export declare function getTemplate(proto: Component | ApiComponent): Element;

package/index.d.ts

@@ -1,4 +1,4 @@
-import { Component } from "./class/component";
+import { Component } from "./class/component/component";
 import { routerController } from "render-security/class/Router";
 export declare class RenderJS {
     readonly config: {};

package/index.js

@@ -1,10 +1,10 @@
-import { Component } from "./class/component";
+import { Component } from "./class/component/component";
 import meta from "./meta/meta";
 import { renderHtml } from "./runtime/runtime";
 import { themeStyle } from "./core/utility/styleUtility";
 // @ts-ignore
 import { redirect } from "render-security/utility/redirect";
-import { PageController } from "./class/pageController";
+import { PageController } from "./class/controller/pageController";
 import { App } from "./meta/app";
 //页面RenderJs
 var RenderJS = /** @class */ (function () {

package/library/cmd/cmd.d.ts

@@ -1,6 +1,6 @@
-import { Component } from "../../class/component";
-import { Controller } from "../../class/controller";
-import { ApiController } from "../../class/apiController";
-import ApiComponent from "../../class/apiComponent";
+import { Component } from "../../class/component/component";
+import { Controller } from "../../class/controller/controller";
+import { ApiController } from "../../class/controller/apiController";
+import ApiComponent from "../../class/component/apiComponent";
 export declare function cmd(tagTemplate: Element, proto: Component | ApiComponent, controller: Controller | ApiController): void;
 export declare function cmdForUpdate(tagTemplate: Element, proto: Component, controller: Controller | ApiController): void;

package/library/cmd/cmd.js

@@ -4,6 +4,8 @@ import { resolver_html } from "../../core/cmd/v-html";
 import { resolver_txt } from "../../core/cmd/v-txt";
 import { resolver_model } from "../../core/cmd/v-model";
 import { resolver_bind } from "../../core/cmd/v-bind";
+import { resolver_show } from "../../core/cmd/v-show";
+import { resolver_render } from "../../core/cmd/v-render";
 export function cmd(tagTemplate, proto, controller) {
     //给所有元素添加上npm=tag标志
     addLabel(tagTemplate.children, proto.getName());
@@ -17,6 +19,10 @@ export function cmd(tagTemplate, proto, controller) {
     resolver_model(tagTemplate.children, controller.proxyForMethods);
     //渲染属性
     resolver_bind(tagTemplate.children, controller.proxyForMethods);
+    //v-show
+    resolver_show(tagTemplate.children, controller.proxyForMethods);
+    //v-render
+    resolver_render(tagTemplate.children, controller.proxyForMethods);
 }
 export function cmdForUpdate(tagTemplate, proto, controller) {
     //给所有元素添加上npm=tag标志
@@ -29,4 +35,8 @@ export function cmdForUpdate(tagTemplate, proto, controller) {
     resolver_txt(tagTemplate.children, controller.proxyForMethods);
     //绑定数据
     resolver_model(tagTemplate.children, controller.proxyForMethods);
+    //v-show
+    resolver_show(tagTemplate.children, controller.proxyForMethods);
+    //v-render
+    resolver_render(tagTemplate.children, controller.proxyForMethods);
 }

package/library/lifecycle/afterMethods.d.ts

@@ -0,0 +1,17 @@
+import { Controller } from "../../class/controller/controller";
+import { ApiController } from "../../class/controller/apiController";
+import { PageController } from "../../class/controller/pageController";
+/**
+ * 该函数用于处理渲染后操作
+ * @param controller
+ * @param child
+ * @param link
+ */
+export declare function afterMethodsTypeOne(controller: Controller, child: Element, link: Controller | ApiController | PageController): void;
+/**
+ * 该函数用于处理渲染后操作
+ * @param controller
+ * @param child
+ * @param link
+ */
+export declare function afterMethodsTypeTwo(controller: Controller, child: Element, link: Controller | ApiController | PageController): void;

package/library/lifecycle/afterMethods.js

@@ -0,0 +1,24 @@
+/**
+ * 该函数用于处理渲染后操作
+ * @param controller
+ * @param child
+ * @param link
+ */
+export function afterMethodsTypeOne(controller, child, link) {
+    //将本控制对象保存到父控制对象的发布数组中
+    link.to.push(controller);
+    //将执行空间保存到父控制对象
+    link.link.set(child.getAttribute("name"), controller.raw_data);
+}
+/**
+ * 该函数用于处理渲染后操作
+ * @param controller
+ * @param child
+ * @param link
+ */
+export function afterMethodsTypeTwo(controller, child, link) {
+    //将本控制对象保存到父控制对象的发布数组中
+    link.to.push(controller);
+    //将执行空间保存到父控制对象
+    link.link.set(child.getAttribute("name"), controller.raw_data);
+}

package/library/lifecycle/controllerCycle.d.ts

@@ -0,0 +1,6 @@
+import { Controller } from "../../class/controller/controller";
+import { Component } from "../../class/component/component";
+import { ApiController } from "../../class/controller/apiController";
+import { PageController } from "../../class/controller/pageController";
+export declare function controllerCycleTypeOne(controller: Controller, proto: Component, child: Element, link: Controller | ApiController | PageController, tagTemplate: Element): void;
+export declare function controllerCycleTypeTwo(controller: Controller, proto: Component, child: Element, link: Controller | ApiController | PageController, tagTemplate: Element): void;

package/library/lifecycle/controllerCycle.js

@@ -0,0 +1,41 @@
+import { inject, injectComputed, injectMethod, injectWatcher } from "../../core/inject/inject";
+import { getProxyObject } from "../../core/proxy/getProxy";
+import { getCodeSpaceForCommit, getCodeSpaceForProperty, getCodeSpaceForPublish, getCommitMethod, getPublishMethod, getSetterMethod } from "../../core/utility/injectUtility";
+export function controllerCycleTypeOne(controller, proto, child, link, tagTemplate) {
+    //保持控制器模板对象
+    controller.proto = proto;
+    //复制原始数据对象到控制对象
+    controller.raw_data = link.link.get(child.getAttribute("name"));
+    //向raw_data中注入元数据
+    inject(controller, tagTemplate);
+    //数据渲染代理对象
+    controller.proxyForMethods = getProxyObject(controller.raw_data, controller);
+    injectComputed(controller, proto);
+    injectWatcher(controller, proto);
+    injectMethod(controller, proto);
+    //注入commit
+    getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
+    //注入receiver
+    getCodeSpaceForPublish(controller.raw_data, getPublishMethod(controller));
+    //注入setter
+    getCodeSpaceForProperty(controller.raw_data, getSetterMethod(controller));
+}
+export function controllerCycleTypeTwo(controller, proto, child, link, tagTemplate) {
+    //保持控制器模板对象
+    controller.proto = proto;
+    //复制原始数据对象到控制对象
+    controller.raw_data = Object.create(proto.getData());
+    //向raw_data中注入元数据
+    inject(controller, tagTemplate);
+    //数据渲染代理对象
+    controller.proxyForMethods = getProxyObject(controller.raw_data, controller);
+    injectComputed(controller, proto);
+    injectWatcher(controller, proto);
+    injectMethod(controller, proto);
+    //注入commit
+    getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
+    //注入receiver
+    getCodeSpaceForPublish(controller.raw_data, getPublishMethod(controller));
+    //注入setter
+    getCodeSpaceForProperty(controller.raw_data, getSetterMethod(controller));
+}

package/library/lifecycle/mount.d.ts

@@ -0,0 +1,3 @@
+import { Controller } from "../../class/controller/controller";
+import { Component } from "../../class/component/component";
+export declare function mount(controller: Controller, proto: Component, parent: ParentNode, child: Element, tagTemplate: Element): void;

package/library/lifecycle/mount.js

@@ -0,0 +1,13 @@
+export function mount(controller, proto, parent, child, tagTemplate) {
+    //mount
+    var renderSpace = document.createElement("div");
+    //给box添加样式
+    renderSpace.setAttribute("style", proto.getBoxStyle());
+    //指定渲染空间
+    controller.root = renderSpace;
+    //开始渲染
+    parent.replaceChild(renderSpace, child);
+    while (tagTemplate.hasChildNodes()) {
+        renderSpace.append(tagTemplate.firstChild);
+    }
+}

package/library/loader/loader.d.ts

@@ -1 +1,7 @@
+/**
+ * 加载自定义标签样式
+ * @param tag
+ * @param theme
+ * @param styleData
+ */
 export declare function loadStyle(tag: string, theme: string, styleData: string): void;

package/library/loader/loader.js

@@ -1,4 +1,10 @@
 import { checkStyleLabel } from "../../core/utility/styleUtility";
+/**
+ * 加载自定义标签样式
+ * @param tag
+ * @param theme
+ * @param styleData
+ */
 export function loadStyle(tag, theme, styleData) {
     if (!checkStyleLabel(tag)) {
         var style = document.createElement('style');

package/meta/app.d.ts

@@ -1,4 +1,3 @@
 export declare class App {
-    constructor();
     setTheme(theme: string): void;
 }

package/meta/app.js

@@ -1,6 +1,6 @@
 // @ts-ignore
 import { status_write } from "render-status";
-import { reloadStyle } from "../library/style/style";
+import { reloadStyle } from "../core/utility/styleUtility";
 var App = /** @class */ (function () {
     function App() {
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "render-core",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "The core for render-js",
   "main": "index.js",
   "types": "index.d.ts",

package/runtime/runtime.d.ts

@@ -1,3 +1,3 @@
-import { PageController } from "../class/pageController";
+import { PageController } from "../class/controller/pageController";
 export declare function renderHtml(collection: HTMLCollection, link: PageController): void;
 export declare function reloadPage(): void;

package/runtime/runtime.js

@@ -1,5 +1,5 @@
 import { isUnKnown } from "../core/utility/checkUtility";
-import { Render } from "../core/render/initRender";
+import { Render } from "../core/render/delivery";
 //检查元素是否为基元素
 export function renderHtml(collection, link) {
     //遍历element节点，判断是否为自定义标签

package/library/getter/getter.d.ts

@@ -1 +0,0 @@
-export declare function getGetter(data: {}): any;

package/library/getter/getter.js

@@ -1,6 +0,0 @@
-export function getGetter(data) {
-    var getter = function (obj, prop) {
-        return obj[prop];
-    };
-    return getter.bind(data);
-}

package/library/render/render.d.ts

@@ -1,7 +0,0 @@
-import { Controller } from "../../class/controller";
-import { Component } from "../../class/component";
-import { ApiController } from "../../class/apiController";
-import { PageController } from "../../class/pageController";
-export declare function init_render(proto: Component, parent: ParentNode, child: Element, link: Controller | ApiController | PageController, tagTemplate: Element): void;
-export declare function post_render(proto: Component, parent: ParentNode, child: Element, link: Controller | ApiController | PageController, tagTemplate: Element): void;
-export declare function raw_render(proto: Component, parent: ParentNode, child: Element, link: Controller | ApiController | PageController, tagTemplate: Element): void;

package/library/render/render.js

@@ -1,152 +0,0 @@
-import { Controller } from "../../class/controller";
-import { getCodeSpaceForCommit, getCodeSpaceForProperty, getCodeSpaceForPublish, getCommitMethod, getPublishMethod, getSetterMethod } from "../../core/utility/injectUtility";
-import { getProxyObject } from "../../core/proxy/getProxy";
-import { findComponent } from "../../core/render/initRender";
-import { inject, injectComputed, injectMethod, injectProps, injectWatcher } from "../inject/inject";
-import { cmd } from "../cmd/cmd";
-export function init_render(proto, parent, child, link, tagTemplate) {
-    //获取控制对象
-    var controller = new Controller();
-    //保持控制器模板对象
-    controller.proto = proto;
-    //复制原始数据对象到控制对象
-    controller.raw_data = link.link.get(child.getAttribute("name"));
-    //向raw_data中注入元数据
-    inject(controller, tagTemplate);
-    //数据渲染代理对象
-    controller.proxyForMethods = getProxyObject(controller.raw_data, controller);
-    injectComputed(controller, proto);
-    injectWatcher(controller, proto);
-    injectMethod(controller, proto);
-    //注入commit
-    getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
-    //注入receiver
-    getCodeSpaceForPublish(controller.raw_data, getPublishMethod(controller));
-    //注入setter
-    getCodeSpaceForProperty(controller.raw_data, getSetterMethod(controller));
-    //beforeRender
-    var beforeRender = proto.getBeforeRender().bind(controller.raw_data);
-    beforeRender();
-    //解析指令
-    cmd(tagTemplate, proto, controller);
-    //beforeMount
-    var beforeMount = proto.getBeforeMount().bind(controller.raw_data);
-    beforeMount();
-    //mount
-    var renderSpace = document.createElement("div");
-    //给box添加样式
-    renderSpace.setAttribute("style", proto.getBoxStyle());
-    //指定渲染空间
-    controller.root = renderSpace;
-    //开始渲染
-    parent.replaceChild(renderSpace, child);
-    while (tagTemplate.hasChildNodes()) {
-        renderSpace.append(tagTemplate.firstChild);
-    }
-    //afterRender
-    var afterRender = proto.getAfterRender().bind(controller.raw_data);
-    afterRender();
-    injectProps(controller, tagTemplate);
-    //将本控制对象保存到父控制对象的发布数组中
-    link.to.push(controller);
-    //将执行空间保存到父控制对象
-    link.link.set(child.getAttribute("name"), controller.raw_data);
-    //深度渲染
-    findComponent(tagTemplate.children, controller);
-}
-export function post_render(proto, parent, child, link, tagTemplate) {
-    //获取控制对象
-    var controller = new Controller();
-    //保持控制器模板对象
-    controller.proto = proto;
-    //复制原始数据对象到控制对象
-    controller.raw_data = Object.create(proto.getData());
-    //向raw_data中注入元数据
-    inject(controller, tagTemplate);
-    //保持数据代理对象
-    controller.proxyForMethods = getProxyObject(controller.raw_data, controller);
-    injectComputed(controller, proto);
-    injectWatcher(controller, proto);
-    injectMethod(controller, proto);
-    //注入commit
-    getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
-    //注入receiver
-    getCodeSpaceForPublish(controller.raw_data, getPublishMethod(controller));
-    //注入setter
-    getCodeSpaceForProperty(controller.raw_data, getSetterMethod(controller));
-    //beforeRender
-    var beforeRender = proto.getBeforeRender().bind(controller.raw_data);
-    beforeRender();
-    //解析指令
-    cmd(tagTemplate, proto, controller);
-    //beforeMount
-    var beforeMount = proto.getBeforeMount().bind(controller.raw_data);
-    beforeMount();
-    //mount
-    var renderSpace = document.createElement("div");
-    //给box添加样式
-    renderSpace.setAttribute("style", proto.getBoxStyle());
-    //指定渲染空间
-    controller.root = renderSpace;
-    //开始渲染
-    parent.replaceChild(renderSpace, child);
-    while (tagTemplate.hasChildNodes()) {
-        renderSpace.append(tagTemplate.firstChild);
-    }
-    //afterRender
-    var afterRender = proto.getAfterRender().bind(controller.raw_data);
-    afterRender();
-    injectProps(controller, tagTemplate);
-    link.to.push(controller);
-    //将执行空间保存到父控制对象
-    link.link.set(child.getAttribute("name"), controller.raw_data);
-    //深度渲染
-    findComponent(controller.root.children, controller);
-}
-export function raw_render(proto, parent, child, link, tagTemplate) {
-    //获取控制对象
-    var controller = new Controller();
-    //保持控制对象原型对象
-    controller.proto = proto;
-    //向raw_data中注入元数据
-    inject(controller, tagTemplate);
-    //复制原始数据对象到控制对象
-    controller.raw_data = Object.create(proto.getData());
-    //数据渲染对象
-    controller.proxyForMethods = getProxyObject(controller.raw_data, controller);
-    injectComputed(controller, proto);
-    injectWatcher(controller, proto);
-    injectMethod(controller, proto);
-    //注入commit
-    getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
-    //注入receiver
-    getCodeSpaceForPublish(controller.raw_data, getPublishMethod(controller));
-    //注入setter
-    getCodeSpaceForProperty(controller.raw_data, getSetterMethod(controller));
-    //beforeRender
-    var beforeRender = proto.getBeforeRender().bind(controller.raw_data);
-    beforeRender();
-    //解析指令
-    cmd(tagTemplate, proto, controller);
-    //beforeMount
-    var beforeMount = proto.getBeforeMount().bind(controller.raw_data);
-    beforeMount();
-    //mount
-    var renderSpace = document.createElement("div");
-    //给box添加样式
-    renderSpace.setAttribute("style", proto.getBoxStyle());
-    //指定渲染空间
-    controller.root = renderSpace;
-    //开始渲染
-    parent.replaceChild(renderSpace, child);
-    while (tagTemplate.hasChildNodes()) {
-        renderSpace.append(tagTemplate.firstChild);
-    }
-    //afterRender
-    var afterRender = proto.getAfterRender().bind(controller.raw_data);
-    afterRender();
-    injectProps(controller, tagTemplate);
-    link.to.push(controller);
-    //深度渲染
-    findComponent(controller.root.children, controller);
-}

package/library/setter/setter.d.ts

@@ -1,5 +0,0 @@
-import { Controller } from "../../class/controller";
-import { ApiController } from "../../class/apiController";
-export declare function getSetter(data: {}, updater: Controller): any;
-export declare function getSetterForInject(data: {}): (obj: any, prop: any, value: any) => boolean;
-export declare function getSetterForApi(data: {}, updater: ApiController): any;

package/library/setter/setter.js

@@ -1,23 +0,0 @@
-import { updateRender } from "../../core/render/updateRender";
-export function getSetter(data, updater) {
-    var setter = function (obj, prop, value) {
-        obj[prop] = value;
-        updateRender(this);
-        return true;
-    };
-    return setter.bind(updater);
-}
-export function getSetterForInject(data) {
-    return function (obj, prop, value) {
-        console.error("Meta filed can't be set value!");
-        return false;
-    };
-}
-export function getSetterForApi(data, updater) {
-    var setter = function (obj, prop, value) {
-        obj[prop] = value;
-        updateRender(this);
-        return true;
-    };
-    return setter.bind(updater);
-}

package/library/style/style.d.ts

@@ -1,2 +0,0 @@
-export declare function styleResolve(tag: string): void;
-export declare function reloadStyle(theme: string): void;

package/library/style/style.js

@@ -1,28 +0,0 @@
-// @ts-ignore
-import { sessionStorageEngin_read } from "render-status/read/read";
-import { loadStyle } from "../loader/loader";
-export function styleResolve(tag) {
-    var theme = sessionStorageEngin_read("theme");
-    if (Reflect.get(window, "styleLib").get(tag.toUpperCase()).get(theme) === undefined) {
-        console.log("tag:" + tag + "has no them" + theme);
-    }
-    else {
-        loadStyle(tag, theme, Reflect.get(window, "styleLib").get(tag.toUpperCase()).get(theme));
-    }
-}
-export function reloadStyle(theme) {
-    Reflect.get(window, "styleLib").forEach(function (value, key) {
-        var styles = document.getElementsByTagName("style");
-        for (var i = 0; i < styles.length; i++) {
-            if (styles[i].getAttribute("tag") === key) {
-                var style = document.createElement('style');
-                var text = document.createTextNode(value.get(theme));
-                style.appendChild(text);
-                style.setAttribute("tag", key.toUpperCase());
-                style.setAttribute("theme", theme);
-                var head = document.getElementsByTagName('head')[0];
-                head.replaceChild(style, styles[i]);
-            }
-        }
-    });
-}

package/library/tag/extend.d.ts

@@ -1,14 +0,0 @@
-export declare function extendTag(component: {
-    name: string;
-    template: string;
-    data?: () => {};
-    computed?: {};
-    methods?: {};
-    components?: {};
-    beforeRender?: () => void;
-    afterRender?: () => void;
-    beforeUpdate?: () => void;
-    afterUpdate?: () => void;
-    beforeMount?: () => void;
-    beforeUnmount?: () => void;
-}): any;

package/library/tag/extend.js

@@ -1,4 +0,0 @@
-import { Component } from "../../class/component";
-export function extendTag(component) {
-    return new Component(component);
-}

package/library/template/template.d.ts

@@ -1,3 +0,0 @@
-import { Component } from "../../class/component";
-import ApiComponent from "../../class/apiComponent";
-export declare function getTemplate(proto: Component | ApiComponent): Element;