dom-render 1.0.90 → 1.0.92

package/operators/DrThis.js

@@ -14,49 +14,93 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrThis = void 0;
-var OperatorRender_1 = require("./OperatorRender");
-var ScriptUtils_1 = require("../utils/script/ScriptUtils");
+var OperatorExecuterAttrRequire_1 = require("./OperatorExecuterAttrRequire");
 var RawSet_1 = require("../rawsets/RawSet");
 var ComponentSet_1 = require("../components/ComponentSet");
+var OperatorExecuter_1 = require("./OperatorExecuter");
 var DrThis = /** @class */ (function (_super) {
     __extends(DrThis, _super);
     function DrThis() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    DrThis.prototype.execRender = function () {
-        var _a;
-        var _b, _c, _d, _e, _f;
-        if (this.elementSource.attrs.drThis) {
-            var r = ScriptUtils_1.ScriptUtils.evalReturn(this.elementSource.attrs.drThis, this.source.obj);
-            // const isStrip = ScriptUtils.eval(`if (${this.elementSource.attrs.drStripOption ?? 'false'}) { return true; } else { return false; }`, this.source.obj);
-            // console.log('isStrip', isStrip)
-            if (r) {
-                if (r instanceof ComponentSet_1.ComponentSet) {
-                    if (this.rawSet.data) {
-                        var destroyOptions = (_c = (_b = this.elementSource.attrs.drDestroyOption) === null || _b === void 0 ? void 0 : _b.split(',')) !== null && _c !== void 0 ? _c : [];
-                        RawSet_1.RawSet.destroy(this.rawSet.data.obj, [], this.source.config, destroyOptions);
-                    }
-                    this.rawSet.data = r;
-                    var componentBody = RawSet_1.RawSet.drThisCreate(this.rawSet, this.elementSource.element, "".concat(this.elementSource.attrs.drThis, ".obj"), (_d = this.elementSource.attrs.drVarOption) !== null && _d !== void 0 ? _d : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config, r);
-                    this.returnContainer.fag.append(componentBody);
-                    this.afterCallBack.onThisComponentSetCallBacks.push(r);
-                }
-                else {
-                    this.returnContainer.fag.append(RawSet_1.RawSet.drThisCreate(this.rawSet, this.elementSource.element, this.elementSource.attrs.drThis, (_e = this.elementSource.attrs.drVarOption) !== null && _e !== void 0 ? _e : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config));
+    DrThis.prototype.executeAttrRequire = function (attr) {
+        var _a, _b, _c, _d, _e;
+        return __awaiter(this, void 0, void 0, function () {
+            var destroyOptions, componentBody, _f, _g, rr;
+            var _h;
+            return __generator(this, function (_j) {
+                switch (_j.label) {
+                    case 0:
+                        if (!(attr && this.elementSource.attrs.drThis)) return [3 /*break*/, 5];
+                        if (!(attr instanceof ComponentSet_1.ComponentSet)) return [3 /*break*/, 2];
+                        if (this.rawSet.data) {
+                            destroyOptions = (_b = (_a = this.elementSource.attrs.drDestroyOption) === null || _a === void 0 ? void 0 : _a.split(',')) !== null && _b !== void 0 ? _b : [];
+                            RawSet_1.RawSet.destroy(this.rawSet.data.obj, [], this.source.config, destroyOptions);
+                        }
+                        this.rawSet.data = attr;
+                        return [4 /*yield*/, RawSet_1.RawSet.drThisCreate(this.rawSet, this.elementSource.element, "".concat(this.elementSource.attrs.drThis).concat(attr.config.objPath ? ('.' + attr.config.objPath) : ''), (_c = this.elementSource.attrs.drVarOption) !== null && _c !== void 0 ? _c : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config, attr)];
+                    case 1:
+                        componentBody = _j.sent();
+                        this.returnContainer.fag.append(componentBody);
+                        this.afterCallBack.onThisComponentSetCallBacks.push(attr);
+                        return [3 /*break*/, 4];
+                    case 2:
+                        _g = (_f = this.returnContainer.fag).append;
+                        return [4 /*yield*/, RawSet_1.RawSet.drThisCreate(this.rawSet, this.elementSource.element, this.elementSource.attrs.drThis, (_d = this.elementSource.attrs.drVarOption) !== null && _d !== void 0 ? _d : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config)];
+                    case 3:
+                        _g.apply(_f, [_j.sent()]);
+                        _j.label = 4;
+                    case 4:
+                        rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
+                        (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
+                        (_h = this.returnContainer.raws).push.apply(_h, rr);
+                        return [3 /*break*/, 6];
+                    case 5:
+                        this.elementSource.element.remove();
+                        _j.label = 6;
+                    case 6: return [2 /*return*/, OperatorExecuter_1.ExecuteState.EXECUTE];
                 }
-                var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
-                (_f = this.elementSource.element.parentNode) === null || _f === void 0 ? void 0 : _f.replaceChild(this.returnContainer.fag, this.elementSource.element);
-                (_a = this.returnContainer.raws).push.apply(_a, rr);
-            }
-            else {
-                this.elementSource.element.remove();
-            }
-            return OperatorRender_1.ExecuteState.EXECUTE;
-        }
-        return OperatorRender_1.ExecuteState.NO_EXECUTE;
+            });
+        });
     };
     return DrThis;
-}(OperatorRender_1.OperatorRender));
+}(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
 exports.DrThis = DrThis;

package/operators/OperatorExecuter.d.ts

@@ -0,0 +1,49 @@
+import { AttrInitCallBack } from '../rawsets/AttrInitCallBack';
+import { ElementInitCallBack } from '../rawsets/ElementInitCallBack';
+import { ComponentSet } from '../components/ComponentSet';
+import { RawSet } from '../rawsets/RawSet';
+import { Render } from '../rawsets/Render';
+import { Attrs } from '../rawsets/Attrs';
+import { Config } from '../configs/Config';
+export declare type OperatorAround = {
+    beforeAttr?: (value: string | null | undefined, opratorExecutor: OperatorExecuter) => string | null | undefined;
+    before?: (data: any, opratorExecutor: OperatorExecuter) => any;
+    after?: (data: any, opratorExecutor: OperatorExecuter) => void;
+};
+export declare enum ExecuteState {
+    EXECUTE = 0,
+    NO_EXECUTE = 1,
+    STOP = 2
+}
+export declare type AfterCallBack = {
+    onAttrInitCallBacks: AttrInitCallBack[];
+    onElementInitCallBacks: ElementInitCallBack[];
+    onThisComponentSetCallBacks: ComponentSet[];
+};
+export declare type ReturnContainer = {
+    raws: RawSet[];
+    fag: DocumentFragment;
+};
+export declare type ElementSource = {
+    element: Element;
+    attrs: Attrs;
+    attr?: string | null;
+    attrName?: string | undefined;
+};
+export declare type Source = {
+    config: Config;
+    operatorAround?: OperatorAround;
+    obj: any;
+};
+export declare abstract class OperatorExecuter<T = any> {
+    rawSet: RawSet;
+    render: Render;
+    returnContainer: ReturnContainer;
+    elementSource: ElementSource;
+    source: Source;
+    afterCallBack: AfterCallBack;
+    startingExecute: boolean;
+    constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack, startingExecute?: boolean);
+    start(): Promise<ExecuteState>;
+    abstract execute(value: T): Promise<ExecuteState>;
+}

package/operators/OperatorExecuter.js

@@ -0,0 +1,89 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OperatorExecuter = exports.ExecuteState = void 0;
+var ScriptUtils_1 = require("../utils/script/ScriptUtils");
+var ExecuteState;
+(function (ExecuteState) {
+    ExecuteState[ExecuteState["EXECUTE"] = 0] = "EXECUTE";
+    ExecuteState[ExecuteState["NO_EXECUTE"] = 1] = "NO_EXECUTE";
+    ExecuteState[ExecuteState["STOP"] = 2] = "STOP";
+})(ExecuteState = exports.ExecuteState || (exports.ExecuteState = {}));
+var OperatorExecuter = /** @class */ (function () {
+    function OperatorExecuter(rawSet, render, returnContainer, elementSource, source, afterCallBack, startingExecute) {
+        if (startingExecute === void 0) { startingExecute = true; }
+        this.rawSet = rawSet;
+        this.render = render;
+        this.returnContainer = returnContainer;
+        this.elementSource = elementSource;
+        this.source = source;
+        this.afterCallBack = afterCallBack;
+        this.startingExecute = startingExecute;
+    }
+    ;
+    OperatorExecuter.prototype.start = function () {
+        var _a, _b, _c, _d, _e, _f;
+        return __awaiter(this, void 0, void 0, function () {
+            var attrValue, r, state;
+            return __generator(this, function (_g) {
+                switch (_g.label) {
+                    case 0:
+                        attrValue = this.elementSource.attr;
+                        if ((_a = this.source.operatorAround) === null || _a === void 0 ? void 0 : _a.beforeAttr) {
+                            attrValue = (_b = this.source.operatorAround.beforeAttr(attrValue, this)) !== null && _b !== void 0 ? _b : '';
+                        }
+                        r = attrValue;
+                        if (r && this.startingExecute) {
+                            r = ScriptUtils_1.ScriptUtils.eval(" ".concat(this.render.bindScript, "; return ").concat(attrValue), Object.assign(this.source.obj, { __render: this.render }));
+                        }
+                        if ((_c = this.source.operatorAround) === null || _c === void 0 ? void 0 : _c.before) {
+                            r = (_d = this.source.operatorAround) === null || _d === void 0 ? void 0 : _d.before(r, this);
+                        }
+                        return [4 /*yield*/, this.execute(r)];
+                    case 1:
+                        state = _g.sent();
+                        (_f = (_e = this.source.operatorAround) === null || _e === void 0 ? void 0 : _e.after) === null || _f === void 0 ? void 0 : _f.call(_e, r, this);
+                        return [2 /*return*/, state];
+                }
+            });
+        });
+    };
+    ;
+    return OperatorExecuter;
+}());
+exports.OperatorExecuter = OperatorExecuter;

package/operators/OperatorExecuterAttrRequire.d.ts

@@ -0,0 +1,8 @@
+import { RawSet } from '../rawsets/RawSet';
+import { Render } from '../rawsets/Render';
+import { AfterCallBack, ElementSource, ExecuteState, OperatorExecuter, ReturnContainer, Source } from './OperatorExecuter';
+export declare abstract class OperatorExecuterAttrRequire<T> extends OperatorExecuter<T> {
+    constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack, startingExecute?: boolean);
+    execute(data: T): Promise<ExecuteState>;
+    protected abstract executeAttrRequire(attr: T): Promise<ExecuteState>;
+}

package/operators/OperatorExecuterAttrRequire.js

@@ -0,0 +1,79 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OperatorExecuterAttrRequire = void 0;
+var OperatorExecuter_1 = require("./OperatorExecuter");
+var OperatorExecuterAttrRequire = /** @class */ (function (_super) {
+    __extends(OperatorExecuterAttrRequire, _super);
+    function OperatorExecuterAttrRequire(rawSet, render, returnContainer, elementSource, source, afterCallBack, startingExecute) {
+        if (startingExecute === void 0) { startingExecute = true; }
+        return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, startingExecute) || this;
+    }
+    ;
+    OperatorExecuterAttrRequire.prototype.execute = function (data) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!this.elementSource.attr) {
+                            return [2 /*return*/, OperatorExecuter_1.ExecuteState.NO_EXECUTE];
+                        }
+                        return [4 /*yield*/, this.executeAttrRequire(data)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    return OperatorExecuterAttrRequire;
+}(OperatorExecuter_1.OperatorExecuter));
+exports.OperatorExecuterAttrRequire = OperatorExecuterAttrRequire;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dom-render",
-  "version": "1.0.90",
+  "version": "1.0.92",
   "main": "DomRender.js",
   "license": "MIT",
   "description": "html view template engine",

