@cat-of-summer/st-script 1.0.6 → 1.0.8

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 (41) hide show
  1. package/README.md +4 -4
  2. package/dist/mask.esm.min.js +1 -1
  3. package/dist/mask.esm.min.js.map +3 -3
  4. package/dist/mask.min.js +1 -1
  5. package/dist/mask.min.js.map +3 -3
  6. package/dist/observer.esm.min.js +2 -0
  7. package/dist/observer.esm.min.js.map +7 -0
  8. package/dist/observer.min.js +3 -0
  9. package/dist/observer.min.js.map +7 -0
  10. package/dist/typograf.esm.min.js +2 -0
  11. package/dist/typograf.esm.min.js.map +7 -0
  12. package/dist/typograf.min.js +3 -0
  13. package/dist/typograf.min.js.map +7 -0
  14. package/dist/validator.esm.min.js +2 -0
  15. package/dist/validator.esm.min.js.map +7 -0
  16. package/dist/validator.min.js +3 -0
  17. package/dist/validator.min.js.map +7 -0
  18. package/package.json +1 -1
  19. package/src/index.js +3 -3
  20. package/src/mask/_engine.js +29 -9
  21. package/src/mask/index.js +16 -1
  22. package/src/observer/_engine.js +71 -0
  23. package/src/observer/index.js +287 -0
  24. package/src/typograf/_engine.js +109 -0
  25. package/src/typograf/index.js +295 -0
  26. package/src/validator/index.js +156 -0
  27. package/dist/st_observer.esm.min.js +0 -2
  28. package/dist/st_observer.esm.min.js.map +0 -7
  29. package/dist/st_observer.min.js +0 -3
  30. package/dist/st_observer.min.js.map +0 -7
  31. package/dist/st_typograf.esm.min.js +0 -2
  32. package/dist/st_typograf.esm.min.js.map +0 -7
  33. package/dist/st_typograf.min.js +0 -3
  34. package/dist/st_typograf.min.js.map +0 -7
  35. package/dist/st_validator.esm.min.js +0 -2
  36. package/dist/st_validator.esm.min.js.map +0 -7
  37. package/dist/st_validator.min.js +0 -3
  38. package/dist/st_validator.min.js.map +0 -7
  39. package/src/st_observer/index.js +0 -426
  40. package/src/st_typograf/index.js +0 -200
  41. package/src/st_validator/index.js +0 -57
