dom-render 1.0.76 → 1.0.77

Sign up to get free protection for your applications and to get access to all the features.
package/DomRenderProxy.js CHANGED
@@ -56,7 +56,7 @@ var DomRenderProxy = /** @class */ (function () {
56
56
  DomRenderProxy.prototype.initRender = function (target) {
57
57
  var _this = this;
58
58
  var _a, _b, _c, _d, _e, _f, _g;
59
- var onCreate = (_b = (_a = target).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, 'dr-on-create');
59
+ var onCreate = (_b = (_a = target).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, "".concat(EventManager_1.EventManager.attrPrefix, "on-create"));
60
60
  var createParam = undefined;
61
61
  if (onCreate) {
62
62
  createParam = ScriptUtils_1.ScriptUtils.evalReturn(onCreate, this._domRender_proxy);
@@ -66,6 +66,7 @@ var DomRenderProxy = /** @class */ (function () {
66
66
  this._targets.add(target);
67
67
  var rawSets = RawSet_1.RawSet.checkPointCreates(target, this.config);
68
68
  // console.log('-------rawSet', rawSets)
69
+ // 중요 초기에 한번 튕겨줘야함.
69
70
  EventManager_1.eventManager.applyEvent(this._domRender_proxy, EventManager_1.eventManager.findAttrElements(target, this.config), this.config);
70
71
  rawSets.forEach(function (it) {
71
72
  var variables = it.getUsingTriggerVariables(_this.config);
@@ -173,8 +174,11 @@ var DomRenderProxy = /** @class */ (function () {
173
174
  this.render(Array.from(iterable));
174
175
  }
175
176
  this._targets.forEach(function (it) {
177
+ // console.log('target------->,', it)
178
+ // return;
176
179
  if (it.nodeType === Node.DOCUMENT_FRAGMENT_NODE || it.nodeType === Node.ELEMENT_NODE) {
177
180
  var targets = EventManager_1.eventManager.findAttrElements(it, _this.config);
181
+ // console.log('------>', targets);
178
182
  EventManager_1.eventManager.changeVar(_this._domRender_proxy, targets, "this.".concat(fullPathStr_1), _this.config);
179
183
  }
180
184
  });
package/README.MD CHANGED
@@ -7,7 +7,7 @@ DOM-RENDER
7
7
 
8
8
  # 🚀 Quick start
9
9
  ```html
10
- <script src="https://cdn.jsdelivr.net/npm/dom-render@1.0.75/dist/bundle.js"></script>
10
+ <script src="https://cdn.jsdelivr.net/npm/dom-render@1.0.77/dist/bundle.js"></script>
11
11
  ```
12
12
  ```html
13
13
  <!DOCTYPE html>
package/RawSet.js CHANGED
@@ -42,7 +42,6 @@ var DrAppender_1 = require("./operators/DrAppender");
42
42
  var DrRepeat_1 = require("./operators/DrRepeat");
43
43
  var DrTargetElement_1 = require("./operators/DrTargetElement");
44
44
  var DrTargetAttr_1 = require("./operators/DrTargetAttr");
45
- var AttrExpresion_1 = require("./operators/AttrExpresion");
46
45
  var DestroyOptionType;
47
46
  (function (DestroyOptionType) {
48
47
  DestroyOptionType["NO_DESTROY"] = "NO_DESTROY";
@@ -76,19 +75,18 @@ var RawSet = /** @class */ (function () {
76
75
  }
77
76
  else if (cNode.nodeType === Node.ELEMENT_NODE) {
78
77
  var element_1 = cNode;
79
- var targetAttrNames_1 = ((_c = (_b = config === null || config === void 0 ? void 0 : config.targetAttrs) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name; })) !== null && _c !== void 0 ? _c : []).concat(RawSet.DR_ATTRIBUTES);
80
- script = targetAttrNames_1.map(function (it) {
78
+ var targetAttrNames = ((_c = (_b = config === null || config === void 0 ? void 0 : config.targetAttrs) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name; })) !== null && _c !== void 0 ? _c : []).concat(RawSet.DR_ATTRIBUTES);
79
+ script = targetAttrNames.map(function (it) {
81
80
  // console.log('-?', element.getAttribute(it))
82
81
  return element_1.getAttribute(it);
83
82
  }).filter(function (it) { return it; }).join(';');
84
83
  // console.log('----!!!!!-->', targetAttrNames)
85
- var otherAttrs = element_1.getAttributeNames()
86
- .filter(function (it) { return !targetAttrNames_1.includes(it.toLowerCase()) && RawSet.isExporesion(element_1.getAttribute(it)); })
87
- .map(function (it) {
88
- var _a;
89
- return "`".concat((_a = element_1.getAttribute(it)) !== null && _a !== void 0 ? _a : '', "`");
90
- }).join(';');
91
- script += ';' + otherAttrs;
84
+ // const otherAttrs = element.getAttributeNames()
85
+ // .filter(it => !targetAttrNames.includes(it.toLowerCase()) && RawSet.isExporesion(element.getAttribute(it)))
86
+ // .map(it => {
87
+ // return `\`${element.getAttribute(it) ?? ''}\``;
88
+ // }).join(';');
89
+ // script += ';' + otherAttrs
92
90
  }
93
91
  if (script) {
94
92
  // script = script.replace('}$','}');
@@ -179,7 +177,6 @@ var RawSet = /** @class */ (function () {
179
177
  new Dr_1.Dr(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
180
178
  new DrIf_1.DrIf(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
181
179
  new DrThis_1.DrThis(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
182
- new AttrExpresion_1.AttrExpresion(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
183
180
  new DrForm_1.DrForm(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
184
181
  new DrInnerText_1.DrInnerText(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
185
182
  new DrInnerHTML_1.DrInnerHTML(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
@@ -290,6 +287,7 @@ var RawSet = /** @class */ (function () {
290
287
  this.childAllRemove();
291
288
  (_a = this.point.start.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(genNode, this.point.start.nextSibling);
292
289
  };
290
+ // 중요
293
291
  RawSet.checkPointCreates = function (element, config) {
294
292
  var _a, _b, _c, _d;
295
293
  var thisVariableName = element.__domrender_this_variable_name;
@@ -312,13 +310,21 @@ var RawSet = /** @class */ (function () {
312
310
  var element_2 = node;
313
311
  // console.log('------>', element);
314
312
  var isElement = ((_c = (_b = config.targetElements) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name.toLowerCase(); })) !== null && _c !== void 0 ? _c : []).includes(element_2.tagName.toLowerCase());
315
- var targetAttrNames_2 = ((_e = (_d = config.targetAttrs) === null || _d === void 0 ? void 0 : _d.map(function (it) { return it.name; })) !== null && _e !== void 0 ? _e : []).concat(RawSet.DR_ATTRIBUTES);
313
+ var targetAttrNames_1 = ((_e = (_d = config.targetAttrs) === null || _d === void 0 ? void 0 : _d.map(function (it) { return it.name; })) !== null && _e !== void 0 ? _e : []).concat(RawSet.DR_ATTRIBUTES);
314
+ var normalAttrs_1 = new Map();
316
315
  var isAttr = element_2.getAttributeNames().filter(function (it) {
317
- var attrExpresion = RawSet.isExporesion(element_2.getAttribute(it));
316
+ var value = element_2.getAttribute(it);
317
+ if (value && RawSet.isExporesion(value)) {
318
+ normalAttrs_1.set(it, RawSet.exporesionGrouops(value)[0][1]);
319
+ }
318
320
  // console.log(element.getAttribute(it), attrExpresion);
319
- var isTargetAttr = targetAttrNames_2.includes(it.toLowerCase());
320
- return isTargetAttr || attrExpresion;
321
+ var isTargetAttr = targetAttrNames_1.includes(it.toLowerCase());
322
+ return isTargetAttr;
321
323
  }).length > 0;
324
+ // 기본 attribute를 처리하기위해
325
+ if (normalAttrs_1.size) {
326
+ element_2.setAttribute(EventManager_1.EventManager.normalAttrMapAttrName, JSON.stringify(Array.from(normalAttrs_1.entries())));
327
+ }
322
328
  return (isAttr || isElement) ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
323
329
  }
324
330
  return NodeFilter.FILTER_REJECT;
package/dist/bundle.js CHANGED
@@ -454,6 +454,7 @@ var EventManager = /** @class */ (function () {
454
454
  EventManager.valueAttrName,
455
455
  EventManager.valueLinkAttrName,
456
456
  EventManager.attrAttrName,
457
+ EventManager.normalAttrMapAttrName,
457
458
  EventManager.styleAttrName,
458
459
  EventManager.classAttrName,
459
460
  EventManager.attrPrefix + 'window-event-' + EventManager.WINDOW_EVENT_POPSTATE,
@@ -532,6 +533,18 @@ var EventManager = /** @class */ (function () {
532
533
  }
533
534
  }
534
535
  });
536
+ // normal-attr-map
537
+ this.procAttr(childNodes, EventManager.normalAttrMapAttrName, function (it, attribute) {
538
+ var map = new Map(JSON.parse(attribute));
539
+ map.forEach(function (v, k) {
540
+ var data = ScriptUtils.eval("const $element = this.element; return ".concat(v, " "), Object.assign(obj, {
541
+ __render: Object.freeze({
542
+ element: it
543
+ })
544
+ }));
545
+ it.setAttribute(k, data);
546
+ });
547
+ });
535
548
  // window event
536
549
  EventManager.WINDOW_EVENTS.forEach(function (it) {
537
550
  _this.procAttr(childNodes, EventManager.attrPrefix + 'window-event-' + it, function (it, attribute) {
@@ -771,6 +784,23 @@ var EventManager = /** @class */ (function () {
771
784
  }
772
785
  }
773
786
  });
787
+ // normal-attr-map
788
+ this.procAttr(elements, EventManager.normalAttrMapAttrName, function (it, attribute) {
789
+ var map = new Map(JSON.parse(attribute));
790
+ map.forEach(function (v, k) {
791
+ // console.log('--->', v, k)
792
+ var isUsing = _this.isUsingThisVar(v, varName);
793
+ // console.log('---isUsing-->', varName, k, v, isUsing);
794
+ if (isUsing) {
795
+ var data = ScriptUtils.eval("const $element = this.element; return ".concat(v, " "), Object.assign(obj, {
796
+ __render: Object.freeze({
797
+ element: it
798
+ })
799
+ }));
800
+ it.setAttribute(k, data);
801
+ }
802
+ });
803
+ });
774
804
  };
775
805
  // eslint-disable-next-line no-undef
776
806
  EventManager.prototype.addDrEvents = function (obj, eventName, elements, config) {
@@ -911,6 +941,7 @@ var EventManager = /** @class */ (function () {
911
941
  EventManager.valueAttrName = EventManager.attrPrefix + 'value';
912
942
  EventManager.valueLinkAttrName = EventManager.attrPrefix + 'value-link';
913
943
  EventManager.attrAttrName = EventManager.attrPrefix + 'attr';
944
+ EventManager.normalAttrMapAttrName = EventManager.attrPrefix + 'normal-attr-map';
914
945
  EventManager.styleAttrName = EventManager.attrPrefix + 'style';
915
946
  EventManager.classAttrName = EventManager.attrPrefix + 'class';
916
947
  EventManager.VALUE_VARNAME = '$value';
@@ -1732,42 +1763,6 @@ var DrTargetAttr = /** @class */ (function (_super) {
1732
1763
  return DrTargetAttr;
1733
1764
  }(OperatorRender));
1734
1765
 
1735
- var AttrExpresion = /** @class */ (function (_super) {
1736
- __extends(AttrExpresion, _super);
1737
- function AttrExpresion() {
1738
- return _super !== null && _super.apply(this, arguments) || this;
1739
- }
1740
- AttrExpresion.prototype.execRender = function () {
1741
- var _a;
1742
- var _this = this;
1743
- var _b;
1744
- var targetAttrs = this.elementSource.element.getAttributeNames()
1745
- .filter(function (it) { return RawSet.isExporesion(_this.elementSource.element.getAttribute(it)); })
1746
- .map(function (it) { return ({ name: it, expresion: RawSet.exporesionGrouops(_this.elementSource.element.getAttribute(it))[0][1] }); })
1747
- .filter(function (it) { return it.name.length > 0 && it.expresion.length > 0; })
1748
- .map(function (it) {
1749
- return "n.setAttribute('".concat(it.name, "', ").concat(it.expresion, ")");
1750
- });
1751
- // console.log('-----', targetAttrs)
1752
- if ((targetAttrs === null || targetAttrs === void 0 ? void 0 : targetAttrs.length) > 0) {
1753
- var newTemp = this.source.config.window.document.createElement('temp');
1754
- // console.log('------>', targetAttrs, targetAttrs.join(';'))
1755
- ScriptUtils.eval("\n ".concat(this.render.bindScript, "\n const n = $element.cloneNode(true);\n ").concat(targetAttrs.join(';'), ";\n this.__render.fag.append(n);\n "), Object.assign(this.source.obj, {
1756
- __render: Object.freeze(__assign({ fag: newTemp, targetAttrs: targetAttrs }, this.render))
1757
- }));
1758
- var tempalte = this.source.config.window.document.createElement('template');
1759
- tempalte.innerHTML = newTemp.innerHTML;
1760
- this.returnContainer.fag.append(tempalte.content);
1761
- var rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
1762
- (_b = this.elementSource.element.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(this.returnContainer.fag, this.elementSource.element);
1763
- (_a = this.returnContainer.raws).push.apply(_a, rr);
1764
- return exports.ExecuteState.EXECUTE;
1765
- }
1766
- return exports.ExecuteState.NO_EXECUTE;
1767
- };
1768
- return AttrExpresion;
1769
- }(OperatorRender));
1770
-
1771
1766
  exports.DestroyOptionType = void 0;
1772
1767
  (function (DestroyOptionType) {
1773
1768
  DestroyOptionType["NO_DESTROY"] = "NO_DESTROY";
@@ -1801,19 +1796,18 @@ var RawSet = /** @class */ (function () {
1801
1796
  }
1802
1797
  else if (cNode.nodeType === Node.ELEMENT_NODE) {
1803
1798
  var element_1 = cNode;
1804
- var targetAttrNames_1 = ((_c = (_b = config === null || config === void 0 ? void 0 : config.targetAttrs) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name; })) !== null && _c !== void 0 ? _c : []).concat(RawSet.DR_ATTRIBUTES);
1805
- script = targetAttrNames_1.map(function (it) {
1799
+ var targetAttrNames = ((_c = (_b = config === null || config === void 0 ? void 0 : config.targetAttrs) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name; })) !== null && _c !== void 0 ? _c : []).concat(RawSet.DR_ATTRIBUTES);
1800
+ script = targetAttrNames.map(function (it) {
1806
1801
  // console.log('-?', element.getAttribute(it))
1807
1802
  return element_1.getAttribute(it);
1808
1803
  }).filter(function (it) { return it; }).join(';');
1809
1804
  // console.log('----!!!!!-->', targetAttrNames)
1810
- var otherAttrs = element_1.getAttributeNames()
1811
- .filter(function (it) { return !targetAttrNames_1.includes(it.toLowerCase()) && RawSet.isExporesion(element_1.getAttribute(it)); })
1812
- .map(function (it) {
1813
- var _a;
1814
- return "`".concat((_a = element_1.getAttribute(it)) !== null && _a !== void 0 ? _a : '', "`");
1815
- }).join(';');
1816
- script += ';' + otherAttrs;
1805
+ // const otherAttrs = element.getAttributeNames()
1806
+ // .filter(it => !targetAttrNames.includes(it.toLowerCase()) && RawSet.isExporesion(element.getAttribute(it)))
1807
+ // .map(it => {
1808
+ // return `\`${element.getAttribute(it) ?? ''}\``;
1809
+ // }).join(';');
1810
+ // script += ';' + otherAttrs
1817
1811
  }
1818
1812
  if (script) {
1819
1813
  // script = script.replace('}$','}');
@@ -1904,7 +1898,6 @@ var RawSet = /** @class */ (function () {
1904
1898
  new Dr(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
1905
1899
  new DrIf(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
1906
1900
  new DrThis(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
1907
- new AttrExpresion(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
1908
1901
  new DrForm(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
1909
1902
  new DrInnerText(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
1910
1903
  new DrInnerHTML(this, __render, { raws: raws, fag: fag }, { element: element, attrs: drAttr }, { config: config, obj: obj }, { onAttrInitCallBacks: onAttrInitCallBacks, onElementInitCallBacks: onElementInitCallBacks, onThisComponentSetCallBacks: onThisComponentSetCallBacks }),
@@ -2015,6 +2008,7 @@ var RawSet = /** @class */ (function () {
2015
2008
  this.childAllRemove();
2016
2009
  (_a = this.point.start.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(genNode, this.point.start.nextSibling);
2017
2010
  };
2011
+ // 중요
2018
2012
  RawSet.checkPointCreates = function (element, config) {
2019
2013
  var _a, _b, _c, _d;
2020
2014
  var thisVariableName = element.__domrender_this_variable_name;
@@ -2037,13 +2031,21 @@ var RawSet = /** @class */ (function () {
2037
2031
  var element_2 = node;
2038
2032
  // console.log('------>', element);
2039
2033
  var isElement = ((_c = (_b = config.targetElements) === null || _b === void 0 ? void 0 : _b.map(function (it) { return it.name.toLowerCase(); })) !== null && _c !== void 0 ? _c : []).includes(element_2.tagName.toLowerCase());
2040
- var targetAttrNames_2 = ((_e = (_d = config.targetAttrs) === null || _d === void 0 ? void 0 : _d.map(function (it) { return it.name; })) !== null && _e !== void 0 ? _e : []).concat(RawSet.DR_ATTRIBUTES);
2034
+ var targetAttrNames_1 = ((_e = (_d = config.targetAttrs) === null || _d === void 0 ? void 0 : _d.map(function (it) { return it.name; })) !== null && _e !== void 0 ? _e : []).concat(RawSet.DR_ATTRIBUTES);
2035
+ var normalAttrs_1 = new Map();
2041
2036
  var isAttr = element_2.getAttributeNames().filter(function (it) {
2042
- var attrExpresion = RawSet.isExporesion(element_2.getAttribute(it));
2037
+ var value = element_2.getAttribute(it);
2038
+ if (value && RawSet.isExporesion(value)) {
2039
+ normalAttrs_1.set(it, RawSet.exporesionGrouops(value)[0][1]);
2040
+ }
2043
2041
  // console.log(element.getAttribute(it), attrExpresion);
2044
- var isTargetAttr = targetAttrNames_2.includes(it.toLowerCase());
2045
- return isTargetAttr || attrExpresion;
2042
+ var isTargetAttr = targetAttrNames_1.includes(it.toLowerCase());
2043
+ return isTargetAttr;
2046
2044
  }).length > 0;
2045
+ // 기본 attribute를 처리하기위해
2046
+ if (normalAttrs_1.size) {
2047
+ element_2.setAttribute(EventManager.normalAttrMapAttrName, JSON.stringify(Array.from(normalAttrs_1.entries())));
2048
+ }
2047
2049
  return (isAttr || isElement) ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
2048
2050
  }
2049
2051
  return NodeFilter.FILTER_REJECT;
@@ -2539,7 +2541,7 @@ var DomRenderProxy = /** @class */ (function () {
2539
2541
  DomRenderProxy.prototype.initRender = function (target) {
2540
2542
  var _this = this;
2541
2543
  var _a, _b, _c, _d, _e, _f, _g;
2542
- var onCreate = (_b = (_a = target).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, 'dr-on-create');
2544
+ var onCreate = (_b = (_a = target).getAttribute) === null || _b === void 0 ? void 0 : _b.call(_a, "".concat(EventManager.attrPrefix, "on-create"));
2543
2545
  var createParam = undefined;
2544
2546
  if (onCreate) {
2545
2547
  createParam = ScriptUtils.evalReturn(onCreate, this._domRender_proxy);
@@ -2549,6 +2551,7 @@ var DomRenderProxy = /** @class */ (function () {
2549
2551
  this._targets.add(target);
2550
2552
  var rawSets = RawSet.checkPointCreates(target, this.config);
2551
2553
  // console.log('-------rawSet', rawSets)
2554
+ // 중요 초기에 한번 튕겨줘야함.
2552
2555
  eventManager.applyEvent(this._domRender_proxy, eventManager.findAttrElements(target, this.config), this.config);
2553
2556
  rawSets.forEach(function (it) {
2554
2557
  var variables = it.getUsingTriggerVariables(_this.config);
@@ -2656,8 +2659,11 @@ var DomRenderProxy = /** @class */ (function () {
2656
2659
  this.render(Array.from(iterable));
2657
2660
  }
2658
2661
  this._targets.forEach(function (it) {
2662
+ // console.log('target------->,', it)
2663
+ // return;
2659
2664
  if (it.nodeType === Node.DOCUMENT_FRAGMENT_NODE || it.nodeType === Node.ELEMENT_NODE) {
2660
2665
  var targets = eventManager.findAttrElements(it, _this.config);
2666
+ // console.log('------>', targets);
2661
2667
  eventManager.changeVar(_this._domRender_proxy, targets, "this.".concat(fullPathStr_1), _this.config);
2662
2668
  }
2663
2669
  });
@@ -3327,46 +3333,17 @@ var RenderManager = /** @class */ (function () {
3327
3333
  return RenderManager;
3328
3334
  }());
3329
3335
 
3330
- var Appender = /** @class */ (function () {
3331
- // [keys: string]: any;
3332
- function Appender() {
3333
- this.length = 0;
3334
- // (this.childs as any).isAppender = true;
3335
- }
3336
- Appender.prototype.push = function () {
3337
- var items = [];
3338
- for (var _i = 0; _i < arguments.length; _i++) {
3339
- items[_i] = arguments[_i];
3340
- }
3341
- // console.log('----2>', this.length)
3342
- items.index = this.length;
3343
- this[this.length++] = items;
3344
- // console.log('---22->', this.length)
3345
- // const appender = this.childs[this.lastIndex];
3346
- // appender.values = items;
3347
- // this.childs.push(new Appender(appender.index + 1));
3348
- };
3349
- Appender.prototype.clear = function () {
3350
- // console.log('length', this.length);
3351
- for (var i = 0; i < this.length; i++) {
3352
- delete this[i];
3353
- }
3354
- this.length = 0;
3355
- };
3356
- return Appender;
3357
- }());
3358
-
3359
- var AllCheckedValidatorArray = /** @class */ (function (_super) {
3360
- __extends(AllCheckedValidatorArray, _super);
3361
- function AllCheckedValidatorArray(value, target, event, autoValid) {
3336
+ var AllUnCheckedValidatorArray = /** @class */ (function (_super) {
3337
+ __extends(AllUnCheckedValidatorArray, _super);
3338
+ function AllUnCheckedValidatorArray(value, target, event, autoValid) {
3362
3339
  if (autoValid === void 0) { autoValid = true; }
3363
3340
  return _super.call(this, value, target, event, autoValid) || this;
3364
3341
  }
3365
- AllCheckedValidatorArray.prototype.valid = function () {
3342
+ AllUnCheckedValidatorArray.prototype.valid = function () {
3366
3343
  var _a;
3367
- return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length > 0);
3344
+ return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > 0);
3368
3345
  };
3369
- return AllCheckedValidatorArray;
3346
+ return AllUnCheckedValidatorArray;
3370
3347
  }(ValidatorArray));
3371
3348
 
3372
3349
  var CheckedValidator = /** @class */ (function (_super) {
@@ -3382,32 +3359,17 @@ var CheckedValidator = /** @class */ (function (_super) {
3382
3359
  return CheckedValidator;
3383
3360
  }(Validator));
3384
3361
 
3385
- var CountEqualsCheckedValidatorArray = /** @class */ (function (_super) {
3386
- __extends(CountEqualsCheckedValidatorArray, _super);
3387
- function CountEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
3388
- if (autoValid === void 0) { autoValid = true; }
3389
- var _this = _super.call(this, value, target, event, autoValid) || this;
3390
- _this.count = count;
3391
- return _this;
3392
- }
3393
- CountEqualsCheckedValidatorArray.prototype.valid = function () {
3394
- var _a;
3395
- return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length === this.count;
3396
- };
3397
- return CountEqualsCheckedValidatorArray;
3398
- }(ValidatorArray));
3399
-
3400
- var AllUnCheckedValidatorArray = /** @class */ (function (_super) {
3401
- __extends(AllUnCheckedValidatorArray, _super);
3402
- function AllUnCheckedValidatorArray(value, target, event, autoValid) {
3362
+ var AllCheckedValidatorArray = /** @class */ (function (_super) {
3363
+ __extends(AllCheckedValidatorArray, _super);
3364
+ function AllCheckedValidatorArray(value, target, event, autoValid) {
3403
3365
  if (autoValid === void 0) { autoValid = true; }
3404
3366
  return _super.call(this, value, target, event, autoValid) || this;
3405
3367
  }
3406
- AllUnCheckedValidatorArray.prototype.valid = function () {
3368
+ AllCheckedValidatorArray.prototype.valid = function () {
3407
3369
  var _a;
3408
- return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > 0);
3370
+ return !(((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length > 0);
3409
3371
  };
3410
- return AllUnCheckedValidatorArray;
3372
+ return AllCheckedValidatorArray;
3411
3373
  }(ValidatorArray));
3412
3374
 
3413
3375
  var CountGreaterThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3425,34 +3387,34 @@ var CountGreaterThanEqualsCheckedValidatorArray = /** @class */ (function (_supe
3425
3387
  return CountGreaterThanEqualsCheckedValidatorArray;
3426
3388
  }(ValidatorArray));
3427
3389
 
3428
- var CountEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
3429
- __extends(CountEqualsUnCheckedValidatorArray, _super);
3430
- function CountEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
3390
+ var CountEqualsCheckedValidatorArray = /** @class */ (function (_super) {
3391
+ __extends(CountEqualsCheckedValidatorArray, _super);
3392
+ function CountEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
3431
3393
  if (autoValid === void 0) { autoValid = true; }
3432
3394
  var _this = _super.call(this, value, target, event, autoValid) || this;
3433
3395
  _this.count = count;
3434
3396
  return _this;
3435
3397
  }
3436
- CountEqualsUnCheckedValidatorArray.prototype.valid = function () {
3398
+ CountEqualsCheckedValidatorArray.prototype.valid = function () {
3437
3399
  var _a;
3438
- return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length === this.count;
3400
+ return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length === this.count;
3439
3401
  };
3440
- return CountEqualsUnCheckedValidatorArray;
3402
+ return CountEqualsCheckedValidatorArray;
3441
3403
  }(ValidatorArray));
3442
3404
 
3443
- var CountLessThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
3444
- __extends(CountLessThanEqualsCheckedValidatorArray, _super);
3445
- function CountLessThanEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
3405
+ var CountGreaterThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
3406
+ __extends(CountGreaterThanEqualsUnCheckedValidatorArray, _super);
3407
+ function CountGreaterThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
3446
3408
  if (autoValid === void 0) { autoValid = true; }
3447
3409
  var _this = _super.call(this, value, target, event, autoValid) || this;
3448
3410
  _this.count = count;
3449
3411
  return _this;
3450
3412
  }
3451
- CountLessThanEqualsCheckedValidatorArray.prototype.valid = function () {
3413
+ CountGreaterThanEqualsUnCheckedValidatorArray.prototype.valid = function () {
3452
3414
  var _a;
3453
- return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length <= this.count;
3415
+ return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length >= this.count;
3454
3416
  };
3455
- return CountLessThanEqualsCheckedValidatorArray;
3417
+ return CountGreaterThanEqualsUnCheckedValidatorArray;
3456
3418
  }(ValidatorArray));
3457
3419
 
3458
3420
  var CountGreaterThanUnCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3470,19 +3432,19 @@ var CountGreaterThanUnCheckedValidatorArray = /** @class */ (function (_super) {
3470
3432
  return CountGreaterThanUnCheckedValidatorArray;
3471
3433
  }(ValidatorArray));
3472
3434
 
3473
- var CountGreaterThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
3474
- __extends(CountGreaterThanEqualsUnCheckedValidatorArray, _super);
3475
- function CountGreaterThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
3435
+ var CountLessThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
3436
+ __extends(CountLessThanEqualsUnCheckedValidatorArray, _super);
3437
+ function CountLessThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
3476
3438
  if (autoValid === void 0) { autoValid = true; }
3477
3439
  var _this = _super.call(this, value, target, event, autoValid) || this;
3478
3440
  _this.count = count;
3479
3441
  return _this;
3480
3442
  }
3481
- CountGreaterThanEqualsUnCheckedValidatorArray.prototype.valid = function () {
3443
+ CountLessThanEqualsUnCheckedValidatorArray.prototype.valid = function () {
3482
3444
  var _a;
3483
- return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length >= this.count;
3445
+ return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length <= this.count;
3484
3446
  };
3485
- return CountGreaterThanEqualsUnCheckedValidatorArray;
3447
+ return CountLessThanEqualsUnCheckedValidatorArray;
3486
3448
  }(ValidatorArray));
3487
3449
 
3488
3450
  var CountLessThanCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3500,19 +3462,34 @@ var CountLessThanCheckedValidatorArray = /** @class */ (function (_super) {
3500
3462
  return CountLessThanCheckedValidatorArray;
3501
3463
  }(ValidatorArray));
3502
3464
 
3503
- var CountLessThanEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
3504
- __extends(CountLessThanEqualsUnCheckedValidatorArray, _super);
3505
- function CountLessThanEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
3465
+ var CountEqualsUnCheckedValidatorArray = /** @class */ (function (_super) {
3466
+ __extends(CountEqualsUnCheckedValidatorArray, _super);
3467
+ function CountEqualsUnCheckedValidatorArray(count, value, target, event, autoValid) {
3506
3468
  if (autoValid === void 0) { autoValid = true; }
3507
3469
  var _this = _super.call(this, value, target, event, autoValid) || this;
3508
3470
  _this.count = count;
3509
3471
  return _this;
3510
3472
  }
3511
- CountLessThanEqualsUnCheckedValidatorArray.prototype.valid = function () {
3473
+ CountEqualsUnCheckedValidatorArray.prototype.valid = function () {
3512
3474
  var _a;
3513
- return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length <= this.count;
3475
+ return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length === this.count;
3514
3476
  };
3515
- return CountLessThanEqualsUnCheckedValidatorArray;
3477
+ return CountEqualsUnCheckedValidatorArray;
3478
+ }(ValidatorArray));
3479
+
3480
+ var CountLessThanEqualsCheckedValidatorArray = /** @class */ (function (_super) {
3481
+ __extends(CountLessThanEqualsCheckedValidatorArray, _super);
3482
+ function CountLessThanEqualsCheckedValidatorArray(count, value, target, event, autoValid) {
3483
+ if (autoValid === void 0) { autoValid = true; }
3484
+ var _this = _super.call(this, value, target, event, autoValid) || this;
3485
+ _this.count = count;
3486
+ return _this;
3487
+ }
3488
+ CountLessThanEqualsCheckedValidatorArray.prototype.valid = function () {
3489
+ var _a;
3490
+ return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length <= this.count;
3491
+ };
3492
+ return CountLessThanEqualsCheckedValidatorArray;
3516
3493
  }(ValidatorArray));
3517
3494
 
3518
3495
  var CountLessThanUnCheckedValidatorArray = /** @class */ (function (_super) {
@@ -3530,6 +3507,21 @@ var CountLessThanUnCheckedValidatorArray = /** @class */ (function (_super) {
3530
3507
  return CountLessThanUnCheckedValidatorArray;
3531
3508
  }(ValidatorArray));
3532
3509
 
3510
+ var CountUnCheckedValidatorArray = /** @class */ (function (_super) {
3511
+ __extends(CountUnCheckedValidatorArray, _super);
3512
+ function CountUnCheckedValidatorArray(count, value, target, event, autoValid) {
3513
+ if (autoValid === void 0) { autoValid = true; }
3514
+ var _this = _super.call(this, value, target, event, autoValid) || this;
3515
+ _this.count = count;
3516
+ return _this;
3517
+ }
3518
+ CountUnCheckedValidatorArray.prototype.valid = function () {
3519
+ var _a;
3520
+ return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length >= this.count;
3521
+ };
3522
+ return CountUnCheckedValidatorArray;
3523
+ }(ValidatorArray));
3524
+
3533
3525
  var FormValidator = /** @class */ (function (_super) {
3534
3526
  __extends(FormValidator, _super);
3535
3527
  function FormValidator(target, event, autoValid) {
@@ -3548,6 +3540,57 @@ var FormValidator = /** @class */ (function (_super) {
3548
3540
  return FormValidator;
3549
3541
  }(Validator));
3550
3542
 
3543
+ var EmptyValidator = /** @class */ (function (_super) {
3544
+ __extends(EmptyValidator, _super);
3545
+ function EmptyValidator(value, target, event, autoValid) {
3546
+ if (autoValid === void 0) { autoValid = true; }
3547
+ return _super.call(this, value, target, event, autoValid) || this;
3548
+ }
3549
+ EmptyValidator.prototype.valid = function () {
3550
+ var _a, _b;
3551
+ var value = this.value;
3552
+ return value === undefined || value === null || ((_b = (_a = value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) <= 0;
3553
+ };
3554
+ return EmptyValidator;
3555
+ }(Validator));
3556
+
3557
+ var CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
3558
+ __extends(CountGreaterThanCheckedValidatorArray, _super);
3559
+ function CountGreaterThanCheckedValidatorArray(count, value, target, event, autoValid) {
3560
+ if (autoValid === void 0) { autoValid = true; }
3561
+ var _this = _super.call(this, value, target, event, autoValid) || this;
3562
+ _this.count = count;
3563
+ return _this;
3564
+ }
3565
+ CountGreaterThanCheckedValidatorArray.prototype.valid = function () {
3566
+ var _a;
3567
+ return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > this.count;
3568
+ };
3569
+ return CountGreaterThanCheckedValidatorArray;
3570
+ }(ValidatorArray));
3571
+
3572
+ var IncludeCheckedValidatorArray = /** @class */ (function (_super) {
3573
+ __extends(IncludeCheckedValidatorArray, _super);
3574
+ function IncludeCheckedValidatorArray(include, allRequired, value, target, event, autoValid) {
3575
+ if (allRequired === void 0) { allRequired = false; }
3576
+ if (autoValid === void 0) { autoValid = true; }
3577
+ var _this = _super.call(this, value, target, event, autoValid) || this;
3578
+ _this.include = include;
3579
+ _this.allRequired = allRequired;
3580
+ return _this;
3581
+ }
3582
+ IncludeCheckedValidatorArray.prototype.valid = function () {
3583
+ var _this = this;
3584
+ var _a;
3585
+ var valus = (_a = this.value) !== null && _a !== void 0 ? _a : [];
3586
+ var checkedValue = valus.filter(function (it) { return it.checked; }).map(function (it) { return it.value; });
3587
+ return checkedValue.length > 0 &&
3588
+ (!(checkedValue.filter(function (it) { return !_this.include.includes(it); }).length > 0)) &&
3589
+ (this.allRequired ? checkedValue.filter(function (it) { return _this.include.includes(it); }).length === this.include.length : true);
3590
+ };
3591
+ return IncludeCheckedValidatorArray;
3592
+ }(ValidatorArray));
3593
+
3551
3594
  var ExcludeCheckedValidatorArray = /** @class */ (function (_super) {
3552
3595
  __extends(ExcludeCheckedValidatorArray, _super);
3553
3596
  function ExcludeCheckedValidatorArray(include, allRequired, value, target, event, autoValid) {
@@ -3570,35 +3613,6 @@ var ExcludeCheckedValidatorArray = /** @class */ (function (_super) {
3570
3613
  return ExcludeCheckedValidatorArray;
3571
3614
  }(ValidatorArray));
3572
3615
 
3573
- var CountUnCheckedValidatorArray = /** @class */ (function (_super) {
3574
- __extends(CountUnCheckedValidatorArray, _super);
3575
- function CountUnCheckedValidatorArray(count, value, target, event, autoValid) {
3576
- if (autoValid === void 0) { autoValid = true; }
3577
- var _this = _super.call(this, value, target, event, autoValid) || this;
3578
- _this.count = count;
3579
- return _this;
3580
- }
3581
- CountUnCheckedValidatorArray.prototype.valid = function () {
3582
- var _a;
3583
- return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return !it.checked; }).length >= this.count;
3584
- };
3585
- return CountUnCheckedValidatorArray;
3586
- }(ValidatorArray));
3587
-
3588
- var EmptyValidator = /** @class */ (function (_super) {
3589
- __extends(EmptyValidator, _super);
3590
- function EmptyValidator(value, target, event, autoValid) {
3591
- if (autoValid === void 0) { autoValid = true; }
3592
- return _super.call(this, value, target, event, autoValid) || this;
3593
- }
3594
- EmptyValidator.prototype.valid = function () {
3595
- var _a, _b;
3596
- var value = this.value;
3597
- return value === undefined || value === null || ((_b = (_a = value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) <= 0;
3598
- };
3599
- return EmptyValidator;
3600
- }(Validator));
3601
-
3602
3616
  var MultipleValidator = /** @class */ (function (_super) {
3603
3617
  __extends(MultipleValidator, _super);
3604
3618
  function MultipleValidator(validators, value, target, event, autoValid) {
@@ -3628,21 +3642,6 @@ var MultipleValidator = /** @class */ (function (_super) {
3628
3642
  return MultipleValidator;
3629
3643
  }(Validator));
3630
3644
 
3631
- var NotEmptyValidator = /** @class */ (function (_super) {
3632
- __extends(NotEmptyValidator, _super);
3633
- function NotEmptyValidator(value, target, event, autoValid) {
3634
- if (autoValid === void 0) { autoValid = true; }
3635
- return _super.call(this, value, target, event, autoValid) || this;
3636
- }
3637
- NotEmptyValidator.prototype.valid = function () {
3638
- var _a, _b;
3639
- var value = this.value;
3640
- // console.log('NotEmptyValidator', value, value !== undefined && value !== null && ((value as any)?.length ?? 0) > 0)
3641
- return value !== undefined && value !== null && ((_b = (_a = value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0;
3642
- };
3643
- return NotEmptyValidator;
3644
- }(Validator));
3645
-
3646
3645
  var NotRegExpTestValidator = /** @class */ (function (_super) {
3647
3646
  __extends(NotRegExpTestValidator, _super);
3648
3647
  function NotRegExpTestValidator(regexp, value, target, event, autoValid) {
@@ -3665,54 +3664,54 @@ var NotRegExpTestValidator = /** @class */ (function (_super) {
3665
3664
  return NotRegExpTestValidator;
3666
3665
  }(Validator));
3667
3666
 
3668
- var IncludeCheckedValidatorArray = /** @class */ (function (_super) {
3669
- __extends(IncludeCheckedValidatorArray, _super);
3670
- function IncludeCheckedValidatorArray(include, allRequired, value, target, event, autoValid) {
3671
- if (allRequired === void 0) { allRequired = false; }
3667
+ var NotEmptyValidator = /** @class */ (function (_super) {
3668
+ __extends(NotEmptyValidator, _super);
3669
+ function NotEmptyValidator(value, target, event, autoValid) {
3672
3670
  if (autoValid === void 0) { autoValid = true; }
3673
- var _this = _super.call(this, value, target, event, autoValid) || this;
3674
- _this.include = include;
3675
- _this.allRequired = allRequired;
3676
- return _this;
3671
+ return _super.call(this, value, target, event, autoValid) || this;
3677
3672
  }
3678
- IncludeCheckedValidatorArray.prototype.valid = function () {
3679
- var _this = this;
3680
- var _a;
3681
- var valus = (_a = this.value) !== null && _a !== void 0 ? _a : [];
3682
- var checkedValue = valus.filter(function (it) { return it.checked; }).map(function (it) { return it.value; });
3683
- return checkedValue.length > 0 &&
3684
- (!(checkedValue.filter(function (it) { return !_this.include.includes(it); }).length > 0)) &&
3685
- (this.allRequired ? checkedValue.filter(function (it) { return _this.include.includes(it); }).length === this.include.length : true);
3673
+ NotEmptyValidator.prototype.valid = function () {
3674
+ var _a, _b;
3675
+ var value = this.value;
3676
+ // console.log('NotEmptyValidator', value, value !== undefined && value !== null && ((value as any)?.length ?? 0) > 0)
3677
+ return value !== undefined && value !== null && ((_b = (_a = value) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0) > 0;
3686
3678
  };
3687
- return IncludeCheckedValidatorArray;
3688
- }(ValidatorArray));
3679
+ return NotEmptyValidator;
3680
+ }(Validator));
3689
3681
 
3690
- var CountGreaterThanCheckedValidatorArray = /** @class */ (function (_super) {
3691
- __extends(CountGreaterThanCheckedValidatorArray, _super);
3692
- function CountGreaterThanCheckedValidatorArray(count, value, target, event, autoValid) {
3682
+ var RegExpTestValidator = /** @class */ (function (_super) {
3683
+ __extends(RegExpTestValidator, _super);
3684
+ function RegExpTestValidator(regexp, value, target, event, autoValid) {
3693
3685
  if (autoValid === void 0) { autoValid = true; }
3694
3686
  var _this = _super.call(this, value, target, event, autoValid) || this;
3695
- _this.count = count;
3687
+ _this.regexp = DomRenderProxy.final(regexp);
3696
3688
  return _this;
3697
3689
  }
3698
- CountGreaterThanCheckedValidatorArray.prototype.valid = function () {
3690
+ RegExpTestValidator.prototype.valid = function () {
3699
3691
  var _a;
3700
- return ((_a = this.value) !== null && _a !== void 0 ? _a : []).filter(function (it) { return it.checked; }).length > this.count;
3692
+ var value = this.value;
3693
+ var regExp = (_a = this.regexp._DomRender_origin) !== null && _a !== void 0 ? _a : this.regexp;
3694
+ // console.log('regexp-->', value, this.regexp, regExp.test(value))
3695
+ if (value) {
3696
+ return regExp.test(value);
3697
+ }
3698
+ else {
3699
+ return false;
3700
+ }
3701
3701
  };
3702
- return CountGreaterThanCheckedValidatorArray;
3703
- }(ValidatorArray));
3702
+ return RegExpTestValidator;
3703
+ }(Validator));
3704
3704
 
3705
- var UnCheckedValidator = /** @class */ (function (_super) {
3706
- __extends(UnCheckedValidator, _super);
3707
- function UnCheckedValidator(value, target, event, autoValid) {
3705
+ var PassValidator = /** @class */ (function (_super) {
3706
+ __extends(PassValidator, _super);
3707
+ function PassValidator(value, target, event, autoValid) {
3708
3708
  if (autoValid === void 0) { autoValid = true; }
3709
3709
  return _super.call(this, value, target, event, autoValid) || this;
3710
3710
  }
3711
- UnCheckedValidator.prototype.valid = function () {
3712
- var _a, _b;
3713
- return !((_b = (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.checked) !== null && _b !== void 0 ? _b : false);
3711
+ PassValidator.prototype.valid = function () {
3712
+ return true;
3714
3713
  };
3715
- return UnCheckedValidator;
3714
+ return PassValidator;
3716
3715
  }(Validator));
3717
3716
 
3718
3717
  var RequiredValidator = /** @class */ (function (_super) {
@@ -3729,20 +3728,6 @@ var RequiredValidator = /** @class */ (function (_super) {
3729
3728
  return RequiredValidator;
3730
3729
  }(Validator));
3731
3730
 
3732
- var ValidValidatorArray = /** @class */ (function (_super) {
3733
- __extends(ValidValidatorArray, _super);
3734
- function ValidValidatorArray(validCallBack, value, target, event, autoValid) {
3735
- if (autoValid === void 0) { autoValid = true; }
3736
- var _this = _super.call(this, value, target, event, autoValid) || this;
3737
- _this.validCallBack = validCallBack;
3738
- return _this;
3739
- }
3740
- ValidValidatorArray.prototype.valid = function () {
3741
- return this.validCallBack(this.value, this.getTarget(), this.getEvent());
3742
- };
3743
- return ValidValidatorArray;
3744
- }(ValidatorArray));
3745
-
3746
3731
  var ValidMultipleValidator = /** @class */ (function (_super) {
3747
3732
  __extends(ValidMultipleValidator, _super);
3748
3733
  function ValidMultipleValidator(validMultipleCallback, validators, value, target, event, autoValid) {
@@ -3758,44 +3743,45 @@ var ValidMultipleValidator = /** @class */ (function (_super) {
3758
3743
  return ValidMultipleValidator;
3759
3744
  }(MultipleValidator));
3760
3745
 
3761
- var ValidValidator = /** @class */ (function (_super) {
3762
- __extends(ValidValidator, _super);
3763
- function ValidValidator(validCallBack, value, target, event, autoValid) {
3746
+ var ValidValidatorArray = /** @class */ (function (_super) {
3747
+ __extends(ValidValidatorArray, _super);
3748
+ function ValidValidatorArray(validCallBack, value, target, event, autoValid) {
3764
3749
  if (autoValid === void 0) { autoValid = true; }
3765
3750
  var _this = _super.call(this, value, target, event, autoValid) || this;
3766
3751
  _this.validCallBack = validCallBack;
3767
3752
  return _this;
3768
3753
  }
3769
- ValidValidator.prototype.valid = function (value, target, event) {
3770
- return this.validCallBack(value, target, event);
3754
+ ValidValidatorArray.prototype.valid = function () {
3755
+ return this.validCallBack(this.value, this.getTarget(), this.getEvent());
3771
3756
  };
3772
- return ValidValidator;
3773
- }(Validator));
3757
+ return ValidValidatorArray;
3758
+ }(ValidatorArray));
3774
3759
 
3775
- var ValueNotEqualsValidator = /** @class */ (function (_super) {
3776
- __extends(ValueNotEqualsValidator, _super);
3777
- function ValueNotEqualsValidator(equalsValue, value, target, event, autoValid) {
3760
+ var ValidValidator = /** @class */ (function (_super) {
3761
+ __extends(ValidValidator, _super);
3762
+ function ValidValidator(validCallBack, value, target, event, autoValid) {
3778
3763
  if (autoValid === void 0) { autoValid = true; }
3779
3764
  var _this = _super.call(this, value, target, event, autoValid) || this;
3780
- _this.equalsValue = equalsValue;
3765
+ _this.validCallBack = validCallBack;
3781
3766
  return _this;
3782
3767
  }
3783
- ValueNotEqualsValidator.prototype.valid = function () {
3784
- return this.value !== this.equalsValue;
3768
+ ValidValidator.prototype.valid = function (value, target, event) {
3769
+ return this.validCallBack(value, target, event);
3785
3770
  };
3786
- return ValueNotEqualsValidator;
3771
+ return ValidValidator;
3787
3772
  }(Validator));
3788
3773
 
3789
- var PassValidator = /** @class */ (function (_super) {
3790
- __extends(PassValidator, _super);
3791
- function PassValidator(value, target, event, autoValid) {
3774
+ var UnCheckedValidator = /** @class */ (function (_super) {
3775
+ __extends(UnCheckedValidator, _super);
3776
+ function UnCheckedValidator(value, target, event, autoValid) {
3792
3777
  if (autoValid === void 0) { autoValid = true; }
3793
3778
  return _super.call(this, value, target, event, autoValid) || this;
3794
3779
  }
3795
- PassValidator.prototype.valid = function () {
3796
- return true;
3780
+ UnCheckedValidator.prototype.valid = function () {
3781
+ var _a, _b;
3782
+ return !((_b = (_a = this.getTarget()) === null || _a === void 0 ? void 0 : _a.checked) !== null && _b !== void 0 ? _b : false);
3797
3783
  };
3798
- return PassValidator;
3784
+ return UnCheckedValidator;
3799
3785
  }(Validator));
3800
3786
 
3801
3787
  var ValueEqualsValidator = /** @class */ (function (_super) {
@@ -3812,49 +3798,71 @@ var ValueEqualsValidator = /** @class */ (function (_super) {
3812
3798
  return ValueEqualsValidator;
3813
3799
  }(Validator));
3814
3800
 
3815
- var RegExpTestValidator = /** @class */ (function (_super) {
3816
- __extends(RegExpTestValidator, _super);
3817
- function RegExpTestValidator(regexp, value, target, event, autoValid) {
3801
+ var ValueNotEqualsValidator = /** @class */ (function (_super) {
3802
+ __extends(ValueNotEqualsValidator, _super);
3803
+ function ValueNotEqualsValidator(equalsValue, value, target, event, autoValid) {
3818
3804
  if (autoValid === void 0) { autoValid = true; }
3819
3805
  var _this = _super.call(this, value, target, event, autoValid) || this;
3820
- _this.regexp = DomRenderProxy.final(regexp);
3806
+ _this.equalsValue = equalsValue;
3821
3807
  return _this;
3822
3808
  }
3823
- RegExpTestValidator.prototype.valid = function () {
3824
- var _a;
3825
- var value = this.value;
3826
- var regExp = (_a = this.regexp._DomRender_origin) !== null && _a !== void 0 ? _a : this.regexp;
3827
- // console.log('regexp-->', value, this.regexp, regExp.test(value))
3828
- if (value) {
3829
- return regExp.test(value);
3809
+ ValueNotEqualsValidator.prototype.valid = function () {
3810
+ return this.value !== this.equalsValue;
3811
+ };
3812
+ return ValueNotEqualsValidator;
3813
+ }(Validator));
3814
+
3815
+ var Appender = /** @class */ (function () {
3816
+ // [keys: string]: any;
3817
+ function Appender() {
3818
+ this.length = 0;
3819
+ // (this.childs as any).isAppender = true;
3820
+ }
3821
+ Appender.prototype.push = function () {
3822
+ var items = [];
3823
+ for (var _i = 0; _i < arguments.length; _i++) {
3824
+ items[_i] = arguments[_i];
3830
3825
  }
3831
- else {
3832
- return false;
3826
+ // console.log('----2>', this.length)
3827
+ items.index = this.length;
3828
+ this[this.length++] = items;
3829
+ // console.log('---22->', this.length)
3830
+ // const appender = this.childs[this.lastIndex];
3831
+ // appender.values = items;
3832
+ // this.childs.push(new Appender(appender.index + 1));
3833
+ };
3834
+ Appender.prototype.clear = function () {
3835
+ // console.log('length', this.length);
3836
+ for (var i = 0; i < this.length; i++) {
3837
+ delete this[i];
3833
3838
  }
3839
+ this.length = 0;
3834
3840
  };
3835
- return RegExpTestValidator;
3836
- }(Validator));
3841
+ return Appender;
3842
+ }());
3837
3843
 
3838
- var ClipBoardUtils = /** @class */ (function () {
3839
- function ClipBoardUtils() {
3844
+ var NodeUtils = /** @class */ (function () {
3845
+ function NodeUtils() {
3840
3846
  }
3841
- ClipBoardUtils.readText = function (clipboard) {
3842
- if (clipboard === void 0) { clipboard = navigator.clipboard; }
3843
- return clipboard.readText();
3847
+ // https://stackoverflow.com/questions/3955229/remove-all-child-elements-of-a-dom-node-in-javascript
3848
+ NodeUtils.removeAllChildNode = function (node) {
3849
+ while (node === null || node === void 0 ? void 0 : node.firstChild) {
3850
+ node.firstChild.remove();
3851
+ }
3844
3852
  };
3845
- ClipBoardUtils.read = function (clipboard) {
3846
- if (clipboard === void 0) { clipboard = navigator.clipboard; }
3847
- return clipboard.read();
3853
+ NodeUtils.appendChild = function (parentNode, childNode) {
3854
+ return parentNode.appendChild(childNode);
3848
3855
  };
3849
- ClipBoardUtils.writeText = function (data, clipboard) {
3850
- if (clipboard === void 0) { clipboard = navigator.clipboard; }
3851
- return clipboard.writeText(data);
3856
+ NodeUtils.replaceNode = function (targetNode, newNode) {
3857
+ var _a;
3858
+ // console.log('repalceNode', targetNode, newNode, targetNode.parentNode)
3859
+ return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.replaceChild(newNode, targetNode);
3852
3860
  };
3853
- ClipBoardUtils.write = function (data, clipboard) {
3854
- if (clipboard === void 0) { clipboard = navigator.clipboard; }
3855
- return clipboard.write(data);
3861
+ NodeUtils.addNode = function (targetNode, newNode) {
3862
+ var _a;
3863
+ return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(newNode, targetNode.nextSibling);
3856
3864
  };
3857
- return ClipBoardUtils;
3865
+ return NodeUtils;
3858
3866
  }());
3859
3867
 
3860
3868
  var StorageUtils = /** @class */ (function () {
@@ -3902,34 +3910,31 @@ var StorageUtils = /** @class */ (function () {
3902
3910
  return StorageUtils;
3903
3911
  }());
3904
3912
 
3905
- var NodeUtils = /** @class */ (function () {
3906
- function NodeUtils() {
3913
+ var ClipBoardUtils = /** @class */ (function () {
3914
+ function ClipBoardUtils() {
3907
3915
  }
3908
- // https://stackoverflow.com/questions/3955229/remove-all-child-elements-of-a-dom-node-in-javascript
3909
- NodeUtils.removeAllChildNode = function (node) {
3910
- while (node === null || node === void 0 ? void 0 : node.firstChild) {
3911
- node.firstChild.remove();
3912
- }
3916
+ ClipBoardUtils.readText = function (clipboard) {
3917
+ if (clipboard === void 0) { clipboard = navigator.clipboard; }
3918
+ return clipboard.readText();
3913
3919
  };
3914
- NodeUtils.appendChild = function (parentNode, childNode) {
3915
- return parentNode.appendChild(childNode);
3920
+ ClipBoardUtils.read = function (clipboard) {
3921
+ if (clipboard === void 0) { clipboard = navigator.clipboard; }
3922
+ return clipboard.read();
3916
3923
  };
3917
- NodeUtils.replaceNode = function (targetNode, newNode) {
3918
- var _a;
3919
- // console.log('repalceNode', targetNode, newNode, targetNode.parentNode)
3920
- return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.replaceChild(newNode, targetNode);
3924
+ ClipBoardUtils.writeText = function (data, clipboard) {
3925
+ if (clipboard === void 0) { clipboard = navigator.clipboard; }
3926
+ return clipboard.writeText(data);
3921
3927
  };
3922
- NodeUtils.addNode = function (targetNode, newNode) {
3923
- var _a;
3924
- return (_a = targetNode.parentNode) === null || _a === void 0 ? void 0 : _a.insertBefore(newNode, targetNode.nextSibling);
3928
+ ClipBoardUtils.write = function (data, clipboard) {
3929
+ if (clipboard === void 0) { clipboard = navigator.clipboard; }
3930
+ return clipboard.write(data);
3925
3931
  };
3926
- return NodeUtils;
3932
+ return ClipBoardUtils;
3927
3933
  }());
3928
3934
 
3929
3935
  exports.AllCheckedValidatorArray = AllCheckedValidatorArray;
3930
3936
  exports.AllUnCheckedValidatorArray = AllUnCheckedValidatorArray;
3931
3937
  exports.Appender = Appender;
3932
- exports.AttrExpresion = AttrExpresion;
3933
3938
  exports.Channel = Channel;
3934
3939
  exports.ChannelSubscriber = ChannelSubscriber;
3935
3940
  exports.ChannelSubscription = ChannelSubscription;
@@ -8,6 +8,7 @@ export declare class EventManager {
8
8
  static readonly valueAttrName: string;
9
9
  static readonly valueLinkAttrName: string;
10
10
  static readonly attrAttrName: string;
11
+ static readonly normalAttrMapAttrName: string;
11
12
  static readonly styleAttrName: string;
12
13
  static readonly classAttrName: string;
13
14
  readonly attrNames: string[];
@@ -18,6 +18,7 @@ var EventManager = /** @class */ (function () {
18
18
  EventManager.valueAttrName,
19
19
  EventManager.valueLinkAttrName,
20
20
  EventManager.attrAttrName,
21
+ EventManager.normalAttrMapAttrName,
21
22
  EventManager.styleAttrName,
22
23
  EventManager.classAttrName,
23
24
  EventManager.attrPrefix + 'window-event-' + EventManager.WINDOW_EVENT_POPSTATE,
@@ -96,6 +97,18 @@ var EventManager = /** @class */ (function () {
96
97
  }
97
98
  }
98
99
  });
100
+ // normal-attr-map
101
+ this.procAttr(childNodes, EventManager.normalAttrMapAttrName, function (it, attribute) {
102
+ var map = new Map(JSON.parse(attribute));
103
+ map.forEach(function (v, k) {
104
+ var data = ScriptUtils_1.ScriptUtils.eval("const $element = this.element; return ".concat(v, " "), Object.assign(obj, {
105
+ __render: Object.freeze({
106
+ element: it
107
+ })
108
+ }));
109
+ it.setAttribute(k, data);
110
+ });
111
+ });
99
112
  // window event
100
113
  EventManager.WINDOW_EVENTS.forEach(function (it) {
101
114
  _this.procAttr(childNodes, EventManager.attrPrefix + 'window-event-' + it, function (it, attribute) {
@@ -335,6 +348,23 @@ var EventManager = /** @class */ (function () {
335
348
  }
336
349
  }
337
350
  });
351
+ // normal-attr-map
352
+ this.procAttr(elements, EventManager.normalAttrMapAttrName, function (it, attribute) {
353
+ var map = new Map(JSON.parse(attribute));
354
+ map.forEach(function (v, k) {
355
+ // console.log('--->', v, k)
356
+ var isUsing = _this.isUsingThisVar(v, varName);
357
+ // console.log('---isUsing-->', varName, k, v, isUsing);
358
+ if (isUsing) {
359
+ var data = ScriptUtils_1.ScriptUtils.eval("const $element = this.element; return ".concat(v, " "), Object.assign(obj, {
360
+ __render: Object.freeze({
361
+ element: it
362
+ })
363
+ }));
364
+ it.setAttribute(k, data);
365
+ }
366
+ });
367
+ });
338
368
  };
339
369
  // eslint-disable-next-line no-undef
340
370
  EventManager.prototype.addDrEvents = function (obj, eventName, elements, config) {
@@ -475,6 +505,7 @@ var EventManager = /** @class */ (function () {
475
505
  EventManager.valueAttrName = EventManager.attrPrefix + 'value';
476
506
  EventManager.valueLinkAttrName = EventManager.attrPrefix + 'value-link';
477
507
  EventManager.attrAttrName = EventManager.attrPrefix + 'attr';
508
+ EventManager.normalAttrMapAttrName = EventManager.attrPrefix + 'normal-attr-map';
478
509
  EventManager.styleAttrName = EventManager.attrPrefix + 'style';
479
510
  EventManager.classAttrName = EventManager.attrPrefix + 'class';
480
511
  EventManager.VALUE_VARNAME = '$value';
@@ -1,4 +0,0 @@
1
- import { ExecuteState, OperatorRender } from './OperatorRender';
2
- export declare class AttrExpresion extends OperatorRender {
3
- execRender(): ExecuteState;
4
- }
@@ -1,68 +1,44 @@
1
1
  "use strict";
2
- var __extends = (this && this.__extends) || (function () {
3
- var extendStatics = function (d, b) {
4
- extendStatics = Object.setPrototypeOf ||
5
- ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
6
- function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
7
- return extendStatics(d, b);
8
- };
9
- return function (d, b) {
10
- if (typeof b !== "function" && b !== null)
11
- throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
12
- extendStatics(d, b);
13
- function __() { this.constructor = d; }
14
- d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
15
- };
16
- })();
17
- var __assign = (this && this.__assign) || function () {
18
- __assign = Object.assign || function(t) {
19
- for (var s, i = 1, n = arguments.length; i < n; i++) {
20
- s = arguments[i];
21
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
22
- t[p] = s[p];
23
- }
24
- return t;
25
- };
26
- return __assign.apply(this, arguments);
27
- };
28
- Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.AttrExpresion = void 0;
30
- var OperatorRender_1 = require("./OperatorRender");
31
- var ScriptUtils_1 = require("../utils/script/ScriptUtils");
32
- var RawSet_1 = require("../RawSet");
33
- var AttrExpresion = /** @class */ (function (_super) {
34
- __extends(AttrExpresion, _super);
35
- function AttrExpresion() {
36
- return _super !== null && _super.apply(this, arguments) || this;
37
- }
38
- AttrExpresion.prototype.execRender = function () {
39
- var _a;
40
- var _this = this;
41
- var _b;
42
- var targetAttrs = this.elementSource.element.getAttributeNames()
43
- .filter(function (it) { return RawSet_1.RawSet.isExporesion(_this.elementSource.element.getAttribute(it)); })
44
- .map(function (it) { return ({ name: it, expresion: RawSet_1.RawSet.exporesionGrouops(_this.elementSource.element.getAttribute(it))[0][1] }); })
45
- .filter(function (it) { return it.name.length > 0 && it.expresion.length > 0; })
46
- .map(function (it) {
47
- return "n.setAttribute('".concat(it.name, "', ").concat(it.expresion, ")");
48
- });
49
- // console.log('-----', targetAttrs)
50
- if ((targetAttrs === null || targetAttrs === void 0 ? void 0 : targetAttrs.length) > 0) {
51
- var newTemp = this.source.config.window.document.createElement('temp');
52
- // console.log('------>', targetAttrs, targetAttrs.join(';'))
53
- ScriptUtils_1.ScriptUtils.eval("\n ".concat(this.render.bindScript, "\n const n = $element.cloneNode(true);\n ").concat(targetAttrs.join(';'), ";\n this.__render.fag.append(n);\n "), Object.assign(this.source.obj, {
54
- __render: Object.freeze(__assign({ fag: newTemp, targetAttrs: targetAttrs }, this.render))
55
- }));
56
- var tempalte = this.source.config.window.document.createElement('template');
57
- tempalte.innerHTML = newTemp.innerHTML;
58
- this.returnContainer.fag.append(tempalte.content);
59
- var rr = RawSet_1.RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
60
- (_b = this.elementSource.element.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(this.returnContainer.fag, this.elementSource.element);
61
- (_a = this.returnContainer.raws).push.apply(_a, rr);
62
- return OperatorRender_1.ExecuteState.EXECUTE;
63
- }
64
- return OperatorRender_1.ExecuteState.NO_EXECUTE;
65
- };
66
- return AttrExpresion;
67
- }(OperatorRender_1.OperatorRender));
68
- exports.AttrExpresion = AttrExpresion;
2
+ // import {ExecuteState, OperatorRender} from './OperatorRender';
3
+ // import {ScriptUtils} from '../utils/script/ScriptUtils';
4
+ // import {RawSet, Render} from '../RawSet';
5
+ //
6
+ // export class AttrExpresion extends OperatorRender {
7
+ // execRender(): ExecuteState {
8
+ // const targetAttrs = this.elementSource.element.getAttributeNames()
9
+ // .filter(it => RawSet.isExporesion(this.elementSource.element.getAttribute(it)))
10
+ // .map(it => ({name: it, expresion: RawSet.exporesionGrouops(this.elementSource.element.getAttribute(it))[0][1]}))
11
+ // .filter(it => it.name.length > 0 && it.expresion.length > 0)
12
+ // .map(it => {
13
+ // return `n.setAttribute('${it.name}', ${it.expresion})`;
14
+ // });
15
+ // // console.log('--!!!!!!!!!---', targetAttrs)
16
+ // if (targetAttrs?.length > 0) {
17
+ // const newTemp = this.source.config.window.document.createElement('temp');
18
+ // // console.log('------>', targetAttrs, targetAttrs.join(';'))
19
+ // ScriptUtils.eval(`
20
+ // ${this.render.bindScript}
21
+ // //const n = $element.cloneNode(true);
22
+ // const n = $element;
23
+ // ${targetAttrs.join(';')};
24
+ // // this.__render.fag.append(n);
25
+ // `, Object.assign(this.source.obj, {
26
+ // __render: Object.freeze({
27
+ // fag: newTemp,
28
+ // targetAttrs,
29
+ // ...this.render
30
+ // } as Render)
31
+ // }));
32
+ // // const tempalte = this.source.config.window.document.createElement('template');
33
+ // // tempalte.innerHTML = newTemp.innerHTML;
34
+ // // this.returnContainer.fag.append(tempalte.content);
35
+ // const rr = RawSet.checkPointCreates(this.render.element, this.source.config);
36
+ // // const rr = RawSet.checkPointCreates(this.returnContainer.fag, this.source.config);
37
+ // // this.elementSource.element.parentNode?.replaceChild(this.returnContainer.fag, this.elementSource.element);
38
+ // this.returnContainer.raws.push(...rr);
39
+ // // return ExecuteState.EXECUTE;
40
+ // return ExecuteState.NO_EXECUTE;
41
+ // }
42
+ // return ExecuteState.NO_EXECUTE;
43
+ // }
44
+ // }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dom-render",
3
- "version": "1.0.76",
3
+ "version": "1.0.77",
4
4
  "main": "DomRender.js",
5
5
  "license": "MIT",
6
6
  "description": "dom-render",