render-core 1.4.30 → 1.4.32

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

@@ -1,4 +1,4 @@
-import { Component } from "../../../index";
+import { AdjustComponent, ControlComponent } from "../../../index";
 /**
  *
  * @param tag
@@ -9,7 +9,7 @@ export declare function checkStyleLabel(tag: string): boolean;
  * @param component
  * @param styleLib
  */
-export declare function themeStyle(component: Component, styleLib: Map<string, object>): void;
+export declare function themeStyle(component: AdjustComponent | ControlComponent, styleLib: Map<string, object>): void;
 /**
  * Here is the function to resolve
  * @param tag
@@ -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/tension/SystemInitPlugin.js

@@ -1,4 +1,4 @@
-import { HttpAction } from "../system/prototype/HttpAction";
+import { HttpAction } from "../system/generic/controller/prototype/HttpAction";
 /**
  *
  */

package/tension/generic/plugin/hooks/HooksGeneric.d.ts

@@ -1,6 +1,4 @@
-import { Component } from "../../../../index";
 export interface HooksGeneric {
     changeStyle(tag: string, theme: string): void;
     changeTheme(theme: string): void;
-    directDelivery(component: Component): void;
 }

package/tension/generic/plugin/preface/PrefaceGeneric.d.ts

@@ -1,11 +1,11 @@
-import { HttpAction } from "../../../../system/prototype/HttpAction";
-import { Component } from "../../../../index";
+import { HttpAction } from "../../../../system/generic/controller/prototype/HttpAction";
+import { AdjustComponent, ControlComponent } from "../../../../index";
 import { RouterGeneric } from "../../router/RouterGeneric";
 export interface PrefaceGeneric {
     add_system_router(router: RouterGeneric): void;
     add_user_http(http: HttpAction): void;
     add_anonymous_extension(name: string, plugin: object): void;
     add_anonymous_filed(name: string, value: any): void;
-    register_component(component: Component): void;
+    register_component(component: AdjustComponent | ControlComponent): void;
     set_field_route_mode(value: boolean): void;
 }

package/tension/generic/router/RouterGeneric.d.ts

@@ -1,5 +1,8 @@
-import { Component } from "../../../index";
+import { PageComponent } from "../../../index";
 export interface RouterGeneric {
-    getComponent(): Component;
-    getPathVariable(): Map<string, any>;
+    getComponent(): {
+        params: Map<string, any>;
+        pathParams: Map<string, any>;
+        component: PageComponent;
+    };
 }

package/tension/prototype/HooksAction.d.ts

@@ -1,7 +1,5 @@
 import { HooksGeneric } from "../generic/plugin/hooks/HooksGeneric";
-import { Component } from "../../index";
 export declare class HooksAction implements HooksGeneric {
     changeStyle(tag: string, theme: string): void;
     changeTheme(theme: string): void;
-    directDelivery(component: Component): void;
 }

package/tension/prototype/HooksAction.js

@@ -1,5 +1,4 @@
 import { changeStyle, changeTheme } from "../../system/utility/style/styleUtility";