@@ -0,0 +1,7 @@
1
+ {
2
+ "version": 3,
3
+ "sources": ["../src/validator/index.js", "../src/_traits/hasInstanceSymbol.js"],
4
+ "sourcesContent": ["import { elements, expose, find, own } from '../_traits/hasInstanceSymbol.js';\n\nexport default class Validator {\n\n static #CONFIG = ['target', 'test', 'message'];\n\n #params = {};\n #methods = {};\n #elements = [];\n\n static find = find;\n\n get params() { return this.#params; }\n\n // \u0412\u0430\u043B\u0438\u0434\u043D\u043E\u0441\u0442\u044C \u043F\u043E \u043F\u0440\u0438\u0432\u044F\u0437\u0430\u043D\u043D\u044B\u043C \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u0430\u043C \u0431\u0435\u0437 state \u0438 \u0445\u0443\u043A\u043E\u0432 (customValidity \u0441\u0438\u043D\u0445\u0440\u043E\u043D\u0438\u0437\u0438\u0440\u0443\u0435\u0442\u0441\u044F).\n get valid() { return this.#elements.map(el => this.#sync(el).valid); }\n\n clone(params) {\n return new Validator({ ...this.#params, ...this.#methods, ...params, parent: this });\n }\n\n constructor(params) {\n params = {\n target: '[validate]',\n events: ['input', 'blur'],\n\n test: null,\n property: null,\n attribute: null,\n message: '\u041D\u0435\u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435',\n\n native: true,\n check_on_init: false,\n\n before_init: () => {},\n on_init: () => {},\n before_check: () => {},\n on_valid: () => {},\n on_invalid: () => {},\n on_check: () => {},\n\n ...params\n };\n\n for (let [key, value] of Object.entries(params))\n if (typeof value == \"function\" && !Validator.#CONFIG.includes(key)) {\n this[key] = value.bind(this);\n this.#methods[key] = value;\n } else\n this.#params[key] = value;\n\n this.before_init(this.#params);\n\n for (let el of elements(this.#params.target))\n this.#bind(el);\n\n if (this.#params.check_on_init) this.check();\n\n this.on_init(this.#params);\n }\n\n check(target = this.#elements) {\n return this.#own(target).map(el => this.#check(el)).every(Boolean);\n }\n\n reset(target = this.#elements) {\n for (let el of this.#own(target)) {\n el.removeAttribute('state');\n this.#sync(el);\n }\n }\n\n #own(target) {\n return elements(target).filter(el => find(el) === this);\n }\n\n #bind(el) {\n if (find(el)) throw new Error(\"\u0412\u0430\u043B\u0438\u0434\u0430\u0442\u043E\u0440 \u0443\u0436\u0435 \u043F\u0440\u0438\u0432\u044F\u0437\u0430\u043D \u043A \u044D\u0442\u043E\u043C\u0443 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u0443\");\n own(el, this);\n this.#elements.push(el);\n\n expose(el, {\n check: () => this.check(el),\n reset: () => this.reset(el)\n });\n\n for (let event of this.#params.events)\n el.addEventListener(event, () => this.#check(el));\n\n // \u041F\u043E\u043F\u044B\u0442\u043A\u0430 \u043E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0444\u043E\u0440\u043C\u0443: \u0431\u0440\u0430\u0443\u0437\u0435\u0440 \u0448\u043B\u0451\u0442 invalid \u043A\u0430\u0436\u0434\u043E\u043C\u0443 \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u043E\u043C\u0443 \u043F\u043E\u043B\u044E.\n el.addEventListener('invalid', () => this.#check(el));\n\n (el.form ?? el.closest('form'))\n ?.addEventListener('reset', () => queueMicrotask(() => this.reset(el)));\n\n this.#sync(el);\n }\n\n #check(el) {\n if (this.before_check(el) === false) return el.getAttribute('state') != 'invalid';\n\n let { valid, message } = this.#sync(el);\n\n el.setAttribute('state', valid ? 'valid' : 'invalid');\n\n if (valid) this.on_valid(el);\n else this.on_invalid(el, message);\n\n this.on_check(el, valid, message);\n\n return valid;\n }\n\n #sync(el) {\n let result = this.#test(el);\n\n if (this.#native(el))\n el.setCustomValidity(result.valid ? '' : result.message || ' ');\n\n return result;\n }\n\n #native(el) {\n return this.#params.native && typeof el.setCustomValidity == 'function';\n }\n\n #test(el) {\n let { test, property, attribute } = this.#params;\n\n // \u0412\u0441\u0442\u0440\u043E\u0435\u043D\u043D\u044B\u0435 \u043E\u0433\u0440\u0430\u043D\u0438\u0447\u0435\u043D\u0438\u044F (required, type, pattern\u2026) \u043F\u0440\u043E\u0432\u0435\u0440\u044F\u044E\u0442\u0441\u044F \u043F\u0435\u0440\u0432\u044B\u043C\u0438.\n if (this.#native(el)) {\n el.setCustomValidity('');\n if (!el.validity.valid) return { valid: false, message: el.validationMessage };\n }\n\n if (attribute && !el.hasAttribute(attribute)) return this.#fail(el);\n\n let source = String((property ? el[property]\n : attribute ? el.getAttribute(attribute)\n : el.value) ?? '');\n\n for (let rule of [test ?? []].flat()) {\n let result = typeof rule == 'function' ? rule.call(this, el) : new RegExp(rule).test(source);\n\n if (typeof result == 'string') return { valid: false, message: result };\n if (!result) return this.#fail(el);\n }\n\n return { valid: true, message: '' };\n }\n\n #fail(el) {\n let message = this.#params.message;\n return { valid: false, message: typeof message == 'function' ? message.call(this, el) : message };\n }\n}\n", "const instance = Symbol();\nconst exposed = Symbol();\n\n// \u041E\u0434\u0438\u043D \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044E\u0449\u0438\u0439 \u044D\u043B\u0435\u043C\u0435\u043D\u0442: Element \u0438\u043B\u0438 CSS-\u0441\u0435\u043B\u0435\u043A\u0442\u043E\u0440 \u2192 Element | undefined.\nexport const element = (param) => {\n try {\n return param instanceof Element ? param : document.querySelector(param);\n } catch {\n return undefined;\n }\n};\n\n// \u041C\u043D\u043E\u0436\u0435\u0441\u0442\u0432\u043E \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044E\u0449\u0438\u0445 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u043E\u0432: Element | NodeList | HTMLCollection | Array |\n// CSS-\u0441\u0435\u043B\u0435\u043A\u0442\u043E\u0440 \u2192 Array<Element>. \u0411\u0435\u0437 \u043F\u043E\u0431\u043E\u0447\u043D\u044B\u0445 \u044D\u0444\u0444\u0435\u043A\u0442\u043E\u0432 (\u043D\u0435\u0441\u043E\u0432\u043F\u0430\u0434\u0435\u043D\u0438\u0435 \u2192 []).\nexport const elements = (param) => {\n if (param == null) return [];\n if (param instanceof Element) return [param];\n if (param instanceof NodeList || param instanceof HTMLCollection) return [...param];\n if (Array.isArray(param)) return param.flatMap(elements);\n\n try {\n return [...document.querySelectorAll(param)];\n } catch {\n return [];\n }\n};\n\nexport const find = (param) => element(param)?.[instance];\n\nexport const own = (el, inst) => { if (el) el[instance] = inst; return el; };\n\n// \u041E\u043F\u0443\u0431\u043B\u0438\u043A\u043E\u0432\u0430\u0442\u044C API \u0432\u043B\u0430\u0434\u0435\u043B\u044C\u0446\u0430 \u043F\u0440\u044F\u043C\u043E \u043D\u0430 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u0435: input.raw(), select.open() \u0438 \u0442.\u043F.\n// \u0421\u0432\u043E\u0439\u0441\u0442\u0432\u0430 \u043D\u0435\u043F\u0435\u0440\u0435\u0447\u0438\u0441\u043B\u0438\u043C\u044B\u0435 (\u043D\u0435 \u043F\u043E\u043F\u0430\u0434\u0430\u044E\u0442 \u0432 Object.keys \u0438 JSON). \u0417\u0430\u043D\u044F\u0442\u043E\u0435 \u0438\u043C\u044F \u2014 \u043D\u0430\u0442\u0438\u0432\u043D\u043E\u0435\n// \u0438\u043B\u0438 \u0447\u0443\u0436\u043E\u0435 \u2014 \u043D\u0435 \u0437\u0430\u0442\u0438\u0440\u0430\u0435\u0442\u0441\u044F: \u043F\u0440\u0435\u0434\u0443\u043F\u0440\u0435\u0436\u0434\u0435\u043D\u0438\u0435 \u0438 \u043F\u0440\u043E\u043F\u0443\u0441\u043A.\nexport const expose = (el, api) => {\n if (!el) return el;\n\n let published = el[exposed] ??= new Set();\n\n for (let [name, value] of Object.entries(api)) {\n if (name in el && !published.has(name)) {\n console.warn(`\u0418\u043C\u044F \"${name}\" \u0443\u0436\u0435 \u0437\u0430\u043D\u044F\u0442\u043E \u043D\u0430 \u044D\u043B\u0435\u043C\u0435\u043D\u0442\u0435 \u2014 \u043C\u0435\u0442\u043E\u0434 \u043D\u0435 \u043E\u043F\u0443\u0431\u043B\u0438\u043A\u043E\u0432\u0430\u043D`, el);\n continue;\n }\n\n Object.defineProperty(el, name, { value, writable: true, configurable: true, enumerable: false });\n published.add(name);\n }\n\n return el;\n};\n"],
5
+ "mappings": "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",
6
+ "names": ["index_exports", "__export", "Validator", "instance", "exposed", "element", "param", "elements", "find", "own", "el", "inst", "expose", "api", "published", "name", "value", "Validator", "_Validator", "#CONFIG", "#params", "#methods", "#elements", "find", "el", "#sync", "params", "key", "value", "elements", "#bind", "target", "#own", "#check", "own", "expose", "event", "valid", "message", "result", "#test", "#native", "test", "property", "attribute", "#fail", "source", "rule"]
7
+ }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cat-of-summer/st-script",
3
- "version": "1.0.6",
3
+ "version": "1.0.8",
4
4
  "description": "Standalone JS classes/components (Modal, App, Typograf , …), shipped as ESM and IIFE/CDN builds.",
