kss-modern 1.7.0-beta.1 → 1.7.0-beta.2

package/dist/node/lib/index.mjs

@@ -3,16 +3,13 @@ import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 import fs from 'fs-extra';
 import { glob } from 'tinyglobby';
-import { l as logger, s as sanitizeSpecialCharacters, P as PUG_ERROR_OVERLAY_TAG, r as requireZod, e as evaluateMixinSchema, c as compileMixinModule, p as pugErrorFile, a as compileMarkup, g as getZodVersion, M as MIXIN_COMPILE_OPTIONS, b as getMixinWrapperSource, d as slugify, I as INSERT_VITE_PUG_TAG_RE, f as PUG_SRC_RE, t as themeClassList, h as ensureStartingSlash, i as sectionSanitizeId, j as stripPugErrorOverlay, k as generateId, m as replaceWrapperContent, n as formatSourceCode, o as htmlToSearchText } from '../shared/kss-modern.D1AKakeJ.mjs';
-export { q as createLogger } from '../shared/kss-modern.D1AKakeJ.mjs';
+import { l as logger, s as sanitizeSpecialCharacters, P as PUG_ERROR_OVERLAY_TAG, r as requireZod, e as evaluateMixinSchema, c as compileMixinModule, p as pugErrorFile, a as compileMarkup, g as getZodVersion, d as discoverMixins, M as MIXIN_COMPILE_OPTIONS, b as getMixinWrapperSource, f as slugify, I as INSERT_VITE_PUG_TAG_RE, h as PUG_SRC_RE, t as themeClassList, i as ensureStartingSlash, j as sectionSanitizeId, k as stripPugErrorOverlay, m as generateId, n as replaceWrapperContent, o as formatSourceCode, q as htmlToSearchText } from '../shared/kss-modern.BOTbHnCm.mjs';
+export { u as createLogger } from '../shared/kss-modern.BOTbHnCm.mjs';
 import { existsSync, readFileSync } from 'node:fs';
 import fs$1 from 'node:fs/promises';
 import { createHash } from 'node:crypto';
 import os from 'node:os';
 import { Worker } from 'node:worker_threads';
-import lex from 'pug-lexer';
-import parse$1 from 'pug-parser';
-import walk from 'pug-walk';
 import htmlLang from '@shikijs/langs/html';
 import markdownLang from '@shikijs/langs/markdown';
 import scssLang from '@shikijs/langs/scss';
@@ -30,6 +27,9 @@ import 'pug';
 import 'consola';
 import 'consola/utils';
 import 'node:module';
+import 'pug-walk';
+import 'pug-lexer';
+import 'pug-parser';
 import 'pug-load';
 
 const HEX_COLOR_RE = /^#[0-9A-F]{6}$/i;
@@ -586,42 +586,6 @@ async function logicalWriteFile(filepath, content) {
   await fs.writeFile(filepath, content);
 }
 
