aptechka 0.30.16 → 0.31.1

package/lib/slicer/SlicerElement.d.ts

@@ -5,7 +5,7 @@ export declare class SlicerElement extends HTMLElement {
     #private;
     get wordsArray(): Word[];
     get lettersArray(): Letter[];
-    get originalText(): string;
+    get originalHTML(): string;
     protected connectedCallback(): void;
     protected disconnectedCallback(): void;
 }

package/lib/slicer/index.cjs

@@ -1,11 +1,11 @@
-"use strict";var w=n=>{throw TypeError(n)};var A=(n,t,s)=>t.has(n)||w("Cannot "+s);var e=(n,t,s)=>(A(n,t,"read from private field"),s?s.call(n):t.get(n)),l=(n,t,s)=>t.has(n)?w("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(n):t.set(n,s),r=(n,t,s,i)=>(A(n,t,"write to private field"),i?i.call(n,s):t.set(n,s),s),f=(n,t,s)=>(A(n,t,"access private method"),s);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const H=require("../media/index.cjs");var m,o;class M{constructor(t){l(this,m);l(this,o);r(this,m,t.index),r(this,o,document.createElement("span")),e(this,o).classList.add("letter"),t.clone?e(this,o).innerHTML=`
+"use strict";var T=i=>{throw TypeError(i)};var M=(i,t,s)=>t.has(i)||T("Cannot "+s);var e=(i,t,s)=>(M(i,t,"read from private field"),s?s.call(i):t.get(i)),l=(i,t,s)=>t.has(i)?T("Cannot add the same private member more than once"):t instanceof WeakSet?t.add(i):t.set(i,s),h=(i,t,s,a)=>(M(i,t,"write to private field"),a?a.call(i,s):t.set(i,s),s),m=(i,t,s)=>(M(i,t,"access private method"),s);Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const $=require("../media/index.cjs");var y,o;class H{constructor(t){l(this,y);l(this,o);h(this,y,t.index),h(this,o,document.createElement("span")),e(this,o).classList.add("letter"),t.clone?e(this,o).innerHTML=`
         <span class="original">${t.text}</span>
         <span class="clone" aria-hidden>${t.text}</span>
       `:e(this,o).innerHTML=`
         <span class="value">${t.text}</span>
-      `}get index(){return e(this,m)}get element(){return e(this,o)}}m=new WeakMap,o=new WeakMap;var y,c,a,x;class S{constructor(t){l(this,y);l(this,c);l(this,a);l(this,x);r(this,y,t.index),r(this,c,document.createElement("span")),r(this,a,[]),r(this,x,t.text.endsWith("\\n")),e(this,x)&&(t.text=t.text.replace("\\n","")),t.letters&&t.lettersAcc!==void 0?(r(this,a,t.text.split("").map((s,i)=>new M({index:t.lettersAcc+i,text:s,clone:t.clone}))),e(this,c).append(...e(this,a).map(s=>s.element))):t.clone?e(this,c).innerHTML=`
+      `}get index(){return e(this,y)}get element(){return e(this,o)}}y=new WeakMap,o=new WeakMap;var L,r,u,g;class S{constructor(t){l(this,L);l(this,r);l(this,u);l(this,g);h(this,L,t.index),h(this,r,document.createElement("span")),h(this,u,[]),h(this,g,t.text.endsWith("\\n")),e(this,g)&&(t.text=t.text.replace("\\n","")),t.letters&&t.lettersAcc!==void 0?(h(this,u,t.text.split("").map((s,a)=>new H({index:t.lettersAcc+a,text:s,clone:t.clone}))),e(this,r).append(...e(this,u).map(s=>s.element))):t.clone?e(this,r).innerHTML=`
           <span class="original">${t.text}</span>
           <span class="clone" aria-hidden>${t.text}</span>
-        `:e(this,c).innerHTML=`
+        `:e(this,r).innerHTML=`
           <span class="value">${t.text}</span>
-        `,e(this,c).classList.add("word")}get index(){return e(this,y)}get element(){return e(this,c)}get letters(){return e(this,a)}get hasNewLine(){return e(this,x)}}y=new WeakMap,c=new WeakMap,a=new WeakMap,x=new WeakMap;var u,h,g,p,d,E,T;class v extends HTMLElement{constructor(){super(...arguments);l(this,d);l(this,u,"");l(this,h,[]);l(this,g,[]);l(this,p,null)}get wordsArray(){return e(this,h)}get lettersArray(){return e(this,g)}get originalText(){return e(this,u)}connectedCallback(){var s;r(this,u,((s=this.textContent)==null?void 0:s.trim())||""),this.hasAttribute("media")?(r(this,p,new H.Media(this.getAttribute("media"))),e(this,p).subscribe(i=>{i.current?f(this,d,E).call(this):!i.current&&i.previous&&f(this,d,T).call(this)})):f(this,d,E).call(this)}disconnectedCallback(){var s;f(this,d,T).call(this),(s=e(this,p))==null||s.close()}}u=new WeakMap,h=new WeakMap,g=new WeakMap,p=new WeakMap,d=new WeakSet,E=function(){this.innerHTML="";let s=0;r(this,h,e(this,u).replace(/  +/g," ").split(" ").map((i,b)=>{const L=new S({index:b,text:i,letters:this.hasAttribute("letters"),lettersAcc:s,clone:this.hasAttribute("clone")});return s+=L.letters.length,e(this,g).push(...L.letters),L})),this.hasAttribute("index")&&(e(this,h).forEach(i=>{i.element.style.setProperty("--word-index",i.index.toString())}),e(this,g).forEach(i=>{i.element.style.setProperty("--letter-index",i.index.toString())})),e(this,h).forEach((i,b)=>{this.appendChild(i.element),b!==e(this,h).length-1&&i.element.insertAdjacentHTML("beforeend","&nbsp;"),i.hasNewLine&&i.element.after(document.createElement("br"))}),this.style.setProperty("--words-length",e(this,h).length.toString()),this.style.setProperty("--letters-length",e(this,g).length.toString())},T=function(){r(this,h,[]),this.textContent=e(this,u),this.style.removeProperty("--words-length"),this.style.removeProperty("--letters-length")};customElements.get("e-slicer")||customElements.define("e-slicer",v);exports.Letter=M;exports.SlicerElement=v;exports.Word=S;
+        `,e(this,r).classList.add("word")}get index(){return e(this,L)}get element(){return e(this,r)}get letters(){return e(this,u)}get hasNewLine(){return e(this,g)}}L=new WeakMap,r=new WeakMap,u=new WeakMap,g=new WeakMap;var p,c,x,f,d,b,A;class v extends HTMLElement{constructor(){super(...arguments);l(this,d);l(this,p,"");l(this,c,[]);l(this,x,[]);l(this,f,null)}get wordsArray(){return e(this,c)}get lettersArray(){return e(this,x)}get originalHTML(){return e(this,p)}connectedCallback(){h(this,p,this.innerHTML.trim()),this.hasAttribute("media")?(h(this,f,new $.Media(this.getAttribute("media"))),e(this,f).subscribe(s=>{s.current?m(this,d,b).call(this):!s.current&&s.previous&&m(this,d,A).call(this)})):m(this,d,b).call(this)}disconnectedCallback(){var s;m(this,d,A).call(this),(s=e(this,f))==null||s.close()}}p=new WeakMap,c=new WeakMap,x=new WeakMap,f=new WeakMap,d=new WeakSet,b=function(){console.log(this.childNodes);const s=[];h(this,c,[]);let a=0,E=0;this.childNodes.forEach(n=>{n.nodeName==="#text"&&n.textContent?n.textContent.trim().replace(/  +/g," ").split(" ").map(P=>{const w=new S({index:a,text:P+" ",letters:this.hasAttribute("letters"),lettersAcc:E,clone:this.hasAttribute("clone")});E+=w.letters.length,a+=1,e(this,x).push(...w.letters),e(this,c).push(w),s.push(w.element)}):s.push(n)}),this.hasAttribute("index")&&(e(this,c).forEach(n=>{n.element.style.setProperty("--word-index",n.index.toString())}),e(this,x).forEach(n=>{n.element.style.setProperty("--letter-index",n.index.toString())})),this.innerHTML="",s.forEach(n=>{this.appendChild(n)}),this.style.setProperty("--words-length",e(this,c).length.toString()),this.style.setProperty("--letters-length",e(this,x).length.toString())},A=function(){h(this,c,[]),this.innerHTML=e(this,p),this.style.removeProperty("--words-length"),this.style.removeProperty("--letters-length")};customElements.get("e-slicer")||customElements.define("e-slicer",v);exports.Letter=H;exports.SlicerElement=v;exports.Word=S;

package/lib/slicer/index.js

@@ -1,15 +1,15 @@
-var T = (n) => {
-  throw TypeError(n);
+var T = (i) => {
+  throw TypeError(i);
 };
-var A = (n, t, s) => t.has(n) || T("Cannot " + s);
-var e = (n, t, s) => (A(n, t, "read from private field"), s ? s.call(n) : t.get(n)), l = (n, t, s) => t.has(n) ? T("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(n) : t.set(n, s), h = (n, t, s, i) => (A(n, t, "write to private field"), i ? i.call(n, s) : t.set(n, s), s), f = (n, t, s) => (A(n, t, "access private method"), s);
-import { Media as M } from "../media/index.js";
-var m, o;
-class H {
+var A = (i, t, s) => t.has(i) || T("Cannot " + s);
+var e = (i, t, s) => (A(i, t, "read from private field"), s ? s.call(i) : t.get(i)), l = (i, t, s) => t.has(i) ? T("Cannot add the same private member more than once") : t instanceof WeakSet ? t.add(i) : t.set(i, s), h = (i, t, s, a) => (A(i, t, "write to private field"), a ? a.call(i, s) : t.set(i, s), s), m = (i, t, s) => (A(i, t, "access private method"), s);
+import { Media as v } from "../media/index.js";
+var L, o;
+class P {
   constructor(t) {
-    l(this, m);
+    l(this, L);
     l(this, o);
-    h(this, m, t.index), h(this, o, document.createElement("span")), e(this, o).classList.add("letter"), t.clone ? e(this, o).innerHTML = `
+    h(this, L, t.index), h(this, o, document.createElement("span")), e(this, o).classList.add("letter"), t.clone ? e(this, o).innerHTML = `
         <span class="original">${t.text}</span>
         <span class="clone" aria-hidden>${t.text}</span>
       ` : e(this, o).innerHTML = `
@@ -17,103 +17,106 @@ class H {
       `;
   }
   get index() {
-    return e(this, m);
+    return e(this, L);
   }
   get element() {
     return e(this, o);
   }
 }