5
5
  "type": "module",
6
6
  "license": "MIT",
package/src/index.js CHANGED
@@ -6,11 +6,11 @@ export { default as Cookie } from './cookie/index.js';
6
6
  export { default as st_links_widget } from './st_links_widget/index.js';
7
7
  export { default as Mask } from './mask/index.js';
8
8
  export { default as Modal } from './modal/index.js';
9
- export { default as st_observer } from './st_observer/index.js';
9
+ export { default as Observer } from './observer/index.js';
10
10
  export { default as Select } from './select/index.js';
11
11
  export { default as Route } from './route/index.js';
12
12
  export { default as Core } from './core/index.js';
13
13
  export { default as Toggle } from './toggle/index.js';
14
- export { default as st_typograf } from './st_typograf/index.js';
14
+ export { default as Typograf } from './typograf/index.js';
15
15
  export { default as Uploader } from './uploader/index.js';
16
- export { default as st_validator } from './st_validator/index.js';
16
+ export { default as Validator } from './validator/index.js';
@@ -1,6 +1,12 @@
1
1
  const SLOTS = { '0': /^[0-9]$/, 'a': /^\p{L}$/u, '*': /^[^\n]$/ };
2
2
 
3
- const unesc = str => str.replace(/\\(.)/g, '$1');
3
+ // Литерал-буква или цифра — часть «кода» маски ('+7', '+375'). Сколько таких литералов ввод
4
+ // совпал подряд с начала — длина узнанного кода (s.lead): по ней выбирается маска страны.
5
+ // Если ввод разошёлся с кодом раньше первого слота, код не узнан (lead = 0); ввод, оборвавшийся
6
+ // внутри кода ('37' для '+375'), — совпадение. Разделители '(', ' ', '-' и '+' на это не влияют
7
+ const SIGNIFICANT = /^[\p{L}\p{N}]$/u;
8
+
9
+ const unesc =str => str.replace(/\\(.)/g, '$1');
4
10
  const no_g = re => re.global ? new RegExp(re.source, re.flags.replace('g', '')) : re;
