@cat-of-summer/st-script 1.0.11 → 1.0.13
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.
- package/README.md +5 -0
- package/dist/app.esm.min.js +1 -1
- package/dist/app.esm.min.js.map +3 -3
- package/dist/app.min.js +1 -1
- package/dist/app.min.js.map +3 -3
- package/dist/cookie.esm.min.js +1 -1
- package/dist/cookie.esm.min.js.map +3 -3
- package/dist/cookie.min.js +1 -1
- package/dist/cookie.min.js.map +3 -3
- package/dist/loader.esm.min.js +1 -1
- package/dist/loader.esm.min.js.map +1 -1
- package/dist/loader.min.js +1 -1
- package/dist/loader.min.js.map +1 -1
- package/dist/mask.esm.min.js +1 -1
- package/dist/mask.esm.min.js.map +1 -1
- package/dist/mask.min.js +1 -1
- package/dist/mask.min.js.map +1 -1
- package/dist/modal.esm.min.js +1 -1
- package/dist/modal.esm.min.js.map +3 -3
- package/dist/modal.min.js +1 -1
- package/dist/modal.min.js.map +3 -3
- package/dist/observer.esm.min.js +1 -1
- package/dist/observer.esm.min.js.map +3 -3
- package/dist/observer.min.js +1 -1
- package/dist/observer.min.js.map +3 -3
- package/dist/route.esm.min.js +1 -1
- package/dist/route.esm.min.js.map +4 -4
- package/dist/route.min.js +1 -1
- package/dist/route.min.js.map +4 -4
- package/dist/select.esm.min.js +1 -1
- package/dist/select.esm.min.js.map +2 -2
- package/dist/select.min.js +1 -1
- package/dist/select.min.js.map +2 -2
- package/dist/toggle.esm.min.js +1 -1
- package/dist/toggle.esm.min.js.map +1 -1
- package/dist/toggle.min.js +1 -1
- package/dist/toggle.min.js.map +1 -1
- package/dist/typograf.esm.min.js +1 -1
- package/dist/typograf.esm.min.js.map +1 -1
- package/dist/typograf.min.js +1 -1
- package/dist/typograf.min.js.map +1 -1
- package/dist/uploader.esm.min.js +1 -1
- package/dist/uploader.esm.min.js.map +3 -3
- package/dist/uploader.min.js +1 -1
- package/dist/uploader.min.js.map +3 -3
- package/dist/validator.esm.min.js +1 -1
- package/dist/validator.esm.min.js.map +1 -1
- package/dist/validator.min.js +1 -1
- package/dist/validator.min.js.map +1 -1
- package/package.json +1 -1
- package/src/_traits/hasInstanceSymbol.js +10 -0
- package/src/app/index.js +101 -28
- package/src/cookie/index.js +4 -1
- package/src/modal/index.js +4 -4
- package/src/route/index.js +3 -1
- package/src/select/index.js +1 -1
- package/src/uploader/index.js +3 -2
package/src/app/index.js
CHANGED
|
@@ -44,10 +44,14 @@ export default class App extends HTMLElement {
|
|
|
44
44
|
#watchers = [];
|
|
45
45
|
#triggeredKeys = new Set();
|
|
46
46
|
#pendingFlush = false;
|
|
47
|
+
#tickWaiters = [];
|
|
48
|
+
// Тип значения из конфига: по нему приводится строка из атрибута :prop.
|
|
49
|
+
#types = new Map();
|
|
47
50
|
#methodWrappers = new Map();
|
|
48
51
|
#renderToken = 0;
|
|
49
52
|
#appliedTemplate = '';
|
|
50
53
|
#tornDown = false;
|
|
54
|
+
#templated = false;
|
|
51
55
|
|
|
52
56
|
constructor() {
|
|
53
57
|
super();
|
|
@@ -117,6 +121,7 @@ export default class App extends HTMLElement {
|
|
|
117
121
|
|
|
118
122
|
applyTemplate(template = '') {
|
|
119
123
|
let tplContent = template || this.#template;
|
|
124
|
+
this.#templated = true;
|
|
120
125
|
this.#appliedTemplate = tplContent;
|
|
121
126
|
this.#cleanupBindings(this.#bindings);
|
|
122
127
|
this.#bindings = [];
|
|
@@ -125,7 +130,7 @@ export default class App extends HTMLElement {
|
|
|
125
130
|
let tpl = document.createElement('template');
|
|
126
131
|
tpl.innerHTML = tplContent.trim();
|
|
127
132
|
let fragment = tpl.content.cloneNode(true);
|
|
128
|
-
|
|
133
|
+
this.#processChildren(fragment);
|
|
129
134
|
this.#mount(fragment);
|
|
130
135
|
}
|
|
131
136
|
let token = ++this.#renderToken;
|
|
@@ -321,7 +326,11 @@ export default class App extends HTMLElement {
|
|
|
321
326
|
let oldVal = w.lastValue;
|
|
322
327
|
w.lastValue = w.deep && newVal !== null && typeof newVal === 'object'
|
|
323
328
|
? JSON.parse(JSON.stringify(newVal)) : newVal;
|
|
324
|
-
|
|
329
|
+
try {
|
|
330
|
+
w.callback(newVal, oldVal, w.unwatch);
|
|
331
|
+
} catch (e) {
|
|
332
|
+
console.error('Watcher callback error:', e);
|
|
333
|
+
}
|
|
325
334
|
}
|
|
326
335
|
|
|
327
336
|
this.#triggeredKeys.clear();
|
|
@@ -330,11 +339,20 @@ export default class App extends HTMLElement {
|
|
|
330
339
|
this.#pendingFlush = false;
|
|
331
340
|
this.#flushing = true;
|
|
332
341
|
Promise.resolve().then(runFlush);
|
|
333
|
-
}
|
|
342
|
+
} else
|
|
343
|
+
this.#tickWaiters.splice(0).forEach(resolve => resolve());
|
|
334
344
|
};
|
|
335
345
|
Promise.resolve().then(runFlush);
|
|
336
346
|
}
|
|
337
347
|
|
|
348
|
+
// Промис, который разрешается после того, как DOM догнал данные: очередь эффектов
|
|
349
|
+
// и колбэков watch() пуста. Первую отрисовку вложенных <st-app> он не ждёт — для неё rendered.
|
|
350
|
+
nextTick() {
|
|
351
|
+
if (!this.#flushing)
|
|
352
|
+
return Promise.resolve();
|
|
353
|
+
return new Promise(resolve => this.#tickWaiters.push(resolve));
|
|
354
|
+
}
|
|
355
|
+
|
|
338
356
|
#getValueByPath(path) {
|
|
339
357
|
return path.split('.').reduce((o, k) => o?.[k], this);
|
|
340
358
|
}
|
|
@@ -470,6 +488,7 @@ export default class App extends HTMLElement {
|
|
|
470
488
|
get: (target, key) => {
|
|
471
489
|
if (key === Symbol.unscopables) return undefined;
|
|
472
490
|
let value = Reflect.get(target, key);
|
|
491
|
+
this.#warnNotReactive(key, value);
|
|
473
492
|
// Вызов f() внутри with передаёт this = scope; методам прототипа (нативным
|
|
474
493
|
// и с приватными полями) нужен сам элемент.
|
|
475
494
|
return typeof value === 'function' && !Object.hasOwn(target, key)
|
|
@@ -479,6 +498,19 @@ export default class App extends HTMLElement {
|
|
|
479
498
|
});
|
|
480
499
|
}
|
|
481
500
|
|
|
501
|
+
#warnedKeys = new Set();
|
|
502
|
+
|
|
503
|
+
// Поля конфига — аксессоры на элементе. Обычное собственное свойство (this.loaded = …
|
|
504
|
+
// без объявления в конфиге) шаблон прочитает, но перерисовки по нему не будет.
|
|
505
|
+
#warnNotReactive(key, value) {
|
|
506
|
+
if (typeof key !== 'string' || typeof value === 'function' || this.#warnedKeys.has(key)) return;
|
|
507
|
+
if (this.#loopContext && key in this.#loopContext) return;
|
|
508
|
+
let descriptor = Object.getOwnPropertyDescriptor(this, key);
|
|
509
|
+
if (!descriptor || !('value' in descriptor)) return;
|
|
510
|
+
this.#warnedKeys.add(key);
|
|
511
|
+
console.warn(`<st-app app="${this.getAttribute('app') ?? ''}">: свойство "${key}" не объявлено в конфиге и не реактивно`);
|
|
512
|
+
}
|
|
513
|
+
|
|
482
514
|
#evalExpression(expr) {
|
|
483
515
|
try {
|
|
484
516
|
return App.#compile(`return (${expr});`).call(this, this.#scope);
|
|
@@ -532,10 +564,14 @@ export default class App extends HTMLElement {
|
|
|
532
564
|
}
|
|
533
565
|
|
|
534
566
|
#bindEvent(element, attr) {
|
|
535
|
-
|
|
567
|
+
// @input.self — только события самого элемента, без всплывших от потомков:
|
|
568
|
+
// так событие вложенного <st-app> не путается с нативным input из его полей.
|
|
569
|
+
let [eventName, ...modifiers] = attr.name.slice(1).split('.');
|
|
570
|
+
let self = modifiers.includes('self');
|
|
536
571
|
let statement = attr.value;
|
|
537
572
|
let capturedLoopCtx = this.#loopContext ? { ...this.#loopContext } : null;
|
|
538
573
|
let handler = (e) => {
|
|
574
|
+
if (self && e.target !== element) return;
|
|
539
575
|
if (capturedLoopCtx)
|
|
540
576
|
this.#withLoopVars(capturedLoopCtx, () => this.#execStatement(statement, e));
|
|
541
577
|
else
|
|
@@ -836,12 +872,20 @@ export default class App extends HTMLElement {
|
|
|
836
872
|
if (node.localName === 'st-app')
|
|
837
873
|
return;
|
|
838
874
|
if (!elementRemoved && (node.parentNode || node.childNodes.length > 0))
|
|
839
|
-
|
|
875
|
+
this.#processChildren(node);
|
|
840
876
|
}
|
|
841
877
|
else if (node.nodeType === Node.TEXT_NODE && /\{\{.+?\}\}/.test(node.nodeValue))
|
|
842
878
|
this.#processTextInterpolation(node);
|
|
843
879
|
}
|
|
844
880
|
|
|
881
|
+
// Обход по снимку, но без узлов, вынутых по ходу: #if забирает соседние #else-if/#else
|
|
882
|
+
// в свою цепочку, и привязки на их отсоединённых оригиналах вычислялись бы впустую.
|
|
883
|
+
#processChildren(parent) {
|
|
884
|
+
for (let child of Array.from(parent.childNodes))
|
|
885
|
+
if (child.parentNode === parent)
|
|
886
|
+
this.#processNode(child);
|
|
887
|
+
}
|
|
888
|
+
|
|
845
889
|
#boot() {
|
|
846
890
|
let app = this.attrs.get('app');
|
|
847
891
|
let prototype = App.#apps.get(app);
|
|
@@ -871,6 +915,8 @@ export default class App extends HTMLElement {
|
|
|
871
915
|
});
|
|
872
916
|
} else if (descriptor.value !== undefined) {
|
|
873
917
|
let value = descriptor.value;
|
|
918
|
+
if (value !== null)
|
|
919
|
+
this.#types.set(key, typeof value === 'object' ? 'json' : typeof value);
|
|
874
920
|
let internalValue = value;
|
|
875
921
|
if (typeof value === 'object' && value !== null)
|
|
876
922
|
internalValue = this.#createReactiveProxy(value, [key]);
|
|
@@ -937,29 +983,49 @@ export default class App extends HTMLElement {
|
|
|
937
983
|
return String(value);
|
|
938
984
|
}
|
|
939
985
|
|
|
940
|
-
|
|
941
|
-
|
|
942
|
-
|
|
943
|
-
|
|
944
|
-
|
|
945
|
-
|
|
946
|
-
|
|
947
|
-
|
|
948
|
-
|
|
949
|
-
let serialized = this.#serializeForAttr(existingVal);
|
|
950
|
-
if (this.getAttribute(name) !== serialized)
|
|
951
|
-
this.setAttribute(name, serialized);
|
|
952
|
-
val = existingVal;
|
|
953
|
-
descriptor = null;
|
|
986
|
+
// Строка атрибута → значение. type — модификатор (:value.json) или тип из конфига;
|
|
987
|
+
// без него — угадывание по виду строки, как для свойств, которых нет в конфиге.
|
|
988
|
+
#castAttr(raw, type) {
|
|
989
|
+
if (raw === '') return type && type !== 'string' ? null : '';
|
|
990
|
+
switch (type) {
|
|
991
|
+
case 'string': return raw;
|
|
992
|
+
case 'number': {
|
|
993
|
+
let number = Number(raw);
|
|
994
|
+
return Number.isNaN(number) ? raw : number;
|
|
954
995
|
}
|
|
996
|
+
case 'boolean': return !['false', '0', 'null', 'undefined'].includes(raw);
|
|
997
|
+
case 'json': try { return JSON.parse(raw); } catch { return raw; }
|
|
955
998
|
}
|
|
956
|
-
if (
|
|
957
|
-
if (
|
|
958
|
-
if (raw)
|
|
959
|
-
|
|
960
|
-
|
|
961
|
-
|
|
962
|
-
|
|
999
|
+
if (raw === 'true') return true;
|
|
1000
|
+
if (raw === 'false') return false;
|
|
1001
|
+
if (/^-?\d+(\.\d+)?$/.test(raw)) return Number(raw);
|
|
1002
|
+
try { return JSON.parse(raw); } catch { return raw; }
|
|
1003
|
+
}
|
|
1004
|
+
|
|
1005
|
+
// initial — первое применение при монтировании: только тогда пустой :prop означает
|
|
1006
|
+
// «взять значение из конфига». Позже пустой атрибут — это пустое значение.
|
|
1007
|
+
#applySingleAttributeOption(name, initial = false) {
|
|
1008
|
+
if (!name.startsWith(':')) return;
|
|
1009
|
+
// Имена атрибутов браузер приводит к нижнему регистру: :initial-count → initialCount.
|
|
1010
|
+
let [propName, cast] = name.replace(/^:+/, '').split('.');
|
|
1011
|
+
propName = propName.replace(/-([a-z])/g, (_, char) => char.toUpperCase());
|
|
1012
|
+
let raw = this.getAttribute(name);
|
|
1013
|
+
if (raw === null) return;
|
|
1014
|
+
let descriptor = Object.getOwnPropertyDescriptor(this, propName);
|
|
1015
|
+
let val;
|
|
1016
|
+
if (raw === '' && initial && descriptor && (descriptor.get || descriptor.value !== undefined)) {
|
|
1017
|
+
val = this[propName];
|
|
1018
|
+
let serialized = this.#serializeForAttr(val);
|
|
1019
|
+
if (raw !== serialized)
|
|
1020
|
+
this.setAttribute(name, serialized);
|
|
1021
|
+
descriptor = null;
|
|
1022
|
+
} else {
|
|
1023
|
+
if (descriptor && descriptor.set === undefined && descriptor.writable === false) return;
|
|
1024
|
+
if (descriptor && descriptor.get !== undefined && descriptor.set === undefined) return;
|
|
1025
|
+
// Атрибут уже совпадает со свойством: это обратная синхронизация, а не новое значение.
|
|
1026
|
+
// Иначе null, отражённый в атрибут как '', вернулся бы в свойство строкой.
|
|
1027
|
+
if (descriptor && this.#serializeForAttr(this[propName]) === raw) return;
|
|
1028
|
+
val = this.#castAttr(raw, cast ?? this.#types.get(propName));
|
|
963
1029
|
}
|
|
964
1030
|
if (!descriptor || !descriptor.set) {
|
|
965
1031
|
let internalValue = val;
|
|
@@ -1025,6 +1091,13 @@ export default class App extends HTMLElement {
|
|
|
1025
1091
|
}
|
|
1026
1092
|
return;
|
|
1027
1093
|
}
|
|
1094
|
+
// Внутри <st-app>, который ещё не взял шаблон: родитель заберёт эту разметку как есть
|
|
1095
|
+
// и пересоздаст узел. Отрисуйся он раньше — в шаблон родителя попал бы готовый снимок.
|
|
1096
|
+
let host = this.parentElement?.closest('st-app');
|
|
1097
|
+
if (host && !host.#templated) {
|
|
1098
|
+
App.#instances.delete(this);
|
|
1099
|
+
return;
|
|
1100
|
+
}
|
|
1028
1101
|
this.#boot();
|
|
1029
1102
|
Promise.all([
|
|
1030
1103
|
new Promise(resolve => {
|
|
@@ -1050,8 +1123,8 @@ export default class App extends HTMLElement {
|
|
|
1050
1123
|
]).then(() => {
|
|
1051
1124
|
this.dispatchEvent('setup');
|
|
1052
1125
|
for (let name of this.attrs.keys()) {
|
|
1053
|
-
if (!name.startsWith(':')
|
|
1054
|
-
this.#applySingleAttributeOption(name);
|
|
1126
|
+
if (!name.startsWith(':')) continue;
|
|
1127
|
+
this.#applySingleAttributeOption(name, true);
|
|
1055
1128
|
}
|
|
1056
1129
|
let appliedInline = false;
|
|
1057
1130
|
if (this.childNodes.length > 0) {
|
package/src/cookie/index.js
CHANGED
|
@@ -65,8 +65,11 @@ export default class Cookie {
|
|
|
65
65
|
...params
|
|
66
66
|
};
|
|
67
67
|
|
|
68
|
+
// Проверяется наличие, а не get() === null: значение null тоже валидно (consent пишет именно его).
|
|
69
|
+
let exists = () => document.cookie.split(';').some(c => c.trim().startsWith(encodeURIComponent(name) + '='));
|
|
70
|
+
|
|
68
71
|
let interval = setInterval(() => {
|
|
69
|
-
if (
|
|
72
|
+
if (!exists()) {
|
|
70
73
|
Cookie.set(name, params.value, params);
|
|
71
74
|
|
|
72
75
|
setTimeout(() => {
|
package/src/modal/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { element, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
1
|
+
import { closestInPath, element, find, own } from '../_traits/hasInstanceSymbol.js';
|
|
2
2
|
|
|
3
3
|
export default class Modal {
|
|
4
4
|
modal;
|
|
@@ -162,7 +162,8 @@ export default class Modal {
|
|
|
162
162
|
|
|
163
163
|
if (this.#params.close_by_overlay)
|
|
164
164
|
this.area.addEventListener('click', (e) => {
|
|
165
|
-
|
|
165
|
+
// composedPath, а не e.target: перерисовка могла вынуть цель из контейнера до всплытия.
|
|
166
|
+
if (!e.composedPath().includes(this.container)) this.hide(e);
|
|
166
167
|
});
|
|
167
168
|
|
|
168
169
|
this.container = document.createElement('modal-container');
|
|
@@ -198,8 +199,7 @@ export default class Modal {
|
|
|
198
199
|
|
|
199
200
|
// Делегирование: кнопки, появившиеся или пересозданные позже (App, innerHTML), тоже работают.
|
|
200
201
|
this.content.addEventListener('click', e => {
|
|
201
|
-
|
|
202
|
-
if (close_button && this.content.contains(close_button)) this.hide();
|
|
202
|
+
if (closestInPath(e, '[action="close"]', this.content)) this.hide();
|
|
203
203
|
});
|
|
204
204
|
|
|
205
205
|
let toggle = (params) => {
|
package/src/route/index.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { closestInPath } from '../_traits/hasInstanceSymbol.js';
|
|
2
|
+
|
|
1
3
|
export default class Route {
|
|
2
4
|
|
|
3
5
|
#params = {};
|
|
@@ -94,7 +96,7 @@ export default class Route {
|
|
|
94
96
|
#intercept(e) {
|
|
95
97
|
if (e.defaultPrevented || e.button !== 0 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey) return;
|
|
96
98
|
|
|
97
|
-
let link = e
|
|
99
|
+
let link = closestInPath(e, 'a[href]');
|
|
98
100
|
if (!link || link.target && link.target !== '_self' || link.hasAttribute('download') || /\bexternal\b/.test(link.rel)) return;
|
|
99
101
|
|
|
100
102
|
let raw = link.getAttribute('href');
|
package/src/select/index.js
CHANGED
|
@@ -136,7 +136,7 @@ export default class Select {
|
|
|
136
136
|
|
|
137
137
|
if (this.#params.close_on_outside)
|
|
138
138
|
document.addEventListener('click', (e) => {
|
|
139
|
-
if (!
|
|
139
|
+
if (!e.composedPath().includes(container)) this.close(container);
|
|
140
140
|
});
|
|
141
141
|
}
|
|
142
142
|
|
package/src/uploader/index.js
CHANGED
|
@@ -87,11 +87,12 @@ export default class Uploader {
|
|
|
87
87
|
|
|
88
88
|
target.files = new Map();
|
|
89
89
|
target.total_size = 0;
|
|
90
|
+
let last_id = 0;
|
|
90
91
|
|
|
91
92
|
const createFileEntry = (file) => {
|
|
92
93
|
let entry = (new DOMParser()).parseFromString(entry_template, 'text/html').body.firstElementChild;
|
|
93
94
|
|
|
94
|
-
file._id =
|
|
95
|
+
file._id = ++last_id;
|
|
95
96
|
|
|
96
97
|
target.files.set(file._id, file);
|
|
97
98
|
target.total_size += file.size;
|
|
@@ -146,7 +147,7 @@ export default class Uploader {
|
|
|
146
147
|
let fileweight = entry.querySelector('*[fileweight]');
|
|
147
148
|
|
|
148
149
|
let file = {
|
|
149
|
-
_id:
|
|
150
|
+
_id: ++last_id,
|
|
150
151
|
preview: preview?.src || '',
|
|
151
152
|
value: input.value,
|
|
152
153
|
name: filename?.textContent || '',
|