@takazudo/zdtp 0.4.6 → 0.4.7

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.4.7
+
+### Fixed
+
+- fix(server): coalesce same-file token groups in createApplyHandler ([#527](https://github.com/Takazudo/zudo-design-token-panel/pull/527)) (1d84c94)
+
+### Other Changes
+
+- chore(deps): resolve 19 pnpm audit security advisories ([#525](https://github.com/Takazudo/zudo-design-token-panel/pull/525)) (80c9a0e)
+
 ## 0.4.6
 
 ### Features

package/dist/bin/server.js

@@ -2,7 +2,7 @@
 import { realpathSync as E } from "node:fs";
 import { createServer as H } from "node:http";
 import { resolve as p } from "node:path";
-import { l as $, c as x } from "../load-routing-LJ72261l.js";
+import { l as $, c as x } from "../load-routing-D4H2VOl5.js";
 function g(o, t) {
   return typeof o != "string" || o.length === 0 || t.length === 0 ? !1 : t.includes(o);
 }

package/dist/{load-routing-LJ72261l.js → load-routing-D4H2VOl5.js}

@@ -1,87 +1,87 @@
-import { promises as y, readFileSync as I } from "node:fs";
-import { relative as T, isAbsolute as q, sep as L, resolve as _, dirname as j, join as x } from "node:path";
-import { randomBytes as A } from "node:crypto";
-import { r as D } from "./route-tokens-to-files-1DvmWBdj.js";
-const b = /* @__PURE__ */ new Map();
+import { promises as b, readFileSync as q } from "node:fs";
+import { relative as P, isAbsolute as L, sep as _, resolve as D, dirname as T, join as j } from "node:path";
+import { randomBytes as x } from "node:crypto";
+import { r as Z } from "./route-tokens-to-files-1DvmWBdj.js";
+const F = /* @__PURE__ */ new Map();
 async function B(t, r) {
-  const e = (b.get(t) ?? Promise.resolve()).then(r, r), o = e.then(
+  const e = (F.get(t) ?? Promise.resolve()).then(r, r), o = e.then(
     () => {
     },
     () => {
     }
   );
-  b.set(t, o);
+  F.set(t, o);
   try {
     return await e;
   } finally {
-    b.get(t) === o && b.delete(t);
+    F.get(t) === o && F.delete(t);
   }
 }
-function Z(t) {
+function H(t) {
   return t.replace(/[\r\n\\;{}]/g, "");
 }
-const H = /^--[a-zA-Z0-9_-]+$/;
-function U(t) {
-  return typeof t == "string" && H.test(t);
+const U = /^--[a-zA-Z0-9_-]+$/;
+function G(t) {
+  return typeof t == "string" && U.test(t);
 }
-function G(t, r) {
+function K(t, r) {
   if (!r.endsWith(".css")) return !1;
-  const n = T(t, r);
-  return !(n === "" || n === "." || q(n) || n === ".." || n.startsWith(`..${L}`) || n.startsWith("../"));
+  const n = P(t, r);
+  return !(n === "" || n === "." || L(n) || n === ".." || n.startsWith(`..${_}`) || n.startsWith("../"));
 }
-function K(t) {
+function Q(t) {
   const r = {};
   for (const [n, e] of Object.entries(t)) {
-    if (!U(n))
+    if (!G(n))
       return { error: `Invalid cssVar name: ${JSON.stringify(n)}` };
     if (typeof e != "string")
       return { error: `Value for ${n} must be a string` };
-    r[n] = Z(e);
+    r[n] = H(e);
   }
   return { sanitized: r };
 }
-class F extends Error {
+class S extends Error {
   constructor(r = 'No top-level ":root { ... }" or "@theme { ... }" block found in source.') {
-    super(r), this.name = "NoTokenBlockError", Object.setPrototypeOf(this, F.prototype);
+    super(r), this.name = "NoTokenBlockError", Object.setPrototypeOf(this, S.prototype);
   }
 }
 function E(t, r, n) {
-  const e = t.length, o = r.length, s = r[0];
-  let i = 0, f = 0;
-  for (; i < e; ) {
-    const d = t[i];
-    if (d === "/" && t[i + 1] === "*") {
-      const c = t.indexOf("*/", i + 2);
+  const e = t.length, o = r.length, i = r[0];
+  let s = 0, u = 0;
+  for (; s < e; ) {
+    const f = t[s];
+    if (f === "/" && t[s + 1] === "*") {
+      const c = t.indexOf("*/", s + 2);
       if (c === -1) return null;
-      i = c + 2;
+      s = c + 2;
       continue;
     }
-    if (d === '"' || d === "'") {
-      const c = d;
-      for (i++; i < e && t[i] !== c; )
-        t[i] === "\\" && i + 1 < e && i++, i++;
-      i++;
+    if (f === '"' || f === "'") {
+      const c = f;
+      for (s++; s < e && t[s] !== c; )
+        t[s] === "\\" && s + 1 < e && s++, s++;
+      s++;
       continue;
     }
-    if (d === "{") {
-      f++, i++;
+    if (f === "{") {
+      u++, s++;
       continue;
     }
-    if (d === "}") {
-      f > 0 && f--, i++;
+    if (f === "}") {
+      u > 0 && u--, s++;
       continue;
     }
-    if (f === 0 && d === s && t.startsWith(r, i)) {
-      const c = i + o, p = t[c] ?? "";
-      if (!S(p)) {
-        const k = n ? X(t, c) : Q(t, c);
+    if (u === 0 && f === i && t.startsWith(r, s)) {
+      const c = s + o, p = t[c] ?? "";
+      if (!$(p)) {
+        const k = n ? Y(t, c) : X(t, c);
         if (k !== -1) {
-          const g = k + 1, l = Y(t, g);
-          return l !== -1 ? { contentStart: g, contentEnd: l } : null;
+          const m = k + 1, l = tt(t, m);
+          return l !== -1 ? { contentStart: m, contentEnd: l } : null;
         }
       }
     }
-    i++;
+    s++;
   }
   return null;
 }
@@ -91,10 +91,10 @@ function C(t) {
 function N(t) {
   return E(t, "@theme", !0);
 }
-function S(t) {
+function $(t) {
   return /[A-Za-z0-9_-]/.test(t);
 }
-function Q(t, r) {
+function X(t, r) {
   const n = t.length;
   let e = r;
   for (; e < n; ) {
@@ -105,16 +105,16 @@ function Q(t, r) {
       continue;
     }
     if (o === "/" && t[e + 1] === "*") {
-      const s = t.indexOf("*/", e + 2);
-      if (s === -1) return -1;
-      e = s + 2;
+      const i = t.indexOf("*/", e + 2);
+      if (i === -1) return -1;
+      e = i + 2;
       continue;
     }
     return o === "{" ? e : -1;
   }
   return -1;
 }
-function X(t, r) {
+function Y(t, r) {
   const n = t.length;
   let e = r;
   for (; e < n; ) {
@@ -125,43 +125,43 @@ function X(t, r) {
       continue;
     }
     if (o === "/" && t[e + 1] === "*") {
-      const s = t.indexOf("*/", e + 2);
-      if (s === -1) return -1;
-      e = s + 2;
+      const i = t.indexOf("*/", e + 2);
+      if (i === -1) return -1;
+      e = i + 2;
       continue;
     }
     if (o === "{") return e;
-    if (S(o)) {
-      for (e++; e < n && S(t[e]); ) e++;
+    if ($(o)) {
+      for (e++; e < n && $(t[e]); ) e++;
       continue;
     }
     return -1;
   }
   return -1;
 }
-function Y(t, r) {
+function tt(t, r) {
   const n = t.length;
   let e = r, o = 1;
   for (; e < n; ) {
-    const s = t[e];
-    if (s === "/" && t[e + 1] === "*") {
-      const i = t.indexOf("*/", e + 2);
-      if (i === -1) return -1;
-      e = i + 2;
+    const i = t[e];
+    if (i === "/" && t[e + 1] === "*") {
+      const s = t.indexOf("*/", e + 2);
+      if (s === -1) return -1;
+      e = s + 2;
       continue;
     }
-    if (s === '"' || s === "'") {
-      const i = s;
-      for (e++; e < n && t[e] !== i; )
+    if (i === '"' || i === "'") {
+      const s = i;
+      for (e++; e < n && t[e] !== s; )
         t[e] === "\\" && e + 1 < n && e++, e++;
       e++;
       continue;
     }
-    if (s === "{") {
+    if (i === "{") {
       o++, e++;
       continue;
     }
-    if (s === "}") {
+    if (i === "}") {
       if (o--, o === 0) return e;
       e++;
       continue;
@@ -170,26 +170,26 @@ function Y(t, r) {
   }
   return -1;
 }
-function tt(t) {
+function et(t) {
   return t.replace(/[\\^$.*+?()[\]{}|]/g, "\\$&");
 }
-function V(t) {
+function M(t) {
   return t.replace(/\/\*[\s\S]*?\*\//g, (r) => " ".repeat(r.length));
 }
-function M(t) {
-  const r = t.startsWith("--") ? t.slice(2) : t, n = tt(r);
+function V(t) {
+  const r = t.startsWith("--") ? t.slice(2) : t, n = et(r);
   return new RegExp("(?<![\\w-])(--" + n + ":)(\\s*)([\\s\\S]+?);");
 }
 function R(t, r) {
-  return M(r).test(V(t));
+  return V(r).test(M(t));
 }
-function P(t, r, n) {
-  const e = M(r), o = V(t), s = e.exec(o);
-  if (!s) return { content: t, status: "unknown" };
-  const [i, f, d] = s, c = s.index, p = c + i.length, k = c + f.length + d.length, g = p - 1, u = t.slice(k, g).trim(), v = n.trim();
-  return u === v ? { content: t, status: "unchanged" } : { content: t.slice(0, c) + f + d + n + ";" + t.slice(p), status: "changed" };
+function A(t, r, n) {
+  const e = V(r), o = M(t), i = e.exec(o);
+  if (!i) return { content: t, status: "unknown" };
+  const [s, u, f] = i, c = i.index, p = c + s.length, k = c + u.length + f.length, m = p - 1, d = t.slice(k, m).trim(), y = n.trim();
+  return d === y ? { content: t, status: "unchanged" } : { content: t.slice(0, c) + u + f + n + ";" + t.slice(p), status: "changed" };
 }
-function et(t, r) {
+function nt(t, r) {
   const n = Object.keys(r), e = C(t), o = N(t);
   if (!e && !o)
     return {
@@ -199,43 +199,43 @@ function et(t, r) {
       unknown: [...n],
       unknownOutsideBlock: n.filter((l) => R(t, l))
     };
-  let s = e ? t.slice(e.contentStart, e.contentEnd) : null, i = o ? t.slice(o.contentStart, o.contentEnd) : null;
-  const f = [], d = [], c = [];
+  let i = e ? t.slice(e.contentStart, e.contentEnd) : null, s = o ? t.slice(o.contentStart, o.contentEnd) : null;
+  const u = [], f = [], c = [];
   for (const l of n) {
-    if (s !== null) {
-      const u = P(s, l, r[l]);
-      if (u.status !== "unknown") {
-        s = u.content, u.status === "changed" ? f.push(l) : d.push(l);
+    if (i !== null) {
+      const d = A(i, l, r[l]);
+      if (d.status !== "unknown") {
+        i = d.content, d.status === "changed" ? u.push(l) : f.push(l);
         continue;
       }
     }
-    if (i !== null) {
-      const u = P(i, l, r[l]);
-      if (u.status !== "unknown") {
-        i = u.content, u.status === "changed" ? f.push(l) : d.push(l);
+    if (s !== null) {
+      const d = A(s, l, r[l]);
+      if (d.status !== "unknown") {
+        s = d.content, d.status === "changed" ? u.push(l) : f.push(l);
         continue;
       }
     }
     c.push(l);
   }
   const p = [];
-  e && s !== null && p.push({ start: e.contentStart, end: e.contentEnd, content: s }), o && i !== null && p.push({
+  e && i !== null && p.push({ start: e.contentStart, end: e.contentEnd, content: i }), o && s !== null && p.push({
     start: o.contentStart,
     end: o.contentEnd,
-    content: i
-  }), p.sort((l, u) => u.start - l.start);
+    content: s
+  }), p.sort((l, d) => d.start - l.start);
   let k = t;
   for (const l of p)
     k = k.slice(0, l.start) + l.content + k.slice(l.end);
-  const g = c.filter((l) => R(t, l));
-  return { updated: k, changed: f, unchanged: d, unknown: c, unknownOutsideBlock: g };
+  const m = c.filter((l) => R(t, l));
+  return { updated: k, changed: u, unchanged: f, unknown: c, unknownOutsideBlock: m };
 }
-function nt(t, r) {
-  if (!rt(t))
-    throw new F();
-  return et(t, r);
+function rt(t, r) {
+  if (!ot(t))
+    throw new S();
+  return nt(t, r);
 }
-function rt(t) {
+function ot(t) {
   return C(t) !== null || N(t) !== null;
 }
 function h(t, r = 200) {
@@ -244,8 +244,8 @@ function h(t, r = 200) {
     headers: { "Content-Type": "application/json" }
   });
 }
-async function ot(t, r, n) {
-  const e = await y.readFile(t, "utf-8"), o = nt(e, n);
+async function st(t, r, n) {
+  const e = await b.readFile(t, "utf-8"), o = rt(e, n);
   return {
     absPath: t,
     relPath: r,
@@ -260,92 +260,97 @@ async function ot(t, r, n) {
 async function it(t) {
   if (t.changed.length !== 0)
     return B(t.absPath, async () => {
-      const r = j(t.absPath), n = x(r, `.tmp-${A(8).toString("hex")}.css`);
+      const r = T(t.absPath), n = j(r, `.tmp-${x(8).toString("hex")}.css`);
       try {
-        await y.writeFile(n, t.updated, "utf-8"), await y.rename(n, t.absPath);
+        await b.writeFile(n, t.updated, "utf-8"), await b.rename(n, t.absPath);
       } catch (e) {
         try {
-          await y.unlink(n);
+          await b.unlink(n);
         } catch {
         }
         throw e;
       }
     });
 }
-async function st(t) {
+async function at(t) {
   return B(t.absPath, async () => {
-    const r = j(t.absPath), n = x(r, `.tmp-${A(8).toString("hex")}.css`);
+    const r = T(t.absPath), n = j(r, `.tmp-${x(8).toString("hex")}.css`);
     try {
-      return await y.writeFile(n, t.original, "utf-8"), await y.rename(n, t.absPath), { ok: !0 };
+      return await b.writeFile(n, t.original, "utf-8"), await b.rename(n, t.absPath), { ok: !0 };
     } catch (e) {
       console.error("[design-token-panel/server] Restore failed for", t.relPath, e);
       try {
-        await y.unlink(n);
+        await b.unlink(n);
       } catch {
       }
       return { ok: !1, error: e };
     }
   });
 }
-function dt(t) {
+function ht(t) {
   const { rootDir: r, writeRoot: n, routing: e } = t;
-  return async function(s) {
-    let i;
+  return async function(i) {
+    let s;
     try {
-      i = await s.json();
+      s = await i.json();
     } catch {
       return h({ ok: !1, error: "Invalid JSON in request body" }, 400);
     }
-    if (typeof i != "object" || i === null || Array.isArray(i))
+    if (typeof s != "object" || s === null || Array.isArray(s))
       return h({ ok: !1, error: "Request body must be a JSON object" }, 400);
-    const { tokens: f } = i;
-    if (typeof f != "object" || f === null || Array.isArray(f))
+    const { tokens: u } = s;
+    if (typeof u != "object" || u === null || Array.isArray(u))
       return h({ ok: !1, error: "tokens must be a JSON object" }, 400);
-    if (Object.entries(f).length === 0)
+    if (Object.entries(u).length === 0)
       return h({ ok: !1, error: "tokens must contain at least one entry" }, 400);
-    const { sanitized: c, error: p } = K(f);
+    const { sanitized: c, error: p } = Q(u);
     if (p || !c)
       return h({ ok: !1, error: p ?? "Invalid tokens" }, 400);
-    const { groups: k, rejected: g } = D(c, e);
-    if (g.length > 0)
-      return h({ ok: !1, error: "Unsupported cssVar prefix", rejected: g }, 400);
+    const { groups: k, rejected: m } = Z(c, e);
+    if (m.length > 0)
+      return h({ ok: !1, error: "Unsupported cssVar prefix", rejected: m }, 400);
     if (k.length === 0)
       return h({ ok: !1, error: "No routable tokens supplied" }, 400);
-    const l = [];
+    const l = /* @__PURE__ */ new Map();
     for (const a of k) {
-      const m = _(r, a.relativePath);
-      if (!G(n, m))
+      const g = D(r, a.relativePath);
+      if (!K(n, g))
         return h({ ok: !1, error: `Path not allowed: ${a.relativePath}` }, 400);
-      l.push({ absPath: m, relPath: a.relativePath, groupTokens: a.tokens });
+      const w = l.get(g);
+      w ? Object.assign(w.groupTokens, a.tokens) : l.set(g, {
+        absPath: g,
+        relPath: a.relativePath,
+        groupTokens: { ...a.tokens }
+      });
     }
-    const u = [];
-    for (const { absPath: a, relPath: m, groupTokens: O } of l)
+    const d = Array.from(l.values()), y = [];
+    for (const { absPath: a, relPath: g, groupTokens: w } of d)
       try {
-        u.push(await ot(a, m, O));
-      } catch (w) {
-        return w instanceof F ? (console.error("[design-token-panel/server] No :root or @theme block in", m), h(
+        y.push(await st(a, g, w));
+      } catch (v) {
+        return v instanceof S ? (console.error("[design-token-panel/server] No :root or @theme block in", g), h(
           {
             ok: !1,
-            error: `No top-level :root { ... } or @theme { ... } block in ${m}`
+            error: `No top-level :root { ... } or @theme { ... } block in ${g}`
           },
           409
-        )) : (console.error(`[design-token-panel/server] Error computing ${m}:`, w), h({ ok: !1, error: "Failed to read or parse source file" }, 500));
+        )) : (console.error(`[design-token-panel/server] Error computing ${g}:`, v), h({ ok: !1, error: "Failed to read or parse source file" }, 500));
       }
-    const v = [];
-    for (const a of u)
+    const O = [];
+    for (const a of y)
       try {
-        await it(a), v.push(a);
-      } catch (m) {
-        console.error(`[design-token-panel/server] Write failed for ${a.relPath}:`, m);
-        const O = [];
-        for (let w = v.length - 1; w >= 0; w--)
-          (await st(v[w])).ok || O.push(v[w].relPath);
-        return O.length > 0 ? h(
+        await it(a), O.push(a);
+      } catch (g) {
+        console.error(`[design-token-panel/server] Write failed for ${a.relPath}:`, g);
+        const w = [];
+        for (let v = O.length - 1; v >= 0; v--)
+          (await at(O[v])).ok || w.push(O[v].relPath);
+        return w.length > 0 ? h(
           {
             ok: !1,
-            error: `Failed to write file ${a.relPath}; rollback also failed for ${O.length} file(s) — disk state is inconsistent. Inspect the listed files manually.`,
+            error: `Failed to write file ${a.relPath}; rollback also failed for ${w.length} file(s) — disk state is inconsistent. Inspect the listed files manually.`,
             failedFile: a.relPath,
-            restoreFailures: O
+            restoreFailures: w
           },
           500
         ) : h(
@@ -357,8 +362,8 @@ function dt(t) {
           500
         );
       }
-    const $ = u.flatMap((a) => a.unknown), J = u.flatMap((a) => a.unchanged), W = u.flatMap((a) => a.unknownOutsideBlock), z = u.map((a) => ({
-      file: a.relPath.startsWith("/") ? T(r, a.relPath) : a.relPath,
+    const J = y.flatMap((a) => a.unknown), W = y.flatMap((a) => a.unchanged), z = y.flatMap((a) => a.unknownOutsideBlock), I = y.map((a) => ({
+      file: a.relPath.startsWith("/") ? P(r, a.relPath) : a.relPath,
       changed: a.changed,
       unchanged: a.unchanged,
       unknown: a.unknown,
@@ -366,30 +371,30 @@ function dt(t) {
     }));
     return h({
       ok: !0,
-      updated: z,
-      unknownCssVars: $,
-      unchangedCssVars: J,
-      unknownOutsideBlockCssVars: W
+      updated: I,
+      unknownCssVars: J,
+      unchangedCssVars: W,
+      unknownOutsideBlockCssVars: z
     });
   };
 }
-function ht(t) {
+function pt(t) {
   let r;
   try {
-    r = I(t, "utf-8");
-  } catch (s) {
+    r = q(t, "utf-8");
+  } catch (i) {
     throw new Error(
       `[design-token-panel] loadRoutingFromFile: cannot read file at ${t}
-  Cause: ${s.message}`
+  Cause: ${i.message}`
     );
   }
   let n;
   try {
     n = JSON.parse(r);
-  } catch (s) {
+  } catch (i) {
     throw new Error(
       `[design-token-panel] loadRoutingFromFile: invalid JSON in ${t}
-  Cause: ${s.message}`
+  Cause: ${i.message}`
     );
   }
   if (n === null || typeof n != "object" || Array.isArray(n))
@@ -401,21 +406,21 @@ function ht(t) {
     throw new Error(
       `[design-token-panel] loadRoutingFromFile: routing map must not be empty (in ${t})`
     );
-  for (const s of o) {
-    const i = e[s];
-    if (typeof i != "string" || i.trim() === "")
+  for (const i of o) {
+    const s = e[i];
+    if (typeof s != "string" || s.trim() === "")
       throw new Error(
-        `[design-token-panel] loadRoutingFromFile: every value must be a non-empty string, but key "${s}" has value ${JSON.stringify(i)} (in ${t})`
+        `[design-token-panel] loadRoutingFromFile: every value must be a non-empty string, but key "${i}" has value ${JSON.stringify(s)} (in ${t})`
       );
   }
   return e;
 }
 export {
-  H as C,
-  U as a,
-  dt as c,
-  G as i,
-  ht as l,
+  U as C,
+  G as a,
+  ht as c,
+  K as i,
+  pt as l,
   B as s,
-  K as v
+  Q as v
 };

package/dist/server/index.js

@@ -1,4 +1,4 @@
-import { C as s, c as i, i as l, a as r, l as t, s as o, v as d } from "../load-routing-LJ72261l.js";
+import { C as s, c as i, i as l, a as r, l as t, s as o, v as d } from "../load-routing-D4H2VOl5.js";
 export {
   s as CSS_VAR_NAME_RE,
   i as createApplyHandler,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takazudo/zdtp",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "Dynamic design-token tweak panel — host-config-driven, framework-agnostic Preact UI.",
   "private": false,
   "license": "MIT",