5
11
 
6
12
  function scan(str, from) {
@@ -193,9 +199,16 @@ function walk(nodes, s, def) {
193
199
  if (s.input[s.ip] === node.char) {
194
200
  s.ip++;
195
201
  s.consumed++;
202
+ if (!s.diverged && SIGNIFICANT.test(node.char)) s.lead++;
196
203
  accept(s, node.char, node.char, 'literal');
197
- } else
204
+ } else {
205
+ if (SIGNIFICANT.test(node.char)) {
206
+ // Начало кода совпало, продолжение — нет ('34' против '375'): код не узнан
207
+ if (!s.diverged && s.raw === '') s.lead = 0;
208
+ s.diverged = true;
209
+ }
198
210
  s.formatted += node.char;
211
+ }
199
212
  } else s.tail += node.char;
200
213
 
201
214
  } else if (node.type == 'slot') {
@@ -248,6 +261,7 @@ function walk(nodes, s, def) {
248
261
  else if (s.input[s.ip] === node.from)
249
262
  s.ip++, s.consumed++;
250
263
  else { s.ip++; continue; }
264
+ if (!s.diverged) s.lead++;
251
265
  accept(s, node.to, node.to);
252
266
  break;
253
267
  }
@@ -322,7 +336,7 @@ function numeral(def, input_string) {
322
336
  for (let i = 1; i <= o.fraction; i++) body += filler(def, i);
323
337
  }
324
338
  return { stream: '', raw: '', formatted: '', tail: '', ph: body + o.suffix,
325
- ph_slots: [], complete: false, consumed: 0, units: [], cells: [], stop_fmt: body.length };
339
+ ph_slots: [], complete: false, consumed: 0, lead: 0, units: [], cells: [], stop_fmt: body.length };
326
340
  }
327
341
 
328
342
  let f = o.fraction;
@@ -359,7 +373,7 @@ function numeral(def, input_string) {
359
373
  let complete = (o.min == null || value >= o.min) && (o.max == null || value <= o.max);
360
374
 
361
375
  return { stream: raw, raw, formatted, tail: '', ph: '', ph_slots: [],
362
- complete, consumed: raw.length, units, cells: [], stop_fmt };
376
+ complete, consumed: raw.length, lead: 0, units, cells: [], stop_fmt };
363
377
  }
364
378
 
