dom-render 1.0.87 → 1.0.90

package/events/EventManager.js

@@ -511,7 +511,6 @@ var EventManager = /** @class */ (function () {
     EventManager.ownerVariablePathAttrName = 'dr-owner-variable-path';
     EventManager.attrPrefix = 'dr-';
     EventManager.onInitAttrName = EventManager.attrPrefix + 'on-init';
-    // public static readonly onComponentInitAttrName = EventManager.attrPrefix + 'on-component-init';
     EventManager.valueAttrName = EventManager.attrPrefix + 'value';
     EventManager.valueLinkAttrName = EventManager.attrPrefix + 'value-link';
     EventManager.attrAttrName = EventManager.attrPrefix + 'attr';

package/lifecycle/OnDestroyRender.d.ts

@@ -1,4 +1,4 @@
-import { CreatorMetaData } from '../RawSet';
+import { CreatorMetaData } from '../rawsets/CreatorMetaData';
 export interface OnDestroyRender {
     onDestroyRender(metaData?: CreatorMetaData): void;
 }

package/lifecycle/OnInitRender.d.ts

@@ -1,7 +1,3 @@
-import { CreatorMetaData, Render } from '../RawSet';
 export interface OnInitRender {
-    onInitRender(data?: {
-        render?: Render;
-        creatorMetaData?: CreatorMetaData;
-    }): void;
+    onInitRender(...param: any[]): void;
 }

package/operators/Dr.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Dr = void 0;
 var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
-var RawSet_1 = require("../RawSet");
+var RawSet_1 = require("../rawsets/RawSet");
 var Dr = /** @class */ (function (_super) {
     __extends(Dr, _super);
     function Dr() {

package/operators/DrAppender.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrAppender = void 0;
 var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
-var RawSet_1 = require("../RawSet");
+var RawSet_1 = require("../rawsets/RawSet");
 var DrAppender = /** @class */ (function (_super) {
     __extends(DrAppender, _super);
     function DrAppender() {

package/operators/DrFor.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrFor = void 0;
 var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
-var RawSet_1 = require("../RawSet");
+var RawSet_1 = require("../rawsets/RawSet");
 var DrFor = /** @class */ (function (_super) {
     __extends(DrFor, _super);
     function DrFor() {

package/operators/DrForOf.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrForOf = void 0;
 var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
-var RawSet_1 = require("../RawSet");
+var RawSet_1 = require("../rawsets/RawSet");
 var DrForOf = /** @class */ (function (_super) {
     __extends(DrForOf, _super);
     function DrForOf() {

package/operators/DrForm.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrForm = void 0;
 var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
-var RawSet_1 = require("../RawSet");
+var RawSet_1 = require("../rawsets/RawSet");
 var Validator_1 = require("../validators/Validator");
 var EventManager_1 = require("../events/EventManager");
 var ValidatorArray_1 = require("../validators/ValidatorArray");
@@ -46,7 +46,7 @@ var DrForm = /** @class */ (function (_super) {
             RawSet_1.RawSet.drFormOtherMoveAttr(this.elementSource.element, 'name', 'temp-name', this.source.config);
             var data = ScriptUtils_1.ScriptUtils.evalReturn("".concat(this.elementSource.attrs.drForm), this.source.obj);
             var childs = Array.from(this.elementSource.element.querySelectorAll('[name]'));
-            var fromName = ScriptUtils_1.ScriptUtils.evalReturn((_b = this.elementSource.element.getAttribute('dr-form:name')) !== null && _b !== void 0 ? _b : '', this.source.obj);
+            var fromName = ScriptUtils_1.ScriptUtils.evalReturn((_b = this.elementSource.element.getAttribute("".concat(RawSet_1.RawSet.DR_FORM_NAME, ":name"))) !== null && _b !== void 0 ? _b : '', this.source.obj);
             var thisName = fromName !== null && fromName !== void 0 ? fromName : this.elementSource.element.getAttribute('name');
             // console.log('dr-form:name', thisName, element.getAttribute('dr-form:name'), obj, element);
             // // 자기자신이 Input 대상일때
@@ -60,10 +60,10 @@ var DrForm = /** @class */ (function (_super) {
             }
             childs.forEach(function (it) {
                 var _a, _b, _c, _d, _e;
-                var eventName = (_a = it.getAttribute('dr-form:event')) !== null && _a !== void 0 ? _a : 'change';
-                var validatorName = it.getAttribute('dr-form:validator');
+                var eventName = (_a = it.getAttribute("".concat(RawSet_1.RawSet.DR_FORM_NAME, ":event"))) !== null && _a !== void 0 ? _a : 'change';
+                var validatorName = it.getAttribute("".concat(RawSet_1.RawSet.DR_FORM_NAME, ":validator"));
                 var attrEventName = EventManager_1.EventManager.attrPrefix + 'event-' + eventName;
-                var varpath = (_c = ScriptUtils_1.ScriptUtils.evalReturn((_b = _this.elementSource.element.getAttribute('dr-form:name')) !== null && _b !== void 0 ? _b : '', _this.source.obj)) !== null && _c !== void 0 ? _c : it.getAttribute('name');
+                var varpath = (_c = ScriptUtils_1.ScriptUtils.evalReturn((_b = _this.elementSource.element.getAttribute("".concat(RawSet_1.RawSet.DR_FORM_NAME, ":name"))) !== null && _b !== void 0 ? _b : '', _this.source.obj)) !== null && _c !== void 0 ? _c : it.getAttribute('name');
                 if (varpath != null) {
                     if (validatorName) {
                         ScriptUtils_1.ScriptUtils.eval("\n                                    ".concat(_this.render.bindScript, "\n                                    const validator = typeof ").concat(validatorName, " ==='function' ?  new  ").concat(validatorName, "() : ").concat(validatorName, ";\n                                    ").concat(_this.elementSource.attrs.drForm, "['").concat(varpath, "'] = validator;\n                                "), Object.assign(_this.source.obj, {

package/operators/DrIf.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrIf = void 0;
 var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
-var RawSet_1 = require("../RawSet");
+var RawSet_1 = require("../rawsets/RawSet");
 var DrIf = /** @class */ (function (_super) {
     __extends(DrIf, _super);
     function DrIf() {

package/operators/DrInnerHTML.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrInnerHTML = void 0;
 var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
-var RawSet_1 = require("../RawSet");
+var RawSet_1 = require("../rawsets/RawSet");
 var DrInnerHTML = /** @class */ (function (_super) {
     __extends(DrInnerHTML, _super);
     function DrInnerHTML() {

package/operators/DrInnerText.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrInnerText = void 0;
 var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
-var RawSet_1 = require("../RawSet");
+var RawSet_1 = require("../rawsets/RawSet");
 var DrInnerText = /** @class */ (function (_super) {
     __extends(DrInnerText, _super);
     function DrInnerText() {

package/operators/DrRepeat.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrRepeat = void 0;
 var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
-var RawSet_1 = require("../RawSet");
+var RawSet_1 = require("../rawsets/RawSet");
 var EventManager_1 = require("../events/EventManager");
 var DrRepeat = /** @class */ (function (_super) {
     __extends(DrRepeat, _super);

package/operators/DrTargetAttr.js

@@ -17,7 +17,7 @@ var __extends = (this && this.__extends) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrTargetAttr = void 0;
 var OperatorRender_1 = require("./OperatorRender");
-var RawSet_1 = require("../RawSet");
+var RawSet_1 = require("../rawsets/RawSet");
 var DrTargetAttr = /** @class */ (function (_super) {
     __extends(DrTargetAttr, _super);
     function DrTargetAttr() {

package/operators/DrTargetElement.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrTargetElement = void 0;
 var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
-var RawSet_1 = require("../RawSet");
+var RawSet_1 = require("../rawsets/RawSet");
 var DrTargetElement = /** @class */ (function (_super) {
     __extends(DrTargetElement, _super);
     function DrTargetElement() {

package/operators/DrThis.js

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrThis = void 0;
 var OperatorRender_1 = require("./OperatorRender");
 var ScriptUtils_1 = require("../utils/script/ScriptUtils");
-var RawSet_1 = require("../RawSet");
+var RawSet_1 = require("../rawsets/RawSet");
 var ComponentSet_1 = require("../components/ComponentSet");
 var DrThis = /** @class */ (function (_super) {
     __extends(DrThis, _super);
@@ -30,6 +30,8 @@ var DrThis = /** @class */ (function (_super) {
         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) {
@@ -37,7 +39,8 @@ var DrThis = /** @class */ (function (_super) {
                         RawSet_1.RawSet.destroy(this.rawSet.data.obj, [], this.source.config, destroyOptions);
                     }
                     this.rawSet.data = r;
-                    this.returnContainer.fag.append(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));
+                    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 {

package/operators/OperatorRender.d.ts

@@ -1,6 +1,10 @@
-import { AttrInitCallBack, Attrs, ElementInitCallBack, RawSet, Render } from '../RawSet';
+import { RawSet } from '../rawsets/RawSet';
 import { ComponentSet } from '../components/ComponentSet';
 import { Config } from '../configs/Config';
+import { Attrs } from '../rawsets/Attrs';
+import { AttrInitCallBack } from '../rawsets/AttrInitCallBack';
+import { ElementInitCallBack } from '../rawsets/ElementInitCallBack';
+import { Render } from '../rawsets/Render';
 export declare enum ExecuteState {
     EXECUTE = 0,
     NO_EXECUTE = 1,

package/package.json

@@ -1,13 +1,17 @@
 {
   "name": "dom-render",
-  "version": "1.0.87",
+  "version": "1.0.90",
   "main": "DomRender.js",
   "license": "MIT",
-  "description": "dom-render",
+  "description": "html view template engine",
   "keywords": [
     "front",
     "spa",
     "SPA",
+    "view template",
+    "view",
+    "template",
+    "template engine",
     "dom-render",
     "front-end",
     "framwork",

package/rawsets/AttrInitCallBack.d.ts

@@ -0,0 +1,5 @@
+export declare type AttrInitCallBack = {
+    attrName: string;
+    attrValue: string;
+    obj: any;
+};

package/rawsets/AttrInitCallBack.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/rawsets/Attrs.d.ts

@@ -0,0 +1,21 @@
+export declare type Attrs = {
+    dr: string | null;
+    drIf: string | null;
+    drAppender: string | null;
+    drFor: string | null;
+    drForOf: string | null;
+    drRepeat: string | null;
+    drThis: string | null;
+    drForm: string | null;
+    drPre: string | null;
+    drInnerHTML: string | null;
+    drInnerText: string | null;
+    drItOption: string | null;
+    drVarOption: string | null;
+    drAfterOption: string | null;
+    drNextOption: string | null;
+    drBeforeOption: string | null;
+    drCompleteOption: string | null;
+    drStripOption: string | null;
+    drDestroyOption: string | null;
+};

package/rawsets/Attrs.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/rawsets/CreatorMetaData.d.ts

@@ -0,0 +1,18 @@
+import { Router } from '../routers/Router';
+import { Attrs } from './Attrs';
+import { RawSet } from './RawSet';
+export declare type CreatorMetaData = {
+    thisVariableName?: string | null;
+    thisFullVariableName?: string | null;
+    componentKey?: string | null;
+    rawSet: RawSet;
+    scripts?: {
+        [n: string]: any;
+    };
+    router?: Router;
+    innerHTML: string;
+    drAttrs?: Attrs;
+    rootCreator: any;
+    attribute: any;
+    creator: any;
+};

package/rawsets/CreatorMetaData.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/rawsets/DestroyOptionType.d.ts

@@ -0,0 +1,4 @@
+export declare enum DestroyOptionType {
+    NO_DESTROY = "NO_DESTROY",
+    NO_MESSENGER_DESTROY = "NO_MESSENGER_DESTROY"
+}

package/rawsets/DestroyOptionType.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DestroyOptionType = void 0;
+var DestroyOptionType;
+(function (DestroyOptionType) {
+    DestroyOptionType["NO_DESTROY"] = "NO_DESTROY";
+    DestroyOptionType["NO_MESSENGER_DESTROY"] = "NO_MESSENGER_DESTROY";
+})(DestroyOptionType = exports.DestroyOptionType || (exports.DestroyOptionType = {}));

package/rawsets/ElementInitCallBack.d.ts

@@ -0,0 +1,8 @@
+import { TargetElement } from '../configs/TargetElement';
+import { CreatorMetaData } from './CreatorMetaData';
+export declare type ElementInitCallBack = {
+    name: string;
+    obj: any;
+    targetElement: TargetElement;
+    creatorMetaData: CreatorMetaData;
+};

package/rawsets/ElementInitCallBack.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/{RawSet.d.ts → rawsets/RawSet.d.ts}

@@ -1,75 +1,10 @@
-import { Config } from './configs/Config';
-import { ComponentSet } from './components/ComponentSet';
-import { TargetElement } from './configs/TargetElement';
-import { TargetAttr } from './configs/TargetAttr';
-export declare enum DestroyOptionType {
-    NO_DESTROY = "NO_DESTROY",
-    NO_MESSENGER_DESTROY = "NO_MESSENGER_DESTROY"
-}
-export declare type Attrs = {
-    dr: string | null;
-    drIf: string | null;
-    drAppender: string | null;
-    drFor: string | null;
-    drForOf: string | null;
-    drRepeat: string | null;
-    drThis: string | null;
-    drForm: string | null;
-    drPre: string | null;
-    drInnerHTML: string | null;
-    drInnerText: string | null;
-    drItOption: string | null;
-    drVarOption: string | null;
-    drAfterOption: string | null;
-    drNextOption: string | null;
-    drBeforeOption: string | null;
-    drCompleteOption: string | null;
-    drStripOption: string | null;
-    drDestroyOption: string | null;
-};
-export declare type CreatorMetaData = {
-    thisVariableName?: string | null;
-    thisFullVariableName?: string | null;
-    componentKey?: string | null;
-    rawSet: RawSet;
-    innerHTML: string;
-    drAttrs?: Attrs;
-    rootCreator: any;
-    attribute: any;
-    creator: any;
-};
-export declare type AttrInitCallBack = {
-    attrName: string;
-    attrValue: string;
-    obj: any;
-};
-export declare type ElementInitCallBack = {
-    name: string;
-    obj: any;
-    targetElement: TargetElement;
-    creatorMetaData: CreatorMetaData;
-};
-export declare enum RawSetType {
-    TEXT = "TEXT",
-    STYLE_TEXT = "STYLE_TEXT",
-    TARGET_ELEMENT = "TARGET_ELEMENT",
-    TARGET_ATTR = "TARGET_ATTR",
-    UNKOWN = "UNKOWN"
-}
-export declare type Render = {
-    rawset?: RawSet;
-    scripts?: {
-        [n: string]: any;
-    };
-    bindScript?: string;
-    element?: any;
-    attribute?: any;
-    creatorMetaData?: CreatorMetaData;
-    router?: any;
-    range?: any;
-    value?: any;
-    [n: string]: any;
-};
+import { Config } from '../configs/Config';
+import { ComponentSet } from '../components/ComponentSet';
+import { TargetElement } from '../configs/TargetElement';
+import { TargetAttr } from '../configs/TargetAttr';
+import { DestroyOptionType } from './DestroyOptionType';
+import { Attrs } from './Attrs';
+import { RawSetType } from './RawSetType';
 export declare class RawSet {
     uuid: string;
     type: RawSetType;
@@ -105,6 +40,12 @@ export declare class RawSet {
     static readonly DR_COMPLETE_OPTIONNAME = "dr-complete";
     static readonly DR_STRIP_OPTIONNAME = "dr-strip";
     static readonly DR_DESTROY_OPTIONNAME = "dr-destroy";
+    static readonly DR_COMPONENT_NAME_OPTIONNAME = "dr-component-name";
+    static readonly DR_COMPONENT_INNER_HTML_NAME_OPTIONNAME = "dr-component-inner-html-name";
+    static readonly DR_ON_CREATE_ARGUMENTS_OPTIONNAME = "dr-on-create:arguments";
+    static readonly DR_ON_CREATED_CALLBACK_OPTIONNAME = "dr-on-create:callback";
+    static readonly DR_ON_INIT_ARGUMENTS_OPTIONNAME = "dr-on-init:arguments";
+    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[];