render-core 1.0.1 → 1.0.2

package/class/component.d.ts

@@ -6,7 +6,6 @@ interface RenderBase {
     getComputed(): {};
     getMethods(): {};
     getWatcher(): {};
-    getExecutor(): {};
     getBeforeRender(): () => void;
     getAfterRender(): () => void;
     getBeforeUpdate(): () => void;
@@ -22,7 +21,6 @@ export declare class Component implements RenderBase {
     private readonly methods?;
     private readonly computed?;
     private readonly watcher?;
-    private readonly executor?;
     private readonly beforeRender?;
     private readonly afterRender?;
     private readonly beforeUpdate?;
@@ -52,7 +50,6 @@ export declare class Component implements RenderBase {
     getMethods(): {};
     getComputed(): {};
     getWatcher(): {};
-    getExecutor(): {};
     getBeforeRender(): () => void;
     getAfterRender(): () => void;
     getBeforeUpdate(): () => void;

package/class/component.js

@@ -39,13 +39,6 @@ var Component = /** @class */ (function () {
         else {
             this.watcher = config.watcher;
         }
-        //添加处理器属性
-        if (typeof config.executor == "undefined") {
-            this.executor = {};
-        }
-        else {
-            this.executor = config.executor;
-        }
         //生命周期函数
         if (typeof config.beforeRender == "undefined") {
             this.beforeRender = function () { };
@@ -105,9 +98,6 @@ var Component = /** @class */ (function () {
     Component.prototype.getWatcher = function () {
         return this.watcher;
     };
-    Component.prototype.getExecutor = function () {
-        return this.executor;
-    };
     Component.prototype.getBeforeRender = function () {
         return this.beforeRender;
     };

package/class/controller.d.ts

@@ -2,7 +2,6 @@ import { Component } from "./component";
 export declare class Controller {
     root: ParentNode;
     proto: Component;
-    preRender: boolean;
     link: Map<string, {}>;
     to: Controller[];
     raw_data: {};

package/class/controller.js

@@ -2,7 +2,6 @@ var Controller = /** @class */ (function () {
     //构造函数
     function Controller() {
         this.link = new Map();
-        this.preRender = false;
         this.to = [];
     }
     //接收器

package/class/pageController.d.ts

@@ -0,0 +1,8 @@
+import { Controller } from "./controller";
+export declare class PageController {
+    private methods;
+    to: Controller[];
+    link: Map<string, {}>;
+    constructor();
+    receiver(method: string, ...args: any[]): void;
+}

package/class/pageController.js

@@ -0,0 +1,17 @@
+var PageController = /** @class */ (function () {
+    //构造函数
+    function PageController() {
+        //注入系统方法
+        this.methods = Reflect.get(window, "pageMethods");
+        this.link = new Map();
+    }
+    //接收器
+    PageController.prototype.receiver = function (method) {
+        var args = [];
+        for (var _i = 1; _i < arguments.length; _i++) {
+            args[_i - 1] = arguments[_i];
+        }
+    };
+    return PageController;
+}());
+export { PageController };

package/core/render/initRender.d.ts

@@ -1,5 +1,6 @@
 import { Controller } from "../../class/controller";
 import { Component } from "../../class/component";
 import { ApiController } from "../../class/apiController";
-export declare function initRender(proto: Component, parent: ParentNode, child: Element, tagLib: Map<string, Component>): void;
-export declare function findComponent(collection: HTMLCollection, tagLib: Map<string, Component>, link: Controller | ApiController): void;
+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;

package/core/render/initRender.js

@@ -1,87 +1,38 @@
-import { loadStyle } from "../../library/loader/loader";
-import { addLabel } from "../utility/miscUtility";
-import { getProxyObject } from "../proxy/getProxy";
-import { Controller } from "../../class/controller";
-import { getCodeSpaceForProps, getCodeSpaceForPublish, getCodeSpaceForQuery, getCodeSpaceForRef, getPublishMethod } from "../utility/injectUtility";
-import { resolveProps } from "../resolver/props";
-import { resolve_Queries } from "../resolver/query";
-import { resolver_event } from "../cmd/v-on";
-import { resolver_html } from "../cmd/v-html";
-import { resolver_txt } from "../cmd/v-txt";
-import { resolver_model } from "../cmd/v-model";
-import { resolver_Ref } from "../cmd/v-ref";
 import { isUnKnown } from "../utility/checkUtility";
-import { resolver_bind } from "../cmd/v-bind";
-import { depthRender } from "./depthRender";
+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 initRender(proto, parent, child, tagLib) {
-    //生成DOM
-    var temp = document.createElement("div");
-    temp.innerHTML = proto.getTemplate();
-    var template = temp.getElementsByTagName("template")[0];
-    var content = template.content;
+export function Render(proto, parent, child, link) {
     //获得模板元素
-    var tagTemplate = content.firstElementChild;
-    //解析元素上的静态属性
-    var props = resolveProps(tagTemplate, proto);
-    //获得模板样式元素
-    var tagStyle = content.lastElementChild;
-    //向head位置添加该组件的样式
-    loadStyle(tagStyle.childNodes[0].nodeValue, proto.getName());
-    //获取控制对象
-    var controller = new Controller();
-    controller.proto = proto;
-    //复制原始数据对象到控制对象
-    controller.raw_data = Object.create(proto.getData());
-    //注入props
-    getCodeSpaceForProps(controller.raw_data, resolveProps(tagTemplate.firstElementChild, controller.proto.getProps()));
-    //注入query
-    getCodeSpaceForQuery(controller.raw_data, resolve_Queries());
-    //注入ref
-    getCodeSpaceForRef(controller.raw_data, resolver_Ref(tagTemplate.children));
-    //数据渲染对象
-    controller.proxyForMethods = getProxyObject(controller.raw_data, controller);
-    //注入receiver
-    getCodeSpaceForPublish(controller.raw_data, getPublishMethod(controller));
-    //beforeRender
-    var beforeRender = proto.getBeforeRender().bind(controller.raw_data);
-    beforeRender();
-    //给所有元素添加上npm=tag标志
-    addLabel(tagTemplate.children, proto.getName());
-    //将元素事件绑定到元素上
-    resolver_event(tagTemplate.children, proto.getMethods(), controller.proxyForMethods);
-    //渲染html
-    resolver_html(tagTemplate.children, controller.proxyForMethods);
-    //渲染text
-    resolver_txt(tagTemplate.children, controller.proxyForMethods);
-    //绑定数据
-    resolver_model(tagTemplate.children, controller.proxyForMethods);
-    //渲染属性
-    resolver_bind(tagTemplate.children, controller.proxyForMethods);
-    //beforeMount
-    var beforeMount = proto.getBeforeMount().bind(controller.raw_data);
-    beforeMount();
-    //mount
-    var renderSpace = document.createElement("div");
-    controller.root = renderSpace;
-    parent.replaceChild(renderSpace, child);
-    while (tagTemplate.hasChildNodes()) {
-        renderSpace.append(tagTemplate.firstChild);
+    var tagTemplate = getTemplate(proto);
+    //解析样式
+    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);
     }
-    //afterRender
-    var afterRender = proto.getAfterRender().bind(controller.raw_data);
-    afterRender();
-    //深度渲染
-    findComponent(controller.root.children, tagLib, controller);
 }
-//继续渲染
-export function findComponent(collection, tagLib, link) {
+//拓展标签深度渲染
+export function findComponent(collection, link) {
     for (var i = 0; i < collection.length; i++) {
         if (isUnKnown(collection[i].nodeName)) {
-            depthRender(tagLib.get(collection[i].nodeName.toUpperCase()), collection[i].parentNode, collection[i], tagLib, link);
+            Render(Reflect.get(window, "tagLib").get(collection[i].nodeName.toUpperCase()), collection[i].parentNode, collection[i], link);
         }
         else {
-            findComponent(collection[i].children, tagLib, link);
+            findComponent(collection[i].children, link);
         }
     }
 }

package/core/render/updateRender.d.ts

@@ -1,2 +1,2 @@
 import { Controller } from "../../class/controller";
-export declare function updateRender(updater: Controller): void;
+export declare function updateRender(controller: Controller): void;

package/core/render/updateRender.js

@@ -1,50 +1,41 @@
-import { resolver_event } from "../cmd/v-on";
-import { resolver_html } from "../cmd/v-html";
-import { resolver_txt } from "../cmd/v-txt";
-import { resolver_bind } from "../cmd/v-bind";
-import { addLabel, bindModelForUpdater } from "../utility/miscUtility";
-import { depthFindComponent } from "./depthRender";
-export function updateRender(updater) {
+import { bindModelForUpdater } from "../utility/miscUtility";
+import { findComponent } from "./initRender";
+import { getTemplate } from "../../library/template/template";
+import { cmdForUpdate } from "../../library/cmd/cmd";
+export function updateRender(controller) {
     //生成DOM
-    var temp = document.createElement("div");
-    temp.innerHTML = updater.proto.getTemplate();
-    var template = temp.getElementsByTagName("template")[0];
-    var tagTemplate = template.content.children[0];
-    var updateRawData = updater.proxyForMethods;
+    var tagTemplate = getTemplate(controller.proto);
+    var controllerawData = controller.proxyForMethods;
     //beforeRender
-    var beforeRender = updater.proto.getBeforeRender().bind(updateRawData);
+    var beforeRender = controller.proto.getBeforeRender().bind(controllerawData);
     beforeRender();
     //beforeUpdate
-    var beforeUpdate = updater.proto.getBeforeUpdate().bind(updateRawData);
+    var beforeUpdate = controller.proto.getBeforeUpdate().bind(controllerawData);
     beforeUpdate();
-    //updateRender actions
-    addLabel(tagTemplate.children, updater.proto.getName());
-    resolver_event(tagTemplate.children, updater.proto.getMethods(), updater.proxyForMethods);
-    resolver_html(tagTemplate.children, updater.proxyForMethods);
-    resolver_txt(tagTemplate.children, updater.proxyForMethods);
-    resolver_bind(tagTemplate.children, updater.proxyForMethods);
+    //解析指令
+    cmdForUpdate(tagTemplate, controller.proto, controller);
     //afterUpdate
-    var afterUpdate = updater.proto.getAfterUpdate().bind(updateRawData);
+    var afterUpdate = controller.proto.getAfterUpdate().bind(controllerawData);
     afterUpdate();
     //beforeUnmount
-    var beforeUnmount = updater.proto.getBeforeUnmount().bind(updateRawData);
+    var beforeUnmount = controller.proto.getBeforeUnmount().bind(controllerawData);
     beforeUnmount();
     //unmount
-    while (updater.root.hasChildNodes()) {
-        updater.root.removeChild(updater.root.firstChild);
+    while (controller.root.hasChildNodes()) {
+        controller.root.removeChild(controller.root.firstChild);
     }
     //beforeMount
-    var beforeMount = updater.proto.getBeforeMount().bind(updateRawData);
+    var beforeMount = controller.proto.getBeforeMount().bind(controllerawData);
     beforeMount();
     //mount
     while (tagTemplate.hasChildNodes()) {
-        updater.root.appendChild(tagTemplate.firstChild);
+        controller.root.appendChild(tagTemplate.firstChild);
     }
     //afterRender
-    var afterRender = updater.proto.getAfterRender().bind(updateRawData);
+    var afterRender = controller.proto.getAfterRender().bind(controllerawData);
     afterRender();
     //获取定位
-    bindModelForUpdater(updater.root.children, updater.proxyForMethods);
+    bindModelForUpdater(controller.root.children, controller.proxyForMethods);
     //深度渲染
-    depthFindComponent(updater.root.children, Reflect.get(window, "tagLib"), updater);
+    findComponent(controller.root.children, controller);
 }

package/core/utility/injectUtility.d.ts

@@ -1,10 +1,11 @@
 import { Controller } from "../../class/controller";
 import { ApiController } from "../../class/apiController";
+import { PageController } from "../../class/pageController";
 export declare function getCodeSpaceForProps(data: {}, $props: {}): void;
 export declare function getCodeSpaceForQuery(data: {}, $query: {}): void;
 export declare function getCodeSpaceForRef(data: {}, $ref: Map<string, Element>): void;
 export declare function getApiCodeSpace(data: {}, method: {}): void;
-export declare function getCommitMethod(controller: Controller | ApiController): any;
+export declare function getCommitMethod(controller: Controller | ApiController | PageController): any;
 export declare function getCodeSpaceForCommit(data: {}, commit: any): void;
-export declare function getPublishMethod(controller: Controller | ApiController): any;
+export declare function getPublishMethod(controller: Controller | ApiController | PageController): any;
 export declare function getCodeSpaceForPublish(data: {}, publisher: any): void;

package/core/utility/miscUtility.d.ts

@@ -1,4 +1,2 @@
-import { Component } from "../../class/component";
 export declare function addLabel(nodes: HTMLCollection, component: string): void;
-export declare function resolver(element: Element, tagLib: Map<string, Component>): void;
 export declare function bindModelForUpdater(nodes: HTMLCollection, data: {}): void;

package/core/utility/miscUtility.js

@@ -1,4 +1,3 @@
-import { initRender } from "../render/initRender";
 export function addLabel(nodes, component) {
     for (var i = 0; i < nodes.length; i++) {
         nodes[i].setAttribute("cpn", component);
@@ -6,9 +5,6 @@ export function addLabel(nodes, component) {
         addLabel(kk, component);
     }
 }
-export function resolver(element, tagLib) {
-    initRender(tagLib.get(element.nodeName.toUpperCase()), element.parentNode, element, tagLib);
-}
 export function bindModelForUpdater(nodes, data) {
     for (var i = 0; i < nodes.length; i++) {
         var result = nodes[i].hasAttribute("v-model");

package/core/utility/styleUtility.d.ts

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

package/core/utility/styleUtility.js

@@ -10,3 +10,14 @@ export function checkStyleLabel(tag) {
     //样式未加载
     return false;
 }
+export function themeStyle(component, styleLib) {
+    var template = component.getTemplate();
+    var dom = document.createElement("div");
+    dom.innerHTML = template;
+    var styles = dom.getElementsByTagName("template")[0].content.querySelectorAll("style");
+    var kk = new Map();
+    for (var i = 0; i < styles.length; i++) {
+        kk.set(styles[i].getAttribute("theme"), styles[i].nodeValue);
+    }
+    styleLib.set(component.getName(), kk);
+}

package/index.d.ts

@@ -1,31 +1,13 @@
 import { Component } from "./class/component";
-import routerController from "render-security-tpyescript/class/Router";
+import { routerController } from "render-security/class/Router";
 export declare class RenderJS {
-    readonly version: string;
+    readonly config: {};
     readonly tagLib: Map<string, Component>;
     private routerC;
+    private readonly page;
     constructor();
-    addTag(component: Component | Component[]): void;
     addRouter(router: routerController): void;
+    addTag(component: Component | Component[]): void;
     run(): void;
-}
-export declare class EmbedRenderJs {
-    private readonly apiComponent;
-    private controller;
-    constructor(config: {
-        name: string;
-        template: string;
-        data?: {};
-        computed?: {};
-        methods?: {};
-        watcher?: {};
-        beforeRender?: () => void;
-        afterRender?: () => void;
-        beforeUpdate?: () => void;
-        afterUpdate?: () => void;
-        beforeMount?: () => void;
-        beforeUnmount?: () => void;
-    });
-    render(selector: string): void;
-    commit(method: string, ...args: any[]): any;
+    private render;
 }

package/index.js

@@ -1,16 +1,23 @@
 import { Component } from "./class/component";
-import ApiComponent from "./class/apiComponent";
 import meta from "./meta/meta";
 import { renderHtml } from "./runtime/runtime";
-import { apiRender } from "./core/render/apiRender";
-import { ApiController } from "./class/apiController";
+import { themeStyle } from "./core/utility/styleUtility";
+// @ts-ignore
+import { redirect } from "render-security/utility/redirect";
+import { PageController } from "./class/pageController";
 //页面RenderJs
 var RenderJS = /** @class */ (function () {
     //构造函数
     function RenderJS() {
         this.tagLib = new Map();
-        this.version = meta.version;
+        this.page = new PageController();
+        Reflect.set(this.config, "version", meta.version);
+        Reflect.set(this.config, "theme", meta.style);
     }
+    //添加路由器
+    RenderJS.prototype.addRouter = function (router) {
+        this.routerC = router;
+    };
     //添加自定义标签
     RenderJS.prototype.addTag = function (component) {
         var _this = this;
@@ -33,57 +40,36 @@ var RenderJS = /** @class */ (function () {
             });
         }
     };
-    RenderJS.prototype.addRouter = function (router) {
-        this.routerC = router;
-    };
     //运行renderJs
     RenderJS.prototype.run = function () {
         if (this.routerC) {
-            if (this.routerC.data.beforeRouter()) {
-                if (typeof this.routerC.getRule(location.href) === "boolean") {
-                    Reflect.set(window, "tagLib", this.tagLib);
-                    renderHtml(document.body.children, this.tagLib);
+            this.routerC.data.beforeRouter();
+            if (typeof this.routerC.getRule(location.href) === "boolean") {
+                this.render();
+            }
+            else {
+                if (this.routerC.getRule(location.href).beforeRouter()) {
+                    this.render();
                 }
                 else {
-                    if (this.routerC.getRule(location.href).beforeRouter()) {
-                        Reflect.set(window, "tagLib", this.tagLib);
-                        renderHtml(document.body.children, this.tagLib);
-                    }
-                    else {
-                        location.href = "/http/error/404.html";
-                    }
+                    redirect("/http/400.html");
                 }
             }
-            else {
-                location.href = "/http/error/404.html";
-            }
+            this.routerC.data.afterRouter();
         }
         else {
-            Reflect.set(window, "tagLib", this.tagLib);
-            renderHtml(document.body.children, this.tagLib);
+            this.render();
         }
     };
-    return RenderJS;
-}());
-export { RenderJS };
-//嵌入式RenderJs
-var EmbedRenderJs = /** @class */ (function () {
-    //构造函数
-    function EmbedRenderJs(config) {
-        this.apiComponent = new ApiComponent(config);
-    }
-    //渲染嵌入式app
-    EmbedRenderJs.prototype.render = function (selector) {
-        this.controller = apiRender(this.apiComponent, document.getElementById(selector), this.apiComponent.getName(), Reflect.get(window, "tagLib"), new ApiController());
-    };
-    //与嵌入式app交互
-    EmbedRenderJs.prototype.commit = function (method) {
-        var args = [];
-        for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
+    RenderJS.prototype.render = function () {
+        Reflect.set(window, "tagLib", this.tagLib);
+        var styleLib = new Map();
+        for (var tagLibKey in this.tagLib) {
+            themeStyle(tagLibKey[tagLibKey], styleLib);
         }
-        return this.controller[method](args);
+        Reflect.set(window, "styleLib", styleLib);
+        renderHtml(document.body.children, this.page);
     };
-    return EmbedRenderJs;
+    return RenderJS;
 }());
-export { EmbedRenderJs };
+export { RenderJS };

package/library/cmd/cmd.d.ts

@@ -0,0 +1,6 @@
+import { Component } from "../../class/component";
+import { Controller } from "../../class/controller";
+import { ApiController } from "../../class/apiController";
+import ApiComponent from "../../class/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

@@ -0,0 +1,32 @@
+import { addLabel } from "../../core/utility/miscUtility";
+import { resolver_event } from "../../core/cmd/v-on";
+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";
+export function cmd(tagTemplate, proto, controller) {
+    //给所有元素添加上npm=tag标志
+    addLabel(tagTemplate.children, proto.getName());
+    //将元素事件绑定到元素上
+    resolver_event(tagTemplate.children, proto.getMethods(), controller.proxyForMethods);
+    //渲染html
+    resolver_html(tagTemplate.children, controller.proxyForMethods);
+    //渲染text
+    resolver_txt(tagTemplate.children, controller.proxyForMethods);
+    //绑定数据
+    resolver_model(tagTemplate.children, controller.proxyForMethods);
+    //渲染属性
+    resolver_bind(tagTemplate.children, controller.proxyForMethods);
+}
+export function cmdForUpdate(tagTemplate, proto, controller) {
+    //给所有元素添加上npm=tag标志
+    addLabel(tagTemplate.children, proto.getName());
+    //将元素事件绑定到元素上
+    resolver_event(tagTemplate.children, proto.getMethods(), controller.proxyForMethods);
+    //渲染html
+    resolver_html(tagTemplate.children, controller.proxyForMethods);
+    //渲染text
+    resolver_txt(tagTemplate.children, controller.proxyForMethods);
+    //绑定数据
+    resolver_model(tagTemplate.children, controller.proxyForMethods);
+}

package/library/inject/inject.d.ts

@@ -0,0 +1,2 @@
+import { Controller } from "../../class/controller";
+export declare function inject(controller: Controller, tagTemplate: Element): void;

package/library/inject/inject.js

@@ -0,0 +1,12 @@
+import { getCodeSpaceForProps, getCodeSpaceForQuery, getCodeSpaceForRef, } from "../../core/utility/injectUtility";
+import { resolveProps } from "../../core/resolver/props";
+import { resolve_Queries } from "../../core/resolver/query";
+import { resolver_Ref } from "../../core/cmd/v-ref";
+export function inject(controller, tagTemplate) {
+    //注入props
+    getCodeSpaceForProps(controller.raw_data, resolveProps(tagTemplate, controller.proto.getProps()));
+    //注入query
+    getCodeSpaceForQuery(controller.raw_data, resolve_Queries());
+    //注入ref
+    getCodeSpaceForRef(controller.raw_data, resolver_Ref(tagTemplate.children));
+}

package/library/loader/loader.d.ts

@@ -1 +1 @@
-export declare function loadStyle(data: string, tag: string): void;
+export declare function loadStyle(tag: string, theme: string, styleData: string): void;

package/library/loader/loader.js

@@ -1,10 +1,11 @@
 import { checkStyleLabel } from "../../core/utility/styleUtility";
-export function loadStyle(data, tag) {
+export function loadStyle(tag, theme, styleData) {
     if (!checkStyleLabel(tag)) {
         var style = document.createElement('style');
-        var text = document.createTextNode(data);
+        var text = document.createTextNode(styleData);
         style.appendChild(text);
         style.setAttribute("tag", tag.toUpperCase());
+        style.setAttribute("theme", theme);
         var head = document.getElementsByTagName('head')[0];
         head.appendChild(style);
     }

package/library/render/render.d.ts

@@ -0,0 +1,7 @@
+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

@@ -0,0 +1,118 @@
+import { Controller } from "../../class/controller";
+import { getCodeSpaceForCommit, getCodeSpaceForPublish, getCommitMethod, getPublishMethod } from "../../core/utility/injectUtility";
+import { getProxyObject } from "../../core/proxy/getProxy";
+import { findComponent } from "../../core/render/initRender";
+import { inject } 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);
+    //注入commit
+    getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
+    //注入receiver
+    getCodeSpaceForPublish(controller.raw_data, getPublishMethod(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");
+    parent.replaceChild(renderSpace, child);
+    while (tagTemplate.hasChildNodes()) {
+        renderSpace.append(tagTemplate.firstChild);
+    }
+    //afterRender
+    var afterRender = proto.getAfterRender().bind(controller.raw_data);
+    afterRender();
+    //指定渲染空间
+    controller.root = renderSpace;
+    link.to.push(controller);
+    //深度渲染
+    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);
+    //注入commit
+    getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
+    //注入receiver
+    getCodeSpaceForPublish(controller.raw_data, getPublishMethod(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");
+    controller.root = renderSpace;
+    parent.replaceChild(renderSpace, child);
+    while (tagTemplate.hasChildNodes()) {
+        renderSpace.append(tagTemplate.firstChild);
+    }
+    //afterRender
+    var afterRender = proto.getAfterRender().bind(controller.raw_data);
+    afterRender();
+    link.to.push(controller);
+    //深度渲染
+    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);
+    //注入commit
+    getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
+    //注入receiver
+    getCodeSpaceForPublish(controller.raw_data, getPublishMethod(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");
+    controller.root = renderSpace;
+    parent.replaceChild(renderSpace, child);
+    while (tagTemplate.hasChildNodes()) {
+        renderSpace.append(tagTemplate.firstChild);
+    }
+    //afterRender
+    var afterRender = proto.getAfterRender().bind(controller.raw_data);
+    afterRender();
+    link.to.push(controller);
+    //深度渲染
+    findComponent(controller.root.children, controller);
+}

package/library/style/style.d.ts

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

package/library/style/style.js

@@ -0,0 +1,12 @@
+// @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).get(theme) === undefined) {
+        console.log("tag:" + tag + "has no them" + theme);
+    }
+    else {
+        loadStyle(tag, theme, Reflect.get(window, "styleLib").get(tag).get(theme));
+    }
+}

package/library/template/template.d.ts

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

package/library/template/template.js

@@ -0,0 +1,9 @@
+export function getTemplate(proto) {
+    //生成DOM
+    var temp = document.createElement("div");
+    temp.innerHTML = proto.getTemplate();
+    var template = temp.getElementsByTagName("template")[0];
+    var content = template.content;
+    //获得模板元素
+    return content.firstElementChild;
+}

package/meta/meta.d.ts

@@ -1,4 +1,5 @@
 declare const _default: {
     version: string;
+    style: string;
 };
 export default _default;

package/meta/meta.js

@@ -1,3 +1,4 @@
 export default {
     version: "2.0.0",
+    style: "default"
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "render-core",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "The router for render-js",
   "main": "index.js",
   "types": "index.d.ts",
@@ -12,5 +12,9 @@
     "url": "https://github.com//render-js/render.git"
   },
   "author": "mutian",
-  "license": "MIT"
+  "license": "MIT",
+  "dependencies": {
+    "render-security": "^1.0.4",
+    "render-status": "^1.0.0"
+  }
 }

package/runtime/runtime.d.ts

@@ -1,2 +1,2 @@
-import { Component } from "../class/component";
-export declare function renderHtml(collection: HTMLCollection, tagLib: Map<string, Component>): void;
+import { PageController } from "../class/pageController";
+export declare function renderHtml(collection: HTMLCollection, link: PageController): void;

package/runtime/runtime.js

@@ -1,16 +1,16 @@
 import { isUnKnown } from "../core/utility/checkUtility";
-import { resolver } from "../core/utility/miscUtility";
+import { Render } from "../core/render/initRender";
 //检查元素是否为基元素
-export function renderHtml(collection, tagLib) {
+export function renderHtml(collection, link) {
     //遍历element节点，判断是否为自定义标签
     for (var i = 0; i < collection.length; i++) {
         if (isUnKnown(collection[i].nodeName.toUpperCase())) {
             //自定义标签
-            resolver(collection[i], tagLib);
+            Render(Reflect.get(window, "tagLib").get(collection[i].nodeName.toUpperCase()), collection[i].parentNode, collection[i], link);
         }
         else {
             //非自定义标签，深度解析
-            renderHtml(collection[i].children, tagLib);
+            renderHtml(collection[i].children, link);
         }
     }
 }

package/core/render/apiRender.d.ts

@@ -1,4 +0,0 @@
-import { Component } from "../../class/component";
-import ApiComponent from "../../class/apiComponent";
-import { ApiController } from "../../class/apiController";
-export declare function apiRender(proto: ApiComponent, parent: ParentNode, attr: string, tagLib: Map<string, Component>, link: ApiController): any;

package/core/render/apiRender.js

@@ -1,60 +0,0 @@
-import { loadStyle } from "../../library/loader/loader";
-import { addLabel } from "../utility/miscUtility";
-import { getProxyObjectForApi } from "../proxy/getProxy";
-import { ApiController } from "../../class/apiController";
-import { getApiCodeSpace, getCodeSpaceForRef } from "../utility/injectUtility";
-import { findComponent } from "./initRender";
-import { resolver_Ref } from "../cmd/v-ref";
-import { resolver_html } from "../cmd/v-html";
-import { resolver_txt } from "../cmd/v-txt";
-import { resolver_model } from "../cmd/v-model";
-import { resolver_bind } from "../cmd/v-bind";
-import { resolver_event } from "../cmd/v-on";
-//渲染自定义标签
-export function apiRender(proto, parent, attr, tagLib, link) {
-    //获取控制对象
-    var apiController = new ApiController();
-    apiController.proto = proto;
-    //复制原始数据对象到控制对象
-    apiController.raw_data = Object.create(proto.getData());
-    //数据渲染对象
-    apiController.proxyForMethods = getProxyObjectForApi(apiController.raw_data, apiController);
-    //beforeRender
-    var beforeRender = proto.getBeforeRender().bind(apiController.raw_data);
-    beforeRender();
-    //Render
-    var temp = document.createElement("div");
-    temp.innerHTML = proto.getTemplate();
-    var template = temp.getElementsByTagName("template")[0];
-    var content = template.content;
-    //获取到模板
-    var tagTemplate = content.firstElementChild;
-    addLabel(tagTemplate.children, proto.getName());
-    resolver_event(tagTemplate.children, proto.getMethods(), apiController.proxyForMethods);
-    resolver_html(tagTemplate.children, apiController.proxyForMethods);
-    resolver_txt(tagTemplate.children, apiController.proxyForMethods);
-    resolver_model(tagTemplate.children, apiController.proxyForMethods);
-    resolver_bind(tagTemplate.children, apiController.proxyForMethods);
-    //获取到模板样式
-    var tagStyle = content.lastElementChild;
-    loadStyle(tagStyle.childNodes[0].nodeValue, proto.getName());
-    //注入ref
-    getCodeSpaceForRef(apiController.raw_data, resolver_Ref(tagTemplate.children));
-    //mount
-    while (parent.hasChildNodes()) {
-        parent.removeChild(parent.firstChild);
-    }
-    while (tagTemplate.hasChildNodes()) {
-        parent.append(tagTemplate.firstChild);
-    }
-    //afterRender
-    var afterRender = proto.getAfterRender().bind(apiController.raw_data);
-    afterRender();
-    //切换根组件
-    apiController.root = parent;
-    //深度渲染
-    findComponent(tagTemplate.children, tagLib, link);
-    //返回api对象
-    getApiCodeSpace(apiController.raw_data, proto.getMethods());
-    return apiController.raw_data;
-}

package/core/render/depthRender.d.ts

@@ -1,5 +0,0 @@
-import { Controller } from "../../class/controller";
-import { Component } from "../../class/component";
-import { ApiController } from "../../class/apiController";
-export declare function depthRender(proto: Component, parent: ParentNode, child: Element, tagLib: Map<string, Component>, link: Controller | ApiController): void;
-export declare function depthFindComponent(collection: HTMLCollection, tagLib: Map<string, Component>, link: Controller | ApiController): void;

package/core/render/depthRender.js

@@ -1,198 +0,0 @@
-import { loadStyle } from "../../library/loader/loader";
-import { addLabel } from "../utility/miscUtility";
-import { getProxyForInject, getProxyObject } from "../proxy/getProxy";
-import { Controller } from "../../class/controller";
-import { getCodeSpaceForCommit, getCodeSpaceForProps, getCodeSpaceForPublish, getCodeSpaceForQuery, getCodeSpaceForRef, getCommitMethod, getPublishMethod, } from "../utility/injectUtility";
-import { resolveProps } from "../resolver/props";
-import { resolve_Queries, } from "../resolver/query";
-import { resolver_event } from "../cmd/v-on";
-import { resolver_html } from "../cmd/v-html";
-import { resolver_txt } from "../cmd/v-txt";
-import { resolver_model } from "../cmd/v-model";
-import { resolver_Ref } from "../cmd/v-ref";
-import { isUnKnown } from "../utility/checkUtility";
-import { resolver_bind } from "../cmd/v-bind";
-//渲染自定义标签
-export function depthRender(proto, parent, child, tagLib, link) {
-    //生成DOM
-    var temp = document.createElement("div");
-    temp.innerHTML = proto.getTemplate();
-    var template = temp.getElementsByTagName("template")[0];
-    var content = template.content;
-    //获得模板元素
-    var tagTemplate = content.firstElementChild;
-    //解析元素上的静态属性
-    var props = resolveProps(tagTemplate, proto);
-    //获得模板样式元素
-    var tagStyle = content.lastElementChild;
-    //向head位置添加该组件的样式
-    loadStyle(tagStyle.childNodes[0].nodeValue, proto.getName());
-    //两种渲染方式
-    if (child.hasAttribute("name")) {
-        if (link.link.has(child.getAttribute("name"))) {
-            //获取控制对象
-            var controller = new Controller();
-            controller.proto = proto;
-            //复制原始数据对象到控制对象
-            controller.raw_data = link.link.get(child.getAttribute("name"));
-            //注入props
-            getCodeSpaceForProps(controller.raw_data, resolveProps(tagTemplate.firstElementChild, controller.proto.getProps()));
-            //注入query
-            getCodeSpaceForQuery(controller.raw_data, resolve_Queries());
-            //注入ref
-            getCodeSpaceForRef(controller.raw_data, resolver_Ref(tagTemplate.children));
-            //数据渲染对象
-            controller.proxyForMethods = getProxyObject(controller.raw_data, controller);
-            //注入commit
-            getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
-            //注入receiver
-            getCodeSpaceForPublish(controller.raw_data, getPublishMethod(controller));
-            //beforeRender
-            var beforeRender = proto.getBeforeRender().bind(controller.raw_data);
-            beforeRender();
-            //给所有元素添加上npm=tag标志
-            addLabel(tagTemplate.children, proto.getName());
-            //将元素事件绑定到元素上
-            resolver_event(tagTemplate.children, proto.getMethods(), controller.proxyForMethods);
-            //渲染html
-            resolver_html(tagTemplate.children, controller.proxyForMethods);
-            //渲染text
-            resolver_txt(tagTemplate.children, controller.proxyForMethods);
-            //绑定数据
-            resolver_model(tagTemplate.children, controller.proxyForMethods);
-            //渲染属性
-            resolver_bind(tagTemplate.children, controller.proxyForMethods);
-            //beforeMount
-            var beforeMount = proto.getBeforeMount().bind(controller.raw_data);
-            beforeMount();
-            //mount
-            var renderSpace = document.createElement("div");
-            parent.replaceChild(renderSpace, child);
-            while (tagTemplate.hasChildNodes()) {
-                renderSpace.append(tagTemplate.firstChild);
-            }
-            //afterRender
-            var afterRender = proto.getAfterRender().bind(controller.raw_data);
-            afterRender();
-            //指定渲染空间
-            controller.root = renderSpace;
-            link.to.push(controller);
-            //深度渲染
-            depthFindComponent(tagTemplate.children, tagLib, controller);
-        }
-        else {
-            //获取控制对象
-            var controller = new Controller();
-            controller.proto = proto;
-            controller.preRender = true;
-            //复制原始数据对象到控制对象
-            controller.raw_data = Object.create(proto.getData());
-            //注入props
-            getCodeSpaceForProps(controller.raw_data, resolveProps(tagTemplate.firstElementChild, controller.proto.getProps()));
-            //注入query
-            getCodeSpaceForQuery(controller.raw_data, resolve_Queries());
-            //注入ref
-            getCodeSpaceForRef(controller.raw_data, resolver_Ref(tagTemplate.children));
-            //数据渲染对象
-            controller.proxyForMethods = getProxyObject(controller.raw_data, controller);
-            getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
-            //注入receiver
-            getCodeSpaceForPublish(controller.raw_data, getPublishMethod(controller));
-            //beforeRender
-            var beforeRender = proto.getBeforeRender().bind(controller.raw_data);
-            beforeRender();
-            //给所有元素添加上npm=tag标志
-            addLabel(tagTemplate.children, proto.getName());
-            //将元素事件绑定到元素上
-            resolver_event(tagTemplate.children, proto.getMethods(), controller.proxyForMethods);
-            //渲染html
-            resolver_html(tagTemplate.children, controller.proxyForMethods);
-            //渲染text
-            resolver_txt(tagTemplate.children, controller.proxyForMethods);
-            //绑定数据
-            resolver_model(tagTemplate.children, controller.proxyForMethods);
-            //渲染属性
-            resolver_bind(tagTemplate.children, controller.proxyForMethods);
-            //beforeMount
-            var beforeMount = proto.getBeforeMount().bind(controller.raw_data);
-            beforeMount();
-            //mount
-            var renderSpace = document.createElement("div");
-            controller.root = renderSpace;
-            parent.replaceChild(renderSpace, child);
-            while (tagTemplate.hasChildNodes()) {
-                renderSpace.append(tagTemplate.firstChild);
-            }
-            //afterRender
-            var afterRender = proto.getAfterRender().bind(controller.raw_data);
-            afterRender();
-            if (controller.preRender) {
-                link.link.set(child.getAttribute("name"), controller.raw_data);
-            }
-            link.to.push(controller);
-            //深度渲染
-            depthFindComponent(controller.root.children, tagLib, controller);
-        }
-    }
-    else {
-        //获取控制对象
-        var controller = new Controller();
-        controller.proto = proto;
-        //复制原始数据对象到控制对象
-        controller.raw_data = Object.create(proto.getData());
-        //数据渲染对象
-        controller.proxyForMethods = getProxyObject(controller.raw_data, controller);
-        //注入commit
-        getCodeSpaceForCommit(controller.raw_data, getCommitMethod(link));
-        //注入receiver
-        getCodeSpaceForPublish(controller.raw_data, getPublishMethod(controller));
-        //beforeRender
-        var beforeRender = proto.getBeforeRender().bind(controller.raw_data);
-        beforeRender();
-        //注入props
-        getCodeSpaceForProps(controller.raw_data, getProxyForInject(props));
-        //注入query
-        getCodeSpaceForQuery(controller.raw_data, resolve_Queries());
-        //注入ref
-        getCodeSpaceForRef(controller.raw_data, resolver_Ref(tagTemplate.children));
-        //给所有元素添加上npm=tag标志
-        addLabel(tagTemplate.children, proto.getName());
-        //将元素事件绑定到元素上
-        resolver_event(tagTemplate.children, proto.getMethods(), controller.proxyForMethods);
-        //渲染html
-        resolver_html(tagTemplate.children, controller.proxyForMethods);
-        //渲染text
-        resolver_txt(tagTemplate.children, controller.proxyForMethods);
-        //绑定数据
-        resolver_model(tagTemplate.children, controller.proxyForMethods);
-        //渲染属性
-        resolver_bind(tagTemplate.children, controller.proxyForMethods);
-        //beforeMount
-        var beforeMount = proto.getBeforeMount().bind(controller.raw_data);
-        beforeMount();
-        //mount
-        var renderSpace = document.createElement("div");
-        controller.root = renderSpace;
-        parent.replaceChild(renderSpace, child);
-        while (tagTemplate.hasChildNodes()) {
-            renderSpace.append(tagTemplate.firstChild);
-        }
-        //afterRender
-        var afterRender = proto.getAfterRender().bind(controller.raw_data);
-        afterRender();
-        link.to.push(controller);
-        //深度渲染
-        depthFindComponent(controller.root.children, tagLib, controller);
-    }
-}
-//继续渲染
-export function depthFindComponent(collection, tagLib, link) {
-    for (var i = 0; i < collection.length; i++) {
-        if (isUnKnown(collection[i].nodeName)) {
-            depthRender(tagLib.get(collection[i].nodeName.toUpperCase()), collection[i].parentNode, collection[i], tagLib, link);
-        }
-        else {
-            depthFindComponent(collection[i].children, tagLib, link);
-        }
-    }
-}