render-core 1.4.25 → 1.4.31

package/index.d.ts

@@ -60,15 +60,15 @@ export declare class Component extends AbstractComponent {
 export declare class RenderJS implements RenderGeneric {
     contextController: ContextController;
     constructor();
-    /**
-     * This func is used to execute plugins
-     */
-    use_plugin(plugin: PluginGeneric): void;
     /**
      * This unc is used to register component to system
      * @param component
      */
     add_tag(component: Component): void;
+    /**
+     * This func is used to execute plugins
+     */
+    use_plugin(plugin: PluginGeneric): void;
     /**
      * This func is used to work under the route mode
      */

package/index.js

@@ -21,6 +21,8 @@ import { AbstractComponent } from "./tension/prototype/AbstractComponent";
 import { set_context_controller } from "./system/recorder/table0/system_func_0";
 import { PrefaceAction } from "./tension/prototype/PrefaceAction";
 import { SystemInitPlugin } from "./tension/SystemInitPlugin";
+import { lintComponent } from "./verify/directive-linter";
+import { errorDisplay } from "./system/output/errorUtility";
 /**
  * This class is used to prototype the properties type
  */
@@ -84,27 +86,23 @@ var RenderJS = /** @class */ (function () {
         /* init the basis extension */
         this.use_plugin(new SystemInitPlugin());
     }
-    /**
-     * This func is used to execute plugins
-     */
-    RenderJS.prototype.use_plugin = function (plugin) {
-        plugin.plugin(new PrefaceAction(), new HooksAction());
-    };
     /**
      * This unc is used to register component to system
      * @param component
      */
     RenderJS.prototype.add_tag = function (component) {
-        // let errors:LintError[]  = lintComponent(component);
-        // if (errors.length > 0) {
-        //     errors.map(error => {
-        //         errorDisplay(component.getName(), error);
-        //     })
-        // }else {
-        //     registerTagLib(component);
-        // }
+        var errors = lintComponent(component);
+        errors.map(function (error) {
+            errorDisplay(component.getName(), error);
+        });
         registerTagLib(component);
     };
+    /**
+     * This func is used to execute plugins
+     */
+    RenderJS.prototype.use_plugin = function (plugin) {
+        plugin.plugin(new PrefaceAction(), new HooksAction());
+    };
     /**
      * This func is used to work under the route mode
      */

package/kernel/directive/slot/v-slot.d.ts

@@ -0,0 +1,13 @@
+import { ContextController } from "../../../system/prototype/ContextController";
+/**
+ * 此函数用于解析自定义元素salt
+ * @param tagTemplate
+ * @param controller
+ */
+export declare function parse_directive_salt_collect(tagTemplate: ChildNode, controller: ContextController): void;
+/**
+ * 此函数用于展开salt
+ * @param elements
+ * @param controller
+ */
+export declare function parse_directive_salt_extract(elements: HTMLCollection, controller: ContextController): void;

package/kernel/directive/slot/v-slot.js

@@ -0,0 +1,46 @@
+/**
+ * 此函数用于解析自定义元素salt
+ * @param tagTemplate
+ * @param controller
+ */
+export function parse_directive_salt_collect(tagTemplate, controller) {
+    if (tagTemplate.hasChildNodes()) {
+        // @ts-ignore
+        var list = tagTemplate.querySelectorAll("slot");
+        if (list.length !== 0) {
+            list.forEach(function (value) {
+                if (value.hasAttribute("name"))
+                    controller.salt.set(value.getAttribute("name"), value.innerHTML);
+                else
+                    controller.salt.set("default", value.innerHTML);
+            });
+        }
+        else {
+            // @ts-ignore
+            controller.salt.set("default", tagTemplate.innerHTML);
+        }
+    }
+}
+/**
+ * 此函数用于展开salt
+ * @param elements
+ * @param controller
+ */
+export function parse_directive_salt_extract(elements, controller) {
+    for (var i = 0; i < elements.length; i++) {
+        var result = elements[i].hasAttribute("@slot");
+        if (result) {
+            var dataName = elements[i].getAttribute("@slot");
+            elements[i].removeAttribute("@slot");
+            if (!dataName) {
+                elements[i].innerHTML = controller.salt.get("default");
+            }
+            else {
+                // @ts-ignore
+                elements[i].innerHTML = controller.solt.get(dataName);
+            }
+        }
+        //深度解析
+        parse_directive_salt_extract(elements[i].children, controller);
+    }
+}

package/kernel/renderer/initRender.js

@@ -9,7 +9,7 @@ import { loader_tag_style } from "../../system/utility/style/styleUtility";
 import { get_style_library } from "../../system/recorder/table0/system_func_0";
 import { get_proxy_for_computed, get_proxy_for_method, get_proxy_for_watcher } from "../proxyer/getProxy";
 import { get_commit_method, get_getter_method, get_publish_method, get_setter_method } from "../../system/injection/injection";
-import { parse_directive_salt_collect } from "../directive/salt/v-solt";
+import { parse_directive_salt_collect } from "../directive/slot/v-slot";
 /**
  * 该函数用于处理需要更更新时候，需要从父组件提取数据状态的渲染操作
  * @param protoType

package/kernel/renderer/postRender.js

@@ -4,7 +4,7 @@ import { archive_mount, extract_mount } from "../../system/lifecycle/mount";
 import { inject_$commit_to_data, inject_$getter_to_data, inject_$http_to_data, inject_$name_to_data, inject_$pathVariable_to_data, inject_$plugins_to_data, inject_$props_to_data, inject_$publish_to_data, inject_$refs_to_data, inject_$setter_to_data, inject_computed_to_controller, inject_method_to_data, inject_watcher_to_controller, } from "../../system/injection/injector";
 import { after_process_for_post } from "../../system/lifecycle/lifeCycle";
 import { findComponent } from "../delivery/delivery";
-import { parse_directive_salt_collect } from "../directive/salt/v-solt";
+import { parse_directive_salt_collect } from "../directive/slot/v-slot";
 import { getTemplate } from "../../system/utility/initiate/templateUtility";
 import { loader_tag_style } from "../../system/utility/style/styleUtility";
 import { get_style_library } from "../../system/recorder/table0/system_func_0";

package/kernel/renderer/rawRender.js

@@ -4,7 +4,7 @@ import { archive_mount, extract_mount } from "../../system/lifecycle/mount";
 import { inject_$commit_to_data, inject_$getter_to_data, inject_$http_to_data, inject_$name_to_data, inject_$pathVariable_to_data, inject_$plugins_to_data, inject_$props_to_data, inject_$publish_to_data, inject_$refs_to_data, inject_$setter_to_data, inject_computed_to_controller, inject_method_to_data, inject_watcher_to_controller, } from "../../system/injection/injector";
 import { after_process_for_post } from "../../system/lifecycle/lifeCycle";
 import { findComponent } from "../delivery/delivery";
-import { parse_directive_salt_collect } from "../directive/salt/v-solt";
+import { parse_directive_salt_collect } from "../directive/slot/v-slot";
 import { getTemplate } from "../../system/utility/initiate/templateUtility";
 import { loader_tag_style } from "../../system/utility/style/styleUtility";
 import { get_style_library } from "../../system/recorder/table0/system_func_0";

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "render-core",
-  "version": "1.4.25",
+  "version": "1.4.31",
   "description": "The extendable javascript web framework",
   "main": "index.js",
   "types": "index.d.ts",
-  "scripts": {
-    "build": "tsc"
-  },
   "repository": {
     "type": "git",
     "url": "https://github.com//render-js/render-core.git"
@@ -15,8 +12,5 @@
     "name": "mutian-xiangcai",
     "email": "mutian_xiangcai@outlook.com"
   },
-  "license": "MIT",
-  "devDependencies": {
-    "typescript": "^5.8.3"
-  }
+  "license": "MIT"
 }

package/system/utility/directive/cmdUtility.js

@@ -9,7 +9,7 @@ import { parse_directive_render } from "../../../kernel/directive/justify/v-rend
 import { parse_directive_if } from "../../../kernel/directive/justify/v-if";
 import { parse_directive_switch } from "../../../kernel/directive/justify/v-switch";
 import { parse_directive_for_of } from "../../../kernel/directive/loop/v-array";
-import { parse_directive_salt_extract } from "../../../kernel/directive/salt/v-solt";
+import { parse_directive_salt_extract } from "../../../kernel/directive/slot/v-slot";
 import { parse_directive_expression } from "../../../kernel/directive/data/v-el";
 import { parse_directive_for_map } from "../../../kernel/directive/loop/v-map";
 /**

package/system/utility/initiate/miscUtility.js

@@ -1,3 +1,4 @@
+import { hashName } from "../style/styleUtility";
 /**
  * This func used to add tag label to the content of the user tag
  * @param nodes
@@ -5,7 +6,7 @@
  */
 export function add_label_to_element(nodes, component) {
     for (var i = 0; i < nodes.length; i++) {
-        nodes[i].setAttribute("cpn", component);
+        nodes[i].setAttribute("v-data", hashName(component));
         var kk = nodes[i].children;
         add_label_to_element(kk, component);
     }

package/system/utility/style/styleUtility.d.ts

@@ -27,3 +27,14 @@ export declare function changeStyle(tag: string, theme: string): void;
  * @param theme
  */
 export declare function changeTheme(theme: string): void;
+/**
+ * 给 CSS 中所有选择器添加 V-data 属性选择器
+ * @param {string} cssText - 原始 CSS 字符串
+ * @param {string} salt - 盐值
+ * @returns {string} 处理后的 CSS 字符串
+ */
+/**
+ * Simple synchronous string hash (djb2) — used to produce a unique salt per component name.
+ */
+export declare function hashName(name: string): string;
+export declare function style_slot_func(cssText: string, salt: string): string;

package/system/utility/style/styleUtility.js

@@ -29,7 +29,7 @@ export function themeStyle(component, styleLib) {
     var styles = dom.getElementsByTagName("template")[0].content.querySelectorAll("style");
     var componentStyleList = new Map();
     for (var i = 0; i < styles.length; i++) {
-        componentStyleList.set(styles[i].getAttribute("theme"), styles[i].innerText);
+        componentStyleList.set(styles[i].getAttribute("theme"), style_slot_func(styles[i].innerText, hashName(component.getName())));
     }
     styleLib.set(component.getName().toUpperCase(), componentStyleList);
 }
@@ -64,7 +64,7 @@ export function loader_tag_style(tag, styleLib) {
 export function changeStyle(tag, theme) {
     var styleTxt = get_style_library().get(tag.toUpperCase()).get(theme);
     if (styleTxt === undefined) {
-        console.log("Dont`t find this style!");
+        console.log("Don`t find this style!");
     }
     else {
         var style = document.createElement('style');
@@ -100,3 +100,44 @@ export function changeTheme(theme) {
     });
     set_theme_style(theme);
 }
+/**
+ * 给 CSS 中所有选择器添加 V-data 属性选择器
+ * @param {string} cssText - 原始 CSS 字符串
+ * @param {string} salt - 盐值
+ * @returns {string} 处理后的 CSS 字符串
+ */
+/**
+ * Simple synchronous string hash (djb2) — used to produce a unique salt per component name.
+ */
+export function hashName(name) {
+    var hash = 0;
+    for (var i = 0; i < name.length; i++) {
+        hash = ((hash << 5) - hash) + name.charCodeAt(i);
+        hash |= 0;
+    }
+    return Math.abs(hash).toString(16);
+}
+export function style_slot_func(cssText, salt) {
+    if (!cssText || !salt)
+        return cssText;
+    // 正则匹配：选择器部分 { 声明部分 }
+    // 注意：这里不处理嵌套规则（如 @media 内部的选择器），如果需要可以调整
+    return cssText.replace(/([^{]+)(\{)/g, function (match, selectors, brace) {
+        // 如果是 @ 开头的规则，不处理
+        if (selectors.trim().startsWith('@')) {
+            return match;
+        }
+        // 将每个选择器（以逗号分隔）都加上 [V-data="salt"]
+        var newSelectors = selectors
+            .split(',')
+            .map(function (sel) {
+            var trimmed = sel.trim();
+            if (!trimmed)
+                return '';
+            return "".concat(trimmed, "[v-data=\"").concat(salt, "\"]");
+        })
+            .filter(function (s) { return s; })
+            .join(', ');
+        return newSelectors + brace;
+    });
+}

package/kernel/directive/loop/v-for-utility.d.ts

@@ -1,14 +0,0 @@
-/**
- * 遍历根元素
- * @param element
- * @param index
- * @param data
- */
-export declare function resolver_array_single(element: Element, index: number, data: any): void;
-/**
- * 遍历根元素的子元素
- * @param elements
- * @param index
- * @param data
- */
-export declare function parse_directive_array_multi(elements: HTMLCollection, index: number, data: any): void;

package/kernel/directive/loop/v-for-utility.js

@@ -1,58 +0,0 @@
-import { resolver_map_single } from "./v-map-utility";
-/**
- * 遍历根元素
- * @param element
- * @param index
- * @param data
- */
-export function resolver_array_single(element, index, data) {
-    //解析data
-    if (element.hasAttribute("@data")) {
-        element.removeAttribute("@data");
-        // @ts-ignore
-        element.innerText = data;
-    }
-    //解析index
-    if (element.hasAttribute("@index")) {
-        element.removeAttribute("@index");
-        // @ts-ignore
-        element.innerText = index;
-    }
-    parse_directive_array_multi(element.children, index, data);
-}
-/**
- * 遍历根元素的子元素
- * @param elements
- * @param index
- * @param data
- */
-export function parse_directive_array_multi(elements, index, data) {
-    //渲染模板子元素
-    for (var i = 0; i < elements.length; i++) {
-        //渲染文档
-        if (elements[i].hasAttribute("@for-document")) {
-            elements[i].removeAttribute("@for-document");
-            resolver_map_single(elements[i], data);
-        }
-        //渲染信息
-        if (elements[i].hasAttribute("@for-message")) {
-            var data_index = elements[i].getAttribute("@for-message");
-            elements[i].removeAttribute("@for-message");
-            // @ts-ignore
-            elements[i].innerText = data[data_index];
-        }
-        //解析data
-        if (elements[i].hasAttribute("@data")) {
-            elements[i].removeAttribute("@data");
-            // @ts-ignore
-            elements[i].innerText = data;
-        }
-        //解析index
-        if (elements[i].hasAttribute("@index")) {
-            elements[i].removeAttribute("@index");
-            // @ts-ignore
-            elements[i].innerText = index;
-        }
-        parse_directive_array_multi(elements[i].children, index, data);
-    }
-}

package/kernel/directive/loop/v-for.d.ts

@@ -1,22 +0,0 @@
-/**
- * 展开数据
- * @param elements
- * @param data
- */
-export declare function parse_directive_for_of(elements: HTMLCollection, data: {}): void;
-/**
- *
- * @param baseRoot
- * @param temp
- * @param index
- * @param data
- */
-export declare function extractForArray(baseRoot: ParentNode, temp: Node, index: number, data: any): void;
-/**
- * 该函数用于处理数组类型数据的展开
- * @param baseRoot
- * @param temp
- * @param index
- * @param data
- */
-export declare function part_render_array(baseRoot: ParentNode, temp: Node, index: number, data: any): void;

package/kernel/directive/loop/v-for.js

@@ -1,64 +0,0 @@
-import { resolver_array_single } from "./v-for-utility";
-/**
- * 展开数据
- * @param elements
- * @param data
- */
-export function parse_directive_for_of(elements, data) {
-    var _loop_1 = function (i) {
-        var result = elements[i].hasAttribute("@for");
-        if (result) {
-            var dataName = elements[i].getAttribute("@for");
-            elements[i].removeAttribute("@for");
-            if (data[dataName] instanceof Array) {
-                data[dataName].forEach(function (value, index) {
-                    //从数组中取出一条信息，然后开始渲染
-                    extractForArray(elements[i].parentNode, elements[i], index, value);
-                    i++;
-                });
-                //将模板节点删除
-                elements[i].parentNode.removeChild(elements[i]);
-                //重新回到原来的索引值
-                i--;
-            }
-            else {
-                console.log("Instruction @for need an array datatype to extract!");
-            }
-        }
-        if (elements[i]) {
-            parse_directive_for_of(elements[i].children, data);
-        }
-        out_i_1 = i;
-    };
-    var out_i_1;
-    for (var i = 0; i < elements.length; i++) {
-        _loop_1(i);
-        i = out_i_1;
-    }
-}
-/**
- *
- * @param baseRoot
- * @param temp
- * @param index
- * @param data
- */
-export function extractForArray(baseRoot, temp, index, data) {
-    //将渲染出来的数据模板插入到根元素下
-    part_render_array(baseRoot, temp, index, data);
-}
-/**
- * 该函数用于处理数组类型数据的展开
- * @param baseRoot
- * @param temp
- * @param index
- * @param data
- */
-export function part_render_array(baseRoot, temp, index, data) {
-    // @ts-ignore
-    var clone = temp.cloneNode(true);
-    // @ts-ignore
-    resolver_array_single(clone, index, data);
-    //插入模板节点
-    baseRoot.insertBefore(clone, temp);
-}