-const MIXIN_SCHEMA_RE = /\bmixinSchema\s*=/;
-const MIXIN_NAME_RE = /^\s*(?:var|let|const)\s+mixinName\s*=\s*(['"])([^'"\n]*)\1\s*(?:;\s*)?$/;
-const MIXIN_KEYWORD_RE = /^\s*mixin\s/m;
-function findMixinCode(block) {
-  const found = {};
-  walk(block, (node) => {
-    if (node.type === "Mixin")
-      return false;
-    if (node.type !== "Code" || node.buffer)
-      return;
-    if (found.schemaSource === void 0 && MIXIN_SCHEMA_RE.test(node.val))
-      found.schemaSource = node.val;
-    const name = MIXIN_NAME_RE.exec(node.val)?.[2];
-    if (found.mixinName === void 0 && name !== void 0)
-      found.mixinName = name;
-  });
-  return found;
-}
-function discoverMixins(source, filename) {
-  if (!MIXIN_KEYWORD_RE.test(source))
-    return [];
-  const ast = parse$1(lex(source, { filename }), { filename, src: source });
-  const mixins = [];
-  for (const node of ast.nodes) {
-    if (node.type !== "Mixin" || node.call)
-      continue;
-    mixins.push({
-      name: node.name,
-      args: node.args ?? null,
-      line: node.line,
-      ...node.block ? findMixinCode(node.block) : {}
-    });
-  }
-  return mixins;
-}
-
 const MIXIN_MANIFEST_PATH = "mixins/manifest.json";
 const MIXIN_OVERVIEW_FILE = "mixins.html";
 function getMixinExplorerHref(id) {

package/dist/node/lib/pug/worker.mjs

@@ -1,5 +1,5 @@
 import { parentPort } from 'node:worker_threads';
-import { r as requireZod, e as evaluateMixinSchema, c as compileMixinModule, a as compileMarkup, p as pugErrorFile } from '../../shared/kss-modern.D1AKakeJ.mjs';
+import { r as requireZod, e as evaluateMixinSchema, c as compileMixinModule, a as compileMarkup, p as pugErrorFile } from '../../shared/kss-modern.BOTbHnCm.mjs';
 import 'node:path';
 import 'pug';
 import 'node:fs';
@@ -8,6 +8,8 @@ import 'consola';
 import 'consola/utils';
 import 'node:module';
 import 'pug-walk';
+import 'pug-lexer';
+import 'pug-parser';
 import 'pug-load';
 
 if (!parentPort) {

package/dist/node/shared/{kss-modern.D1AKakeJ.mjs → kss-modern.BOTbHnCm.mjs}

@@ -6,6 +6,8 @@ import { createConsola } from 'consola';
 import { colors } from 'consola/utils';
 import { createRequire } from 'node:module';
 import walk from 'pug-walk';
+import lex from 'pug-lexer';
+import parse from 'pug-parser';
 import pugLoad from 'pug-load';
 
 const sectionSanitizeId = (id2) => id2.toLowerCase().replaceAll(".", "-");
@@ -98,6 +100,72 @@ function generateId() {
   return value;
 }
 
+const MIXIN_SCHEMA_RE = /\bmixinSchema\s*=/;
+const MIXIN_NAME_RE = /^\s*(?:var|let|const)\s+mixinName\s*=\s*(['"])([^'"\n]*)\1\s*(?:;\s*)?$/;
+const MIXIN_KEYWORD_RE = /^\s*mixin\s/m;
+function findMixinCode(block) {
+  const found = {};
+  walk(block, (node) => {
+    if (node.type === "Mixin")
+      return false;
+    if (node.type !== "Code" || node.buffer)
+      return;
+    if (found.schemaSource === void 0 && MIXIN_SCHEMA_RE.test(node.val))
+      found.schemaSource = node.val;
+    const name = MIXIN_NAME_RE.exec(node.val)?.[2];
+    if (found.mixinName === void 0 && name !== void 0)
+      found.mixinName = name;
+  });
+  return found;
+}
+function discoverMixins(source, filename) {
+  if (!MIXIN_KEYWORD_RE.test(source))
+    return [];
+  const ast = parse(lex(source, { filename }), { filename, src: source });
+  const mixins = [];
+  for (const node of ast.nodes) {
+    if (node.type !== "Mixin" || node.call)
+      continue;
+    mixins.push({
+      name: node.name,
+      args: node.args ?? null,
+      line: node.line,
+      ...node.block ? findMixinCode(node.block) : {}
+    });
+  }
+  return mixins;
+}
+
+function getMixinMarkerName(name, mixinName) {
+  const segment = mixinName?.split("/").map((part) => part.trim()).filter(Boolean).at(-1) ?? name;
+  return segment.replace(/([a-z\d])([A-Z])/g, "$1 $2").replace(/[-_\s]+/g, " ").trim().toUpperCase();
+}
+function createComment(val, node) {
+  return { type: "Comment", val, buffer: true, line: node.line, column: node.column, filename: node.filename };
+}
+function hasStartMarker(nodes) {
+  return nodes.some((node) => node.type === "Comment" && node.buffer === true && node.val?.trim().startsWith("START "));
+}
+const mixinMarkerPlugin = {
+  preCodeGen(ast) {
+    return walk(ast, (node) => {
+      if (node.type !== "Mixin" || node.call || !node.block || typeof node.name !== "string")
+        return;
+      if (hasStartMarker(node.block.nodes))
+        return;
+      const { schemaSource, mixinName } = findMixinCode(node.block);
+      if (schemaSource === void 0)
+        return;
+      const markerName = getMixinMarkerName(node.name, mixinName);
+      node.block.nodes = [
+        createComment(` START ${markerName}`, node),
+        ...node.block.nodes,
+        createComment(` END ${markerName}`, node)
+      ];
+    });
+  }
+};
+
 const parseCache = /* @__PURE__ */ new Map();
 function signatureOf(filename) {
   try {
@@ -178,7 +246,7 @@ function compileMixinModule(file, name) {
     ...MIXIN_COMPILE_OPTIONS,
     // a sibling of the mixin's file, so its relative includes resolve exactly as in the file itself
     filename: path.join(path.dirname(absoluteFile), `__kss-mixin-${name}.pug`),
-    plugins: [mixinPugPlugin]
+    plugins: [mixinPugPlugin, mixinMarkerPlugin]
   });
   return {
     code: `${body}
@@ -436,8 +504,9 @@ function compilePugFile(pugFilePath, mode, sectionId, extraLocals = {}) {
     // line-mapping — measurably bloating codegen and `new Function`. We surface compile errors via
     // our own overlay, so the precise pug line in a runtime stack isn't worth the cost.
     compileDebug: false,
-    // records which mixins the section calls, see ./mixin-trace.ts
-    plugins: [mixinTracePlugin]
+    // START/END comments around public mixins, see ./mixin-markers.ts; records which mixins the
+    // section calls, see ./mixin-trace.ts
+    plugins: [mixinMarkerPlugin, mixinTracePlugin]
   });
   const dependencies = [path.resolve(pugFilePath), ...pugFn.dependencies.map((dep) => path.resolve(dep))];
   const locals = { modifierClass: "{{modifier_class}}", ...extraLocals, useId: createUseId(sectionId) };
@@ -499,4 +568,4 @@ async function compileMarkup(contentDir, mode, html, sectionId) {
   return { html: result, dependencies: [...new Set(dependencies)], mixinUsage: mergeMixinUsage(mixinUsage) };
 }
 
-export { INSERT_VITE_PUG_TAG_RE as I, MIXIN_COMPILE_OPTIONS as M, PUG_ERROR_OVERLAY_TAG as P, compileMarkup as a, getMixinWrapperSource as b, compileMixinModule as c, slugify as d, evaluateMixinSchema as e, PUG_SRC_RE as f, getZodVersion as g, ensureStartingSlash as h, sectionSanitizeId as i, stripPugErrorOverlay as j, generateId as k, logger as l, replaceWrapperContent as m, formatSourceCode as n, htmlToSearchText as o, pugErrorFile as p, createLogger as q, requireZod as r, sanitizeSpecialCharacters as s, themeClassList as t };
+export { INSERT_VITE_PUG_TAG_RE as I, MIXIN_COMPILE_OPTIONS as M, PUG_ERROR_OVERLAY_TAG as P, compileMarkup as a, getMixinWrapperSource as b, compileMixinModule as c, discoverMixins as d, evaluateMixinSchema as e, slugify as f, getZodVersion as g, PUG_SRC_RE as h, ensureStartingSlash as i, sectionSanitizeId as j, stripPugErrorOverlay as k, logger as l, generateId as m, replaceWrapperContent as n, formatSourceCode as o, pugErrorFile as p, htmlToSearchText as q, requireZod as r, sanitizeSpecialCharacters as s, themeClassList as t, createLogger as u };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "kss-modern",
   "type": "module",
-  "version": "1.7.0-beta.1",
+  "version": "1.7.0-beta.2",
   "description": "Modern KSS compatible styleguide generator",
   "keywords": [
     "kss",