-m = new WeakMap(), o = new WeakMap();
-var y, c, a, g;
-class v {
+L = new WeakMap(), o = new WeakMap();
+var y, r, u, g;
+class $ {
   constructor(t) {
     l(this, y);
-    l(this, c);
-    l(this, a);
+    l(this, r);
+    l(this, u);
     l(this, g);
-    h(this, y, t.index), h(this, c, document.createElement("span")), h(this, a, []), h(this, g, t.text.endsWith("\\n")), e(this, g) && (t.text = t.text.replace("\\n", "")), t.letters && t.lettersAcc !== void 0 ? (h(this, a, t.text.split("").map((s, i) => new H({
-      index: t.lettersAcc + i,
+    h(this, y, t.index), h(this, r, document.createElement("span")), h(this, u, []), h(this, g, t.text.endsWith("\\n")), e(this, g) && (t.text = t.text.replace("\\n", "")), t.letters && t.lettersAcc !== void 0 ? (h(this, u, t.text.split("").map((s, a) => new P({
+      index: t.lettersAcc + a,
       text: s,
       clone: t.clone
-    }))), e(this, c).append(...e(this, a).map((s) => s.element))) : t.clone ? e(this, c).innerHTML = `
+    }))), e(this, r).append(...e(this, u).map((s) => s.element))) : t.clone ? e(this, r).innerHTML = `
           <span class="original">${t.text}</span>
           <span class="clone" aria-hidden>${t.text}</span>
-        ` : e(this, c).innerHTML = `
+        ` : e(this, r).innerHTML = `
           <span class="value">${t.text}</span>
-        `, e(this, c).classList.add("word");
+        `, e(this, r).classList.add("word");
   }
   get index() {
     return e(this, y);
   }
   get element() {
-    return e(this, c);
+    return e(this, r);
   }
   get letters() {
-    return e(this, a);
+    return e(this, u);
   }
   get hasNewLine() {
     return e(this, g);
   }
 }
-y = new WeakMap(), c = new WeakMap(), a = new WeakMap(), g = new WeakMap();
-var u, r, x, p, d, E, w;
-class P extends HTMLElement {
+y = new WeakMap(), r = new WeakMap(), u = new WeakMap(), g = new WeakMap();
+var p, c, x, f, d, M, E;
+class C extends HTMLElement {
   constructor() {
     super(...arguments);
     l(this, d);
-    l(this, u, "");
-    l(this, r, []);
+    l(this, p, "");
+    l(this, c, []);
     l(this, x, []);
-    l(this, p, null);
+    l(this, f, null);
   }
   get wordsArray() {
-    return e(this, r);
+    return e(this, c);
   }
   get lettersArray() {
     return e(this, x);
   }
-  get originalText() {
-    return e(this, u);
+  get originalHTML() {
+    return e(this, p);
   }
   connectedCallback() {
-    var s;
-    h(this, u, ((s = this.textContent) == null ? void 0 : s.trim()) || ""), this.hasAttribute("media") ? (h(this, p, new M(this.getAttribute("media"))), e(this, p).subscribe((i) => {
-      i.current ? f(this, d, E).call(this) : !i.current && i.previous && f(this, d, w).call(this);
-    })) : f(this, d, E).call(this);
+    h(this, p, this.innerHTML.trim()), this.hasAttribute("media") ? (h(this, f, new v(this.getAttribute("media"))), e(this, f).subscribe((s) => {
+      s.current ? m(this, d, M).call(this) : !s.current && s.previous && m(this, d, E).call(this);
+    })) : m(this, d, M).call(this);
   }
   disconnectedCallback() {
     var s;
-    f(this, d, w).call(this), (s = e(this, p)) == null || s.close();
+    m(this, d, E).call(this), (s = e(this, f)) == null || s.close();
   }
 }
-u = new WeakMap(), r = new WeakMap(), x = new WeakMap(), p = new WeakMap(), d = new WeakSet(), E = function() {
-  this.innerHTML = "";
-  let s = 0;
-  h(this, r, e(this, u).replace(/  +/g, " ").split(" ").map((i, L) => {
-    const b = new v({
-      index: L,
-      text: i,
-      letters: this.hasAttribute("letters"),
-      lettersAcc: s,
-      clone: this.hasAttribute("clone")
-    });
-    return s += b.letters.length, e(this, x).push(...b.letters), b;
-  })), this.hasAttribute("index") && (e(this, r).forEach((i) => {
-    i.element.style.setProperty("--word-index", i.index.toString());
-  }), e(this, x).forEach((i) => {
-    i.element.style.setProperty(
+p = new WeakMap(), c = new WeakMap(), x = new WeakMap(), f = new WeakMap(), d = new WeakSet(), M = function() {
+  console.log(this.childNodes);
+  const s = [];
+  h(this, c, []);
+  let a = 0, H = 0;
+  this.childNodes.forEach((n) => {
+    n.nodeName === "#text" && n.textContent ? n.textContent.trim().replace(/  +/g, " ").split(" ").map((b) => {
+      const w = new $({
+        index: a,
+        text: b + " ",
+        letters: this.hasAttribute("letters"),
+        lettersAcc: H,
+        clone: this.hasAttribute("clone")
+      });
+      H += w.letters.length, a += 1, e(this, x).push(...w.letters), e(this, c).push(w), s.push(w.element);
+    }) : s.push(n);
+  }), this.hasAttribute("index") && (e(this, c).forEach((n) => {
+    n.element.style.setProperty("--word-index", n.index.toString());
+  }), e(this, x).forEach((n) => {
+    n.element.style.setProperty(
       "--letter-index",
-      i.index.toString()
+      n.index.toString()
     );
-  })), e(this, r).forEach((i, L) => {
-    this.appendChild(i.element), L !== e(this, r).length - 1 && i.element.insertAdjacentHTML("beforeend", "&nbsp;"), i.hasNewLine && i.element.after(document.createElement("br"));
-  }), this.style.setProperty("--words-length", e(this, r).length.toString()), this.style.setProperty("--letters-length", e(this, x).length.toString());
-}, w = function() {
-  h(this, r, []), this.textContent = e(this, u), this.style.removeProperty("--words-length"), this.style.removeProperty("--letters-length");
+  })), this.innerHTML = "", s.forEach((n) => {
+    this.appendChild(n);
+  }), this.style.setProperty("--words-length", e(this, c).length.toString()), this.style.setProperty("--letters-length", e(this, x).length.toString());
+}, E = function() {
+  h(this, c, []), this.innerHTML = e(this, p), this.style.removeProperty("--words-length"), this.style.removeProperty("--letters-length");
 };
-customElements.get("e-slicer") || customElements.define("e-slicer", P);
+customElements.get("e-slicer") || customElements.define("e-slicer", C);
 export {
-  H as Letter,
-  P as SlicerElement,
-  v as Word
+  P as Letter,
+  C as SlicerElement,
+  $ as Word
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aptechka",
-  "version": "0.30.16",
+  "version": "0.31.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/denisavitski/aptechka.git"