dom-render 1.0.88 → 1.0.91

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (44) hide show
  1. package/DomRenderProxy.js +31 -11
  2. package/README.MD +18 -11
  3. package/components/ComponentSet.d.ts +5 -2
  4. package/components/ComponentSet.js +2 -3
  5. package/configs/Config.d.ts +5 -0
  6. package/dist/bundle.js +582 -534
  7. package/events/EventManager.js +0 -1
  8. package/lifecycle/OnInitRender.d.ts +1 -6
  9. package/operators/Dr.d.ts +7 -3
  10. package/operators/Dr.js +21 -23
  11. package/operators/DrAppender.d.ts +7 -3
  12. package/operators/DrAppender.js +28 -26
  13. package/operators/DrFor.d.ts +7 -3
  14. package/operators/DrFor.js +24 -23
  15. package/operators/DrForOf.d.ts +7 -3
  16. package/operators/DrForOf.js +27 -26
  17. package/operators/DrForm.d.ts +7 -3
  18. package/operators/DrForm.js +51 -54
  19. package/operators/DrIf.d.ts +7 -3
  20. package/operators/DrIf.js +29 -32
  21. package/operators/DrInnerHTML.d.ts +7 -3
  22. package/operators/DrInnerHTML.js +19 -21
  23. package/operators/DrInnerText.d.ts +7 -3
  24. package/operators/DrInnerText.js +17 -19
  25. package/operators/DrPre.d.ts +6 -3
  26. package/operators/DrPre.js +9 -6
  27. package/operators/DrRepeat.d.ts +7 -3
  28. package/operators/DrRepeat.js +24 -23
  29. package/operators/DrTargetAttr.d.ts +6 -3
  30. package/operators/DrTargetAttr.js +10 -8
  31. package/operators/DrTargetElement.d.ts +6 -3
  32. package/operators/DrTargetElement.js +10 -32
  33. package/operators/DrThis.d.ts +4 -3
  34. package/operators/DrThis.js +21 -27
  35. package/operators/OperatorExecuter.d.ts +48 -0
  36. package/operators/OperatorExecuter.js +43 -0
  37. package/operators/OperatorExecuterAttrRequire.d.ts +8 -0
  38. package/operators/OperatorExecuterAttrRequire.js +55 -0
  39. package/package.json +1 -1
  40. package/rawsets/RawSet.d.ts +7 -1
  41. package/rawsets/RawSet.js +60 -42
  42. package/utils/location/LocationUtils.js +7 -1
  43. package/operators/OperatorRender.d.ts +0 -45
  44. package/operators/OperatorRender.js +0 -21
