dom-render 1.0.67 → 1.0.68

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 (55) hide show
  1. package/DomRender.js +2 -1
  2. package/DomRenderProxy.d.ts +3 -2
  3. package/DomRenderProxy.js +74 -9
  4. package/RawSet.js +128 -84
  5. package/dist/bundle.js +2268 -3056
  6. package/events/EventManager.d.ts +1 -1
  7. package/events/EventManager.js +69 -95
  8. package/iterators/Range.d.ts +0 -1
  9. package/iterators/Range.js +7 -33
  10. package/managers/RenderManager.js +1 -1
  11. package/package.json +9 -9
  12. package/types/Types.js +2 -2
  13. package/utils/clipboard/ClipBoardUtils.js +1 -1
  14. package/utils/dom/DomUtils.js +1 -1
  15. package/utils/location/LocationUtils.js +1 -1
  16. package/utils/node/NodeUtils.js +3 -1
  17. package/utils/random/RandomUtils.js +2 -1
  18. package/utils/script/ScriptUtils.js +24 -43
  19. package/utils/storage/StorageUtils.js +1 -1
  20. package/utils/string/StringUtils.js +18 -1
  21. package/utils/valid/ValidUtils.js +6 -1
  22. package/validators/AllCheckedValidatorArray.js +1 -1
  23. package/validators/AllUnCheckedValidatorArray.js +1 -1
  24. package/validators/CheckedValidator.js +1 -1
  25. package/validators/CountEqualsCheckedValidatorArray.js +1 -1
  26. package/validators/CountEqualsUnCheckedValidatorArray.js +1 -1
  27. package/validators/CountGreaterThanCheckedValidatorArray.js +1 -1
  28. package/validators/CountGreaterThanEqualsCheckedValidatorArray.js +1 -1
  29. package/validators/CountGreaterThanEqualsUnCheckedValidatorArray.js +1 -1
  30. package/validators/CountGreaterThanUnCheckedValidatorArray.js +1 -1
  31. package/validators/CountLessThanCheckedValidatorArray.js +1 -1
  32. package/validators/CountLessThanEqualsCheckedValidatorArray.js +1 -1
  33. package/validators/CountLessThanEqualsUnCheckedValidatorArray.js +1 -1
  34. package/validators/CountLessThanUnCheckedValidatorArray.js +1 -1
  35. package/validators/CountUnCheckedValidatorArray.js +1 -1
  36. package/validators/EmptyValidator.js +1 -1
  37. package/validators/ExcludeCheckedValidatorArray.js +1 -1
  38. package/validators/FormValidator.js +1 -1
  39. package/validators/IncludeCheckedValidatorArray.js +1 -1
  40. package/validators/MultipleValidator.js +2 -1
  41. package/validators/NonPassValidator.js +1 -1
  42. package/validators/NotEmptyValidator.js +2 -1
  43. package/validators/NotRegExpTestValidator.js +1 -1
  44. package/validators/PassValidator.js +1 -1
  45. package/validators/RegExpTestValidator.js +2 -1
  46. package/validators/RequiredValidator.js +2 -1
  47. package/validators/UnCheckedValidator.js +1 -1
  48. package/validators/ValidMultipleValidator.js +1 -1
  49. package/validators/ValidValidator.js +1 -1
  50. package/validators/ValidValidatorArray.js +1 -1
  51. package/validators/Validator.js +12 -24
  52. package/validators/ValidatorArray.js +1 -1
  53. package/validators/ValueEqualsValidator.js +1 -1
  54. package/validators/ValueNotEqualsValidator.js +1 -1
  55. package/dist/bundle.js.map +0 -1
package/RawSet.js CHANGED
@@ -10,42 +10,6 @@ var __assign = (this && this.__assign) || function () {
10
10
  };
11
11
  return __assign.apply(this, arguments);
12
12
  };
13
- var __read = (this && this.__read) || function (o, n) {
14
- var m = typeof Symbol === "function" && o[Symbol.iterator];
15
- if (!m) return o;
16
- var i = m.call(o), r, ar = [], e;
17
- try {
18
- while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
19
- }
20
- catch (error) { e = { error: error }; }
21
- finally {
22
- try {
23
- if (r && !r.done && (m = i["return"])) m.call(i);
24
- }
25
- finally { if (e) throw e.error; }
26
- }
27
- return ar;
28
- };
29
- var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
30
- if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
31
- if (ar || !(i in from)) {
32
- if (!ar) ar = Array.prototype.slice.call(from, 0, i);
33
- ar[i] = from[i];
34
- }
35
- }
36
- return to.concat(ar || Array.prototype.slice.call(from));
37
- };
38
- var __values = (this && this.__values) || function(o) {
39
- var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
40
- if (m) return m.call(o);
41
- if (o && typeof o.length === "number") return {
42
- next: function () {
43
- if (o && i >= o.length) o = void 0;
44
- return { value: o && o[i++], done: !o };
45
- }
46
- };
47
- throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
48
- };
49
13
  Object.defineProperty(exports, "__esModule", { value: true });
50
14
  exports.RawSet = void 0;
51
15
  var RandomUtils_1 = require("./utils/random/RandomUtils");
@@ -56,7 +20,7 @@ var Range_1 = require("./iterators/Range");
56
20
  var Validator_1 = require("./validators/Validator");
57
21
  var ValidatorArray_1 = require("./validators/ValidatorArray");
58
22
  var Types_1 = require("./types/Types");
