From 6348df2f685f7fe41bc0d55d1c80a069835f5985 Mon Sep 17 00:00:00 2001 From: Binu Baiju Date: Fri, 29 Aug 2025 17:37:09 +0530 Subject: [PATCH 1/3] fix: GitHub profile pictures not loading - use correct avatar_url property - Fixed camelCase vs snake_case mismatch in user metadata - GitHub OAuth provides avatar_url, not avatarUrl - Resolves profile pictures showing only initials instead of actual images --- apps/backend/package.json | 2 +- apps/backend/supabase/config.toml | 10 +- .../src/server/api/routers/user/user.ts | 4 +- .../template/public/onlook-preload-script.js | 1188 ++++++++--------- packages/db/drizzle.config.ts | 2 +- 5 files changed, 591 insertions(+), 615 deletions(-) diff --git a/apps/backend/package.json b/apps/backend/package.json index d7d1c6fd5d..6c9274a1d0 100644 --- a/apps/backend/package.json +++ b/apps/backend/package.json @@ -2,7 +2,7 @@ "name": "@onlook/backend", "private": true, "scripts": { - "start": "supabase start", + "start": "supabase start --exclude mailpit,logflare,vector", "stop": "supabase stop", "push": "supabase db push", "reset": "supabase db reset", diff --git a/apps/backend/supabase/config.toml b/apps/backend/supabase/config.toml index b5438ff440..b750c19eb9 100644 --- a/apps/backend/supabase/config.toml +++ b/apps/backend/supabase/config.toml @@ -2,7 +2,7 @@ project_id = "onlook-web" [api] enabled = true -port = 54321 +port = 55321 schemas = ["public", "storage"] extra_search_path = ["public"] max_rows = 100 @@ -16,22 +16,22 @@ additional_redirect_urls = [ jwt_expiry = 36000 [db] -port = 54322 +port = 55432 [studio] -port = 54323 +port = 55323 [auth.external.github] enabled = true client_id = "env(GITHUB_CLIENT_ID)" secret = "env(GITHUB_SECRET)" -redirect_uri = "http://127.0.0.1:54321/auth/v1/callback" +redirect_uri = "http://127.0.0.1:55321/auth/v1/callback" [auth.external.google] enabled = true client_id = "env(GOOGLE_CLIENT_ID)" secret = "env(GOOGLE_SECRET)" -redirect_uri = "http://127.0.0.1:54321/auth/v1/callback" +redirect_uri = "http://127.0.0.1:55321/auth/v1/callback" [analytics] enabled = true diff --git a/apps/web/client/src/server/api/routers/user/user.ts b/apps/web/client/src/server/api/routers/user/user.ts index 1d683703b2..98dfb101cd 100644 --- a/apps/web/client/src/server/api/routers/user/user.ts +++ b/apps/web/client/src/server/api/routers/user/user.ts @@ -22,7 +22,7 @@ export const userRouter = createTRPCRouter({ lastName: user.lastName ?? lastName, displayName: user.displayName ?? displayName, email: user.email ?? authUser.email, - avatarUrl: user.avatarUrl ?? authUser.user_metadata.avatarUrl, + avatarUrl: user.avatarUrl ?? authUser.user_metadata.avatar_url, }) : null; return userData; }), @@ -56,7 +56,7 @@ export const userRouter = createTRPCRouter({ lastName: input.lastName ?? lastName, displayName: input.displayName ?? displayName, email: input.email ?? authUser.email, - avatarUrl: input.avatarUrl ?? authUser.user_metadata.avatarUrl, + avatarUrl: input.avatarUrl ?? authUser.user_metadata.avatar_url, }; const [user] = await ctx.db diff --git a/apps/web/template/public/onlook-preload-script.js b/apps/web/template/public/onlook-preload-script.js index 5f489bfe22..7437af047a 100644 --- a/apps/web/template/public/onlook-preload-script.js +++ b/apps/web/template/public/onlook-preload-script.js @@ -158,17 +158,17 @@ var Mr = hl((k5, Lf) => { m = !0; if (typeof l != 'function') throw new TypeError(jc); if (((i = Gf(i) || 0), Wc(t))) - ((h = !!t.leading), + (h = !!t.leading), (c = 'maxWait' in t), (o = c ? sc(Gf(t.maxWait) || 0, i) : o), - (m = 'trailing' in t ? !!t.trailing : m)); + (m = 'trailing' in t ? !!t.trailing : m); function u(L) { var y = r, T = n; - return ((r = n = void 0), (f = L), (b = l.apply(T, y)), b); + return (r = n = void 0), (f = L), (b = l.apply(T, y)), b; } function X(L) { - return ((f = L), (g = setTimeout(q, i)), h ? u(L) : b); + return (f = L), (g = setTimeout(q, i)), h ? u(L) : b; } function I(L) { var y = L - e, @@ -188,11 +188,11 @@ var Mr = hl((k5, Lf) => { } function V(L) { if (((g = void 0), m && r)) return u(L); - return ((r = n = void 0), b); + return (r = n = void 0), b; } function fl() { if (g !== void 0) clearTimeout(g); - ((f = 0), (r = e = n = g = void 0)); + (f = 0), (r = e = n = g = void 0); } function K() { return g === void 0 ? b : V(Hr()); @@ -202,12 +202,12 @@ var Mr = hl((k5, Lf) => { y = F(L); if (((r = arguments), (n = this), (e = L), y)) { if (g === void 0) return X(e); - if (c) return (clearTimeout(g), (g = setTimeout(q, i)), u(e)); + if (c) return clearTimeout(g), (g = setTimeout(q, i)), u(e); } if (g === void 0) g = setTimeout(q, i); return b; } - return ((G.cancel = fl), (G.flush = K), G); + return (G.cancel = fl), (G.flush = K), G; } Lf.exports = Qc; }); @@ -270,9 +270,9 @@ var H0 = hl((Qm) => { if (t >= n) throw new Error('Expected more digits in base 64 VLQ value.'); if (((e = R0.decode(i.charCodeAt(t++))), e === -1)) throw new Error('Invalid base64 digit: ' + i.charAt(t - 1)); - ((g = !!(e & K0)), (e &= V0), (o = o + (e << b)), (b += rn)); + (g = !!(e & K0)), (e &= V0), (o = o + (e << b)), (b += rn); } while (g); - ((r.value = Ym(o)), (r.rest = t)); + (r.value = Ym(o)), (r.rest = t); }; }); var fr = hl((Cm) => { @@ -307,7 +307,7 @@ var fr = hl((Cm) => { for (var r = 0; r < i.length; r++) if (i[r].input === t) { var n = i[0]; - return ((i[0] = i[r]), (i[r] = n), i[0].result); + return (i[0] = i[r]), (i[r] = n), i[0].result; } var o = l(t); if ((i.unshift({ input: t, result: o }), i.length > Rm)) i.pop(); @@ -337,10 +337,10 @@ var fr = hl((Cm) => { if (((e = o[g]), e === '.')) o.splice(g, 1); else if (e === '..') f++; else if (f > 0) - if (e === '') (o.splice(g + 1, f), (f = 0)); - else (o.splice(g, 2), f--); + if (e === '') o.splice(g + 1, f), (f = 0); + else o.splice(g, 2), f--; if (((t = o.join('/')), t === '')) t = n ? '/' : '.'; - if (r) return ((r.path = t), Vi(r)); + if (r) return (r.path = t), Vi(r); return t; }); Cm.normalize = nn; @@ -355,9 +355,9 @@ var fr = hl((Cm) => { return Vi(t); } if (t || i.match(Bm)) return i; - if (r && !r.host && !r.path) return ((r.host = i), Vi(r)); + if (r && !r.host && !r.path) return (r.host = i), Vi(r); var n = i.charAt(0) === '/' ? i : nn(l.replace(/\/+$/, '') + '/' + i); - if (r) return ((r.path = n), Vi(r)); + if (r) return (r.path = n), Vi(r); return n; } Cm.join = y0; @@ -495,7 +495,7 @@ var S0 = hl((cw) => { bn = Object.prototype.hasOwnProperty, vi = typeof Map !== 'undefined'; function dl() { - ((this._array = []), (this._set = vi ? new Map() : Object.create(null))); + (this._array = []), (this._set = vi ? new Map() : Object.create(null)); } dl.fromArray = function l(i, t) { var r = new dl(); @@ -550,20 +550,20 @@ var C0 = hl((pw) => { return r > t || (r == t && o >= n) || N0.compareByGeneratedPositionsInflated(l, i) <= 0; } function gr() { - ((this._array = []), + (this._array = []), (this._sorted = !0), - (this._last = { generatedLine: -1, generatedColumn: 0 })); + (this._last = { generatedLine: -1, generatedColumn: 0 }); } gr.prototype.unsortedForEach = function l(i, t) { this._array.forEach(i, t); }; gr.prototype.add = function l(i) { - if (ww(this._last, i)) ((this._last = i), this._array.push(i)); - else ((this._sorted = !1), this._array.push(i)); + if (ww(this._last, i)) (this._last = i), this._array.push(i); + else (this._sorted = !1), this._array.push(i); }; gr.prototype.toArray = function l() { if (!this._sorted) - (this._array.sort(N0.compareByGeneratedPositionsInflated), (this._sorted = !0)); + this._array.sort(N0.compareByGeneratedPositionsInflated), (this._sorted = !0); return this._array; }; pw.MappingList = gr; @@ -574,7 +574,7 @@ var Ec = class extends Error { code; constructor(l, i) { super(i); - ((this.name = 'PenpalError'), (this.code = l)); + (this.name = 'PenpalError'), (this.code = l); } }, _l = Ec, @@ -586,7 +586,7 @@ var Ec = class extends Error { }), Lc = ({ name: l, message: i, stack: t, penpalCode: r }) => { let n = r ? new _l(r, i) : new Error(i); - return ((n.name = l), (n.stack = t), n); + return (n.name = l), (n.stack = t), n; }, Bc = Symbol('Reply'), Rc = class { @@ -594,7 +594,7 @@ var Ec = class extends Error { transferables; #l = Bc; constructor(l, i) { - ((this.value = l), (this.transferables = i?.transferables)); + (this.value = l), (this.transferables = i?.transferables); } }, Fc = Rc, @@ -665,24 +665,24 @@ var Ec = class extends Error { let m = Hc(g, i); if (!m) throw new _l('METHOD_NOT_FOUND', `Method \`${oi(g)}\` is not found.`); let u = await m(...e); - if (u instanceof Fc) ((c = u.transferables), (u = await u.value)); + if (u instanceof Fc) (c = u.transferables), (u = await u.value); h = { namespace: ql, channel: t, type: 'REPLY', callId: f, value: u }; } catch (m) { h = Bf(t, f, m); } if (n) return; try { - (r?.(`Sending ${oi(g)}() reply`, h), l.sendMessage(h, c)); + r?.(`Sending ${oi(g)}() reply`, h), l.sendMessage(h, c); } catch (m) { if (m.name === 'DataCloneError') - ((h = Bf(t, f, m)), r?.(`Sending ${oi(g)}() reply`, h), l.sendMessage(h)); + (h = Bf(t, f, m)), r?.(`Sending ${oi(g)}() reply`, h), l.sendMessage(h); throw m; } }; return ( l.addMessageHandler(o), () => { - ((n = !0), l.removeMessageHandler(o)); + (n = !0), l.removeMessageHandler(o); } ); }, @@ -700,7 +700,7 @@ var Ec = class extends Error { timeout; #l = Ac; constructor(l) { - ((this.transferables = l?.transferables), (this.timeout = l?.timeout)); + (this.transferables = l?.transferables), (this.timeout = l?.timeout); } }, kc = Uc, @@ -749,13 +749,13 @@ var Ec = class extends Error { let V = u !== void 0 ? window.setTimeout(() => { - (n.delete(h), + n.delete(h), q( new _l( 'METHOD_CALL_TIMEOUT', `Method call ${oi(e)}() timed out after ${u}ms`, ), - )); + ); }, u) : void 0; n.set(h, { methodPath: e, resolve: F, reject: q, timeoutId: V }); @@ -768,16 +768,16 @@ var Ec = class extends Error { methodPath: e, args: I, }; - (t?.(`Sending ${oi(e)}() call`, fl), l.sendMessage(fl, X)); + t?.(`Sending ${oi(e)}() call`, fl), l.sendMessage(fl, X); } catch (fl) { q(new _l('TRANSMISSION_FAILED', fl.message)); } }); }, t), destroy: () => { - ((r = !0), l.removeMessageHandler(o)); + (r = !0), l.removeMessageHandler(o); for (let { methodPath: e, reject: f, timeoutId: h } of n.values()) - (clearTimeout(h), f(Rf(e))); + clearTimeout(h), f(Rf(e)); n.clear(); }, } @@ -788,7 +788,7 @@ var Ec = class extends Error { let l, i; return { promise: new Promise((r, n) => { - ((l = r), (i = n)); + (l = r), (i = n); }), resolve: l, reject: i, @@ -889,7 +889,7 @@ var Ec = class extends Error { if (e) return; g.push(yc(l, i, r, n)); let { remoteProxy: G, destroy: L } = Cc(l, r, n); - (g.push(L), clearTimeout(u), (e = !0), c({ remoteProxy: G, destroy: X })); + g.push(L), clearTimeout(u), (e = !0), c({ remoteProxy: G, destroy: X }); }, F = () => { let G = { namespace: ql, type: 'SYN', channel: r, participantId: o }; @@ -925,21 +925,21 @@ var Ec = class extends Error { I(); }, fl = (G) => { - (n?.('Received handshake ACK2', G), I()); + n?.('Received handshake ACK2', G), I(); }, K = (G) => { if (si(G)) q(G); if (kt(G)) V(G); if (ct(G)) fl(G); }; - return (l.addMessageHandler(K), g.push(() => l.removeMessageHandler(K)), F(), h); + return l.addMessageHandler(K), g.push(() => l.removeMessageHandler(K)), F(), h; }, rm = tm, nm = (l) => { let i = !1, t; return (...r) => { - if (!i) ((i = !0), (t = l(...r))); + if (!i) (i = !0), (t = l(...r)); return t; }; }, @@ -970,10 +970,10 @@ var Ec = class extends Error { return { promise: (async () => { try { - (l.initialize({ log: n, validateReceivedMessage: g }), + l.initialize({ log: n, validateReceivedMessage: g }), l.addMessageHandler((c) => { if (Kc(c)) b(!1); - })); + }); let { remoteProxy: f, destroy: h } = await rm({ messenger: l, methods: i, @@ -981,7 +981,7 @@ var Ec = class extends Error { channel: r, log: n, }); - return (o.push(h), f); + return o.push(h), f; } catch (f) { throw (b(!0), f); } @@ -1003,10 +1003,10 @@ var Ec = class extends Error { #f = !1; constructor({ remoteWindow: l, allowedOrigins: i }) { if (!l) throw new _l('INVALID_ARGUMENT', 'remoteWindow must be defined'); - ((this.#l = l), (this.#n = i?.length ? i : [window.origin])); + (this.#l = l), (this.#n = i?.length ? i : [window.origin]); } initialize = ({ log: l, validateReceivedMessage: i }) => { - ((this.#t = l), (this.#i = i), window.addEventListener('message', this.#c)); + (this.#t = l), (this.#i = i), window.addEventListener('message', this.#c); }; sendMessage = (l, i) => { if (si(l)) { @@ -1022,7 +1022,7 @@ var Ec = class extends Error { } if (ct(l)) { let { port1: t, port2: r } = new MessageChannel(); - ((this.#o = t), t.addEventListener('message', this.#e), t.start()); + (this.#o = t), t.addEventListener('message', this.#e), t.start(); let n = [r, ...(i || [])], o = this.#g(l); this.#l.postMessage(l, { targetOrigin: o, transfer: n }); @@ -1041,7 +1041,7 @@ var Ec = class extends Error { this.#r.delete(l); }; destroy = () => { - (window.removeEventListener('message', this.#c), this.#h(), this.#r.clear()); + window.removeEventListener('message', this.#c), this.#h(), this.#r.clear(); }; #m = (l) => { return this.#n.some((i) => (i instanceof RegExp ? i.test(l) : i === l || i === '*')); @@ -1052,16 +1052,14 @@ var Ec = class extends Error { return this.#b === 'null' && this.#n.includes('*') ? '*' : this.#b; }; #h = () => { - (this.#o?.removeEventListener('message', this.#e), - this.#o?.close(), - (this.#o = void 0)); + this.#o?.removeEventListener('message', this.#e), this.#o?.close(), (this.#o = void 0); }; #c = ({ source: l, origin: i, ports: t, data: r }) => { if (l !== this.#l) return; if (Zc(r)) - (this.#t?.('Please upgrade the child window to the latest version of Penpal.'), + this.#t?.('Please upgrade the child window to the latest version of Penpal.'), (this.#f = !0), - (r = lm(r))); + (r = lm(r)); if (!this.#i?.(r)) return; if (!this.#m(i)) { this.#t?.( @@ -1069,10 +1067,10 @@ var Ec = class extends Error { ); return; } - if (si(r)) (this.#h(), (this.#b = i)); + if (si(r)) this.#h(), (this.#b = i); if (ct(r) && !this.#f) { if (((this.#o = t[0]), !this.#o)) throw new Yi('No port received on ACK2'); - (this.#o.addEventListener('message', this.#e), this.#o.start()); + this.#o.addEventListener('message', this.#e), this.#o.start(); } for (let n of this.#r) n(r); }; @@ -1092,7 +1090,7 @@ var Ec = class extends Error { this.#l = l; } initialize = ({ validateReceivedMessage: l }) => { - ((this.#n = l), this.#l.addEventListener('message', this.#r)); + (this.#n = l), this.#l.addEventListener('message', this.#r); }; sendMessage = (l, i) => { if (si(l) || kt(l)) { @@ -1101,10 +1099,10 @@ var Ec = class extends Error { } if (ct(l)) { let { port1: t, port2: r } = new MessageChannel(); - ((this.#i = t), + (this.#i = t), t.addEventListener('message', this.#r), t.start(), - this.#l.postMessage(l, { transfer: [r, ...(i || [])] })); + this.#l.postMessage(l, { transfer: [r, ...(i || [])] }); return; } if (this.#i) { @@ -1120,19 +1118,17 @@ var Ec = class extends Error { this.#t.delete(l); }; destroy = () => { - (this.#l.removeEventListener('message', this.#r), this.#b(), this.#t.clear()); + this.#l.removeEventListener('message', this.#r), this.#b(), this.#t.clear(); }; #b = () => { - (this.#i?.removeEventListener('message', this.#r), - this.#i?.close(), - (this.#i = void 0)); + this.#i?.removeEventListener('message', this.#r), this.#i?.close(), (this.#i = void 0); }; #r = ({ ports: l, data: i }) => { if (!this.#n?.(i)) return; if (si(i)) this.#b(); if (ct(i)) { if (((this.#i = l[0]), !this.#i)) throw new Yi('No port received on ACK2'); - (this.#i.addEventListener('message', this.#r), this.#i.start()); + this.#i.addEventListener('message', this.#r), this.#i.start(); } for (let t of this.#t) t(i); }; @@ -1146,7 +1142,7 @@ var N5 = class { this.#l = l; } initialize = ({ validateReceivedMessage: l }) => { - ((this.#n = l), this.#l.addEventListener('message', this.#i), this.#l.start()); + (this.#n = l), this.#l.addEventListener('message', this.#i), this.#l.start(); }; sendMessage = (l, i) => { this.#l?.postMessage(l, { transfer: i }); @@ -1158,7 +1154,7 @@ var N5 = class { this.#t.delete(l); }; destroy = () => { - (this.#l.removeEventListener('message', this.#i), this.#l.close(), this.#t.clear()); + this.#l.removeEventListener('message', this.#i), this.#l.close(), this.#t.clear(); }; #i = ({ data: l }) => { if (!this.#n?.(l)) return; @@ -1291,7 +1287,7 @@ var If = (l = 21) => { }; function Jl(l) { let i = l.getAttribute('data-odid'); - if (!i) ((i = `odid-${If()}`), l.setAttribute('data-odid', i)); + if (!i) (i = `odid-${If()}`), l.setAttribute('data-odid', i); return i; } function Vl(l) { @@ -1322,14 +1318,14 @@ function Qi() { return l; } function hm(l = document.body) { - if (!Qi()) return (console.warn('frameView id not found, skipping dom processing'), null); + if (!Qi()) return console.warn('frameView id not found, skipping dom processing'), null; let t = zl(l); - if (!t) return (console.warn('Error building layer tree, root element is null'), null); + if (!t) return console.warn('Error building layer tree, root element is null'), null; let r = l.getAttribute('data-odid'); - if (!r) return (console.warn('Root dom id not found'), null); + if (!r) return console.warn('Root dom id not found'), null; let n = t.get(r); - if (!n) return (console.warn('Root node not found'), null); - return (Tf(t, n), { rootDomId: r, layerMap: Array.from(t.entries()) }); + if (!n) return console.warn('Root node not found'), null; + return Tf(t, n), { rootDomId: r, layerMap: Array.from(t.entries()) }; } var St = df.default(hm, 500), cm = [ @@ -1355,7 +1351,7 @@ function zl(l) { }, }), r = Zf(l); - ((r.children = []), i.set(r.domId, r)); + (r.children = []), i.set(r.domId, r); let n = t.nextNode(); while (n) { let o = Zf(n); @@ -1369,7 +1365,7 @@ function zl(l) { if (e && e.children) e.children.push(o.domId); } } - (i.set(o.domId, o), (n = t.nextNode())); + i.set(o.domId, o), (n = t.nextNode()); } return i; } @@ -1560,7 +1556,7 @@ var Ct = (l, i) => { console.warn('Failed to updateElementInstanceId: Element not found'); return; } - (r.setAttribute('data-oiid', i), r.setAttribute('data-ocname', t)); + r.setAttribute('data-oiid', i), r.setAttribute('data-ocname', t); }, h0 = (l) => { let i = H(l); @@ -1579,33 +1575,33 @@ var Ct = (l, i) => { }; function w0(l, i, t) { let r = H(l.domId); - if (!r) return (console.warn('Failed to find parent element', l.domId), null); + if (!r) return console.warn('Failed to find parent element', l.domId), null; let n = um(i), o = new Set(t.map((f) => f.domId)), b = Array.from(r.children) .map((f, h) => ({ element: f, index: h, domId: Jl(f) })) .filter(({ domId: f }) => o.has(f)); - if (b.length === 0) return (console.warn('No valid children found to group'), null); + if (b.length === 0) return console.warn('No valid children found to group'), null; let g = Math.min(...b.map((f) => f.index)); return ( r.insertBefore(n, r.children[g] ?? null), b.forEach(({ element: f }) => { let h = f.cloneNode(!0); - (h.setAttribute('data-onlook-inserted', 'true'), + h.setAttribute('data-onlook-inserted', 'true'), n.appendChild(h), (f.style.display = 'none'), - u0(f)); + u0(f); }), { domEl: nl(n, !0), newMap: zl(n) } ); } function p0(l, i) { let t = H(l.domId); - if (!t) return (console.warn(`Parent element not found: ${l.domId}`), null); + if (!t) return console.warn(`Parent element not found: ${l.domId}`), null; let r; if (i.domId) r = H(i.domId); - else return (console.warn('Container domId is required for ungrouping'), null); - if (!r) return (console.warn('Container element not found for ungrouping'), null); + else return console.warn('Container domId is required for ungrouping'), null; + if (!r) return console.warn('Container element not found for ungrouping'), null; return ( Array.from(r.children).forEach((b) => { t.appendChild(b); @@ -1627,9 +1623,9 @@ function um(l) { ); } function u0(l) { - (l.removeAttribute('data-odid'), + l.removeAttribute('data-odid'), l.removeAttribute('data-oid'), - l.removeAttribute('data-onlook-inserted')); + l.removeAttribute('data-onlook-inserted'); let i = Array.from(l.children); if (i.length === 0) return; i.forEach((t) => { @@ -1638,15 +1634,15 @@ function u0(l) { } function Pt(l) { let i = H(l); - if (!i) return (console.warn('Element not found for domId:', l), null); + if (!i) return console.warn('Element not found for domId:', l), null; return z0(i); } function z0(l) { let i = Array.from(l.attributes).reduce((r, n) => { - return ((r[n.name] = n.value), r); + return (r[n.name] = n.value), r; }, {}), t = Kl(l) || Vl(l) || null; - if (!t) return (console.warn('Element has no oid'), null); + if (!t) return console.warn('Element has no oid'), null; return { oid: t, domId: Jl(l), @@ -1665,7 +1661,7 @@ function x0(l) { let t = i.parentElement; if (!t) throw new Error('Inserted element has no parent'); let r = Kl(t) || Vl(t); - if (!r) return (console.warn('Parent element has no oid'), null); + if (!r) return console.warn('Parent element has no oid'), null; let n = Jl(t), o = Array.from(t.children).indexOf(i); if (o === -1) return { type: 'append', targetDomId: n, targetOid: r }; @@ -1675,8 +1671,7 @@ function a0(l) { let i = document.querySelector(`[${'data-odid'}="${l}"]`); if (!i) return ( - console.warn('No element found', { domId: l }), - { dynamicType: null, coreType: null } + console.warn('No element found', { domId: l }), { dynamicType: null, coreType: null } ); let t = i.getAttribute('data-onlook-dynamic-type') || null, r = i.getAttribute('data-onlook-core-element-type') || null; @@ -1847,11 +1842,11 @@ function zt(l, i) { function xi(l, i) { let t = l.charCodeAt(i); if (t === 43 || t === 45) t = l.charCodeAt((i += 1)); - if (ol(t)) ((i = Tr(l, i + 1)), (t = l.charCodeAt(i))); - if (t === 46 && ol(l.charCodeAt(i + 1))) ((i += 2), (i = Tr(l, i))); + if (ol(t)) (i = Tr(l, i + 1)), (t = l.charCodeAt(i)); + if (t === 46 && ol(l.charCodeAt(i + 1))) (i += 2), (i = Tr(l, i)); if (Il(l, i, 101)) { let r = 0; - if (((t = l.charCodeAt(i + 1)), t === 45 || t === 43)) ((r = 1), (t = l.charCodeAt(i + 2))); + if (((t = l.charCodeAt(i + 1)), t === 45 || t === 43)) (r = 1), (t = l.charCodeAt(i + 2)); if (ol(t)) i = Tr(l, i + 1 + r + 1); } return i; @@ -1919,22 +1914,22 @@ function q0(l) { for (let e = r; e < t; e++) { let f = i.charCodeAt(e); if (((n[e] = b), (o[e] = g++), f === D0 || f === $0 || f === Om)) { - if (f === $0 && e + 1 < t && i.charCodeAt(e + 1) === D0) (e++, (n[e] = b), (o[e] = g)); - (b++, (g = 1)); + if (f === $0 && e + 1 < t && i.charCodeAt(e + 1) === D0) e++, (n[e] = b), (o[e] = g); + b++, (g = 1); } } - ((n[t] = b), (o[t] = g), (l.lines = n), (l.columns = o), (l.computed = !0)); + (n[t] = b), (o[t] = g), (l.lines = n), (l.columns = o), (l.computed = !0); } class or { constructor(l, i, t, r) { - (this.setSource(l, i, t, r), (this.lines = null), (this.columns = null)); + this.setSource(l, i, t, r), (this.lines = null), (this.columns = null); } setSource(l = '', i = 0, t = 1, r = 1) { - ((this.source = l), + (this.source = l), (this.startOffset = i), (this.startLine = t), (this.startColumn = r), - (this.computed = !1)); + (this.computed = !1); } getLocation(l, i) { if (!this.computed) q0(this); @@ -1969,11 +1964,11 @@ class br { this.setSource(l, i); } reset() { - ((this.eof = !1), + (this.eof = !1), (this.tokenIndex = -1), (this.tokenType = 0), (this.tokenStart = this.firstCharOffset), - (this.tokenEnd = this.firstCharOffset)); + (this.tokenEnd = this.firstCharOffset); } setSource(l = '', i = () => {}) { l = String(l || ''); @@ -1984,7 +1979,7 @@ class br { b = -1, g = 0, e = l.length; - ((this.offsetAndType = null), + (this.offsetAndType = null), (this.balance = null), n.fill(0), i(l, (f, h, c) => { @@ -1992,11 +1987,11 @@ class br { if (((r[m] = (f << Al) | c), b === -1)) b = h; if (((n[m] = e), f === g)) { let u = n[e]; - ((n[e] = m), (e = u), (g = ai[r[u] >> Al])); - } else if (J0(f)) ((e = m), (g = ai[f])); + (n[e] = m), (e = u), (g = ai[r[u] >> Al]); + } else if (J0(f)) (e = m), (g = ai[f]); }), (r[o] = (Yl << Al) | t), - (n[o] = o)); + (n[o] = o); for (let f = 0; f < o; f++) { let h = n[f]; if (h <= f) { @@ -2004,13 +1999,13 @@ class br { if (c !== f) n[f] = c; } else if (h > o) n[f] = o; } - ((this.source = l), + (this.source = l), (this.firstCharOffset = b === -1 ? 0 : b), (this.tokenCount = o), (this.offsetAndType = r), (this.balance = n), this.reset(), - this.next()); + this.next(); } lookupType(l) { if (((l += this.tokenIndex), l < this.tokenCount)) return this.offsetAndType[l] >> Al; @@ -2065,26 +2060,26 @@ class br { skip(l) { let i = this.tokenIndex + l; if (i < this.tokenCount) - ((this.tokenIndex = i), + (this.tokenIndex = i), (this.tokenStart = this.offsetAndType[i - 1] & yl), (i = this.offsetAndType[i]), (this.tokenType = i >> Al), - (this.tokenEnd = i & yl)); - else ((this.tokenIndex = this.tokenCount), this.next()); + (this.tokenEnd = i & yl); + else (this.tokenIndex = this.tokenCount), this.next(); } next() { let l = this.tokenIndex + 1; if (l < this.tokenCount) - ((this.tokenIndex = l), + (this.tokenIndex = l), (this.tokenStart = this.tokenEnd), (l = this.offsetAndType[l]), (this.tokenType = l >> Al), - (this.tokenEnd = l & yl)); + (this.tokenEnd = l & yl); else - ((this.eof = !0), + (this.eof = !0), (this.tokenIndex = this.tokenCount), (this.tokenType = Yl), - (this.tokenStart = this.tokenEnd = this.source.length)); + (this.tokenStart = this.tokenEnd = this.source.length); } skipSC() { while (this.tokenType === Y || this.tokenType === U) this.next(); @@ -2116,7 +2111,7 @@ class br { n = this.offsetAndType[i], o = n & yl, b = n >> Al; - ((t = o), l(b, r, o, i)); + (t = o), l(b, r, o, i); } } dump() { @@ -2140,11 +2135,11 @@ function bi(l, i) { } function r() { if (((f = xi(l, f)), Gi(t(f), t(f + 1), t(f + 2)))) { - ((h = j), (f = zt(l, f))); + (h = j), (f = zt(l, f)); return; } if (t(f) === 37) { - ((h = A), f++); + (h = A), f++; return; } h = v; @@ -2153,14 +2148,14 @@ function bi(l, i) { let c = f; if (((f = zt(l, f)), Tl(l, c, f, 'url') && t(f) === 40)) { if (((f = ut(l, f + 1)), t(f) === 34 || t(f) === 39)) { - ((h = _), (f = c + 4)); + (h = _), (f = c + 4); return; } b(); return; } if (t(f) === 40) { - ((h = _), f++); + (h = _), f++; return; } h = w; @@ -2176,7 +2171,7 @@ function bi(l, i) { return; case pt: if (wt(m)) { - ((f += rr(l, f, m)), (h = Ei)); + (f += rr(l, f, m)), (h = Ei); return; } break; @@ -2190,7 +2185,7 @@ function bi(l, i) { } } function b() { - ((h = il), (f = ut(l, f))); + (h = il), (f = ut(l, f)); for (; f < l.length; f++) { let c = l.charCodeAt(f); switch (tr(c)) { @@ -2202,20 +2197,20 @@ function bi(l, i) { if (f < l.length) f++; return; } - ((f = nr(l, f)), (h = wl)); + (f = nr(l, f)), (h = wl); return; case 34: case 39: case 40: case Ir: - ((f = nr(l, f)), (h = wl)); + (f = nr(l, f)), (h = wl); return; case 92: if (Ol(c, t(f + 1))) { f = Ml(l, f) - 1; break; } - ((f = nr(l, f)), (h = wl)); + (f = nr(l, f)), (h = wl); return; } } @@ -2229,75 +2224,75 @@ function bi(l, i) { let c = l.charCodeAt(f); switch (tr(c)) { case pt: - ((h = Y), (f = ut(l, f + 1))); + (h = Y), (f = ut(l, f + 1)); break; case 34: o(); break; case 35: - if (mt(t(f + 1)) || Ol(t(f + 1), t(f + 2))) ((h = R), (f = zt(l, f + 1))); - else ((h = $), f++); + if (mt(t(f + 1)) || Ol(t(f + 1), t(f + 2))) (h = R), (f = zt(l, f + 1)); + else (h = $), f++; break; case 39: o(); break; case 40: - ((h = s), f++); + (h = s), f++; break; case 41: - ((h = a), f++); + (h = a), f++; break; case 43: if (dt(c, t(f + 1), t(f + 2))) r(); - else ((h = $), f++); + else (h = $), f++; break; case 44: - ((h = d), f++); + (h = d), f++; break; case 45: if (dt(c, t(f + 1), t(f + 2))) r(); - else if (t(f + 1) === 45 && t(f + 2) === 62) ((h = cl), (f = f + 3)); + else if (t(f + 1) === 45 && t(f + 2) === 62) (h = cl), (f = f + 3); else if (Gi(c, t(f + 1), t(f + 2))) n(); - else ((h = $), f++); + else (h = $), f++; break; case 46: if (dt(c, t(f + 1), t(f + 2))) r(); - else ((h = $), f++); + else (h = $), f++; break; case 47: if (t(f + 1) === 42) - ((h = U), (f = l.indexOf('*/', f + 2)), (f = f === -1 ? l.length : f + 2)); - else ((h = $), f++); + (h = U), (f = l.indexOf('*/', f + 2)), (f = f === -1 ? l.length : f + 2); + else (h = $), f++; break; case 58: - ((h = P), f++); + (h = P), f++; break; case 59: - ((h = Z), f++); + (h = Z), f++; break; case 60: - if (t(f + 1) === 33 && t(f + 2) === 45 && t(f + 3) === 45) ((h = Pl), (f = f + 4)); - else ((h = $), f++); + if (t(f + 1) === 33 && t(f + 2) === 45 && t(f + 3) === 45) (h = Pl), (f = f + 4); + else (h = $), f++; break; case 64: - if (Gi(t(f + 1), t(f + 2), t(f + 3))) ((h = S), (f = zt(l, f + 1))); - else ((h = $), f++); + if (Gi(t(f + 1), t(f + 2), t(f + 3))) (h = S), (f = zt(l, f + 1)); + else (h = $), f++; break; case 91: - ((h = el), f++); + (h = el), f++; break; case 92: if (Ol(c, t(f + 1))) n(); - else ((h = $), f++); + else (h = $), f++; break; case 93: - ((h = pl), f++); + (h = pl), f++; break; case 123: - ((h = N), f++); + (h = N), f++; break; case 125: - ((h = ml), f++); + (h = ml), f++; break; case Pr: r(); @@ -2306,7 +2301,7 @@ function bi(l, i) { n(); break; default: - ((h = $), f++); + (h = $), f++; } i(h, e, (e = f)); } @@ -2317,7 +2312,7 @@ class ll { return { prev: null, next: null, data: l }; } constructor() { - ((this.head = null), (this.tail = null), (this.cursor = null)); + (this.head = null), (this.tail = null), (this.cursor = null); } createItem(l) { return ll.createItem(l); @@ -2325,13 +2320,13 @@ class ll { allocateCursor(l, i) { let t; if (Fi !== null) - ((t = Fi), (Fi = Fi.cursor), (t.prev = l), (t.next = i), (t.cursor = this.cursor)); + (t = Fi), (Fi = Fi.cursor), (t.prev = l), (t.next = i), (t.cursor = this.cursor); else t = { prev: l, next: i, cursor: this.cursor }; - return ((this.cursor = t), t); + return (this.cursor = t), t; } releaseCursor() { let { cursor: l } = this; - ((this.cursor = l.cursor), (l.prev = null), (l.next = null), (l.cursor = Fi), (Fi = l)); + (this.cursor = l.cursor), (l.prev = null), (l.next = null), (l.cursor = Fi), (Fi = l); } updateCursors(l, i, t, r) { let { cursor: n } = this; @@ -2365,9 +2360,9 @@ class ll { let r = ll.createItem(t); if (i !== null) i.next = r; else this.head = r; - ((r.prev = i), (i = r)); + (r.prev = i), (i = r); } - return ((this.tail = i), this); + return (this.tail = i), this; } toArray() { return [...this]; @@ -2379,7 +2374,7 @@ class ll { let t = this.allocateCursor(null, this.head); while (t.next !== null) { let r = t.next; - ((t.next = r.next), l.call(i, r.data, r, this)); + (t.next = r.next), l.call(i, r.data, r, this); } this.releaseCursor(); } @@ -2387,7 +2382,7 @@ class ll { let t = this.allocateCursor(this.tail, null); while (t.prev !== null) { let r = t.prev; - ((t.prev = r.prev), l.call(i, r.data, r, this)); + (t.prev = r.prev), l.call(i, r.data, r, this); } this.releaseCursor(); } @@ -2396,16 +2391,16 @@ class ll { n = i, o; while (r.next !== null) - ((o = r.next), (r.next = o.next), (n = l.call(t, n, o.data, o, this))); - return (this.releaseCursor(), n); + (o = r.next), (r.next = o.next), (n = l.call(t, n, o.data, o, this)); + return this.releaseCursor(), n; } reduceRight(l, i, t = this) { let r = this.allocateCursor(this.tail, null), n = i, o; while (r.prev !== null) - ((o = r.prev), (r.prev = o.prev), (n = l.call(t, n, o.data, o, this))); - return (this.releaseCursor(), n); + (o = r.prev), (r.prev = o.prev), (n = l.call(t, n, o.data, o, this)); + return this.releaseCursor(), n; } some(l, i = this) { for (let t = this.head; t !== null; t = t.next) if (l.call(i, t.data, t, this)) return !0; @@ -2441,7 +2436,7 @@ class ll { this.releaseCursor(); } clear() { - ((this.head = null), (this.tail = null)); + (this.head = null), (this.tail = null); } copy() { let l = new ll(); @@ -2450,9 +2445,9 @@ class ll { } prepend(l) { if ((this.updateCursors(null, l, this.head, l), this.head !== null)) - ((this.head.prev = l), (l.next = this.head)); + (this.head.prev = l), (l.next = this.head); else this.tail = l; - return ((this.head = l), this); + return (this.head = l), this; } prependData(l) { return this.prepend(ll.createItem(l)); @@ -2467,11 +2462,11 @@ class ll { if (i !== null) if ((this.updateCursors(i.prev, l, i, l), i.prev === null)) { if (this.head !== i) throw new Error("before doesn't belong to list"); - ((this.head = l), (i.prev = l), (l.next = i), this.updateCursors(null, l)); - } else ((i.prev.next = l), (l.prev = i.prev), (i.prev = l), (l.next = i)); + (this.head = l), (i.prev = l), (l.next = i), this.updateCursors(null, l); + } else (i.prev.next = l), (l.prev = i.prev), (i.prev = l), (l.next = i); else { if ((this.updateCursors(this.tail, l, null, l), this.tail !== null)) - ((this.tail.next = l), (l.prev = this.tail)); + (this.tail.next = l), (l.prev = this.tail); else this.head = l; this.tail = l; } @@ -2491,7 +2486,7 @@ class ll { if (this.tail !== l) throw new Error("item doesn't belong to list"); this.tail = l.prev; } - return ((l.prev = null), (l.next = null), l); + return (l.prev = null), (l.next = null), l; } push(l) { this.insert(ll.createItem(l)); @@ -2515,16 +2510,16 @@ class ll { if (l.head === null) return this; if (i !== void 0 && i !== null) { if ((this.updateCursors(i.prev, l.tail, i, l.head), i.prev !== null)) - ((i.prev.next = l.head), (l.head.prev = i.prev)); + (i.prev.next = l.head), (l.head.prev = i.prev); else this.head = l.head; - ((i.prev = l.tail), (l.tail.next = i)); + (i.prev = l.tail), (l.tail.next = i); } else { if ((this.updateCursors(this.tail, l.tail, null, l.head), this.tail !== null)) - ((this.tail.next = l.head), (l.head.prev = this.tail)); + (this.tail.next = l.head), (l.head.prev = this.tail); else this.head = l.head; this.tail = l.tail; } - return ((l.head = null), (l.tail = null), this); + return (l.head = null), (l.tail = null), this; } replace(l, i) { if ('head' in i) this.insertList(i, l); @@ -2564,14 +2559,14 @@ function j0({ source: l, line: i, column: t, baseLine: r, baseColumn: n }, o) { m = Math.max(4, String(c).length) + 1, u = 0; if (((t += (W0.length - 1) * (f[i - 1].substr(0, t - 1).match(/\t/g) || []).length), t > Zr)) - ((u = t - X0 + 3), (t = X0 - 2)); + (u = t - X0 + 3), (t = X0 - 2); for (let X = h; X <= c; X++) if (X >= 0 && X < f.length) - ((f[X] = f[X].replace(/\t/g, W0)), + (f[X] = f[X].replace(/\t/g, W0)), (f[X] = (u > 0 && f[X].length > u ? '…' : '') + f[X].substr(u, Zr - 2) + - (f[X].length > u + Zr - 1 ? '…' : ''))); + (f[X].length > u + Zr - 1 ? '…' : '')); return [b(h, i), new Array(t + m + 2).join('-') + '^', b(i, c)] .filter(Boolean) .join( @@ -2611,7 +2606,7 @@ function s0(l) { this.next(); continue; case Y: - ((t = !0), this.next()); + (t = !0), this.next(); continue; } let n = l.getNode.call(this, r); @@ -2711,7 +2706,7 @@ function G0(l) { if (o) throw m; this.skip(c - this.tokenIndex); let u = h.call(this); - return ((o = !0), n(m, u), (o = !1), u); + return (o = !0), n(m, u), (o = !1), u; } }, lookupNonWSType(f) { @@ -2737,15 +2732,15 @@ function G0(l) { }, consume(f) { let h = this.tokenStart; - return (this.eat(f), this.substrToCursor(h)); + return this.eat(f), this.substrToCursor(h); }, consumeFunctionName() { let f = i.substring(this.tokenStart, this.tokenEnd - 1); - return (this.eat(_), f); + return this.eat(_), f; }, consumeNumber(f) { let h = i.substring(this.tokenStart, xi(i, this.tokenStart)); - return (this.eat(f), h); + return this.eat(f), h; }, eat(f) { if (this.tokenType !== f) { @@ -2758,16 +2753,16 @@ function G0(l) { switch (f) { case w: if (this.tokenType === _ || this.tokenType === il) - ((m = this.tokenEnd - 1), - (c = 'Identifier is expected but function found')); + (m = this.tokenEnd - 1), + (c = 'Identifier is expected but function found'); else c = 'Identifier is expected'; break; case R: - if (this.isDelim($m)) (this.next(), m++, (c = 'Name is expected')); + if (this.isDelim($m)) this.next(), m++, (c = 'Name is expected'); break; case A: if (this.tokenType === v) - ((m = this.tokenEnd), (c = 'Percent sign is expected')); + (m = this.tokenEnd), (c = 'Percent sign is expected'); break; } this.error(c, m); @@ -2819,7 +2814,7 @@ function G0(l) { }); return Object.assign( function (f, h) { - ((i = f), + (i = f), (h = h || {}), g.setSource(i, bi), b.setSource(i, h.offset, h.line, h.column), @@ -2832,7 +2827,7 @@ function G0(l) { (g.parseRulePrelude = 'parseRulePrelude' in h ? Boolean(h.parseRulePrelude) : !0), (g.parseValue = 'parseValue' in h ? Boolean(h.parseValue) : !0), (g.parseCustomProperty = - 'parseCustomProperty' in h ? Boolean(h.parseCustomProperty) : !1)); + 'parseCustomProperty' in h ? Boolean(h.parseCustomProperty) : !1); let { context: c = 'default', onComment: m } = h; if (c in g.context === !1) throw new Error('Unknown context `' + c + '`'); if (typeof m === 'function') @@ -2856,14 +2851,14 @@ var _t = H0(), zw = C0().MappingList; function jl(l) { if (!l) l = {}; - ((this._file = bl.getArg(l, 'file', null)), + (this._file = bl.getArg(l, 'file', null)), (this._sourceRoot = bl.getArg(l, 'sourceRoot', null)), (this._skipValidation = bl.getArg(l, 'skipValidation', !1)), (this._ignoreInvalidMapping = bl.getArg(l, 'ignoreInvalidMapping', !1)), (this._sources = new er()), (this._names = new er()), (this._mappings = new zw()), - (this._sourcesContents = null)); + (this._sourcesContents = null); } jl.prototype._version = 3; jl.fromSourceMap = function l(i, t) { @@ -2942,7 +2937,7 @@ jl.prototype.applySourceMap = function l(i, t, r) { if (o != null) n = bl.relative(o, n); var b = new er(), g = new er(); - (this._mappings.unsortedForEach(function (e) { + this._mappings.unsortedForEach(function (e) { if (e.source === n && e.originalLine != null) { var f = i.originalPositionFor({ line: e.originalLine, column: e.originalColumn }); if (f.source != null) { @@ -2966,7 +2961,7 @@ jl.prototype.applySourceMap = function l(i, t, r) { if (o != null) e = bl.relative(o, e); this.setSourceContent(e, f); } - }, this)); + }, this); }; jl.prototype._validateMapping = function l(i, t, r, n) { if (t && typeof t.line !== 'number' && typeof t.column !== 'number') { @@ -3017,7 +3012,7 @@ jl.prototype._serializeMappings = function l() { for (var u = 0, X = m.length; u < X; u++) { if (((f = m[u]), (e = ''), f.generatedLine !== t)) { i = 0; - while (f.generatedLine !== t) ((e += ';'), t++); + while (f.generatedLine !== t) (e += ';'), t++; } else if (u > 0) { if (!bl.compareByGeneratedPositionsInflated(f, m[u - 1])) continue; e += ','; @@ -3033,7 +3028,7 @@ jl.prototype._serializeMappings = function l() { (r = f.originalColumn), f.name != null) ) - ((h = this._names.indexOf(f.name)), (e += _t.encode(h - o)), (o = h)); + (h = this._names.indexOf(f.name)), (e += _t.encode(h - o)), (o = h); } g += e; } @@ -3085,15 +3080,15 @@ function I0(l) { if (((r.line = u), (r.column = X), (t.line = b), (t.column = g), e)) { if (((e = !1), t.line !== n.line || t.column !== n.column)) i.addMapping(o); } - ((e = !0), i.addMapping({ source: m.loc.source, original: r, generated: t })); + (e = !0), i.addMapping({ source: m.loc.source, original: r, generated: t }); } } - if ((f.call(this, m), e && P0.has(m.type))) ((n.line = b), (n.column = g)); + if ((f.call(this, m), e && P0.has(m.type))) (n.line = b), (n.column = g); }; let h = l.emit; l.emit = function (m, u, X) { for (let I = 0; I < m.length; I++) - if (m.charCodeAt(I) === 10) (b++, (g = 0)); + if (m.charCodeAt(I) === 10) b++, (g = 0); else g++; h(m, u, X); }; @@ -3237,7 +3232,7 @@ function Dw(l, i) { let t = null; l.children.forEach((r) => { if (t !== null) i.call(this, t); - (this.node(r), (t = r)); + this.node(r), (t = r); }); return; } @@ -3292,7 +3287,7 @@ function d0(l) { token: (e, f) => b.token(e, f), tokenize: $w, }; - return (b.node(t), b.result()); + return b.node(t), b.result(); }; } function lg(l) { @@ -3366,7 +3361,7 @@ function rg(l, i) { if (i) t.reverse(); return function (o, b, g, e) { let f; - if (n) ((f = b[r]), (b[r] = o)); + if (n) (f = b[r]), (b[r] = o); for (let h of t) { let c = o[h.name]; if (!h.nullable || c) { @@ -3392,7 +3387,7 @@ function og(l) { n = Symbol('break-walk'), o = Symbol('skip-node'); for (let f in i) - if (hn.call(i, f) && i[f] !== null) ((t[f] = rg(i[f], !1)), (r[f] = rg(i[f], !0))); + if (hn.call(i, f) && i[f] !== null) (t[f] = rg(i[f], !1)), (r[f] = rg(i[f], !0)); let b = ng(t), g = ng(r), e = function (f, h) { @@ -3436,7 +3431,7 @@ function og(l) { Object.keys(i).sort().join(', ') + ')', ); - ((m = tg(m, h.visit)), (u = tg(u, h.visit))); + (m = tg(m, h.visit)), (u = tg(u, h.visit)); } } if (m === vt && u === vt) @@ -3452,7 +3447,7 @@ function og(l) { let c = null; return ( e(f, function (m, u, X) { - if (h.call(this, m, u, X)) return ((c = m), n); + if (h.call(this, m, u, X)) return (c = m), n; }), c ); @@ -3463,7 +3458,7 @@ function og(l) { e(f, { reverse: !0, enter(m, u, X) { - if (h.call(this, m, u, X)) return ((c = m), n); + if (h.call(this, m, u, X)) return (c = m), n; }, }), c @@ -3574,16 +3569,16 @@ function Yw(l, i) { c; for (let m = 0; m < t.length; m++) { let u = t[m].value; - if (m === r) ((g = u.length), (b = f.length)); + if (m === r) (g = u.length), (b = f.length); if (o !== null && t[m].node === o) if (m <= r) e++; else e = 0; f += u; } - if (r === t.length || e > 1) ((h = mr(o || i, 'end') || Ot(bg, f)), (c = Ot(h))); + if (r === t.length || e > 1) (h = mr(o || i, 'end') || Ot(bg, f)), (c = Ot(h)); else - ((h = mr(o, 'start') || Ot(mr(i, 'start') || bg, f.slice(0, b))), - (c = mr(o, 'end') || Ot(h, f.substr(b, g)))); + (h = mr(o, 'start') || Ot(mr(i, 'start') || bg, f.slice(0, b))), + (c = mr(o, 'end') || Ot(h, f.substr(b, g))); return { css: f, mismatchOffset: b, mismatchLength: g, start: h, end: c }; } function mr(l, i) { @@ -3595,15 +3590,15 @@ function Ot({ offset: l, line: i, column: t }, r) { let n = { offset: l, line: i, column: t }; if (r) { let o = r.split(/\n|\r\n?|\f/); - ((n.offset += r.length), + (n.offset += r.length), (n.line += o.length - 1), - (n.column = o.length === 1 ? n.column + r.length : o.pop().length + 1)); + (n.column = o.length === 1 ? n.column + r.length : o.pop().length + 1); } return n; } var Hi = function (l, i) { let t = _i('SyntaxReferenceError', l + (i ? ' `' + i + '`' : '')); - return ((t.reference = i), t); + return (t.reference = i), t; }, fg = function (l, i, t, r) { let n = _i('SyntaxMatchError', l), @@ -3636,10 +3631,7 @@ var wr = new Map(), var pr = Qw, cn = Ew; function ur(l, i) { - return ( - (i = i || 0), - l.length - i >= 2 && l.charCodeAt(i) === 45 && l.charCodeAt(i + 1) === 45 - ); + return (i = i || 0), l.length - i >= 2 && l.charCodeAt(i) === 45 && l.charCodeAt(i + 1) === 45; } function gg(l, i) { if (((i = i || 0), l.length - i >= 3)) { @@ -3665,7 +3657,7 @@ function Qw(l) { custom: r, }); } - return (wr.set(l, t), t); + return wr.set(l, t), t; } function Ew(l) { if (Mi.has(l)) return Mi.get(l); @@ -3677,7 +3669,7 @@ function Ew(l) { if (!r) { if (((i = i.toLowerCase()), Mi.has(i))) { let g = Mi.get(i); - return (Mi.set(l, g), g); + return Mi.set(l, g), g; } } let n = !r ? gg(i, t.length) : '', @@ -3690,7 +3682,7 @@ function Ew(l) { prefix: o, custom: r, }); - return (Mi.set(l, b), b); + return Mi.set(l, b), b; } var yi = ['initial', 'inherit', 'unset', 'revert', 'revert-layer']; var $t = 43, @@ -3741,7 +3733,7 @@ function un(l, i) { return wn(i(++t), t, i); case 3: if (l.value.charCodeAt(2) !== Ul) return 0; - return ((t = Dt(i(++t), t, i)), (l = i(t)), fi(l, 0, Ai, t)); + return (t = Dt(i(++t), t, i)), (l = i(t)), fi(l, 0, Ai, t); default: if (l.value.charCodeAt(2) !== Ul) return 0; return fi(l, 3, Ai, t); @@ -3754,7 +3746,7 @@ function un(l, i) { return wn(i(++t), t, i); case 2: if (l.value.charCodeAt(1) !== Ul) return 0; - return ((t = Dt(i(++t), t, i)), (l = i(t)), fi(l, 0, Ai, t)); + return (t = Dt(i(++t), t, i)), (l = i(t)), fi(l, 0, Ai, t); default: if (l.value.charCodeAt(1) !== Ul) return 0; return fi(l, 2, Ai, t); @@ -3770,7 +3762,7 @@ function un(l, i) { else { if (l.value.charCodeAt(o + 1) !== Ul) return 0; if (o + 2 === l.value.length) - return ((t = Dt(i(++t), t, i)), (l = i(t)), fi(l, 0, Ai, t)); + return (t = Dt(i(++t), t, i)), (l = i(t)), fi(l, 0, Ai, t); else return fi(l, o + 2, Ai, t); } } @@ -3790,7 +3782,7 @@ function qt(l, i, t) { let r = 0; for (let n = i; n < l.value.length; n++) { let o = l.value.charCodeAt(n); - if (o === eg && t && r !== 0) return (qt(l, i + r + 1, !1), 6); + if (o === eg && t && r !== 0) return qt(l, i + r + 1, !1), 6; if (!Dl(o)) return 0; if (++r > 6) return 0; } @@ -3876,7 +3868,7 @@ function Kw(l, i) { case s: case el: case N: - (r.push(t), (t = an.get(l.type))); + r.push(t), (t = an.get(l.type)); break; } n++; @@ -3951,7 +3943,7 @@ function Uw(l, i) { case s: case el: case N: - (r.push(t), (t = an.get(l.type))); + r.push(t), (t = an.get(l.type)); break; } n++; @@ -3978,7 +3970,7 @@ function kw(l, i) { case s: case el: case N: - (r.push(t), (t = an.get(l.type))); + r.push(t), (t = an.get(l.type)); break; } n++; @@ -4192,7 +4184,7 @@ var bp = 9, xg = new Uint8Array(128).map((l, i) => (/[a-zA-Z0-9\-]/.test(String.fromCharCode(i)) ? 1 : 0)); class vn { constructor(l) { - ((this.str = l), (this.pos = 0)); + (this.str = l), (this.pos = 0); } charCodeAt(l) { return l < this.str.length ? this.str.charCodeAt(l) : 0; @@ -4255,7 +4247,7 @@ class vn { } scanString() { let l = this.str.indexOf("'", this.pos + 1); - if (l === -1) ((this.pos = this.str.length), this.error('Expect an apostrophe')); + if (l === -1) (this.pos = this.str.length), this.error('Expect an apostrophe'); return this.substringToPos(l + 1); } } @@ -4289,26 +4281,26 @@ function qg(l) { let i = null, t = null; if ((l.eat(vr), l.skipWs(), (i = l.scanNumber(l)), l.skipWs(), l.charCode() === Xn)) { - if ((l.pos++, l.skipWs(), l.charCode() !== Og)) ((t = l.scanNumber(l)), l.skipWs()); + if ((l.pos++, l.skipWs(), l.charCode() !== Og)) (t = l.scanNumber(l)), l.skipWs(); } else t = i; - return (l.eat(Og), { min: Number(i), max: t ? Number(t) : 0 }); + return l.eat(Og), { min: Number(i), max: t ? Number(t) : 0 }; } function ap(l) { let i = null, t = !1; switch (l.charCode()) { case Wg: - (l.pos++, (i = { min: 0, max: 0 })); + l.pos++, (i = { min: 0, max: 0 }); break; case Jn: - (l.pos++, (i = { min: 1, max: 0 })); + l.pos++, (i = { min: 1, max: 0 }); break; case $n: - (l.pos++, (i = { min: 0, max: 1 })); + l.pos++, (i = { min: 0, max: 1 }); break; case qn: if ((l.pos++, (t = !0), l.charCode() === vr)) i = qg(l); - else if (l.charCode() === $n) (l.pos++, (i = { min: 0, max: 0 })); + else if (l.charCode() === $n) l.pos++, (i = { min: 0, max: 0 }); else i = { min: 1, max: 0 }; break; case vr: @@ -4347,15 +4339,15 @@ function vp(l) { let i = null, t = null, r = 1; - if ((l.eat(Jt), l.charCode() === _g)) (l.peek(), (r = -1)); + if ((l.eat(Jt), l.charCode() === _g)) l.peek(), (r = -1); if (r == -1 && l.charCode() === Dg) l.peek(); else if (((i = r * Number(l.scanNumber(l))), l.isNameCharCode())) i += l.scanWord(); if ((l.skipWs(), l.eat(Xn), l.skipWs(), l.charCode() === Dg)) l.peek(); else { - if (((r = 1), l.charCode() === _g)) (l.peek(), (r = -1)); + if (((r = 1), l.charCode() === _g)) l.peek(), (r = -1); if (((t = r * Number(l.scanNumber(l))), l.isNameCharCode())) t += l.scanWord(); } - return (l.eat(Xt), { type: 'Range', min: i, max: t }); + return l.eat(Xt), { type: 'Range', min: i, max: t }; } function Op(l) { let i, @@ -4369,13 +4361,13 @@ function Op(l) { gi(l, { type: 'Boolean', term: r.terms.length === 1 ? r.terms[0] : r }) ); } - if (l.charCode() === Xg && l.nextCharCode() === zp) ((l.pos += 2), (i += '()')); - if (l.charCodeAt(l.findWsEnd(l.pos)) === Jt) (l.skipWs(), (t = vp(l))); - return (l.eat(Dn), gi(l, { type: 'Type', name: i, opts: t })); + if (l.charCode() === Xg && l.nextCharCode() === zp) (l.pos += 2), (i += '()'); + if (l.charCodeAt(l.findWsEnd(l.pos)) === Jt) l.skipWs(), (t = vp(l)); + return l.eat(Dn), gi(l, { type: 'Type', name: i, opts: t }); } function Dp(l) { let i = l.scanWord(); - if (l.charCode() === Xg) return (l.pos++, { type: 'Function', name: i }); + if (l.charCode() === Xg) return l.pos++, { type: 'Function', name: i }; return gi(l, { type: 'Keyword', name: i }); } function $p(l, i) { @@ -4393,10 +4385,9 @@ function $p(l, i) { if (b.type === 'Combinator') if (b.value === r) { if (o === -1) o = n - 1; - (l.splice(n, 1), n--); + l.splice(n, 1), n--; } else { - if (o !== -1 && n - o > 1) - (l.splice(o, n - o, t(l.slice(o, n), r)), (n = o + 1)); + if (o !== -1 && n - o > 1) l.splice(o, n - o, t(l.slice(o, n), r)), (n = o + 1); o = -1; } } @@ -4414,13 +4405,13 @@ function jn(l, i) { if (n.type !== 'Spaces') { if (n.type === 'Combinator') { if (o === null || o.type === 'Combinator') - ((l.pos = b), l.error('Unexpected combinator')); + (l.pos = b), l.error('Unexpected combinator'); t[n.value] = !0; } else if (o !== null && o.type !== 'Combinator') - ((t[' '] = !0), r.push({ type: 'Combinator', value: ' ' })); - (r.push(n), (o = n), (b = l.pos)); + (t[' '] = !0), r.push({ type: 'Combinator', value: ' ' }); + r.push(n), (o = n), (b = l.pos); } - if (o !== null && o.type === 'Combinator') ((l.pos -= b), l.error('Unexpected combinator')); + if (o !== null && o.type === 'Combinator') (l.pos -= b), l.error('Unexpected combinator'); return { type: 'Group', terms: r, @@ -4432,7 +4423,7 @@ function jn(l, i) { function qp(l, i) { let t; if ((l.eat(Jt), (t = jn(l, i)), l.eat(Xt), (t.explicit = !0), l.charCode() === Jg)) - (l.pos++, (t.disallowEmpty = !0)); + l.pos++, (t.disallowEmpty = !0); return t; } function Jp(l, i) { @@ -4450,9 +4441,9 @@ function Jp(l, i) { value: l.substringToPos(l.pos + (l.nextCharCode() === vg ? 2 : 1)), }; case ag: - return (l.pos++, l.eat(ag), { type: 'Combinator', value: '&&' }); + return l.pos++, l.eat(ag), { type: 'Combinator', value: '&&' }; case Xn: - return (l.pos++, { type: 'Comma' }); + return l.pos++, { type: 'Comma' }; case _r: return gi(l, { type: 'String', value: l.scanString() }); case up: @@ -4463,7 +4454,7 @@ function Jp(l, i) { return { type: 'Spaces', value: l.scanSpaces() }; case xp: if (((t = l.nextCharCode()), l.isNameCharCode(t))) - return (l.pos++, { type: 'AtKeyword', name: l.scanWord() }); + return l.pos++, { type: 'AtKeyword', name: l.scanWord() }; return On(l); case Wg: case Jn: @@ -4517,7 +4508,7 @@ function sn(l, i, t) { let n = jt, o = jt; if (typeof i === 'function') n = i; - else if (i) ((n = jg(i.enter)), (o = jg(i.leave))); + else if (i) (n = jg(i.enter)), (o = jg(i.leave)); if (n === jt && o === jt) throw new Error( "Neither `enter` nor `leave` walker handler is set or both aren't a function", @@ -4532,7 +4523,7 @@ var Wp = { ...l, node(r) { let n = t; - ((t = r), l.node.call(this, r), (t = n)); + (t = r), l.node.call(this, r), (t = n); }, emit(r, n, o) { i.push({ type: n, value: r, node: o ? null : t }); @@ -4545,7 +4536,7 @@ var Wp = { }; function jp(l) { let i = []; - return (bi(l, (t, r, n) => i.push({ type: t, value: l.slice(r, n), node: null })), i); + return bi(l, (t, r, n) => i.push({ type: t, value: l.slice(r, n), node: null })), i; } function Yn(l, i) { if (typeof l === 'string') return jp(l); @@ -4559,7 +4550,7 @@ var M = { type: 'Match' }, function xl(l, i, t) { if (i === M && t === k) return l; if (l === M && i === M && t === M) return l; - if (l.type === 'If' && l.else === k && i === M) ((i = l.then), (l = l.match)); + if (l.type === 'If' && l.else === k && i === M) (i = l.then), (l = l.match); return { type: 'If', match: l, then: i, else: t }; } function Yg(l) { @@ -4580,9 +4571,9 @@ function st(l, i, t = new Set()) { if (!t.has(l)) switch ((t.add(l), l.type)) { case 'If': - ((l.match = st(l.match, i, t)), + (l.match = st(l.match, i, t)), (l.then = st(l.then, i, t)), - (l.else = st(l.else, i, t))); + (l.else = st(l.else, i, t)); break; case 'Type': return i[l.name] || l; @@ -4606,7 +4597,7 @@ function Qn(l, i, t) { let b = i[o]; if (sg(b)) { if (n === null && o > 0 && sg(i[o - 1])) - ((n = Object.create(null)), (r = xl({ type: 'Enum', map: n }, M, r))); + (n = Object.create(null)), (r = xl({ type: 'Enum', map: n }, M, r)); if (n !== null) { let g = (Yg(b.name) ? b.name.slice(0, -1) : b.name).toLowerCase(); if (g in n === !1) { @@ -4615,7 +4606,7 @@ function Qn(l, i, t) { } } } - ((n = null), (r = xl(b, M, r))); + (n = null), (r = xl(b, M, r)); } return r; } @@ -4743,7 +4734,7 @@ function Ui(l) { '|', ), ); - return (st(r, { '!term': i, '!self': t }), st(t, { '!boolean-group': r }), t); + return st(r, { '!term': i, '!self': t }), st(t, { '!boolean-group': r }), t; } case 'Type': case 'Property': @@ -4788,7 +4779,7 @@ function Fp(l) { let i = null, t = null, r = l; - while (r !== null) ((t = r.prev), (r.prev = i), (i = r), (r = t)); + while (r !== null) (t = r.prev), (r.prev = i), (i = r), (r = t); return i; } function En(l, i) { @@ -4815,7 +4806,7 @@ function Bg(l) { } function Kp(l, i, t) { function r() { - do (V++, (q = V < l.length ? l[V] : null)); + do V++, (q = V < l.length ? l[V] : null); while (q !== null && (q.type === Y || q.type === U)); } function n(G) { @@ -4843,8 +4834,8 @@ function Kp(l, i, t) { fl = V; } function f() { - ((c = { syntax: i.syntax, opts: i.syntax.opts || (c !== null && c.opts) || null, prev: c }), - (K = { type: Gn, syntax: i.syntax, token: K.token, prev: K })); + (c = { syntax: i.syntax, opts: i.syntax.opts || (c !== null && c.opts) || null, prev: c }), + (K = { type: Gn, syntax: i.syntax, token: K.token, prev: K }); } function h() { if (K.type === Gn) K = K.prev; @@ -4885,18 +4876,18 @@ function Kp(l, i, t) { break; case 'Mismatch': if (X !== null && X !== !1) { - if (u === null || V > u.tokenIndex) ((u = X), (X = !1)); + if (u === null || V > u.tokenIndex) (u = X), (X = !1); } else if (u === null) { F = Lp; break; } - ((i = u.nextState), + (i = u.nextState), (m = u.thenStack), (c = u.syntaxStack), (K = u.matchStack), (V = u.tokenIndex), (q = V < l.length ? l[V] : null), - (u = u.prev)); + (u = u.prev); break; case 'MatchGraph': i = i.match; @@ -4926,9 +4917,9 @@ function Kp(l, i, t) { for (; i.index < y.length; i.index++) { let T = 1 << i.index; if ((i.mask & T) === 0) { - (g(i), + g(i), b({ type: 'AddMatchOnce', syntax: i.syntax, mask: i.mask | T }), - (i = y[i.index++])); + (i = y[i.index++]); break; } } @@ -4976,7 +4967,7 @@ function Kp(l, i, t) { break; } } - (f(), (i = T.matchRef || T.match)); + f(), (i = T.matchRef || T.match); break; } case 'Keyword': { @@ -4985,7 +4976,7 @@ function Kp(l, i, t) { let T = q.value; if (T.indexOf('\\') !== -1) T = T.replace(/\\[09].*$/, ''); if (En(T, y)) { - (e(), (i = M)); + e(), (i = M); break; } } @@ -4995,14 +4986,14 @@ function Kp(l, i, t) { case 'AtKeyword': case 'Function': if (q !== null && En(q.value, i.name)) { - (e(), (i = M)); + e(), (i = M); break; } i = k; break; case 'Token': if (q !== null && q.value === i.value) { - (e(), (i = M)); + e(), (i = M); break; } i = k; @@ -5010,7 +5001,7 @@ function Kp(l, i, t) { case 'Comma': if (q !== null && q.type === d) if (Lg(K.token)) i = k; - else (e(), (i = Bg(q) ? k : M)); + else e(), (i = Bg(q) ? k : M); else i = Lg(K.token) || Bg(q) ? M : k; break; case 'String': @@ -5027,9 +5018,7 @@ function Kp(l, i, t) { } switch (((Rp += I), F)) { case null: - (console.warn('[csstree-match] BREAK after ' + Gg + ' iterations'), - (F = Bp), - (K = null)); + console.warn('[csstree-match] BREAK after ' + Gg + ' iterations'), (F = Bp), (K = null); break; case Eg: while (c !== null) h(); @@ -5049,10 +5038,10 @@ function Ln(l, i, t) { while (n !== null) { switch (n.type) { case Gn: - (o.match.push((o = { syntax: n.syntax, match: [] })), b.push(o)); + o.match.push((o = { syntax: n.syntax, match: [] })), b.push(o); break; case Rg: - (b.pop(), (o = b[b.length - 1])); + b.pop(), (o = b[b.length - 1]); break; default: o.match.push({ @@ -5079,7 +5068,7 @@ function Fg(l) { if (i(n.syntax)) r.unshift(n.syntax); return !0; } - } else if (n.node === l) return ((r = i(n.syntax) ? [n.syntax] : []), !0); + } else if (n.node === l) return (r = i(n.syntax) ? [n.syntax] : []), !0; return !1; } let r = null; @@ -5311,7 +5300,7 @@ class Et { if (typeof l === 'string') Object.defineProperty(o, 'syntax', { get() { - return (Object.defineProperty(o, 'syntax', { value: Wt(l) }), o.syntax); + return Object.defineProperty(o, 'syntax', { value: Wt(l) }), o.syntax; }, }); else o.syntax = l; @@ -5319,8 +5308,7 @@ class Et { (Object.defineProperty(o, 'match', { get() { return ( - Object.defineProperty(o, 'match', { value: Yt(o.syntax, n) }), - o.match + Object.defineProperty(o, 'match', { value: Yt(o.syntax, n) }), o.match ); }, }), @@ -5330,7 +5318,7 @@ class Et { get() { let b = o.syntax, g = Np(b) ? Yt({ ...b, terms: [b.terms[0].term] }, n) : null; - return (Object.defineProperty(o, 'matchRef', { value: g }), g); + return Object.defineProperty(o, 'matchRef', { value: g }), g; }, }); } @@ -5486,15 +5474,15 @@ class Et { let m = c.type === 'Type' ? g.types : g.properties, u = c.type === 'Type' ? r : n; if (!hasOwnProperty.call(m, c.name)) - (t.push( + t.push( `${l(e, f === r)} used missed syntax definition ${l(c.name, c.type === 'Type')}`, ), - f.set(e, !0)); + f.set(e, !0); else if (i(g, c.name, u, m[c.name])) - (t.push( + t.push( `${l(e, f === r)} used broken syntax definition ${l(c.name, c.type === 'Type')}`, ), - f.set(e, !0)); + f.set(e, !0); }, this, ); @@ -7116,14 +7104,14 @@ function yn() { i = this.isDelim(kl, l) ? kl : Xl; do t = this.lookupType(++l); while (t === Y || t === U); - if (t !== v) (this.skip(l), Si.call(this, Oi)); + if (t !== v) this.skip(l), Si.call(this, Oi); } else return null; if (l > 0) this.skip(l); if (i === 0) { if (((t = this.charCodeAt(this.tokenStart)), t !== kl && t !== Xl)) this.error('Number sign is expected'); } - return (Si.call(this, i !== 0), i === Xl ? '-' + this.consume(v) : this.consume(v)); + return Si.call(this, i !== 0), i === Xl ? '-' + this.consume(v) : this.consume(v); } var Pp = 'AnPlusB', Ip = { a: [String, null], b: [String, null] }; @@ -7131,44 +7119,44 @@ function An() { let l = this.tokenStart, i = null, t = null; - if (this.tokenType === v) (Si.call(this, Cp), (t = this.consume(v))); + if (this.tokenType === v) Si.call(this, Cp), (t = this.consume(v)); else if (this.tokenType === w && this.cmpChar(this.tokenStart, Xl)) switch (((i = '-1'), hi.call(this, 1, Dr), this.tokenEnd - this.tokenStart)) { case 2: - (this.next(), (t = yn.call(this))); + this.next(), (t = yn.call(this)); break; case 3: - (hi.call(this, 2, Xl), + hi.call(this, 2, Xl), this.next(), this.skipSC(), Si.call(this, Oi), - (t = '-' + this.consume(v))); + (t = '-' + this.consume(v)); break; default: - (hi.call(this, 2, Xl), + hi.call(this, 2, Xl), $r.call(this, 3, Oi), this.next(), - (t = this.substrToCursor(l + 2))); + (t = this.substrToCursor(l + 2)); } else if (this.tokenType === w || (this.isDelim(kl) && this.lookupType(1) === w)) { let r = 0; - if (((i = '1'), this.isDelim(kl))) ((r = 1), this.next()); + if (((i = '1'), this.isDelim(kl))) (r = 1), this.next(); switch ((hi.call(this, 0, Dr), this.tokenEnd - this.tokenStart)) { case 1: - (this.next(), (t = yn.call(this))); + this.next(), (t = yn.call(this)); break; case 2: - (hi.call(this, 1, Xl), + hi.call(this, 1, Xl), this.next(), this.skipSC(), Si.call(this, Oi), - (t = '-' + this.consume(v))); + (t = '-' + this.consume(v)); break; default: - (hi.call(this, 1, Xl), + hi.call(this, 1, Xl), $r.call(this, 2, Oi), this.next(), - (t = this.substrToCursor(l + r + 1))); + (t = this.substrToCursor(l + r + 1)); } } else if (this.tokenType === j) { let r = this.charCodeAt(this.tokenStart), @@ -7181,13 +7169,13 @@ function An() { (i = this.substring(l, o)), o + 1 === this.tokenEnd) ) - (this.next(), (t = yn.call(this))); + this.next(), (t = yn.call(this)); else if ((hi.call(this, o - this.tokenStart + 1, Xl), o + 2 === this.tokenEnd)) - (this.next(), this.skipSC(), Si.call(this, Oi), (t = '-' + this.consume(v))); + this.next(), this.skipSC(), Si.call(this, Oi), (t = '-' + this.consume(v)); else - ($r.call(this, o - this.tokenStart + 2, Oi), + $r.call(this, o - this.tokenStart + 2, Oi), this.next(), - (t = this.substrToCursor(o + 1))); + (t = this.substrToCursor(o + 1)); } else this.error(); if (i !== null && i.charCodeAt(0) === kl) i = i.substr(1); if (t !== null && t.charCodeAt(0) === kl) t = t.substr(1); @@ -7304,10 +7292,10 @@ function hu() { if (this.eof) this.error('Unexpected end of input'); let l = this.tokenStart, i = !1; - if (this.isDelim(Ng)) ((i = !0), this.next()); + if (this.isDelim(Ng)) (i = !0), this.next(); else if (!this.isDelim(Pn)) this.eat(w); if (this.isDelim(Pn)) { - if (this.charCodeAt(this.tokenStart + 1) !== qr) (this.next(), this.eat(w)); + if (this.charCodeAt(this.tokenStart + 1) !== qr) this.next(), this.eat(w); else if (i) this.error('Identifier is expected', this.tokenEnd); } else if (i) this.error('Vertical line is expected'); return { @@ -7342,11 +7330,11 @@ function In() { n = null; if ((this.eat(el), this.skipSC(), (i = hu.call(this)), this.skipSC(), this.tokenType !== pl)) { if (this.tokenType !== w) - ((t = cu.call(this)), + (t = cu.call(this)), this.skipSC(), (r = this.tokenType === gl ? this.String() : this.Identifier()), - this.skipSC()); - if (this.tokenType === w) ((n = this.consume(w)), this.skipSC()); + this.skipSC(); + if (this.tokenType === w) (n = this.consume(w)), this.skipSC(); } return ( this.eat(pl), @@ -7362,7 +7350,7 @@ function In() { } function pu(l) { if ((this.token($, '['), this.node(l.name), l.matcher !== null)) - (this.tokenize(l.matcher), this.node(l.value)); + this.tokenize(l.matcher), this.node(l.value); if (l.flags !== null) this.token(w, l.flags); this.token($, ']'); } @@ -7417,11 +7405,11 @@ function Zn(l) { return { type: 'Block', loc: this.getLocation(t, this.tokenStart), children: r }; } function vu(l) { - (this.token(N, '{'), + this.token(N, '{'), this.children(l, (i) => { if (i.type === 'Declaration') this.token(Z, ';'); }), - this.token(ml, '}')); + this.token(ml, '}'); } var io = {}; D(io, { structure: () => Du, parse: () => lo, name: () => Ou, generate: () => $u }); @@ -7434,7 +7422,7 @@ function lo(l, i) { return { type: 'Brackets', loc: this.getLocation(t, this.tokenStart), children: r }; } function $u(l) { - (this.token($, '['), this.children(l), this.token($, ']')); + this.token($, '['), this.children(l), this.token($, ']'); } var ro = {}; D(ro, { structure: () => Ju, parse: () => to, name: () => qu, generate: () => Xu }); @@ -7442,7 +7430,7 @@ var qu = 'CDC', Ju = []; function to() { let l = this.tokenStart; - return (this.eat(cl), { type: 'CDC', loc: this.getLocation(l, this.tokenStart) }); + return this.eat(cl), { type: 'CDC', loc: this.getLocation(l, this.tokenStart) }; } function Xu() { this.token(cl, '-->'); @@ -7453,7 +7441,7 @@ var Wu = 'CDO', ju = []; function no() { let l = this.tokenStart; - return (this.eat(Pl), { type: 'CDO', loc: this.getLocation(l, this.tokenStart) }); + return this.eat(Pl), { type: 'CDO', loc: this.getLocation(l, this.tokenStart) }; } function su() { this.token(Pl, '