package/operators/DrIf.js CHANGED
@@ -27,46 +27,43 @@ var __assign = (this && this.__assign) || function () {
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
29
  exports.DrIf = void 0;
30
- var OperatorRender_1 = require("./OperatorRender");
30
+ var OperatorExecuterAttrRequire_1 = require("./OperatorExecuterAttrRequire");
31
31
  var ScriptUtils_1 = require("../utils/script/ScriptUtils");
32
32
  var RawSet_1 = require("../rawsets/RawSet");
33
+ var OperatorExecuter_1 = require("./OperatorExecuter");
33
34
  var DrIf = /** @class */ (function (_super) {
34
35
  __extends(DrIf, _super);
35
- function DrIf() {
36
- return _super !== null && _super.apply(this, arguments) || this;
36
+ function DrIf(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
37
+ var _this = this;
38
+ source.operatorAround = undefined;
39
+ _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
40
+ return _this;
37
41
  }
38
- DrIf.prototype.execRender = function () {
42
+ DrIf.prototype.executeAttrRequire = function (attr) {
39
43
  var _a;
40
44
  var _b, _c, _d, _e;
41
- if (this.elementSource.attrs.drIf) {
42
- var itRandom = RawSet_1.RawSet.drItOtherEncoding(this.elementSource.element);
43
- var vars = RawSet_1.RawSet.drVarEncoding(this.elementSource.element, (_b = this.elementSource.attrs.drVarOption) !== null && _b !== void 0 ? _b : '');
44
- var newTemp = this.source.config.window.document.createElement('temp');
45
- // Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v)); <-- 이부분은 다른 attr에도 적용을 할지말지 생각해야됨 엘리먼트 존재유무에 따라서 적용을 할지말지 결정해야됨
46
- var keepgoing = ScriptUtils_1.ScriptUtils.eval("\n ".concat(this.render.bindScript, "\n ").concat((_c = this.elementSource.attrs.drBeforeOption) !== null && _c !== void 0 ? _c : '', "\n if ($rawset.data === (").concat(this.elementSource.attrs.drIf, ")) {\n return false;\n }\n $rawset.data = ").concat(this.elementSource.attrs.drIf, "\n if($rawset.data) {\n const n = $element.cloneNode(true);\n Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v));\n var destIt = ").concat(this.elementSource.attrs.drItOption, ";\n if (destIt !== undefined) {\n n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt)))\n n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt);\n }\n if (this.__render.drStripOption === 'true') {\n Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n } else {\n this.__render.fag.append(n);\n }\n }\n ").concat((_d = this.elementSource.attrs.drAfterOption) !== null && _d !== void 0 ? _d : '', ";\n return true;\n "), Object.assign(this.source.obj, {
47
- __render: Object.freeze(__assign({ fag: newTemp, drAttr: this.elementSource.attrs, drAttrsOriginName: RawSet_1.RawSet.drAttrsOriginName, drStripOption: this.elementSource.attrs.drStripOption }, this.render))
48
- }));
49
- // console.log('keepgoing', keepgoing);
50
- if (keepgoing === false) {
51
- return OperatorRender_1.ExecuteState.STOP;
52
- }
53
- RawSet_1.RawSet.drVarDecoding(newTemp, vars);
54
- RawSet_1.RawSet.drItOtherDecoding(newTemp, itRandom);
55
- // const bypass = (newTemp.innerHTML ?? '').trim().length <= 0;
56
- var tempalte = this.source.config.window.document.createElement('template');
57
- tempalte.innerHTML = newTemp.innerHTML;
58
- // console.log(tempalte.innerHTML)
59
- this.returnContainer.fag.append(tempalte.content);
60
- var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
61
- (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
62
- (_a = this.returnContainer.raws).push.apply(_a, rr);
63
- // if (bypass) {
64
- // continue;
65
- // }
66
- return OperatorRender_1.ExecuteState.EXECUTE;
45
+ var itRandom = RawSet_1.RawSet.drItOtherEncoding(this.elementSource.element);
46
+ var vars = RawSet_1.RawSet.drVarEncoding(this.elementSource.element, (_b = this.elementSource.attrs.drVarOption) !== null && _b !== void 0 ? _b : '');
47
+ var newTemp = this.source.config.window.document.createElement('temp');
48
+ // Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v)); <-- 이부분은 다른 attr에도 적용을 할지말지 생각해야됨 엘리먼트 존재유무에 따라서 적용을 할지말지 결정해야됨
49
+ var keepgoing = ScriptUtils_1.ScriptUtils.eval("\n ".concat(this.render.bindScript, "\n ").concat((_c = this.elementSource.attrs.drBeforeOption) !== null && _c !== void 0 ? _c : '', "\n if ($rawset.data === (").concat(attr, ")) {\n return false;\n }\n $rawset.data = ").concat(attr, ";\n if($rawset.data) {\n const n = $element.cloneNode(true);\n Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v));\n var destIt = ").concat(this.elementSource.attrs.drItOption, ";\n if (destIt !== undefined) {\n n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt)))\n n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt);\n }\n if (this.__render.drStripOption === 'true') {\n Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n } else {\n this.__render.fag.append(n);\n }\n }\n ").concat((_d = this.elementSource.attrs.drAfterOption) !== null && _d !== void 0 ? _d : '', ";\n return true;\n "), Object.assign(this.source.obj, {
50
+ __render: Object.freeze(__assign({ fag: newTemp, drAttr: this.elementSource.attrs, drAttrsOriginName: RawSet_1.RawSet.drAttrsOriginName, drStripOption: this.elementSource.attrs.drStripOption }, this.render))
51
+ }));
52
+ // TODO: 뭐지?? 지워야되는거 아닌가?
53
+ if (keepgoing === false) {
54
+ return OperatorExecuter_1.ExecuteState.STOP;
67
55
  }
68
- return OperatorRender_1.ExecuteState.NO_EXECUTE;
56
+ RawSet_1.RawSet.drVarDecoding(newTemp, vars);
57
+ RawSet_1.RawSet.drItOtherDecoding(newTemp, itRandom);
58
+ // const bypass = (newTemp.innerHTML ?? '').trim().length <= 0;
59
+ var tempalte = this.source.config.window.document.createElement('template');
60
+ tempalte.innerHTML = newTemp.innerHTML;
61
+ this.returnContainer.fag.append(tempalte.content);
62
+ var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
63
+ (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
64
+ (_a = this.returnContainer.raws).push.apply(_a, rr);
65
+ return OperatorExecuter_1.ExecuteState.EXECUTE;
69
66
  };
70
67
  return DrIf;
71
- }(OperatorRender_1.OperatorRender));
68
+ }(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
72
69
  exports.DrIf = DrIf;
@@ -1,4 +1,8 @@
1
- import { ExecuteState, OperatorRender } from './OperatorRender';
2
- export declare class DrInnerHTML extends OperatorRender {
3
- execRender(): ExecuteState;
1
+ import { OperatorExecuterAttrRequire } from './OperatorExecuterAttrRequire';
2
+ import { RawSet } from '../rawsets/RawSet';
3
+ import { Render } from '../rawsets/Render';
4
+ import { AfterCallBack, ElementSource, ExecuteState, ReturnContainer, Source } from './OperatorExecuter';
5
+ export declare class DrInnerHTML extends OperatorExecuterAttrRequire<string> {
6
+ constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack);
7
+ executeAttrRequire(attr: string): ExecuteState;
4
8
  }
@@ -27,34 +27,32 @@ var __assign = (this && this.__assign) || function () {
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
29
  exports.DrInnerHTML = void 0;
30
- var OperatorRender_1 = require("./OperatorRender");
30
+ var OperatorExecuterAttrRequire_1 = require("./OperatorExecuterAttrRequire");
31
31
  var ScriptUtils_1 = require("../utils/script/ScriptUtils");
32
32
  var RawSet_1 = require("../rawsets/RawSet");
33
+ var OperatorExecuter_1 = require("./OperatorExecuter");
33
34
  var DrInnerHTML = /** @class */ (function (_super) {
34
35
  __extends(DrInnerHTML, _super);
35
- function DrInnerHTML() {
36
- return _super !== null && _super.apply(this, arguments) || this;
36
+ function DrInnerHTML(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
37
+ return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
37
38
  }
38
- DrInnerHTML.prototype.execRender = function () {
39
+ DrInnerHTML.prototype.executeAttrRequire = function (attr) {
39
40
  var _a;
40
41
  var _b, _c, _d;
41
- if (this.elementSource.attrs.drInnerHTML) {
42
- var newTemp = this.source.config.window.document.createElement('temp');
43
- ScriptUtils_1.ScriptUtils.eval("\n ".concat(this.render.bindScript, "\n const n = $element.cloneNode(true);\n ").concat((_b = this.elementSource.attrs.drBeforeOption) !== null && _b !== void 0 ? _b : '', "\n n.innerHTML = ").concat(this.elementSource.attrs.drInnerHTML, ";\n if (this.__render.drStripOption === 'true') {\n Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n } else {\n this.__render.fag.append(n);\n }\n ").concat((_c = this.elementSource.attrs.drAfterOption) !== null && _c !== void 0 ? _c : '', "\n "), Object.assign(this.source.obj, {
44
- __render: Object.freeze(__assign({ drStripOption: this.elementSource.attrs.drStripOption, fag: newTemp }, this.render
45
- // eslint-disable-next-line no-use-before-define
46
- ))
47
- }));
48
- var tempalte = this.source.config.window.document.createElement('template');
49
- tempalte.innerHTML = newTemp.innerHTML;
50
- this.returnContainer.fag.append(tempalte.content);
51
- var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
52
- (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(this.returnContainer.fag, this.elementSource.element);
53
- (_a = this.returnContainer.raws).push.apply(_a, rr);
54
- return OperatorRender_1.ExecuteState.EXECUTE;
55
- }
56
- return OperatorRender_1.ExecuteState.NO_EXECUTE;
42
+ var newTemp = this.source.config.window.document.createElement('temp');
43
+ ScriptUtils_1.ScriptUtils.eval("\n ".concat(this.render.bindScript, "\n const n = $element.cloneNode(true);\n ").concat((_b = this.elementSource.attrs.drBeforeOption) !== null && _b !== void 0 ? _b : '', "\n n.innerHTML = ").concat(attr, ";\n if (this.__render.drStripOption === 'true') {\n Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n } else {\n this.__render.fag.append(n);\n }\n ").concat((_c = this.elementSource.attrs.drAfterOption) !== null && _c !== void 0 ? _c : '', "\n "), Object.assign(this.source.obj, {
44
+ __render: Object.freeze(__assign({ drStripOption: this.elementSource.attrs.drStripOption, fag: newTemp }, this.render
45
+ // eslint-disable-next-line no-use-before-define
46
+ ))
47
+ }));
48
+ var tempalte = this.source.config.window.document.createElement('template');
49
+ tempalte.innerHTML = newTemp.innerHTML;
50
+ this.returnContainer.fag.append(tempalte.content);
51
+ var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
52
+ (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(this.returnContainer.fag, this.elementSource.element);
53
+ (_a = this.returnContainer.raws).push.apply(_a, rr);
54
+ return OperatorExecuter_1.ExecuteState.EXECUTE;
57
55
  };
58
56
  return DrInnerHTML;
59
- }(OperatorRender_1.OperatorRender));
57
+ }(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
60
58
  exports.DrInnerHTML = DrInnerHTML;
@@ -1,4 +1,8 @@
1
- import { ExecuteState, OperatorRender } from './OperatorRender';
2
- export declare class DrInnerText extends OperatorRender {
3
- execRender(): ExecuteState;
1
+ import { OperatorExecuterAttrRequire } from './OperatorExecuterAttrRequire';
2
+ import { RawSet } from '../rawsets/RawSet';
3
+ import { Render } from '../rawsets/Render';
4
+ import { AfterCallBack, ElementSource, ExecuteState, ReturnContainer, Source } from './OperatorExecuter';
5
+ export declare class DrInnerText extends OperatorExecuterAttrRequire<string> {
6
+ constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack);
7
+ executeAttrRequire(attr: string): ExecuteState;
4
8
  }
@@ -27,32 +27,30 @@ var __assign = (this && this.__assign) || function () {
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
29
  exports.DrInnerText = void 0;
30
- var OperatorRender_1 = require("./OperatorRender");
30
+ var OperatorExecuterAttrRequire_1 = require("./OperatorExecuterAttrRequire");
31
31
  var ScriptUtils_1 = require("../utils/script/ScriptUtils");
32
32
  var RawSet_1 = require("../rawsets/RawSet");
33
+ var OperatorExecuter_1 = require("./OperatorExecuter");
33
34
  var DrInnerText = /** @class */ (function (_super) {
34
35
  __extends(DrInnerText, _super);
35
- function DrInnerText() {
36
- return _super !== null && _super.apply(this, arguments) || this;
36
+ function DrInnerText(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
37
+ return _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
37
38
  }
38
- DrInnerText.prototype.execRender = function () {
39
+ DrInnerText.prototype.executeAttrRequire = function (attr) {
39
40
  var _a;
40
41
  var _b, _c, _d;
41
- if (this.elementSource.attrs.drInnerText) {
42
- var newTemp = this.source.config.window.document.createElement('temp');
43
- ScriptUtils_1.ScriptUtils.eval(" \n ".concat(this.render.bindScript, "\n const n = $element.cloneNode(true); \n ").concat((_b = this.elementSource.attrs.drBeforeOption) !== null && _b !== void 0 ? _b : '', "\n n.innerText = ").concat(this.elementSource.attrs.drInnerText, ";\n if (this.__render.drStripOption === 'true') {\n Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n } else {\n this.__render.fag.append(n);\n }\n ").concat((_c = this.elementSource.attrs.drAfterOption) !== null && _c !== void 0 ? _c : '', "\n "), Object.assign(this.source.obj, {
44
- __render: Object.freeze(__assign({ drStripOption: this.elementSource.attrs.drStripOption, fag: newTemp }, this.render))
45
- }));
46
- var tempalte = this.source.config.window.document.createElement('template');
47
- tempalte.innerHTML = newTemp.innerHTML;
48
- this.returnContainer.fag.append(tempalte.content);
49
- var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
50
- (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(this.returnContainer.fag, this.elementSource.element);
51
- (_a = this.returnContainer.raws).push.apply(_a, rr);
52
- return OperatorRender_1.ExecuteState.EXECUTE;
53
- }
54
- return OperatorRender_1.ExecuteState.NO_EXECUTE;
42
+ var newTemp = this.source.config.window.document.createElement('temp');
43
+ ScriptUtils_1.ScriptUtils.eval(" \n ".concat(this.render.bindScript, "\n const n = $element.cloneNode(true); \n ").concat((_b = this.elementSource.attrs.drBeforeOption) !== null && _b !== void 0 ? _b : '', "\n n.innerText = ").concat(attr, ";\n if (this.__render.drStripOption === 'true') {\n Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n } else {\n this.__render.fag.append(n);\n }\n ").concat((_c = this.elementSource.attrs.drAfterOption) !== null && _c !== void 0 ? _c : '', "\n "), Object.assign(this.source.obj, {
44
+ __render: Object.freeze(__assign({ drStripOption: this.elementSource.attrs.drStripOption, fag: newTemp }, this.render))
45
+ }));
46
+ var tempalte = this.source.config.window.document.createElement('template');
47
+ tempalte.innerHTML = newTemp.innerHTML;
48
+ this.returnContainer.fag.append(tempalte.content);
49
+ var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
50
+ (_d = this.elementSource.element.parentNode) === null || _d === void 0 ? void 0 : _d.replaceChild(this.returnContainer.fag, this.elementSource.element);
51
+ (_a = this.returnContainer.raws).push.apply(_a, rr);
52
+ return OperatorExecuter_1.ExecuteState.EXECUTE;
55
53
  };
56
54
  return DrInnerText;
57
- }(OperatorRender_1.OperatorRender));
55
+ }(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
58
56
  exports.DrInnerText = DrInnerText;
@@ -1,4 +1,7 @@
1
- import { ExecuteState, OperatorRender } from './OperatorRender';
2
- export declare class DrPre extends OperatorRender {
3
- execRender(): ExecuteState;
1
+ import { AfterCallBack, ElementSource, ExecuteState, OperatorExecuter, ReturnContainer, Source } from './OperatorExecuter';
2
+ import { RawSet } from '../rawsets/RawSet';
3
+ import { Render } from '../rawsets/Render';
4
+ export declare class DrPre extends OperatorExecuter<null> {
5
+ constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack);
6
+ execute(value: null): ExecuteState;
4
7
  }
@@ -16,15 +16,18 @@ var __extends = (this && this.__extends) || (function () {
16
16
  })();
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.DrPre = void 0;
19
- var OperatorRender_1 = require("./OperatorRender");
19
+ var OperatorExecuter_1 = require("./OperatorExecuter");
20
20
  var DrPre = /** @class */ (function (_super) {
21
21
  __extends(DrPre, _super);
22
- function DrPre() {
23
- return _super !== null && _super.apply(this, arguments) || this;
22
+ function DrPre(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
23
+ var _this = this;
24
+ source.operatorAround = undefined;
25
+ _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack) || this;
26
+ return _this;
24
27
  }
25
- DrPre.prototype.execRender = function () {
26
- return (this.elementSource.attrs.drPre != null) ? OperatorRender_1.ExecuteState.EXECUTE : OperatorRender_1.ExecuteState.NO_EXECUTE;
28
+ DrPre.prototype.execute = function (value) {
29
+ return (value != null) ? OperatorExecuter_1.ExecuteState.EXECUTE : OperatorExecuter_1.ExecuteState.NO_EXECUTE;
27
30
  };
28
31
  return DrPre;
29
- }(OperatorRender_1.OperatorRender));
32
+ }(OperatorExecuter_1.OperatorExecuter));
30
33
  exports.DrPre = DrPre;
@@ -1,4 +1,8 @@
1
- import { ExecuteState, OperatorRender } from './OperatorRender';
2
- export declare class DrRepeat extends OperatorRender {
3
- execRender(): ExecuteState;
1
+ import { OperatorExecuterAttrRequire } from './OperatorExecuterAttrRequire';
2
+ import { RawSet } from '../rawsets/RawSet';
3
+ import { Render } from '../rawsets/Render';
4
+ import { AfterCallBack, ElementSource, ExecuteState, ReturnContainer, Source } from './OperatorExecuter';
5
+ export declare class DrRepeat extends OperatorExecuterAttrRequire<string> {
6
+ constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack);
7
+ executeAttrRequire(attr: string): ExecuteState;
4
8
  }
@@ -27,37 +27,38 @@ var __assign = (this && this.__assign) || function () {
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
29
  exports.DrRepeat = void 0;
30
- var OperatorRender_1 = require("./OperatorRender");
30
+ var OperatorExecuterAttrRequire_1 = require("./OperatorExecuterAttrRequire");
31
31
  var ScriptUtils_1 = require("../utils/script/ScriptUtils");
32
32
  var RawSet_1 = require("../rawsets/RawSet");
33
33
  var EventManager_1 = require("../events/EventManager");
34
+ var OperatorExecuter_1 = require("./OperatorExecuter");
34
35
  var DrRepeat = /** @class */ (function (_super) {
35
36
  __extends(DrRepeat, _super);
36
- function DrRepeat() {
37
- return _super !== null && _super.apply(this, arguments) || this;
37
+ function DrRepeat(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
38
+ var _this = this;
39
+ source.operatorAround = undefined;
40
+ _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
41
+ return _this;
38
42
  }
39
- DrRepeat.prototype.execRender = function () {
43
+ DrRepeat.prototype.executeAttrRequire = function (attr) {
40
44
  var _a;
41
45
  var _b, _c, _d, _e;
42
- if (this.elementSource.attrs.drRepeat) {
43
- var itRandom = RawSet_1.RawSet.drItOtherEncoding(this.elementSource.element);
44
- var vars = RawSet_1.RawSet.drVarEncoding(this.elementSource.element, (_b = this.elementSource.attrs.drVarOption) !== null && _b !== void 0 ? _b : '');
45
- var newTemp = this.source.config.window.document.createElement('temp');
46
- ScriptUtils_1.ScriptUtils.eval("\n ".concat(this.render.bindScript, "\n ").concat((_c = this.elementSource.attrs.drBeforeOption) !== null && _c !== void 0 ? _c : '', "\n var i = 0; \n const repeat = ").concat(this.elementSource.attrs.drRepeat, ";\n const repeatStr = `").concat(this.elementSource.attrs.drRepeat, "`;\n let range = repeat;\n if (typeof repeat === 'number') {\n range = ").concat(EventManager_1.EventManager.RANGE_VARNAME, "(repeat);\n } \n for(const it of range) {\n var destIt = it;\n if (range.isRange) {\n destIt = it;\n } else {\n destIt = repeatStr + '[' + i +']'\n }\n const n = this.__render.element.cloneNode(true);\n n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt).replace(/\\#nearRangeIt\\#/g, destIt).replace(/\\#nearRangeIndex\\#/g, destIt)))\n n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt).replace(/\\#index\\#/g, destIt);\n \n if (this.__render.drStripOption === 'true') {\n Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n } else {\n this.__render.fag.append(n);\n }\n i++;\n }\n ").concat((_d = this.elementSource.attrs.drAfterOption) !== null && _d !== void 0 ? _d : '', "\n "), Object.assign(this.source.obj, {
47
- __render: Object.freeze(__assign({ fag: newTemp, drStripOption: this.elementSource.attrs.drStripOption }, this.render))
48
- }));
49
- RawSet_1.RawSet.drVarDecoding(newTemp, vars);
50
- RawSet_1.RawSet.drItOtherDecoding(newTemp, itRandom);
51
- var tempalte = this.source.config.window.document.createElement('template');
52
- tempalte.innerHTML = newTemp.innerHTML;
53
- this.returnContainer.fag.append(tempalte.content);
54
- var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
55
- (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
56
- (_a = this.returnContainer.raws).push.apply(_a, rr);
57
- return OperatorRender_1.ExecuteState.EXECUTE;
58
- }
59
- return OperatorRender_1.ExecuteState.NO_EXECUTE;
46
+ var itRandom = RawSet_1.RawSet.drItOtherEncoding(this.elementSource.element);
47
+ var vars = RawSet_1.RawSet.drVarEncoding(this.elementSource.element, (_b = this.elementSource.attrs.drVarOption) !== null && _b !== void 0 ? _b : '');
48
+ var newTemp = this.source.config.window.document.createElement('temp');
49
+ ScriptUtils_1.ScriptUtils.eval("\n ".concat(this.render.bindScript, "\n ").concat((_c = this.elementSource.attrs.drBeforeOption) !== null && _c !== void 0 ? _c : '', "\n var i = 0; \n const repeat = ").concat(attr, ";\n const repeatStr = `").concat(attr, "`;\n let range = repeat;\n if (typeof repeat === 'number') {\n range = ").concat(EventManager_1.EventManager.RANGE_VARNAME, "(repeat);\n } \n for(const it of range) {\n var destIt = it;\n if (range.isRange) {\n destIt = it;\n } else {\n destIt = repeatStr + '[' + i +']'\n }\n const n = this.__render.element.cloneNode(true);\n n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt).replace(/\\#nearRangeIt\\#/g, destIt).replace(/\\#nearRangeIndex\\#/g, destIt)))\n n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt).replace(/\\#index\\#/g, destIt);\n \n if (this.__render.drStripOption === 'true') {\n Array.from(n.childNodes).forEach(it => this.__render.fag.append(it));\n } else {\n this.__render.fag.append(n);\n }\n i++;\n }\n ").concat((_d = this.elementSource.attrs.drAfterOption) !== null && _d !== void 0 ? _d : '', "\n "), Object.assign(this.source.obj, {
50
+ __render: Object.freeze(__assign({ fag: newTemp, drStripOption: this.elementSource.attrs.drStripOption }, this.render))
51
+ }));
52
+ RawSet_1.RawSet.drVarDecoding(newTemp, vars);
53
+ RawSet_1.RawSet.drItOtherDecoding(newTemp, itRandom);
54
+ var tempalte = this.source.config.window.document.createElement('template');
55
+ tempalte.innerHTML = newTemp.innerHTML;
56
+ this.returnContainer.fag.append(tempalte.content);
57
+ var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
58
+ (_e = this.elementSource.element.parentNode) === null || _e === void 0 ? void 0 : _e.replaceChild(this.returnContainer.fag, this.elementSource.element);
59
+ (_a = this.returnContainer.raws).push.apply(_a, rr);
60
+ return OperatorExecuter_1.ExecuteState.EXECUTE;
60
61
  };
61
62
  return DrRepeat;
62
- }(OperatorRender_1.OperatorRender));
63
+ }(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
63
64
  exports.DrRepeat = DrRepeat;
@@ -1,4 +1,7 @@
1
- import { ExecuteState, OperatorRender } from './OperatorRender';
2
- export declare class DrTargetAttr extends OperatorRender {
3
- execRender(): ExecuteState;
1
+ import { RawSet } from '../rawsets/RawSet';
2
+ import { AfterCallBack, ElementSource, ExecuteState, OperatorExecuter, ReturnContainer, Source } from './OperatorExecuter';
3
+ import { Render } from '../rawsets/Render';
4
+ export declare class DrTargetAttr extends OperatorExecuter<void> {
5
+ constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack);
6
+ execute(): ExecuteState;
4
7
  }
@@ -16,18 +16,20 @@ var __extends = (this && this.__extends) || (function () {
16
16
  })();
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.DrTargetAttr = void 0;
19
- var OperatorRender_1 = require("./OperatorRender");
20
19
  var RawSet_1 = require("../rawsets/RawSet");
20
+ var OperatorExecuter_1 = require("./OperatorExecuter");
21
21
  var DrTargetAttr = /** @class */ (function (_super) {
22
22
  __extends(DrTargetAttr, _super);
23
- function DrTargetAttr() {
24
- return _super !== null && _super.apply(this, arguments) || this;
23
+ function DrTargetAttr(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
24
+ var _this = this;
25
+ source.operatorAround = undefined;
26
+ _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
27
+ return _this;
25
28
  }
26
- DrTargetAttr.prototype.execRender = function () {
29
+ DrTargetAttr.prototype.execute = function () {
27
30
  var _a;
28
31
  var _b, _c, _d, _e;
29
32
  var attributeNames = this.elementSource.element.getAttributeNames();
30
- // const targetAttr = config?.targetAttrs?.find(it => (!drAttr.drForOf && !drAttr.drFor && !drAttr.drRepeat) && attributeNames.includes(it.name));
31
33
  var targetAttr = (_c = (_b = this.source.config) === null || _b === void 0 ? void 0 : _b.targetAttrs) === null || _c === void 0 ? void 0 : _c.find(function (it) { return attributeNames.includes(it.name); });
32
34
  if (targetAttr) {
33
35
  var attrName = targetAttr.name;
@@ -46,10 +48,10 @@ var DrTargetAttr = /** @class */ (function (_super) {
46
48
  (_e = targetAttr === null || targetAttr === void 0 ? void 0 : targetAttr.complete) === null || _e === void 0 ? void 0 : _e.call(targetAttr, this.elementSource.element, attrValue, this.source.obj, this.rawSet);
47
49
  }
48
50
  }
49
- return OperatorRender_1.ExecuteState.EXECUTE;
51
+ return OperatorExecuter_1.ExecuteState.EXECUTE;
50
52
  }
51
- return OperatorRender_1.ExecuteState.NO_EXECUTE;
53
+ return OperatorExecuter_1.ExecuteState.NO_EXECUTE;
52
54
  };
53
55
  return DrTargetAttr;
54
- }(OperatorRender_1.OperatorRender));
56
+ }(OperatorExecuter_1.OperatorExecuter));
55
57
  exports.DrTargetAttr = DrTargetAttr;
@@ -1,4 +1,7 @@
1
- import { ExecuteState, OperatorRender } from './OperatorRender';
2
- export declare class DrTargetElement extends OperatorRender {
3
- execRender(): ExecuteState;
1
+ import { RawSet } from '../rawsets/RawSet';
2
+ import { AfterCallBack, ElementSource, ExecuteState, OperatorExecuter, ReturnContainer, Source } from './OperatorExecuter';
3
+ import { Render } from '../rawsets/Render';
4
+ export declare class DrTargetElement extends OperatorExecuter<void> {
5
+ constructor(rawSet: RawSet, render: Render, returnContainer: ReturnContainer, elementSource: ElementSource, source: Source, afterCallBack: AfterCallBack);
6
+ execute(): ExecuteState;
4
7
  }
@@ -16,15 +16,18 @@ var __extends = (this && this.__extends) || (function () {
16
16
  })();
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.DrTargetElement = void 0;
19
- var OperatorRender_1 = require("./OperatorRender");
20
19
  var ScriptUtils_1 = require("../utils/script/ScriptUtils");
21
20
  var RawSet_1 = require("../rawsets/RawSet");
21
+ var OperatorExecuter_1 = require("./OperatorExecuter");
22
22
  var DrTargetElement = /** @class */ (function (_super) {
23
23
  __extends(DrTargetElement, _super);
24
- function DrTargetElement() {
25
- return _super !== null && _super.apply(this, arguments) || this;
24
+ function DrTargetElement(rawSet, render, returnContainer, elementSource, source, afterCallBack) {
25
+ var _this = this;
26
+ source.operatorAround = undefined;
27
+ _this = _super.call(this, rawSet, render, returnContainer, elementSource, source, afterCallBack, false) || this;
28
+ return _this;
26
29
  }
27
- DrTargetElement.prototype.execRender = function () {
30
+ DrTargetElement.prototype.execute = function () {
28
31
  var _a;
29
32
  var _this = this;
30
33
  var _b, _c, _d, _e;
@@ -32,34 +35,10 @@ var DrTargetElement = /** @class */ (function (_super) {
32
35
  if (targetElement) {
33
36
  var documentFragment = targetElement.callBack(this.elementSource.element, this.source.obj, this.rawSet, this.elementSource.attrs, this.source.config);
34
37
  if (documentFragment) {
35
- // const targetAttrMap = this.elementSource.element.getAttribute(EventManager.normalAttrMapAttrName);
36
38
  var detectAction_1 = this.elementSource.element.getAttribute(RawSet_1.RawSet.DR_DETECT_NAME);
37
39
  var render_1 = documentFragment.render;
38
- // console.log('-------drTargetElement->', render, targetAttrMap);
39
40
  this.rawSet.fragment = documentFragment;
40
41
  this.rawSet.data = render_1.component;
41
- // const targetAttrs = this.elementSource.element.getAttributeNames()
42
- // .filter(it => RawSet.isExporesion(this.elementSource.element.getAttribute(it)))
43
- // .map(it => ({name: it, expresion: RawSet.exporesionGrouops(this.elementSource.element.getAttribute(it))[0][1]}))
44
- // .filter(it => it.name.length > 0 && it.expresion.length > 0)
45
- // .map(it => {
46
- // return `n.setAttribute('${it.name}', ${it.expresion})`;
47
- // });
48
- // if (targetAttrMap) {
49
- // ScriptUtils.eval(`
50
- // ${this.render.bindScript}
51
- // //const n = $element.cloneNode(true);
52
- // const n = $element;
53
- // ${targetAttrMap.join(';')};
54
- // // this.__render.fag.append(n);
55
- // `, Object.assign(this.source.obj, {
56
- // __render: Object.freeze({
57
- // fag: newTemp,
58
- // targetAttrs: targetAttrMap,
59
- // ...this.render
60
- // } as Render)
61
- // }));
62
- // }
63
42
  if (detectAction_1 && render_1) {
64
43
  this.rawSet.detect = {
65
44
  action: function () {
@@ -80,13 +59,12 @@ var DrTargetElement = /** @class */ (function (_super) {
80
59
  targetElement: targetElement,
81
60
  creatorMetaData: targetElement.__creatorMetaData
82
61
  });
83
- // console.log(document.body.innerHTML);
84
62
  (_e = targetElement === null || targetElement === void 0 ? void 0 : targetElement.complete) === null || _e === void 0 ? void 0 : _e.call(targetElement, this.elementSource.element, this.source.obj, this.rawSet);
85
63
  }
86
- return OperatorRender_1.ExecuteState.EXECUTE;
64
+ return OperatorExecuter_1.ExecuteState.EXECUTE;
87
65
  }
88
- return OperatorRender_1.ExecuteState.NO_EXECUTE;
66
+ return OperatorExecuter_1.ExecuteState.NO_EXECUTE;
89
67
  };
90
68
  return DrTargetElement;
91
- }(OperatorRender_1.OperatorRender));
69
+ }(OperatorExecuter_1.OperatorExecuter));
92
70
  exports.DrTargetElement = DrTargetElement;
@@ -1,4 +1,5 @@
1
- import { ExecuteState, OperatorRender } from './OperatorRender';
2
- export declare class DrThis extends OperatorRender {
3
- execRender(): ExecuteState;
1
+ import { OperatorExecuterAttrRequire } from './OperatorExecuterAttrRequire';
2
+ import { ExecuteState } from './OperatorExecuter';
3
+ export declare class DrThis extends OperatorExecuterAttrRequire<string> {
4
+ executeAttrRequire(attr: any): ExecuteState;
4
5
  }
@@ -16,47 +16,41 @@ var __extends = (this && this.__extends) || (function () {
16
16
  })();
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.DrThis = void 0;
19
- var OperatorRender_1 = require("./OperatorRender");
20
- var ScriptUtils_1 = require("../utils/script/ScriptUtils");
19
+ var OperatorExecuterAttrRequire_1 = require("./OperatorExecuterAttrRequire");
21
20
  var RawSet_1 = require("../rawsets/RawSet");
22
21
  var ComponentSet_1 = require("../components/ComponentSet");
22
+ var OperatorExecuter_1 = require("./OperatorExecuter");
23
23
  var DrThis = /** @class */ (function (_super) {
24
24
  __extends(DrThis, _super);
25
25
  function DrThis() {
26
26
  return _super !== null && _super.apply(this, arguments) || this;
27
27
  }
28
- DrThis.prototype.execRender = function () {
28
+ DrThis.prototype.executeAttrRequire = function (attr) {
29
29
  var _a;
30
30
  var _b, _c, _d, _e, _f;
31
- if (this.elementSource.attrs.drThis) {
32
- var r = ScriptUtils_1.ScriptUtils.evalReturn(this.elementSource.attrs.drThis, this.source.obj);
33
- // const isStrip = ScriptUtils.eval(`if (${this.elementSource.attrs.drStripOption ?? 'false'}) { return true; } else { return false; }`, this.source.obj);
34
- // console.log('isStrip', isStrip)
35
- if (r) {
36
- if (r instanceof ComponentSet_1.ComponentSet) {
37
- if (this.rawSet.data) {
38
- var destroyOptions = (_c = (_b = this.elementSource.attrs.drDestroyOption) === null || _b === void 0 ? void 0 : _b.split(',')) !== null && _c !== void 0 ? _c : [];
39
- RawSet_1.RawSet.destroy(this.rawSet.data.obj, [], this.source.config, destroyOptions);
40
- }
41
- this.rawSet.data = r;
42
- 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);
43
- this.returnContainer.fag.append(componentBody);
44
- this.afterCallBack.onThisComponentSetCallBacks.push(r);
31
+ if (attr && this.elementSource.attrs.drThis) {
32
+ if (attr instanceof ComponentSet_1.ComponentSet) {
33
+ if (this.rawSet.data) {
34
+ var destroyOptions = (_c = (_b = this.elementSource.attrs.drDestroyOption) === null || _b === void 0 ? void 0 : _b.split(',')) !== null && _c !== void 0 ? _c : [];
35
+ RawSet_1.RawSet.destroy(this.rawSet.data.obj, [], this.source.config, destroyOptions);
45
36
  }
46
- else {
47
- 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));
48
- }
49
- var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
50
- (_f = this.elementSource.element.parentNode) === null || _f === void 0 ? void 0 : _f.replaceChild(this.returnContainer.fag, this.elementSource.element);
51
- (_a = this.returnContainer.raws).push.apply(_a, rr);
37
+ this.rawSet.data = attr;
38
+ var componentBody = RawSet_1.RawSet.drThisCreate(this.rawSet, this.elementSource.element, "".concat(this.elementSource.attrs.drThis).concat(attr.config.objPath ? ('.' + attr.config.objPath) : ''), (_d = this.elementSource.attrs.drVarOption) !== null && _d !== void 0 ? _d : '', this.elementSource.attrs.drStripOption, this.source.obj, this.source.config, attr);
39
+ this.returnContainer.fag.append(componentBody);
40
+ this.afterCallBack.onThisComponentSetCallBacks.push(attr);
52
41
  }
53
42
  else {
54
- this.elementSource.element.remove();
43
+ 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));
55
44
  }
56
- return OperatorRender_1.ExecuteState.EXECUTE;
45
+ var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.obj, this.source.config);
46
+ (_f = this.elementSource.element.parentNode) === null || _f === void 0 ? void 0 : _f.replaceChild(this.returnContainer.fag, this.elementSource.element);
47
+ (_a = this.returnContainer.raws).push.apply(_a, rr);
48
+ }
49
+ else {
50
+ this.elementSource.element.remove();
57
51
  }
58
- return OperatorRender_1.ExecuteState.NO_EXECUTE;
52
+ return OperatorExecuter_1.ExecuteState.EXECUTE;
59
53
  };
60
54
  return DrThis;
61
- }(OperatorRender_1.OperatorRender));
55
+ }(OperatorExecuterAttrRequire_1.OperatorExecuterAttrRequire));
62
56
  exports.DrThis = DrThis;