wiki-formant 0.52.0 → 0.52.1

package/README.md

@@ -268,7 +268,7 @@ Four configs had restated these by hand on the grounds that a config could not i
 `withWikiDefaults(config, { csp })` wraps the whole config: the headers on every route with `csp` enforced in production, AVIF before WebP from the image optimiser, Turbopack's build cache off (Vercel restored a stale one and shipped a stylesheet two commits old), and `distDir` from `STUDIO_DIST_DIR` for radix-studio's second dev server. What the app sets wins, and its own `headers()` follow these.
 
 ```ts
-export default withWikiDefaults({ async redirects() { /* … */ } }, { csp });
+export default withWikiDefaults<NextConfig>({ async redirects() { /* … */ } }, { csp });
 ```
 
 `contentSecurityPolicy` starts from the policy all four origins shared line for line, and each directive passed replaces its default rather than appending, so the call site reads as the whole list. An empty list drops a directive.

package/bin/check-classes.mjs

@@ -66,22 +66,28 @@ for (const f of cssFiles) {
   }
 }
 
-// Classes this project defines itself. Everything else the build emitted is a
-// Tailwind utility, which is what makes the composition count derivable rather
-// than a maintained prefix list. Read from rule preludes only, so a decimal in a
-// value or a class named in a comment is not taken for a selector.
-const globalsFile = walk(SRC_DIR, '.css').find(f => f.endsWith('globals.css'));
-const named = new Set();
-if (globalsFile) {
-  const css = fs.readFileSync(globalsFile, 'utf8').replace(/\/\*[\s\S]*?\*\//g, '');
+// Classes defined by this project's stylesheets or by wiki-formant's base.css.
+// Everything else the build emitted is a Tailwind utility, which is what makes
+// the composition count derivable rather than a maintained prefix list. Read
+// from rule preludes only, so a decimal in a value or a class named in a
+// comment is not taken for a selector.
+const classesIn = file => {
+  const out = new Set();
+  const css = fs.readFileSync(file, 'utf8').replace(/\/\*[\s\S]*?\*\//g, '');
   for (const [, prelude] of css.matchAll(/([^{};]*)\{/g)) {
     if (prelude.trim().startsWith('@')) continue;
     for (const m of prelude.matchAll(/\.((?:\\.|[-\w])+)/g)) {
       const name = m[1].replace(/\\/g, '');
-      if (/^[A-Za-z_-]/.test(name)) named.add(name);
+      if (/^[A-Za-z_-]/.test(name)) out.add(name);
     }
   }
-}
+  return out;
+};
+const ownCss = walk(SRC_DIR, '.css');
+const globalsFile = ownCss.find(f => f.endsWith('globals.css'));
+const own = new Set(ownCss.flatMap(f => [...classesIn(f)]));
+const baseCss = new URL('../dist/base.css', import.meta.url);
+const named = new Set([...own, ...(fs.existsSync(baseCss) ? classesIn(baseCss) : [])]);
 
 // Only bare literals: anything interpolated is beyond a static check.
 const dead = new Map();
@@ -120,20 +126,22 @@ if (compositions.length) {
 }
 
 // Every token in the JavaScript the build ships, server and client. A selector
-// is referenced when its name appears whole, or when a prefix of it ending in `-`
-// or `_` does, which is how `editorial-banner-${variant}` is written.
+// is referenced when its name appears whole, when a prefix of it ending in `-`
+// or `_` does, which is how `editorial-banner-${variant}` is written, or when it
+// splits at a `-` or `_` into two shipped tokens, which is how `RailShell`'s
+// `${prefix}--open` is written.
 const shipped = new Set();
 for (const f of [...walk(STATIC_DIR, '.js'), ...walk('.next/server', '.js')]) {
   for (const [tok] of fs.readFileSync(f, 'utf8').matchAll(/[\w-]+/g)) shipped.add(tok);
 }
 const referenced = name =>
   shipped.has(name) ||
-  [...name].some((c, i) => i >= 3 && (c === '-' || c === '_') && shipped.has(name.slice(0, i + 1)));
-const unused = [...named].filter(n => !referenced(n)).sort();
+  [...name].some((c, i) => i >= 3 && (c === '-' || c === '_') && (shipped.has(name.slice(0, i + 1)) || (shipped.has(name.slice(0, i)) && shipped.has(name.slice(i)))));
+const unused = [...own].filter(n => !referenced(n)).sort();
 
 if (unused.length) {
   const verb = CHECK_UNUSED ? 'must be deleted' : 'advisory';
-  console.error(`check-classes: ${unused.length} selector(s) in ${globalsFile} referenced by nothing the build ships (${verb}):\n`);
+  console.error(`check-classes: ${unused.length} selector(s) in ${ownCss.join(', ')} referenced by nothing the build ships (${verb}):\n`);
   console.error(`  ${unused.join(', ')}\n`);
   console.error('  Class names inside HTML stored in a database do not count, so check stored content before deleting one.\n');
 }

package/dist/headers.d.ts

@@ -30,7 +30,7 @@ interface WikiNextConfig {
     distDir?: string;
     experimental?: object;
     images?: object;
-    headers?: () => Promise<unknown[]>;
+    headers?: () => Promise<unknown[]> | unknown[];
 }
 /**
  * An app's Next config with the settings every app here wrote out the same way:
@@ -46,7 +46,8 @@ interface WikiNextConfig {
  *   Next's dev runtime is inline and `eval`. An origin that sets its policy
  *   per request (a nonce) passes none.
  *
- * Anything the app sets wins, and its own `headers()` follow these.
+ * Anything the app sets wins, and its own `headers()` follow these. Pass
+ * `NextConfig` as `T` so the object is typed as Next's own config.
  */
 export declare function withWikiDefaults<T extends WikiNextConfig>(config: T, { csp }?: {
     csp?: string;

package/dist/headers.js

@@ -93,7 +93,8 @@ export function securityHeaders(csp) {
  *   Next's dev runtime is inline and `eval`. An origin that sets its policy
  *   per request (a nonce) passes none.
  *
- * Anything the app sets wins, and its own `headers()` follow these.
+ * Anything the app sets wins, and its own `headers()` follow these. Pass
+ * `NextConfig` as `T` so the object is typed as Next's own config.
  */
 export function withWikiDefaults(config, { csp } = {}) {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-formant",
-  "version": "0.52.0",
+  "version": "0.52.1",
   "description": "The portable half of a wiki: derived taxonomy and facet controls, a version-negotiating MCP transport, markdown twins, block rendering, a rich-text editor engine, conditional-GET plumbing, and the headers and CSP every origin sends.",
   "type": "module",
   "license": "MIT",