package/rawsets/RawSet.d.ts

@@ -20,7 +20,7 @@ export declare class RawSet {
         action: Function;
     } | undefined;
     data?: any;
-    static readonly DR = "dr";
+    static readonly DR_NAME = "dr";
     static readonly DR_IF_NAME = "dr-if";
     static readonly DR_FOR_NAME = "dr-for";
     static readonly DR_FOR_OF_NAME = "dr-for-of";
@@ -48,7 +48,7 @@ export declare class RawSet {
     static readonly DR_ON_CONSTRUCTOR_ARGUMENTS_OPTIONNAME = "dr-on-constructor:arguments";
     static readonly drAttrsOriginName: Attrs;
     static readonly DR_TAGS: never[];
-    static readonly DR_ATTRIBUTES: string[];
+    static readonly DR_ATTRIBUTES: readonly ["dr", "dr-appender", "dr-if", "dr-for-of", "dr-for", "dr-this", "dr-form", "dr-pre", "dr-inner-html", "dr-inner-text", "dr-repeat", "dr-detect"];
     constructor(uuid: string, type: RawSetType, point: {
         start: Comment | Text | HTMLMetaElement;
         node: Node;
@@ -60,7 +60,7 @@ export declare class RawSet {
     } | undefined, data?: any);
     get isConnected(): boolean;
     getUsingTriggerVariables(config?: Config): Set<string>;
-    render(obj: any, config: Config): RawSet[];
+    render(obj: any, config: Config): Promise<RawSet[]>;
     static generateStyleSheetsLocal(): void;
     static generateCSS(id: string, cssRule: CSSRule): void;
     static generateStyleTransform(styleBody: string | string[], id: string, styleTagWrap?: boolean): string;
@@ -95,7 +95,7 @@ export declare class RawSet {
         regex: RegExp;
         random: string;
     }[]): void;
-    static drThisCreate(rawSet: RawSet, element: Element, drThis: string, drVarOption: string, drStripOption: boolean | string | null, obj: any, config: Config, set?: ComponentSet): DocumentFragment;
+    static drThisCreate(rawSet: RawSet, element: Element, drThis: string, drVarOption: string, drStripOption: boolean | string | null, obj: any, config: Config, set?: ComponentSet): Promise<DocumentFragment>;
     static createComponentTargetAttribute(name: string, getThisObj: (element: Element, attrValue: string, obj: any, rawSet: RawSet) => any, factory: (element: Element, attrValue: string, obj: any, rawSet: RawSet) => DocumentFragment): TargetAttr;
     static createComponentTargetElement(name: string, objFactory: (element: Element, obj: any, rawSet: RawSet, counstructorParam: any[]) => any, template?: string, styles?: string[]): TargetElement;
     static isExporesion(data: string | null): boolean;