59
- var RawSet = (function () {
23
+ var RawSet = /** @class */ (function () {
60
24
  function RawSet(uuid, point, fragment, data) {
61
25
  if (data === void 0) { data = {}; }
62
26
  this.uuid = uuid;
@@ -85,18 +49,23 @@ var RawSet = (function () {
85
49
  script = targetAttrNames.map(function (it) { return (element_1.getAttribute(it)); }).filter(function (it) { return it; }).join(';');
86
50
  }
87
51
  if (script) {
52
+ // script = script.replace('}$','}');
53
+ // console.log('----------->', script)
88
54
  EventManager_1.EventManager.VARNAMES.forEach(function (it) {
55
+ // script = script.replace(RegExp(it.replace('$', '\\$'), 'g'), `this?.___${it}`);
56
+ // script = script.replace(RegExp(it.replace('$', '\\$'), 'g'), `this.___${it}`);
89
57
  script = script.replace(RegExp(it.replace('$', '\\$'), 'g'), "this.___".concat(it));
90
58
  });
91
- Array.from(ScriptUtils_1.ScriptUtils.getVariablePaths(script)).filter(function (it) { return !it.startsWith("___".concat(EventManager_1.EventManager.SCRIPTS_VARNAME)) && !it.startsWith("___".concat(EventManager_1.EventManager.SCRIPTS_VARNAME)); }).forEach(function (it) { return usingTriggerVariables.add(it); });
59
+ // console.log('----------', script);
60
+ Array.from(ScriptUtils_1.ScriptUtils.getVariablePaths(script)).filter(function (it) { return !it.startsWith("___".concat(EventManager_1.EventManager.SCRIPTS_VARNAME)); }).forEach(function (it) { return usingTriggerVariables.add(it); });
92
61
  }
93
62
  });
63
+ // console.log('usingTriggerVariable----------->', usingTriggerVariables)
94
64
  return usingTriggerVariables;
95
65
  };
96
66
  RawSet.prototype.render = function (obj, config) {
97
- var e_1, _a, e_2, _b;
98
67
  var _this = this;
99
- var _c, _d, _e, _f, _g, _h, _j, _k;
68
+ var _a, _b, _c, _d, _e, _f, _g, _h;
100
69
  var genNode = config.window.document.importNode(this.fragment, true);
101
70
  var raws = [];
102
71
  var onAttrInitCallBack = [];
@@ -110,11 +79,13 @@ var RawSet = (function () {
110
79
  range: Range_1.Range.range,
111
80
  element: cNode,
112
81
  bindScript: "\n const ".concat(EventManager_1.EventManager.SCRIPTS_VARNAME, " = this.__render.scripts;\n const ").concat(EventManager_1.EventManager.RAWSET_VARNAME, " = this.__render.rawset;\n const ").concat(EventManager_1.EventManager.ELEMENT_VARNAME, " = this.__render.element;\n const ").concat(EventManager_1.EventManager.RANGE_VARNAME, " = this.__render.range;\n ")
82
+ // eslint-disable-next-line no-use-before-define
113
83
  });
114
84
  var fag = config.window.document.createDocumentFragment();
115
85
  if (cNode.nodeType === Node.TEXT_NODE && cNode.textContent) {
116
86
  var textContent = cNode.textContent;
117
87
  var runText = RawSet.exporesionGrouops(textContent)[0][1];
88
+ // console.log('--->', textContent,runText, runText[0][1])
118
89
  var n = void 0;
119
90
  if (textContent === null || textContent === void 0 ? void 0 : textContent.startsWith('#')) {
120
91
  var r = ScriptUtils_1.ScriptUtils.eval("".concat(__render.bindScript, " return ").concat(runText), Object.assign(obj, { __render: __render }));
@@ -166,12 +137,13 @@ var RawSet = (function () {
166
137
  fag.append(tempalte.content);
167
138
  var rr = RawSet.checkPointCreates(fag, config);
168
139
  (_c = element_2.parentNode) === null || _c === void 0 ? void 0 : _c.replaceChild(fag, element_2);
169
- raws.push.apply(raws, __spreadArray([], __read(rr), false));
140
+ raws.push.apply(raws, rr);
170
141
  }
171
142
  if (drAttr_1.drIf) {
172
143
  var itRandom = RawSet.drItOtherEncoding(element_2);
173
144
  var vars = RawSet.drVarEncoding(element_2, (_d = drAttr_1.drVarOption) !== null && _d !== void 0 ? _d : '');
174
145
  var newTemp = config.window.document.createElement('temp');
146
+ // Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drIf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v)); <-- 이부분은 다른 attr에도 적용을 할지말지 생각해야됨 엘리먼트 존재유무에 따라서 적용을 할지말지 결정해야됨
175
147
  ScriptUtils_1.ScriptUtils.eval("\n ".concat(__render.bindScript, "\n ").concat((_e = drAttr_1.drBeforeOption) !== null && _e !== void 0 ? _e : '', "\n if(").concat(drAttr_1.drIf, ") {\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(drAttr_1.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((_f = drAttr_1.drAfterOption) !== null && _f !== void 0 ? _f : '', "\n "), Object.assign(obj, {
176
148
  __render: Object.freeze(__assign({ fag: newTemp, drAttr: drAttr_1, drAttrsOriginName: RawSet.drAttrsOriginName, drStripOption: drAttr_1.drStripOption }, __render))
177
149
  }));
@@ -183,7 +155,7 @@ var RawSet = (function () {
183
155
  fag.append(tempalte.content);
184
156
  var rr = RawSet.checkPointCreates(fag, config);
185
157
  (_h = element_2.parentNode) === null || _h === void 0 ? void 0 : _h.replaceChild(fag, element_2);
186
- raws.push.apply(raws, __spreadArray([], __read(rr), false));
158
+ raws.push.apply(raws, rr);
187
159
  if (bypass) {
188
160
  return;
189
161
  }
@@ -194,7 +166,7 @@ var RawSet = (function () {
194
166
  fag.append(RawSet.drThisCreate(element_2, drAttr_1.drThis, (_j = drAttr_1.drVarOption) !== null && _j !== void 0 ? _j : '', drAttr_1.drStripOption, obj, config));
195
167
  var rr = RawSet.checkPointCreates(fag, config);
196
168
  (_k = element_2.parentNode) === null || _k === void 0 ? void 0 : _k.replaceChild(fag, element_2);
197
- raws.push.apply(raws, __spreadArray([], __read(rr), false));
169
+ raws.push.apply(raws, rr);
198
170
  }
199
171
  else {
200
172
  cNode.remove();
@@ -206,6 +178,8 @@ var RawSet = (function () {
206
178
  var childs = Array.from(element_2.querySelectorAll('[name]'));
207
179
  var fromName = ScriptUtils_1.ScriptUtils.evalReturn((_l = element_2.getAttribute('dr-form:name')) !== null && _l !== void 0 ? _l : '', obj);
208
180
  var thisName = fromName !== null && fromName !== void 0 ? fromName : element_2.getAttribute('name');
181
+ // console.log('dr-form:name', thisName, element.getAttribute('dr-form:name'), obj, element);
182
+ // // 자기자신이 Input 대상일때
209
183
  if (childs.length <= 0 && thisName) {
210
184
  childs.push(element_2);
211
185
  }
@@ -233,6 +207,9 @@ var RawSet = (function () {
233
207
  data_1.addValidator(it.value, it);
234
208
  }
235
209
  else if (data_1 instanceof Validator_1.Validator) {
210
+ // varpath += (varpath ? '.value' : 'value');
211
+ // varpath = drAttr.drForm + '.' + varpath;
212
+ // it.setAttribute(attrEventName, `${varpath} = $target.value; ${target}=$target; ${event}=$event;`);
236
213
  it.setAttribute(attrEventName, "".concat(varpath, ".set($target.value, $target, $event); ").concat((_e = it.getAttribute(attrEventName)) !== null && _e !== void 0 ? _e : '', ";"));
237
214
  data_1.setTarget(it);
238
215
  data_1.value = it.value;
@@ -243,7 +220,7 @@ var RawSet = (function () {
243
220
  }
244
221
  });
245
222
  RawSet.drFormOtherMoveAttr(element_2, 'temp-name', 'name', config);
246
- raws.push.apply(raws, __spreadArray([], __read(RawSet.checkPointCreates(element_2, config)), false));
223
+ raws.push.apply(raws, RawSet.checkPointCreates(element_2, config));
247
224
  }
248
225
  if (drAttr_1.drInnerText) {
249
226
  var newTemp = config.window.document.createElement('temp');
@@ -255,25 +232,27 @@ var RawSet = (function () {
255
232
  fag.append(tempalte.content);
256
233
  var rr = RawSet.checkPointCreates(fag, config);
257
234
  (_p = element_2.parentNode) === null || _p === void 0 ? void 0 : _p.replaceChild(fag, element_2);
258
- raws.push.apply(raws, __spreadArray([], __read(rr), false));
235
+ raws.push.apply(raws, rr);
259
236
  }
260
237
  if (drAttr_1.drInnerHTML) {
261
238
  var newTemp = config.window.document.createElement('temp');
262
239
  ScriptUtils_1.ScriptUtils.eval("\n ".concat(__render.bindScript, "\n const n = $element.cloneNode(true);\n ").concat((_q = drAttr_1.drBeforeOption) !== null && _q !== void 0 ? _q : '', "\n n.innerHTML = ").concat(drAttr_1.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((_r = drAttr_1.drAfterOption) !== null && _r !== void 0 ? _r : '', "\n "), Object.assign(obj, {
263
- __render: Object.freeze(__assign({ drStripOption: drAttr_1.drStripOption, fag: newTemp }, __render))
240
+ __render: Object.freeze(__assign({ drStripOption: drAttr_1.drStripOption, fag: newTemp }, __render
241
+ // eslint-disable-next-line no-use-before-define
242
+ ))
264
243
  }));
265
244
  var tempalte = config.window.document.createElement('template');
266
245
  tempalte.innerHTML = newTemp.innerHTML;
267
246
  fag.append(tempalte.content);
268
247
  var rr = RawSet.checkPointCreates(fag, config);
269
248
  (_s = element_2.parentNode) === null || _s === void 0 ? void 0 : _s.replaceChild(fag, element_2);
270
- raws.push.apply(raws, __spreadArray([], __read(rr), false));
249
+ raws.push.apply(raws, rr);
271
250
  }
272
251
  if (drAttr_1.drFor) {
273
252
  var itRandom = RawSet.drItOtherEncoding(element_2);
274
253
  var vars = RawSet.drVarEncoding(element_2, (_t = drAttr_1.drVarOption) !== null && _t !== void 0 ? _t : '');
275
254
  var newTemp = config.window.document.createElement('temp');
276
- ScriptUtils_1.ScriptUtils.eval("\n ".concat(__render.bindScript, "\n ").concat((_u = drAttr_1.drBeforeOption) !== null && _u !== void 0 ? _u : '', "\n for(").concat(drAttr_1.drFor, ") {\n const n = this.__render.element.cloneNode(true);\n var destIt = ").concat(drAttr_1.drItOption, ";\n if (destIt !== undefined) {\n n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt).replace(/\\#nearForIt\\#/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((_v = drAttr_1.drAfterOption) !== null && _v !== void 0 ? _v : '', "\n "), Object.assign(obj, {
255
+ ScriptUtils_1.ScriptUtils.eval("\n ".concat(__render.bindScript, "\n ").concat((_u = drAttr_1.drBeforeOption) !== null && _u !== void 0 ? _u : '', "\n for(").concat(drAttr_1.drFor, ") {\n const n = this.__render.element.cloneNode(true);\n var destIt = ").concat(drAttr_1.drItOption, ";\n if (destIt !== undefined) {\n n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt).replace(/\\#nearForIt\\#/g, destIt).replace(/\\#nearForIndex\\#/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 }\n ").concat((_v = drAttr_1.drAfterOption) !== null && _v !== void 0 ? _v : '', "\n "), Object.assign(obj, {
277
256
  __render: Object.freeze(__assign({ fag: newTemp, drStripOption: drAttr_1.drStripOption }, __render))
278
257
  }));
279
258
  RawSet.drVarDecoding(newTemp, vars);
@@ -283,14 +262,16 @@ var RawSet = (function () {
283
262
  fag.append(tempalte.content);
284
263
  var rr = RawSet.checkPointCreates(fag, config);
285
264
  (_w = element_2.parentNode) === null || _w === void 0 ? void 0 : _w.replaceChild(fag, element_2);
286
- raws.push.apply(raws, __spreadArray([], __read(rr), false));
265
+ raws.push.apply(raws, rr);
287
266
  }
288
267
  if (drAttr_1.drForOf) {
289
268
  var itRandom = RawSet.drItOtherEncoding(element_2);
290
269
  var vars = RawSet.drVarEncoding(element_2, (_x = drAttr_1.drVarOption) !== null && _x !== void 0 ? _x : '');
291
270
  var newTemp = config.window.document.createElement('temp');
292
- ScriptUtils_1.ScriptUtils.eval("\n ".concat(__render.bindScript, "\n ").concat((_y = drAttr_1.drBeforeOption) !== null && _y !== void 0 ? _y : '', "\n var i = 0; \n const forOf = ").concat(drAttr_1.drForOf, ";\n const forOfStr = `").concat(drAttr_1.drForOf, "`.trim();\n if (forOf) {\n for(const it of forOf) {\n var destIt = it;\n if (/\\[(.*,?)\\],/g.test(forOfStr)) {\n if (typeof it === 'string') {\n destIt = it;\n } else {\n destIt = forOfStr.substring(1, forOfStr.length-1).split(',')[i];\n }\n } else if (forOf.isRange) {\n destIt = it;\n } else {\n destIt = forOfStr + '[' + i +']'\n }\n const n = this.__render.element.cloneNode(true);\n Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drForOf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v));\n n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt).replace(/\\#nearForOfIt\\#/g, destIt)))\n n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt);\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 }\n ").concat((_z = drAttr_1.drAfterOption) !== null && _z !== void 0 ? _z : '', "\n "), Object.assign(obj, {
293
- __render: Object.freeze(__assign({ drStripOption: drAttr_1.drStripOption, drAttr: drAttr_1, drAttrsOriginName: RawSet.drAttrsOriginName, fag: newTemp }, __render))
271
+ ScriptUtils_1.ScriptUtils.eval("\n ".concat(__render.bindScript, "\n ").concat((_y = drAttr_1.drBeforeOption) !== null && _y !== void 0 ? _y : '', "\n var i = 0; \n const forOf = ").concat(drAttr_1.drForOf, ";\n const forOfStr = `").concat(drAttr_1.drForOf, "`.trim();\n if (forOf) {\n for(const it of forOf) {\n var destIt = it;\n if (/\\[(.*,?)\\],/g.test(forOfStr)) {\n if (typeof it === 'string') {\n destIt = it;\n } else {\n destIt = forOfStr.substring(1, forOfStr.length-1).split(',')[i];\n }\n } else if (forOf.isRange) {\n destIt = it;\n } else {\n destIt = forOfStr + '[' + i +']'\n }\n const n = this.__render.element.cloneNode(true);\n Object.entries(this.__render.drAttr).filter(([k,v]) => k !== 'drForOf' && v).forEach(([k, v]) => n.setAttribute(this.__render.drAttrsOriginName[k], v));\n n.getAttributeNames().forEach(it => n.setAttribute(it, n.getAttribute(it).replace(/\\#it\\#/g, destIt).replace(/\\#nearForOfIt\\#/g, destIt).replace(/\\#it\\#/g, destIt).replace(/\\#nearForOfIndex\\#/g, i)))\n n.innerHTML = n.innerHTML.replace(/\\#it\\#/g, destIt).replace(/\\#index\\#/g, i);\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 }\n ").concat((_z = drAttr_1.drAfterOption) !== null && _z !== void 0 ? _z : '', "\n "), Object.assign(obj, {
272
+ __render: Object.freeze(__assign({ drStripOption: drAttr_1.drStripOption, drAttr: drAttr_1, drAttrsOriginName: RawSet.drAttrsOriginName, fag: newTemp }, __render
273
+ // eslint-disable-next-line no-use-before-define
274
+ ))
294
275
  }));
295
276
  RawSet.drVarDecoding(newTemp, vars);
296
277
  RawSet.drItOtherDecoding(newTemp, itRandom);
@@ -299,13 +280,14 @@ var RawSet = (function () {
299
280
  fag.append(tempalte.content);
300
281
  var rr = RawSet.checkPointCreates(fag, config);
301
282
  (_0 = element_2.parentNode) === null || _0 === void 0 ? void 0 : _0.replaceChild(fag, element_2);
302
- raws.push.apply(raws, __spreadArray([], __read(rr), false));
283
+ //const rrr = rr.flatMap(it => it.render(obj, config));// .flat();
284
+ raws.push.apply(raws, rr);
303
285
  }
304
286
  if (drAttr_1.drRepeat) {
305
287
  var itRandom = RawSet.drItOtherEncoding(element_2);
306
288
  var vars = RawSet.drVarEncoding(element_2, (_1 = drAttr_1.drVarOption) !== null && _1 !== void 0 ? _1 : '');
307
289
  var newTemp = config.window.document.createElement('temp');
308
- ScriptUtils_1.ScriptUtils.eval("\n ".concat(__render.bindScript, "\n ").concat((_2 = drAttr_1.drBeforeOption) !== null && _2 !== void 0 ? _2 : '', "\n var i = 0; \n const repeat = ").concat(drAttr_1.drRepeat, ";\n const repeatStr = `").concat(drAttr_1.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)))\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 i++;\n }\n ").concat((_3 = drAttr_1.drAfterOption) !== null && _3 !== void 0 ? _3 : '', "\n "), Object.assign(obj, {
290
+ ScriptUtils_1.ScriptUtils.eval("\n ".concat(__render.bindScript, "\n ").concat((_2 = drAttr_1.drBeforeOption) !== null && _2 !== void 0 ? _2 : '', "\n var i = 0; \n const repeat = ").concat(drAttr_1.drRepeat, ";\n const repeatStr = `").concat(drAttr_1.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((_3 = drAttr_1.drAfterOption) !== null && _3 !== void 0 ? _3 : '', "\n "), Object.assign(obj, {
309
291
  __render: Object.freeze(__assign({ fag: newTemp, drStripOption: drAttr_1.drStripOption }, __render))
310
292
  }));
311
293
  RawSet.drVarDecoding(newTemp, vars);
@@ -315,17 +297,26 @@ var RawSet = (function () {
315
297
  fag.append(tempalte.content);
316
298
  var rr = RawSet.checkPointCreates(fag, config);
317
299
  (_4 = element_2.parentNode) === null || _4 === void 0 ? void 0 : _4.replaceChild(fag, element_2);
318
- raws.push.apply(raws, __spreadArray([], __read(rr), false));
300
+ raws.push.apply(raws, rr);
319
301
  }
302
+ // config detecting
303
+ // console.log('config targetElement-->', config?.targetElements)
320
304
  (_5 = config === null || config === void 0 ? void 0 : config.targetElements) === null || _5 === void 0 ? void 0 : _5.forEach(function (it) {
321
305
  var _a, _b;
322
306
  var name = it.name;
323
307
  if (name.toLowerCase() === element_2.tagName.toLowerCase() && (!drAttr_1.drForOf && !drAttr_1.drFor && !drAttr_1.drRepeat)) {
324
308
  var documentFragment = it.callBack(element_2, obj, _this);
309
+ // console.log('target-->',name, documentFragment)
325
310
  if (documentFragment) {
311
+ // fag.append(documentFragment)
326
312
  var rr = RawSet.checkPointCreates(documentFragment, config);
327
313
  (_a = element_2.parentNode) === null || _a === void 0 ? void 0 : _a.replaceChild(documentFragment, element_2);
328
- raws.push.apply(raws, __spreadArray([], __read(rr), false));
314
+ // TODO: 나중에 삭제?
315
+ // const onInit = element.getAttribute('dr-on-init-component');
316
+ // if (onInit) {
317
+ // ScriptUtils.evalReturn(onInit, obj)(obj?.__componentInstances[this.uuid], this);
318
+ // }
319
+ raws.push.apply(raws, rr);
329
320
  onElementInitCallBack.push({
330
321
  name: name,
331
322
  obj: obj,
@@ -340,12 +331,14 @@ var RawSet = (function () {
340
331
  var _a, _b;
341
332
  var attrName = it.name;
342
333
  var attrValue = _this.getAttributeAndDelete(element_2, attrName);
334
+ // console.log('?????attrValue', attrName, attrValue)
343
335
  if (attrValue && attrName && (!drAttr_1.drForOf && !drAttr_1.drFor && !drAttr_1.drRepeat)) {
344
336
  var documentFragment = it.callBack(element_2, attrValue, obj, _this);
345
337
  if (documentFragment) {
338
+ // fag.append(documentFragment);
346
339
  var rr = RawSet.checkPointCreates(documentFragment, config);
347
340
  (_a = element_2.parentNode) === null || _a === void 0 ? void 0 : _a.replaceChild(documentFragment, element_2);
348
- raws.push.apply(raws, __spreadArray([], __read(rr), false));
341
+ raws.push.apply(raws, rr);
349
342
  onAttrInitCallBack.push({
350
343
  attrName: attrName,
351
344
  attrValue: attrValue,
@@ -361,41 +354,25 @@ var RawSet = (function () {
361
354
  this.replaceBody(genNode);
362
355
  drAttrs.forEach(function (it) {
363
356
  if (it.drCompleteOption) {
357
+ // genNode.childNodes
364
358
  ScriptUtils_1.ScriptUtils.eval("\n const ".concat(EventManager_1.EventManager.FAG_VARNAME, " = this.__render.fag;\n const ").concat(EventManager_1.EventManager.SCRIPTS_VARNAME, " = this.__render.scripts;\n const ").concat(EventManager_1.EventManager.RAWSET_VARNAME, " = this.__render.rawset;\n ").concat(it.drCompleteOption, "\n "), Object.assign(obj, {
365
359
  __render: Object.freeze({
366
360
  rawset: _this,
367
361
  fag: genNode,
368
362
  scripts: EventManager_1.EventManager.setBindProperty(config === null || config === void 0 ? void 0 : config.scripts, obj)
363
+ // eslint-disable-next-line no-use-before-define
369
364
  })
370
365
  }));
371
366
  }
372
367
  });
373
- try {
374
- for (var onElementInitCallBack_1 = __values(onElementInitCallBack), onElementInitCallBack_1_1 = onElementInitCallBack_1.next(); !onElementInitCallBack_1_1.done; onElementInitCallBack_1_1 = onElementInitCallBack_1.next()) {
375
- var it_1 = onElementInitCallBack_1_1.value;
376
- (_f = (_e = (_d = (_c = it_1.targetElement) === null || _c === void 0 ? void 0 : _c.__render) === null || _d === void 0 ? void 0 : _d.component) === null || _e === void 0 ? void 0 : _e.onInitRender) === null || _f === void 0 ? void 0 : _f.call(_e, { render: (_g = it_1.targetElement) === null || _g === void 0 ? void 0 : _g.__render, creatorMetaData: (_h = it_1.targetElement) === null || _h === void 0 ? void 0 : _h.__creatorMetaData });
377
- var r = (_j = config === null || config === void 0 ? void 0 : config.onElementInit) === null || _j === void 0 ? void 0 : _j.call(config, it_1.name, obj, this, it_1.targetElement);
378
- }
379
- }
380
- catch (e_1_1) { e_1 = { error: e_1_1 }; }
381
- finally {
382
- try {
383
- if (onElementInitCallBack_1_1 && !onElementInitCallBack_1_1.done && (_a = onElementInitCallBack_1.return)) _a.call(onElementInitCallBack_1);
384
- }
385
- finally { if (e_1) throw e_1.error; }
386
- }
387
- try {
388
- for (var onAttrInitCallBack_1 = __values(onAttrInitCallBack), onAttrInitCallBack_1_1 = onAttrInitCallBack_1.next(); !onAttrInitCallBack_1_1.done; onAttrInitCallBack_1_1 = onAttrInitCallBack_1.next()) {
389
- var it_2 = onAttrInitCallBack_1_1.value;
390
- var r = (_k = config === null || config === void 0 ? void 0 : config.onAttrInit) === null || _k === void 0 ? void 0 : _k.call(config, it_2.attrName, it_2.attrValue, obj, this);
391
- }
368
+ for (var _i = 0, onElementInitCallBack_1 = onElementInitCallBack; _i < onElementInitCallBack_1.length; _i++) {
369
+ var it_1 = onElementInitCallBack_1[_i];
370
+ (_d = (_c = (_b = (_a = it_1.targetElement) === null || _a === void 0 ? void 0 : _a.__render) === null || _b === void 0 ? void 0 : _b.component) === null || _c === void 0 ? void 0 : _c.onInitRender) === null || _d === void 0 ? void 0 : _d.call(_c, { render: (_e = it_1.targetElement) === null || _e === void 0 ? void 0 : _e.__render, creatorMetaData: (_f = it_1.targetElement) === null || _f === void 0 ? void 0 : _f.__creatorMetaData });
371
+ var r = (_g = config === null || config === void 0 ? void 0 : config.onElementInit) === null || _g === void 0 ? void 0 : _g.call(config, it_1.name, obj, this, it_1.targetElement);
392
372
  }
393
- catch (e_2_1) { e_2 = { error: e_2_1 }; }
394
- finally {
395
- try {
396
- if (onAttrInitCallBack_1_1 && !onAttrInitCallBack_1_1.done && (_b = onAttrInitCallBack_1.return)) _b.call(onAttrInitCallBack_1);
397
- }
398
- finally { if (e_2) throw e_2.error; }
373
+ for (var _j = 0, onAttrInitCallBack_1 = onAttrInitCallBack; _j < onAttrInitCallBack_1.length; _j++) {
374
+ var it_2 = onAttrInitCallBack_1[_j];
375
+ var r = (_h = config === null || config === void 0 ? void 0 : config.onAttrInit) === null || _h === void 0 ? void 0 : _h.call(config, it_2.attrName, it_2.attrValue, obj, this);
399
376
  }
400
377
  return raws;
401
378
  };
@@ -420,12 +397,20 @@ var RawSet = (function () {
420
397
  RawSet.checkPointCreates = function (element, config) {
421
398
  var _a, _b, _c, _d;
422
399
  var thisVariableName = element.__domrender_this_variable_name;
400
+ // console.log('checkPointCreates thisVariableName', thisVariableName);
423
401
  var nodeIterator = config.window.document.createNodeIterator(element, NodeFilter.SHOW_ALL, {
424
402
  acceptNode: function (node) {
425
403
  var _a, _b, _c, _d, _e;
426
404
  if (node.nodeType === Node.TEXT_NODE) {
405
+ // console.log('????????', node.parentElement, node.parentElement?.getAttribute('dr-pre'));
406
+ // console.log('???????/',node.textContent, node.parentElement?.getAttribute('dr-pre'))
407
+ // 나중에
408
+ // const between = StringUtils.betweenRegexpStr('[$#]\\{', '\\}', StringUtils.deleteEnter((node as Text).data ?? ''))
427
409
  var between = RawSet.exporesionGrouops(StringUtils_1.StringUtils.deleteEnter((_a = node.data) !== null && _a !== void 0 ? _a : ''));
410
+ // console.log('bbbb', between)
428
411
  return (between === null || between === void 0 ? void 0 : between.length) > 0 ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
412
+ // return /\$\{.*?\}/g.test(StringUtils.deleteEnter((node as Text).data ?? '')) ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
413
+ // return /[$#]\{.*?\}/g.test(StringUtils.deleteEnter((node as Text).data ?? '')) ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_REJECT;
429
414
  }
430
415
  else if (node.nodeType === Node.ELEMENT_NODE) {
431
416
  var element_3 = node;
@@ -443,7 +428,10 @@ var RawSet = (function () {
443
428
  if (currentNode.nodeType === Node.TEXT_NODE) {
444
429
  var text = (_a = currentNode.textContent) !== null && _a !== void 0 ? _a : '';
445
430
  var template_1 = config.window.document.createElement('template');
446
- var a = RawSet.exporesionGrouops(text);
431
+ // const a = StringUtils.regexExec(/\$\{.*?\}/g, text);
432
+ // const a = StringUtils.regexExec(/[$#]\{.*?\}/g, text);
433
+ // const a = StringUtils.betweenRegexpStr('[$#]\\{', '\\}', text); // <--나중에..
434
+ var a = RawSet.exporesionGrouops(text); // <--나중에..
447
435
  var map = a.map(function (it) {
448
436
  return {
449
437
  uuid: RandomUtils_1.RandomUtils.uuid(),
@@ -457,9 +445,11 @@ var RawSet = (function () {
457
445
  var preparedText = regexArr.input.substring(lasterIndex_1, regexArr.index);
458
446
  var start = config.window.document.createComment("start text ".concat(it.uuid));
459
447
  var end = config.window.document.createComment("end text ".concat(it.uuid));
460
- template_1.content.append(document.createTextNode(preparedText));
448
+ // layout setting
449
+ template_1.content.append(document.createTextNode(preparedText)); // 사이사이값.
461
450
  template_1.content.append(start);
462
451
  template_1.content.append(end);
452
+ // content
463
453
  var fragment = config.window.document.createDocumentFragment();
464
454
  fragment.append(config.window.document.createTextNode(it.content));
465
455
  pars.push(new RawSet(it.uuid, {
@@ -473,10 +463,12 @@ var RawSet = (function () {
473
463
  (_b = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _b === void 0 ? void 0 : _b.replaceChild(template_1.content, currentNode);
474
464
  }
475
465
  else {
466
+ // console.log('------------->', currentNode)
476
467
  var uuid = RandomUtils_1.RandomUtils.uuid();
477
468
  var fragment = config.window.document.createDocumentFragment();
478
469
  var start = config.window.document.createComment("start ".concat(uuid));
479
470
  var end = config.window.document.createComment("end ".concat(uuid));
471
+ //console.log('start--', uuid)
480
472
  (_c = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _c === void 0 ? void 0 : _c.insertBefore(start, currentNode);
481
473
  (_d = currentNode === null || currentNode === void 0 ? void 0 : currentNode.parentNode) === null || _d === void 0 ? void 0 : _d.insertBefore(end, currentNode.nextSibling);
482
474
  fragment.append(currentNode);
@@ -487,9 +479,11 @@ var RawSet = (function () {
487
479
  }, fragment));
488
480
  }
489
481
  };
482
+ // eslint-disable-next-line no-cond-assign
490
483
  while (currentNode = nodeIterator.nextNode()) {
491
484
  _loop_1();
492
485
  }
486
+ // console.log('check-->', pars)
493
487
  return pars;
494
488
  };
495
489
  RawSet.prototype.childAllRemove = function () {
@@ -515,8 +509,44 @@ var RawSet = (function () {
515
509
  it.innerHTML = it.innerHTML.replace(RegExp(random, 'g'), '#it#');
516
510
  });
517
511
  };
512
+ // public static drDVarEncoding(element: Element, drVarOption: string) {
513
+ // const vars = (drVarOption?.split(',') ?? []).map(it => {
514
+ // const s = it.trim().split('=');
515
+ // return {
516
+ // name: s[0],
517
+ // value: s[1],
518
+ // regex: RegExp('(?<!(dr-|\\.))var\\.' + s[0] + '(?=.?)', 'g'),
519
+ // random: RandomUtils.uuid()
520
+ // }
521
+ // })
522
+ // element.querySelectorAll(`[${RawSet.DR_THIS_NAME}]`).forEach(it => {
523
+ // vars.filter(vit => vit.value && vit.name).forEach(vit => {
524
+ // it.innerHTML = it.innerHTML.replace(vit.regex, vit.random);
525
+ // })
526
+ // });
527
+ // vars.filter(vit => vit.value && vit.name).forEach(vit => {
528
+ // element.innerHTML = element.innerHTML.replace(vit.regex, vit.value);
529
+ // })
530
+ // return vars;
531
+ // }
532
+ //
533
+ // public static drDVarDecoding(element: Element, vars: { name: string, value: string, regex: RegExp, random: string }[]) {
534
+ // element.querySelectorAll(`[${RawSet.DR_THIS_NAME}]`).forEach(it => {
535
+ // vars.filter(vit => vit.value && vit.name).forEach(vit => {
536
+ // it.innerHTML = it.innerHTML.replace(RegExp(vit.random, 'g'), vit.value);
537
+ // })
538
+ // });
539
+ // }
518
540
  RawSet.drThisEncoding = function (element, drThis) {
519
541
  var thisRandom = RandomUtils_1.RandomUtils.uuid();
542
+ // const thisRegex = /(?<!(dr-|\.))this(?=.?)/g;
543
+ // const thisRegex = /[^(dr\-)]this(?=.?)/g;
544
+ // const thisRegex = /[^(dr\-)]this\./g;
545
+ // safari 때문에 전위 검색 regex가 안됨 아 짜증나서 이걸로함.
546
+ // element.querySelectorAll(`[${RawSet.DR_PRE_NAME}]`).forEach(it => {
547
+ // let message = it.innerHTML;
548
+ // })
549
+ // console.log('-----?', `[${RawSet.DR_THIS_NAME}], :not([${RawSet.DR_PRE_NAME}])`)
520
550
  element.querySelectorAll("[".concat(RawSet.DR_PRE_NAME, "]")).forEach(function (it) {
521
551
  it.innerHTML = it.innerHTML.replace(/this/g, thisRandom);
522
552
  });
@@ -559,6 +589,7 @@ var RawSet = (function () {
559
589
  }
560
590
  });
561
591
  var node;
592
+ // eslint-disable-next-line no-cond-assign
562
593
  while (node = nodeIterator.nextNode()) {
563
594
  var element_5 = node;
564
595
  element_5.setAttribute(to, (_a = element_5.getAttribute(as)) !== null && _a !== void 0 ? _a : '');
@@ -576,10 +607,12 @@ var RawSet = (function () {
576
607
  return {
577
608
  name: name,
578
609
  value: value,
610
+ // regex: RegExp('(?<!(dr-|\\.))var\\.' + s[0] + '(?=.?)', 'g'),
579
611
  regex: RegExp('\\$var\\.' + name + '(?=.?)', 'g'),
580
612
  random: RandomUtils_1.RandomUtils.uuid()
581
613
  };
582
614
  });
615
+ // element.querySelectorAll(`[${RawSet.DR_THIS_NAME}]`).forEach(it => {
583
616
  element.querySelectorAll("[".concat(RawSet.DR_VAR_OPTIONNAME, "]")).forEach(function (it) {
584
617
  vars.filter(function (vit) { return vit.value && vit.name; }).forEach(function (vit) {
585
618
  it.innerHTML = it.innerHTML.replace(vit.regex, vit.random);
@@ -614,6 +647,7 @@ var RawSet = (function () {
614
647
  fag.append(n);
615
648
  }
616
649
  fag.__domrender_this_variable_name = drThis;
650
+ // console.log('set __domrender_this_variable_name', (fag as any).__domrender_this_variable_name)
617
651
  return fag;
618
652
  };
619
653
  RawSet.createComponentTargetAttribute = function (name, getThisObj, factory) {
@@ -637,7 +671,9 @@ var RawSet = (function () {
637
671
  };
638
672
  return targetAttribute;
639
673
  };
640
- RawSet.createComponentTargetElement = function (name, objFactory, template, styles, scripts, config) {
674
+ RawSet.createComponentTargetElement = function (name, objFactory, template, styles, scripts,
675
+ // complete: (element: Element, obj: any, rawSet: RawSet) => void | undefined,
676
+ config) {
641
677
  if (template === void 0) { template = ''; }
642
678
  if (styles === void 0) { styles = []; }
643
679
  var targetElement = {
@@ -646,13 +682,16 @@ var RawSet = (function () {
646
682
  template: template,
647
683
  callBack: function (element, obj, rawSet) {
648
684
  var _a, _b;
685
+ // console.log('callback------->')
649
686
  if (!obj.__domrender_components) {
650
687
  obj.__domrender_components = {};
651
688
  }
652
689
  var domrenderComponents = obj.__domrender_components;
653
690
  var componentKey = '_' + RandomUtils_1.RandomUtils.getRandomString(20);
691
+ // console.log('callback settttt---a-->', componentKey, objFactory, objFactory(element, obj, rawSet))
654
692
  domrenderComponents[componentKey] = objFactory(element, obj, rawSet);
655
693
  var instance = domrenderComponents[componentKey];
694
+ // console.log('callback settttt---b-->', obj.__domrender_components, instance)
656
695
  var attribute = {};
657
696
  element.getAttributeNames().forEach(function (it) {
658
697
  attribute[it] = element.getAttribute(it);
@@ -665,6 +704,7 @@ var RawSet = (function () {
665
704
  rawset: rawSet,
666
705
  componentKey: componentKey,
667
706
  scripts: EventManager_1.EventManager.setBindProperty(scripts, obj)
707
+ // eslint-disable-next-line no-use-before-define
668
708
  });
669
709
  this.__render = render;
670
710
  var i = instance['__domrender_component_new'] = ((_a = instance['__domrender_component_new']) !== null && _a !== void 0 ? _a : new Proxy({}, new Types_1.DomRenderFinalProxy()));
@@ -684,8 +724,10 @@ var RawSet = (function () {
684
724
  }
685
725
  applayTemplate = template.replace('#innerHTML#', applayTemplate);
686
726
  var oninit = element.getAttribute('dr-on-init');
727
+ // console.log('oninit', oninit)
687
728
  if (oninit) {
688
729
  var script = "var $component = this.__render.component; var $element = this.__render.element; var $innerHTML = this.__render.innerHTML; var $attribute = this.__render.attribute; ".concat(oninit, " ");
730
+ // console.log('--->onInit--?', oninit, script, obj)
689
731
  ScriptUtils_1.ScriptUtils.eval(script, Object.assign(obj, {
690
732
  __render: render
691
733
  }));
@@ -695,10 +737,12 @@ var RawSet = (function () {
695
737
  var data = RawSet.drThisCreate(element, "this.__domrender_components.".concat(componentKey), '', true, obj, config);
696
738
  return data;
697
739
  },
740
+ // complete
698
741
  };
699
742
  return targetElement;
700
743
  };
701
744
  RawSet.exporesionGrouops = function (data) {
745
+ // const reg = /(?:[$#]\{(?:(([$#]\{)??[^$#]*?)\}[$#]))/g;
702
746
  var reg = /(?:[$#]\{(?:(([$#]\{)??[^$#]?[^{]*?)\}[$#]))/g;
703
747
  return StringUtils_1.StringUtils.regexExec(reg, data);
704
748
  };