-import { direct_delivery } from "../../kernel/delivery/delivery";
 var HooksAction = /** @class */ (function () {
     function HooksAction() {
     }
@@ -11,9 +10,6 @@ var HooksAction = /** @class */ (function () {
     HooksAction.prototype.changeTheme = function (theme) {
         changeTheme(theme);
     };
-    HooksAction.prototype.directDelivery = function (component) {
-        direct_delivery(component);
-    };
     return HooksAction;
 }());
 export { HooksAction };

package/tension/prototype/PrefaceAction.d.ts

@@ -1,12 +1,12 @@
 import { PrefaceGeneric } from "../generic/plugin/preface/PrefaceGeneric";
-import { Component } from "../../index";
-import { HttpAction } from "../../system/prototype/HttpAction";
+import { AdjustComponent, ControlComponent } from "../../index";
+import { HttpAction } from "../../system/generic/controller/prototype/HttpAction";
 import { RouterGeneric } from "../generic/router/RouterGeneric";
 export declare class PrefaceAction implements PrefaceGeneric {
     add_anonymous_extension(name: string, plugin: object): void;
     add_anonymous_filed(name: string, value: any): void;
     add_system_router(router: RouterGeneric): void;
     add_user_http(http: HttpAction): void;
-    register_component(component: Component): void;
+    register_component(component: AdjustComponent | ControlComponent): void;
     set_field_route_mode(value: boolean): void;
 }

package/verify/directive-linter.d.ts

@@ -1,4 +0,0 @@
-import { Component } from "../index";
-import LintError from "./generic/lintError";
-export declare function lintComponent(component: Component): LintError[];
-export declare function lintComponents(components: Component[]): Map<string, LintError[]>;

package/verify/directive-linter.js

@@ -1,123 +1,152 @@
-var BOOLEAN_CONDITION_DIRECTIVES = ["@if", "@show"];
-var ARRAY_ITERATION_DIRECTIVES = ["@for", "@map"];
-var MODEL_ELEMENT = ["INPUT", "SELECT", "TEXTAREA"];
-function parseTemplateForDirectives(template) {
-    var directives = [];
-    var lines = template.split("\n");
-    for (var lineIndex = 0; lineIndex < lines.length; lineIndex++) {
-        var line = lines[lineIndex];
-        var directiveRegex = /@(\w+)(?:\s*=\s*"([^"]*)"|\s*=\s*'([^']*)')?/g;
-        var match = void 0;
-        while ((match = directiveRegex.exec(line)) !== null) {
-            var directiveName = match[1];
-            var expression = match[2] || match[3] || "";
-            var elementMatch = line.match(/<(\w+)/);
-            var element = elementMatch ? elementMatch[1] : "unknown";
-            directives.push({
-                directive: "@".concat(directiveName),
-                expression: expression,
-                element: element.toUpperCase(),
-                line: lineIndex + 1,
-                column: match.index + 1
-            });
-        }
-    }
-    return directives;
-}
-function inferType(value) {
-    if (value === true || value === false)
-        return "boolean";
-    if (Array.isArray(value))
-        return "array";
-    if (typeof value === "number")
-        return "number";
-    if (typeof value === "string")
-        return "string";
-    if (typeof value === "object" && value !== null)
-        return "object";
-    if (value === null)
-        return "null";
-    return "unknown";
-}
-function getDataTypes(component) {
-    var types = new Map();
-    var data = component.getData();
-    if (data && typeof data === "object") {
-        Object.keys(data).forEach(function (key) {
-            types.set(key, inferType(data[key]));
-        });
-    }
-    return types;
-}
-function validateBooleanCondition(directive, component) {
-    var dataTypes = getDataTypes(component);
-    var actualType = dataTypes.get(directive.expression);
-    if (actualType && actualType !== "boolean") {
-        return {
-            rule: "boolean-condition",
-            message: "Directive '".concat(directive.directive, "' expects boolean but '").concat(directive.expression, "' is ").concat(actualType),
-            line: directive.line,
-            column: directive.column
-        };
-    }
-    return null;
-}
-function validateArrayIteration(directive, component) {
-    var dataTypes = getDataTypes(component);
-    var actualType = dataTypes.get(directive.expression);
-    if (actualType && actualType !== "array") {
-        return {
-            rule: "array-iteration",
-            message: "Directive '".concat(directive.directive, "' expects array but '").concat(directive.expression, "' is ").concat(actualType),
-            line: directive.line,
-            column: directive.column
-        };
-    }
-    return null;
-}
-function validateModelElement(directive, component) {
-    if (MODEL_ELEMENT.indexOf(directive.element) === -1) {
-        return {
-            rule: "valid-model-element",
-            message: "Directive '@model' can only be used on INPUT, SELECT, or TEXTAREA, but found '".concat(directive.element, "'"),
-            line: directive.line,
-            column: directive.column
-        };
-    }
-    return null;
-}
-export function lintComponent(component) {
-    var errors = [];
-    var template = component.getTemplate();
-    var directives = parseTemplateForDirectives(template);
-    for (var _i = 0, directives_1 = directives; _i < directives_1.length; _i++) {
-        var directive = directives_1[_i];
-        if (BOOLEAN_CONDITION_DIRECTIVES.indexOf(directive.directive) !== -1) {
-            var error = validateBooleanCondition(directive, component);
-            if (error)
-                errors.push(error);
-        }
-        if (ARRAY_ITERATION_DIRECTIVES.indexOf(directive.directive) !== -1) {
-            var error = validateArrayIteration(directive, component);
-            if (error)
-                errors.push(error);
-        }
-        if (directive.directive === "@model") {
-            var error = validateModelElement(directive, component);
-            if (error)
-                errors.push(error);
-        }
-    }
-    return errors;
-}
-export function lintComponents(components) {
-    var allErrors = new Map();
-    for (var _i = 0, components_1 = components; _i < components_1.length; _i++) {
-        var component = components_1[_i];
-        var errors = lintComponent(component);
-        if (errors.length > 0) {
-            allErrors.set(component.getName(), errors);
-        }
-    }
-    return allErrors;
-}
+// import {Component} from "../index";
+// import DirectiveLocation from "./generic/location";
+// import LintError from "./generic/lintError";
+//
+// const BOOLEAN_CONDITION_DIRECTIVES = ["@if", "@show"];
+// const ARRAY_ITERATION_DIRECTIVES = ["@for", "@map"];
+// const MODEL_ELEMENT = ["INPUT", "SELECT", "TEXTAREA"];
+//
+// function parseTemplateForDirectives(template: string): DirectiveLocation[] {
+//     const directives: DirectiveLocation[] = [];
+//     const lines = template.split("\n");
+//
+//     for (let lineIndex = 0; lineIndex < lines.length; lineIndex++) {
+//         const line = lines[lineIndex];
+//
+//         const directiveRegex = /@(\w+)(?:\s*=\s*"([^"]*)"|\s*=\s*'([^']*)')?/g;
+//         let match;
+//
+//         while ((match = directiveRegex.exec(line)) !== null) {
+//             const directiveName = match[1];
+//             const expression = match[2] || match[3] || "";
+//
+//             const elementMatch = line.match(/<(\w+)/);
+//             const element = elementMatch ? elementMatch[1] : "unknown";
+//
+//             directives.push({
+//                 directive: `@${directiveName}`,
+//                 expression: expression,
+//                 element: element.toUpperCase(),
+//                 line: lineIndex + 1,
+//                 column: match.index + 1
+//             });
+//         }
+//     }
+//
+//     return directives;
+// }
+//
+// function inferType(value: any): string {
+//     if (value === true || value === false) return "boolean";
+//     if (Array.isArray(value)) return "array";
+//     if (typeof value === "number") return "number";
+//     if (typeof value === "string") return "string";
+//     if (typeof value === "object" && value !== null) return "object";
+//     if (value === null) return "null";
+//     return "unknown";
+// }
+//
+// function getDataTypes(component: Component): Map<string, string> {
+//     const types = new Map<string, string>();
+//     const data = component.getData();
+//
+//     if (data && typeof data === "object") {
+//         Object.keys(data).forEach(function(key: string) {
+//             types.set(key, inferType((data as any)[key]));
+//         });
+//     }
+//
+//     return types;
+// }
+//
+// function validateBooleanCondition(
+//     directive: DirectiveLocation,
+//     component: Component
+// ): LintError | null {
+//     const dataTypes = getDataTypes(component);
+//     const actualType = dataTypes.get(directive.expression);
+//
+//     if (actualType && actualType !== "boolean") {
+//         return {
+//             rule: "boolean-condition",
+//             message: `Directive '${directive.directive}' expects boolean but '${directive.expression}' is ${actualType}`,
+//             line: directive.line,
+//             column: directive.column
+//         };
+//     }
+//
+//     return null;
+// }
+//
+// function validateArrayIteration(
+//     directive: DirectiveLocation,
+//     component: Component
+// ): LintError | null {
+//     const dataTypes = getDataTypes(component);
+//     const actualType = dataTypes.get(directive.expression);
+//
+//     if (actualType && actualType !== "array") {
+//         return {
+//             rule: "array-iteration",
+//             message: `Directive '${directive.directive}' expects array but '${directive.expression}' is ${actualType}`,
+//             line: directive.line,
+//             column: directive.column
+//         };
+//     }
+//
+//     return null;
+// }
+//
+// function validateModelElement(
+//     directive: DirectiveLocation,
+//     component: Component
+// ): LintError | null {
+//     if (MODEL_ELEMENT.indexOf(directive.element) === -1) {
+//         return {
+//             rule: "valid-model-element",
+//             message: `Directive '@model' can only be used on INPUT, SELECT, or TEXTAREA, but found '${directive.element}'`,
+//             line: directive.line,
+//             column: directive.column
+//         };
+//     }
+//
+//     return null;
+// }
+//
+// export function lintComponent(component: Component): LintError[] {
+//     const errors: LintError[] = [];
+//     const template = component.getTemplate();
+//     const directives = parseTemplateForDirectives(template);
+//
+//     for (const directive of directives) {
+//         if (BOOLEAN_CONDITION_DIRECTIVES.indexOf(directive.directive) !== -1) {
+//             const error = validateBooleanCondition(directive, component);
+//             if (error) errors.push(error);
+//         }
+//
+//         if (ARRAY_ITERATION_DIRECTIVES.indexOf(directive.directive) !== -1) {
+//             const error = validateArrayIteration(directive, component);
+//             if (error) errors.push(error);
+//         }
+//
+//         if (directive.directive === "@model") {
+//             const error = validateModelElement(directive, component);
+//             if (error) errors.push(error);
+//         }
+//     }
+//
+//     return errors;
+// }
+//
+// export function lintComponents(components: Component[]): Map<string, LintError[]> {
+//     const allErrors = new Map<string, LintError[]>();
+//
+//     for (const component of components) {
+//         const errors = lintComponent(component);
+//         if (errors.length > 0) {
+//             allErrors.set(component.getName(), errors);
+//         }
+//     }
+//
+//     return allErrors;
+// }

package/xboot/entrance.d.ts

@@ -1,16 +1,4 @@
-import { Component } from "../index";
-/**
- * The entrance of weave
- * @param root
- */
-export declare function render_for_weave(root?: string): void;
 /**
  * The entrance of listen
  */
-export declare function render_for_listen(): void;
-/**
- * The entrance of render
- * @param component
- * @param mounter
- */
-export declare function render_for_render(component: Component, mounter: string): void;
+export declare function render_for_listen(params: Map<string, any>, pathParams: Map<string, any>): void;

package/xboot/entrance.js

@@ -1,53 +1,7 @@
-import { themeStyle } from "../system/utility/style/styleUtility";
-import { renderHtml } from "./renderProcessor";
-import { get_context_controller, get_style_library, get_tag_library } from "../system/recorder/table0/system_func_0";
-import { router_listener_with_router, router_listener_without_router } from "../kernel/router/router";
-/**
- * The entrance of weave
- * @param root
- */
-export function render_for_weave(root) {
-    get_tag_library().forEach(function (component) {
-        themeStyle(component, get_style_library());
-    });
-    if (root == null) {
-        //开始渲染
-        get_context_controller().componentAttachedRootElement = document.body;
-        renderHtml(document.children, get_context_controller());
-    }
-    else {
-        var mountPoint = document.getElementById(root);
-        if (mountPoint == null) {
-            get_context_controller().componentAttachedRootElement = document.body;
-            //开始渲染
-            console.warn("Mount point not found");
-            console.warn("Mount point was selected to body");
-            renderHtml(document.body.children, get_context_controller());
-        }
-        else {
-            //开始渲染
-            get_context_controller().componentAttachedRootElement = mountPoint;
-            renderHtml(mountPoint.children, get_context_controller());
-        }
-    }
-}
+import { router_listener_with_router } from "../kernel/router/router";
 /**
  * The entrance of listen
  */
-export function render_for_listen() {
-    get_tag_library().forEach(function (component) {
-        themeStyle(component, get_style_library());
-    });
-    router_listener_with_router(document.querySelector("webview"));
-}
-/**
- * The entrance of render
- * @param component
- * @param mounter
- */
-export function render_for_render(component, mounter) {
-    get_tag_library().forEach(function (component) {
-        themeStyle(component, get_style_library());
-    });
-    router_listener_without_router(component, document.getElementById(mounter));
+export function render_for_listen(params, pathParams) {
+    router_listener_with_router(document.body, params, pathParams);
 }

package/xboot/renderProcessor.d.ts

@@ -1,4 +1,4 @@
-import { ContextController } from "../system/prototype/ContextController";
+import { ContextController } from "../system/generic/controller/prototype/ContextController";
 /**
  * This function is used to render element below the mount point.
  * @param collection

package/xboot/tagProcessor.d.ts

@@ -1,7 +1,7 @@
-import { Component } from "../index";
+import { AdjustComponent, ControlComponent } from "../index";
 /**
  * This function is used to save the prototype component proto in the window object.
  * So, you can have a tip that we custom a property named 'tagLib' in the window object.
  * @param component
  */
-export declare function registerTagLib(component: Component | Component[]): void;
+export declare function registerTagLib(component: AdjustComponent | AdjustComponent[] | ControlComponent | ControlComponent[]): void;