365
379
  export function run(def, input_string, ctx) {
@@ -371,7 +385,7 @@ export function run(def, input_string, ctx) {
371
385
  ip: 0,
372
386
  stream: '', raw: '', formatted: '', tail: '', ph: '',
373
387
  ph_slots: [], units: [], cells: [],
374
- consumed: 0, ordinal: 0,
388
+ consumed: 0, lead: 0, diverged: false, ordinal: 0,
375
389
  complete: true, done: false, stop_fmt: -1
376
390
  };
377
391
 
@@ -382,7 +396,7 @@ export function run(def, input_string, ctx) {
382
396
  return {
383
397
  stream: s.stream, raw: s.raw, formatted: s.formatted, tail: s.tail,
384
398
  ph: s.ph, ph_slots: s.ph_slots, complete: s.complete, consumed: s.consumed,
385
- units: s.units, cells: s.cells, stop_fmt: s.stop_fmt
399
+ lead: s.lead, units: s.units, cells: s.cells, stop_fmt: s.stop_fmt
386
400
  };
387
401
  }
388
402
 
@@ -396,14 +410,20 @@ export function run_all(defs, input_string, ctx = {}) {
396
410
  let best = null;
397
411
  for (let def of resolved) {
398
412
  let result = run(def, input_string, ctx);
399
- if (!best
400
- || result.consumed > best.result.consumed
401
- || result.consumed == best.result.consumed && result.complete && !best.result.complete)
413
+ if (!best || better(result, best.result))
402
414
  best = { result, def, mask_id: def.key };
403
415
  }
404
416
  return best;
405
417
  }
406
418
 
419
+ // Кто из кандидатов лучше подходит под ввод: принял больше символов → узнал более длинный
420
+ // код в начале ввода ('375' у '+375' против ничего у '+7'; '+7 (7' против '+7').
421
+ // Заполненность не учитывается: номер без кода остаётся у первой маски, а не перескакивает
422
+ // на более короткую, заполнившуюся раньше. При полном равенстве остаётся первая маска
423
+ function better(a, b) {
424
+ return a.consumed != b.consumed ? a.consumed > b.consumed : a.lead > b.lead;
425
+ }
426
+
407
427
  export function render(result, placeholder) {
408
428
  if (placeholder == 'always') return result.formatted + result.tail + result.ph;
409
429
  if (placeholder === false) return result.formatted;
package/src/mask/index.js CHANGED
@@ -18,6 +18,20 @@ export default class Mask {
18
18
  return layout;
19
19
  }
20
20
 
21
+ // Атрибут mask="" — строка-шаблон либо JSON: массив строк или словарь { ключ: строка | [строки] }.
22
+ // Шаблоны тоже начинаются с '[' и '{' ('{*;0-}', '[0]'), поэтому JSON берётся только
23
+ // подходящей формы, всё остальное остаётся шаблоном
24
+ static #from_attr(attr) {
25
+ if (!/^\s*[[{]/.test(attr)) return attr;
26
+ let strings = v => typeof v == 'string' || Array.isArray(v) && v.every(m => typeof m == 'string');
27
+ try {
28
+ let v = JSON.parse(attr);
29
+ if (Array.isArray(v) ? strings(v) : v && typeof v == 'object' && Object.values(v).every(strings))
30
+ return v;
31
+ } catch {}
32
+ return attr;
33
+ }
34
+
21
35
  #params = {};
22
36
  #methods = {};
23
37
  #defs = null;
@@ -145,8 +159,9 @@ export default class Mask {
145
159
  if (ml != null) input.removeAttribute('maxlength');
146
160
  let max_raw = this.#params.max_raw ?? (ml != null ? +ml : null);
147
161
 
162
+ let attr = input.getAttribute('mask');
148
163
  let defs = this.#defs
149
- ?? (input.getAttribute('mask') ? build(input.getAttribute('mask'), this.#base()) : this.#default_for(coerced));
164
+ ?? (attr ? build(Mask.#from_attr(attr), this.#base()) : this.#default_for(coerced));
150
165
  if (!defs) {
151
166
  console.warn('Mask: для поля не задана маска (ни в params.mask, ни в атрибуте mask)', input);
152
167
  return;
@@ -0,0 +1,71 @@
1
+ // Чистая геометрия Observer: без DOM, на вход — прямоугольники { top, left, width, height }.
2
+ //
3
+ // Зона элемента — две линии, как в ScrollTrigger: start 'top bottom' — верх элемента встречает
4
+ // низ root, end 'bottom top' — низ элемента встречает верх root. По текущим rect считаются
5
+ // a = линия элемента − линия root для start и b — то же для end. Прокрутка уменьшает обе на одно
6
+ // и то же δ, поэтому a > 0 — зона впереди, b < 0 — позади, progress = −a / (b − a).
7
+
8
+ const KEYS = { top: 0, left: 0, center: 0.5, bottom: 1, right: 1 };
9
+ const ORDER = { before: 0, active: 1, after: 2 };
10
+
11
+ const amount = (num, unit) => unit == '%' ? { frac: num / 100, px: 0 } : { frac: 0, px: num };
12
+
13
+ // Край: 'top' | 'center' | 'bottom' | 'left' | 'right' | '80%' | '120px' | 120,
14
+ // со сдвигом: 'top+100px', 'bottom-10%'. Мусор — предупреждение и край 0
15
+ export function parse_edge(token) {
16
+ if (typeof token == 'number') return { frac: 0, px: token };
17
+
18
+ let m = /^(?:([a-z]+)|(-?\d*\.?\d+)(%|px)?)(?:([+-])(\d*\.?\d+)(%|px)?)?$/.exec(String(token).trim().toLowerCase());
19
+ if (!m || m[1] && !(m[1] in KEYS)) {
20
+ console.warn('Observer: некорректный край зоны', token);
21
+ return { frac: 0, px: 0 };
22
+ }
23
+
24
+ let base = m[1] ? { frac: KEYS[m[1]], px: 0 } : amount(+m[2], m[3]);
25
+ if (!m[4]) return base;
26
+
27
+ let shift = amount(m[4] == '-' ? -m[5] : +m[5], m[6]);
28
+ return { frac: base.frac + shift.frac, px: base.px + shift.px };
29
+ }
30
+
31
+ // Линия 'край_элемента край_root' → [edge, edge]; без второго токена root берёт root_default
32
+ export function parse_line(value, root_default) {
33
+ let [el, root = root_default] = typeof value == 'number' ? ['top', value] : String(value).trim().split(/\s+/);
34
+ return [parse_edge(el), parse_edge(root)];
35
+ }
36
+
37
+ export const parse_zone = (start, end) => ({ start: parse_line(start, 'bottom'), end: parse_line(end, 'top') });
38
+
39
+ const pos = (rect, edge, axis) => axis == 'x'
40
+ ? rect.left + edge.frac * rect.width + edge.px
41
+ : rect.top + edge.frac * rect.height + edge.px;
42
+
43
+ export const measure = (rect, root, zone, axis = 'y') => ({
44
+ a: pos(rect, zone.start[0], axis) - pos(root, zone.start[1], axis),
45
+ b: pos(rect, zone.end[0], axis) - pos(root, zone.end[1], axis),
46
+ });
47
+
48
+ export const state_of = (a, b) => a > 0 ? 'before' : b < 0 ? 'after' : 'active';
49
+
50
+ // Вырожденная зона (end не дальше start) — ступенька 0 → 1 на линии start
51
+ export function progress_of(a, b) {
52
+ let length = b - a;
53
+ if (length <= 0) return a > 0 ? 0 : 1;
54
+ return Math.min(1, Math.max(0, -a / length));
55
+ }
56
+
57
+ export const intersects = (r1, r2) => !(r1.left + r1.width <= r2.left || r1.left >= r2.left + r2.width
58
+ || r1.top + r1.height <= r2.top || r1.top >= r2.top + r2.height);
59
+
60
+ // Смена состояния → хуки в порядке вызова. Перескок зоны за кадр (before ↔ after) даёт
61
+ // вход и выход подряд, чтобы once и пары enter/leave не терялись на быстром скролле
62
+ export function steps(prev, next) {
63
+ if (prev == next) return [];
64
+
65
+ let direction = ORDER[next] > ORDER[prev] ? 'forward' : 'backward';
66
+ let enter = { hook: 'on_enter', direction, state: 'active' };
67
+
68
+ if (next == 'active') return [enter];
69
+ if (prev == 'active') return [{ hook: 'on_leave', direction, state: next }];
70
+ return [enter, { hook: 'on_leave', direction, state: next }];
71
+ }
@@ -0,0 +1,287 @@
1
+ import { element, elements, find, own } from '../_traits/hasInstanceSymbol.js';
2
+ import { parse_zone, measure, state_of, progress_of, intersects, steps } from './_engine.js';
3
+
4
+ const CALLBACKS = ['before_init', 'on_init', 'on_enter', 'on_leave', 'on_progress', 'on_cross', 'on_uncross'];
5
+
6
+ export default class Observer {
7
+
8
+ static #CONFIG = ['target', 'root', 'cross'];
9
+
10
+ // атрибут-флаг: нет атрибута → значение по умолчанию, '' / 'true' → да, 'false' → нет
11
+ static #flag(attr, fallback) {
12
+ return attr == null ? !!fallback : attr != 'false';
13
+ }
14
+
15
+ #params = {};
16
+ #methods = {};
17
+ #zone = null;
18
+ #root = null;
19
+ #states = new Map();
20
+ #done = new WeakSet();
21
+ #goals = [];
22
+ #frame = 0;
23
+ #io = null;
24
+ #mo = null;
25
+ #ro = null;
26
+ #schedule = () => { this.#frame ||= requestAnimationFrame(() => this.#tick()); };
27
+ #later = () => requestAnimationFrame(this.#schedule);
28
+
29
+ static find = find;
30
+
31
+ get params() { return this.#params; }
32
+
33
+ get elements() { return [...this.#states.keys()]; }
34
+
35
+ clone(params) {
36
+ return new Observer({ ...this.#params, ...this.#methods, ...params, parent: this });
37
+ }
38
+
39
+ constructor(params) {
40
+ params = {
41
+ target: '[observe]',
42
+ root: null,
43
+ axis: 'y',
44
+ start: 'top bottom',
45
+ end: 'bottom top',
46
+ once: false,
47
+ progress: false,
48
+ stagger: 0,
49
+ live: false,
50
+ cross: null,
51
+ ...Object.fromEntries(CALLBACKS.map(k => [k, () => {}])),
52
+ ...params
53
+ };
54
+
55
+ for (let [key, value] of Object.entries(params))
56
+ if (typeof value == "function" && !Observer.#CONFIG.includes(key)) {
57
+ this[key] = value.bind(this);
58
+ this.#methods[key] = value;
59
+ } else
60
+ this.#params[key] = value;
61
+
62
+ this.before_init(this.#params);
63
+
64
+ this.#zone = parse_zone(this.#params.start, this.#params.end);
65
+ this.#root = this.#params.root == null ? null : element(this.#params.root) ?? null;
66
+
67
+ // гейт: каждый кадр меряются только элементы в пределах ещё одного root с каждой стороны
68
+ this.#io = new IntersectionObserver(entries => {
69
+ for (let entry of entries) {
70
+ let st = this.#states.get(entry.target);
71
+ if (!st) continue;
72
+ st.near = entry.isIntersecting;
73
+ st.dirty = true;
74
+ }
75
+ this.#schedule();
76
+ }, { root: this.#root, rootMargin: '100%' });
77
+
78
+ // scroll не всплывает, но ловится на захвате: так видна прокрутка и окна, и вложенных контейнеров
79
+ document.addEventListener('scroll', this.#schedule, { capture: true, passive: true });
80
+ window.addEventListener('resize', this.#schedule, { passive: true });
81
+
82
+ this.#ro = new ResizeObserver(this.#schedule);
83
+ this.#ro.observe(this.#root ?? document.documentElement);
84
+
85
+ if (this.#params.live && typeof this.#params.target == 'string') {
86
+ let pending = false;
87
+ this.#mo = new MutationObserver(records => {
88
+ if (pending || !records.some(r => [...r.addedNodes, ...r.removedNodes].some(n => n instanceof Element)))
89
+ return;
90
+ pending = true;
91
+ queueMicrotask(() => { pending = false; this.refresh(); });
92
+ });
93
+ this.#mo.observe(document.documentElement, { childList: true, subtree: true });
94
+ }
95
+
96
+ this.#goals = elements(this.#params.cross);
97
+ for (let el of elements(this.#params.target)) this.#bind(el);
98
+
99
+ this.on_init(this.#params);
100
+ }
101
+
102
+ // явный observe берёт и отпущенные раньше элементы (после once или unobserve)
103
+ observe(target) {
104
+ for (let el of elements(target)) {
105
+ this.#done.delete(el);
106
+ this.#bind(el);
107
+ }
108
+ return this;
109
+ }
110
+
111
+ unobserve(target) {
112
+ for (let el of elements(target)) {
113
+ this.#done.add(el);
114
+ this.#release(el);
115
+ }
116
+ return this;
117
+ }
118
+
119
+ // Пересканировать target и цели cross, отпустить элементы, ушедшие из DOM, пересчитать всё.
120
+ // Отпущенные через once / unobserve при пересканировании не берутся заново
121
+ refresh() {
122
+ for (let el of this.#states.keys()) if (!el.isConnected) this.#release(el);
123
+ if (typeof this.#params.target == 'string')
124
+ for (let el of elements(this.#params.target)) if (!this.#done.has(el)) this.#bind(el);
125
+ this.#goals = elements(this.#params.cross);
126
+ for (let st of this.#states.values()) st.dirty = true;
127
+ this.#schedule();
128
+ return this;
129
+ }
130
+
131
+ state(target) {
132
+ let st = this.#states.get(element(target));
133
+ return st ? { state: st.state, progress: st.value, direction: st.direction } : null;
134
+ }
135
+
136
+ destroy() {
137
+ for (let el of [...this.#states.keys()]) this.#release(el);
138
+ cancelAnimationFrame(this.#frame);
139
+ this.#frame = 0;
140
+ this.#io.disconnect();
141
+ this.#ro.disconnect();
142
+ this.#mo?.disconnect();
143
+ document.removeEventListener('scroll', this.#schedule, { capture: true });
144
+ window.removeEventListener('resize', this.#schedule);
145
+ }
146
+
147
+ #bind(el) {
148
+ if (this.#states.has(el)) return;
149
+ let owner = find(el);
150
+ if (owner instanceof Observer && owner !== this) {
151
+ console.warn('Observer: элемент уже отслеживается другим Observer — пропущен', el);
152
+ return;
153
+ }
154
+ own(el, this);
155
+
156
+ let attr = name => el.getAttribute('observe-' + name);
157
+ let start = attr('start'), end = attr('end');
158
+
159
+ // начальное состояние — before: вход в зону на следующих кадрах проигрывает CSS-переход
160
+ this.#states.set(el, {
161
+ zone: start == null && end == null ? this.#zone
162
+ : parse_zone(start ?? this.#params.start, end ?? this.#params.end),
163
+ once: Observer.#flag(attr('once'), this.#params.once),
164
+ progress: Observer.#flag(attr('progress'), this.#params.progress),
165
+ state: 'before', direction: null, value: null, index: 0,
166
+ near: true, dirty: true, timer: 0, pending: null, crossing: new Set()
167
+ });
168
+ el.setAttribute('state', 'before');
169
+
170
+ this.#io.observe(el);
171
+ this.#later();
172
+ }
173
+
174
+ // forget = false оставляет владение: Observer.find(el) после once по-прежнему отвечает
175
+ #release(el, forget = true) {
176
+ let st = this.#states.get(el);
177
+ if (!st) return;
178
+ clearTimeout(st.timer);
179
+ this.#states.delete(el);
180
+ this.#io.unobserve(el);
181
+ if (forget && find(el) === this) own(el, undefined);
182
+ }
183
+
184
+ #root_rect() {
185
+ if (!this.#root) {
186
+ let doc = document.documentElement;
187
+ return { top: 0, left: 0, width: doc.clientWidth, height: doc.clientHeight };
188
+ }
189
+ let r = this.#root.getBoundingClientRect();
190
+ return { top: r.top + this.#root.clientTop, left: r.left + this.#root.clientLeft,
191
+ width: this.#root.clientWidth, height: this.#root.clientHeight };
192
+ }
193
+
194
+ // Кадр: сначала все чтения геометрии, потом все записи — без layout thrashing
195
+ #tick() {
196
+ this.#frame = 0;
197
+
198
+ let root = this.#root_rect(), axis = this.#params.axis;
199
+ let goals = this.#goals.filter(g => g.isConnected).map(g => [g, g.getBoundingClientRect()]);
200
+ let reads = [];
201
+
202
+ for (let [el, st] of this.#states) {
203
+ if (!el.isConnected || !st.near && !st.dirty && !goals.length) continue;
204
+ st.dirty = false;
205
+
206
+ let rect = el.getBoundingClientRect();
207
+ let { a, b } = measure(rect, root, st.zone, axis);
208
+ let crossing = goals.length
209
+ ? new Set(goals.filter(([g, r]) => g !== el && intersects(rect, r)).map(([g]) => g))
210
+ : null;
211
+ reads.push([el, st, state_of(a, b), progress_of(a, b), crossing]);
212
+ }
213
+
214
+ let entering = [];
215
+
216
+ for (let [el, st, next, progress, crossing] of reads) {
217
+ if (st.progress) this.#progress(el, st, progress);
218
+ if (crossing) this.#cross(el, st, crossing);
219
+
220
+ // отложенный stagger-вход ждёт своей очереди; если цель сменилась — отменяется,
221
+ // и события считаются от уже показанного состояния
222
+ if (st.timer) {
223
+ if (st.pending == next) continue;
224
+ clearTimeout(st.timer);
225
+ st.timer = 0;
226
+ }
227
+
228
+ let events = steps(st.state, next);
229
+ if (!events.length) continue;
230
+
231
+ if (this.#params.stagger > 0 && events[0].hook == 'on_enter') entering.push([el, st, next, events]);
232
+ else this.#commit(el, st, next, events);
233
+ }
234
+
235
+ if (!entering.length) return;
236
+
237
+ entering.sort(([x], [y]) => x.compareDocumentPosition(y) & Node.DOCUMENT_POSITION_FOLLOWING ? -1 : 1);
238
+ entering.forEach(([el, st, next, events], index) => {
239
+ st.index = index;
240
+ st.pending = next;
241
+ el.style.setProperty('--index', index);
242
+ st.timer = setTimeout(() => this.#commit(el, st, next, events), index * this.#params.stagger * 1000);
243
+ });
244
+ }
245
+
246
+ #commit(el, st, next, events) {
247
+ st.timer = 0;
248
+
249
+ // once: первый вход фиксирует active навсегда, дальше элемент не отслеживается
250
+ let once = st.once && events[0].hook == 'on_enter';
251
+ if (once) [events, next] = [[events[0]], 'active'];
252
+
253
+ let prev = st.state;
254
+ st.state = next;
255
+ st.direction = events.at(-1).direction;
256
+ el.setAttribute('state', next);
257
+
258
+ for (let { hook, direction, state } of events)
259
+ this.#call(hook, el, { state, prev, direction, progress: st.value, index: st.index });
260
+
261
+ if (once) {
262
+ this.#done.add(el);
263
+ this.#release(el, false);
264
+ }
265
+ }
266
+
267
+ #progress(el, st, progress) {
268
+ let value = Math.round(progress * 1e4) / 1e4;
269
+ if (value === st.value) return;
270
+ st.value = value;
271
+ el.style.setProperty('--progress', value);
272
+ this.#call('on_progress', el, { state: st.state, prev: st.state, direction: st.direction, progress: value, index: st.index });
273
+ }
274
+
275
+ #cross(el, st, crossing) {
276
+ for (let goal of st.crossing)
277
+ if (!crossing.has(goal)) { st.crossing.delete(goal); this.#call('on_uncross', el, goal); }
278
+ for (let goal of crossing)
279
+ if (!st.crossing.has(goal)) { st.crossing.add(goal); this.#call('on_cross', el, goal); }
280
+ el.toggleAttribute('crossing', st.crossing.size > 0);
281
+ }
282
+
283
+ // ошибка в пользовательском хуке не должна ронять кадр для остальных элементов
284
+ #call(hook, ...args) {
285
+ try { this[hook](...args); } catch (e) { console.error(e); }
286
+ }
287
+ }