kss-modern 1.2.0-beta.3 → 1.2.0-beta.5

package/dist/node/lib/index.mjs

@@ -1,11 +1,10 @@
 import path from 'node:path';
-import { performance } from 'node:perf_hooks';
 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, I as INSERT_VITE_PUG_TAG_RE, P as PUG_SRC_RE, a as PUG_ERROR_OVERLAY_TAG, c as compileMarkup, p as pugErrorFile, b as sectionSanitizeId, d as stripPugErrorOverlay, e as ensureStartingSlash, g as generateId, r as replaceWrapperContent } from '../shared/kss-modern.o1Fp758z.mjs';
-export { f as createLogger } from '../shared/kss-modern.o1Fp758z.mjs';
+import { l as logger, s as sanitizeSpecialCharacters, I as INSERT_VITE_PUG_TAG_RE, P as PUG_SRC_RE, a as PUG_ERROR_OVERLAY_TAG, c as compileMarkup, p as pugErrorFile, b as sectionSanitizeId, d as stripPugErrorOverlay, e as ensureStartingSlash, g as generateId, r as replaceWrapperContent } from '../shared/kss-modern.D8n3gEE1.mjs';
+export { f as createLogger } from '../shared/kss-modern.D8n3gEE1.mjs';
 import htmlLang from '@shikijs/langs/html';
 import markdownLang from '@shikijs/langs/markdown';
 import scssLang from '@shikijs/langs/scss';
@@ -1037,17 +1036,6 @@ const graph = new PugDependencyGraph();
 function getPugDependencyGraph() {
   return graph;
 }
-let lastCompileTimings = { read: 0, parse: 0, render: 0, a11y: 0, sections: 0 };
-function accumulateTimings(timings) {
-  lastCompileTimings.read += timings.read;
-  lastCompileTimings.parse += timings.parse;
-  lastCompileTimings.render += timings.render;
-  lastCompileTimings.a11y += timings.a11y;
-  lastCompileTimings.sections += 1;
-}
-function getLastCompileTimings() {
-  return lastCompileTimings;
-}
 const __filename$1 = fileURLToPath(import.meta.url);
 const __dirname$1 = path.dirname(__filename$1);
 const workerFilePath = __dirname$1.includes("dist/") ? "./pug/worker.mjs" : "./worker.ts";
@@ -1114,9 +1102,6 @@ function runPinned(id, input) {
   });
   return run;
 }
-function getPugPoolInfo() {
-  return { cpus: os.cpus().length, maxPoolSize: MAX_POOL_SIZE, workers: allWorkers.size };
-}
 async function terminatePugWorkers() {
   const workers = [...allWorkers];
   allWorkers.clear();
@@ -1147,9 +1132,8 @@ function recordFailure(mode, repository, errors, pugError) {
 async function compileInline(mode, contentDir, repository, id, errors) {
   const markupSource = repository.get(id).markup;
   try {
-    const { html, dependencies, timings } = await compileMarkup(contentDir, mode, markupSource, id);
+    const { html, dependencies } = await compileMarkup(contentDir, mode, markupSource, id);
     repository.set(id, { markup: html });
-    accumulateTimings(timings);
     await storeResult(id, markupSource, html, dependencies);
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -1177,7 +1161,6 @@ async function compileViaWorkerPool(mode, contentDir, repository, ids, errors) {
       return;
     }
     repository.set(id, { markup: result.html });
-    accumulateTimings(result.timings);
     await storeResult(id, markupSource, result.html, result.dependencies);
   });
   await Promise.all(tasks);
@@ -1202,7 +1185,6 @@ async function compileIds(mode, contentDir, repository, ids) {
   if (misses.length === 0)
     return clonedRepository;
   const errors = [];
-  lastCompileTimings = { read: 0, parse: 0, render: 0, a11y: 0, sections: 0 };
   const useInline = mode === "development" && misses.length <= INLINE_THRESHOLD;
   if (useInline) {
     await Promise.all(misses.map((id) => compileInline(mode, contentDir, clonedRepository, id, errors)));
@@ -1227,6 +1209,13 @@ async function compilePugMarkupIncremental(mode, contentDir, repository, ids) {
   return compileIds(mode, contentDir, repository, wanted);
 }
 
+const TRANSIENT_FS_ERROR_CODES = /* @__PURE__ */ new Set(["ENOENT", "EBUSY", "EPERM", "EACCES"]);
+function isTransientFsError(error) {
+  if (typeof error !== "object" || error === null)
+    return false;
+  const { code } = error;
+  return code !== void 0 && TRANSIENT_FS_ERROR_CODES.has(code);
+}
 async function logicalWriteFile(filepath, content) {
   const dir = path.dirname(filepath);
   await fs.ensureDir(dir);
@@ -2296,13 +2285,25 @@ function matchArraysEqual(a, b) {
   return a.every((value, index) => value === b[index]);
 }
 const kssSectionRegex = /\/\*{1,2}[\s\S]*?Styleguide[\s\S]*?\*\//g;
+function tryReadFileSync(filePath) {
+  try {
+    return readFileSync(filePath, "utf8");
+  } catch (error) {
+    if (isTransientFsError(error))
+      return void 0;
+    throw error;
+  }
+}
 function watchStyleguideForChanges(watchPath, handlers) {
   if (typeof handlers.onStructuralChange !== "function" || typeof handlers.onMarkupChange !== "function") {
     throw new TypeError("styleguide watch requires onStructuralChange and onMarkupChange callbacks");
   }
   const regexFileContents = /* @__PURE__ */ new Map();
   const handleCssAdd = (filePath) => {
-    const currentFileMatches = readFileSync(filePath, "utf8").match(kssSectionRegex);
+    const contents = tryReadFileSync(filePath);
+    if (contents === void 0)
+      return;
+    const currentFileMatches = contents.match(kssSectionRegex);
     if (currentFileMatches === null) {
       return;
     }
@@ -2312,7 +2313,10 @@ function watchStyleguideForChanges(watchPath, handlers) {
   const handleCssChange = (filePath) => {
     const previousFileMatches = regexFileContents.get(filePath);
     const hasFileBeenReadBefore = previousFileMatches !== void 0;
-    const currentFileMatches = readFileSync(filePath, "utf8").match(kssSectionRegex);
+    const contents = tryReadFileSync(filePath);
+    if (contents === void 0)
+      return;
+    const currentFileMatches = contents.match(kssSectionRegex);
     if (!hasFileBeenReadBefore) {
       regexFileContents.set(filePath, currentFileMatches);
       if (currentFileMatches === null) {
@@ -2643,21 +2647,17 @@ async function rebuildSections(config, context, changedSectionIds) {
   }
   if (subset.size === 0)
     return;
-  const startedAt = performance.now();
-  const workersBefore = getPugPoolInfo().workers;
   const recompiled = await compilePugMarkupIncremental(config.mode, config.contentDir, subset, subset.keys());
   for (const [id, entry] of recompiled) {
     context.compiledRepository.set(id, { markup: entry.markup });
     reindexInsertMarkupConsumer(context, id);
   }
-  const afterCompile = performance.now();
   const resolved = resolveInsertMarkupForSections(context.compiledRepository, context.sectionsById, affected);
   for (const [id, markup] of resolved) {
     const node = context.nodeById.get(id);
     if (node)
       node.markup = markup;
   }
-  const afterResolve = performance.now();
   const writeTasks = [];
   const previewsToWrite = /* @__PURE__ */ new Set();
   for (const id of affected) {
@@ -2675,16 +2675,6 @@ async function rebuildSections(config, context, changedSectionIds) {
     writeTasks.push(writePreviewFile(config, context, firstLevelIndex, secondLevelIndex));
   }
   await Promise.all(writeTasks);
-  const afterWrite = performance.now();
-  if (config.mode === "development") {
-    const ms = (value) => `${value.toFixed(1)}ms`;
-    const pool = getPugPoolInfo();
-    const spawned = pool.workers - workersBefore;
-    const t = getLastCompileTimings();
-    logger.info(
-      `Incremental rebuild: ${affected.size} section(s), ${writeTasks.length} file(s) in ${ms(afterWrite - startedAt)} (compile ${ms(afterCompile - startedAt)}, insert-markup ${ms(afterResolve - afterCompile)}, write ${ms(afterWrite - afterResolve)}) [cpus=${pool.cpus}, pool=${pool.maxPoolSize}, workers=${pool.workers}${spawned > 0 ? `, +${spawned} cold-spawned` : ""}] compile breakdown over ${t.sections} section(s): read ${ms(t.read)}, parse ${ms(t.parse)}, render ${ms(t.render)}, a11y ${ms(t.a11y)} (summed per-section; read=disk I/O, parse=lex/parse/codegen)`
-    );
-  }
 }
 async function watchStyleguide(config, onChange, onError) {
   const initialBuild = await buildAll(config);

package/dist/node/lib/pug/worker.d.mts

@@ -1,17 +1,6 @@
 import { StyleguideConfiguration } from '../index.mjs';
 
 type Mode = StyleguideConfiguration['mode'];
-/** Where a section's compile time went, summed over the entry file and any <insert-vite-pug> tags. */
-interface CompileTimings {
-    /** Reading the entry file + all includes/extends off disk (file I/O only). */
-    read: number;
-    /** pug lex + parse + codegen (CPU; excludes the include reads). */
-    parse: number;
-    /** Executing the compiled template function (pure render). */
-    render: number;
-    /** `fixAccessibilityIssues` post-processing. */
-    a11y: number;
-}
 
 interface PugWorkerInput {
     id: string;
@@ -23,7 +12,6 @@ interface PugWorkerSuccess {
     id: string;
     html: string;
     dependencies: string[];
-    timings: CompileTimings;
 }
 interface PugWorkerError {
     id: string;

package/dist/node/lib/pug/worker.d.ts

@@ -1,17 +1,6 @@
 import { StyleguideConfiguration } from '../index.js';
 
 type Mode = StyleguideConfiguration['mode'];
-/** Where a section's compile time went, summed over the entry file and any <insert-vite-pug> tags. */
-interface CompileTimings {
-    /** Reading the entry file + all includes/extends off disk (file I/O only). */
-    read: number;
-    /** pug lex + parse + codegen (CPU; excludes the include reads). */
-    parse: number;
-    /** Executing the compiled template function (pure render). */
-    render: number;
-    /** `fixAccessibilityIssues` post-processing. */
-    a11y: number;
-}
 
 interface PugWorkerInput {
     id: string;
@@ -23,7 +12,6 @@ interface PugWorkerSuccess {
     id: string;
     html: string;
     dependencies: string[];
-    timings: CompileTimings;
 }
 interface PugWorkerError {
     id: string;

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

@@ -1,9 +1,8 @@
 import { parentPort } from 'node:worker_threads';
-import { c as compileMarkup, p as pugErrorFile } from '../../shared/kss-modern.o1Fp758z.mjs';
+import { c as compileMarkup, p as pugErrorFile } from '../../shared/kss-modern.D8n3gEE1.mjs';
 import 'node:fs';
 import 'node:fs/promises';
 import 'node:path';
-import 'node:perf_hooks';
 import 'pug';
 import 'consola';
 import 'consola/utils';
@@ -15,8 +14,8 @@ if (!parentPort) {
 parentPort.on("message", async (data) => {
   const { id, mode, html, contentDir } = data;
   try {
-    const { html: compiled, dependencies, timings } = await compileMarkup(contentDir, mode, html, id);
-    parentPort.postMessage({ id, html: compiled, dependencies, timings });
+    const { html: compiled, dependencies } = await compileMarkup(contentDir, mode, html, id);
+    parentPort.postMessage({ id, html: compiled, dependencies });
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     parentPort.postMessage({ id, error: message, file: pugErrorFile(error) });

package/dist/node/shared/{kss-modern.o1Fp758z.mjs → kss-modern.D8n3gEE1.mjs}

@@ -1,7 +1,6 @@
 import { statSync, readFileSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { performance } from 'node:perf_hooks';
 import pug from 'pug';
 import { createConsola } from 'consola';
 import { colors } from 'consola/utils';
@@ -176,19 +175,8 @@ function pugErrorFile(error) {
   const candidate = error;
   return candidate?.path ?? candidate?.filename;
 }
-let includeReadMs = 0;
-function timedRead(filePath) {
-  const t0 = performance.now();
-  const content = readFileSync(filePath, "utf8");
-  includeReadMs += performance.now() - t0;
-  return content;
-}
 function compilePugFile(pugFilePath, mode, sectionId, extraLocals = {}) {
-  const tRead0 = performance.now();
   const source = readFileSync(pugFilePath, "utf8");
-  let readMs = performance.now() - tRead0;
-  const includeReadBefore = includeReadMs;
-  const tParse0 = performance.now();
   const pugFn = pug.compile(source, {
     filename: pugFilePath,
     // define doctype to avoid self-closing tags on wrong places
@@ -198,28 +186,19 @@ function compilePugFile(pugFilePath, mode, sectionId, extraLocals = {}) {
     // pug defaults this to true, which wraps the generated function in per-line try/catch +
     // 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,
-    plugins: [{ read: timedRead }]
+    compileDebug: false
   });
-  const includeReads = includeReadMs - includeReadBefore;
-  const parseMs = performance.now() - tParse0 - includeReads;
-  readMs += includeReads;
   const dependencies = [path.resolve(pugFilePath), ...pugFn.dependencies.map((dep) => path.resolve(dep))];
-  const tRender0 = performance.now();
   const html = pugFn({ ...extraLocals, useId: createUseId(sectionId) });
-  const renderMs = performance.now() - tRender0;
-  return { html, dependencies, readMs, parseMs, renderMs };
+  return { html, dependencies };
 }
 async function expandVitePugTags(contentDir, mode, html, sectionId) {
   const vitePugTags = html.match(INSERT_VITE_PUG_TAG_RE);
   if (!vitePugTags) {
-    return { html, dependencies: [], timings: { read: 0, parse: 0, render: 0, a11y: 0 } };
+    return { html, dependencies: [] };
   }
   let markupOutput = html;
   const dependencies = [];
-  let read = 0;
-  let parse = 0;
-  let render = 0;
   await Promise.all(vitePugTags.map(async (vitePugTag) => {
     const pugSourcePath = vitePugTag.match(PUG_SRC_RE)?.[1];
     if (!pugSourcePath) {
@@ -232,51 +211,35 @@ async function expandVitePugTags(contentDir, mode, html, sectionId) {
     const pugModifierClass = vitePugTag.match(PUG_MODIFIER_CLASS_RE);
     const pugLocals = pugModifierClass && pugModifierClass[1] ? { modifierClass: pugModifierClass[1] } : {};
     const pugFilePath = path.join(contentDir, pugSourcePath);
-    const { html: pugOutput, dependencies: pugDependencies, readMs, parseMs, renderMs } = compilePugFile(pugFilePath, mode, sectionId, pugLocals);
+    const { html: pugOutput, dependencies: pugDependencies } = compilePugFile(pugFilePath, mode, sectionId, pugLocals);
     dependencies.push(...pugDependencies);
-    read += readMs;
-    parse += parseMs;
-    render += renderMs;
     markupOutput = markupOutput.replaceAll(vitePugTag, pugOutput);
   }));
-  return { html: markupOutput, dependencies, timings: { read, parse, render, a11y: 0 } };
+  return { html: markupOutput, dependencies };
 }
 async function compileMarkup(contentDir, mode, html, sectionId) {
   let result = html;
   const dependencies = [];
-  let read = 0;
-  let parse = 0;
-  let render = 0;
   const trimmed = html.trim();
   const isBarePath = !trimmed.includes("<") && !trimmed.includes("\n");
   if (isBarePath && trimmed.endsWith(".html")) {
     const htmlFilePath = path.join(contentDir, trimmed);
-    const t0 = performance.now();
     result = await fs.readFile(htmlFilePath, "utf-8");
-    read += performance.now() - t0;
     dependencies.push(path.resolve(htmlFilePath));
   } else if (isBarePath && trimmed.endsWith(".pug")) {
     const pugFilePath = path.join(contentDir, trimmed);
     const compiled = compilePugFile(pugFilePath, mode, sectionId);
     result = compiled.html;
     dependencies.push(...compiled.dependencies);
-    read += compiled.readMs;
-    parse += compiled.parseMs;
-    render += compiled.renderMs;
   }
   const expanded = await expandVitePugTags(contentDir, mode, result, sectionId);
   result = expanded.html;
   dependencies.push(...expanded.dependencies);
-  read += expanded.timings.read;
-  parse += expanded.timings.parse;
-  render += expanded.timings.render;
   if (mode === "production") {
     result = await biomeFormat(result);
   }
-  const tA11y = performance.now();
   result = fixAccessibilityIssues(result);
-  const a11y = performance.now() - tA11y;
-  return { html: result, dependencies: [...new Set(dependencies)], timings: { read, parse, render, a11y } };
+  return { html: result, dependencies: [...new Set(dependencies)] };
 }
 
 export { INSERT_VITE_PUG_TAG_RE as I, PUG_SRC_RE as P, PUG_ERROR_OVERLAY_TAG as a, sectionSanitizeId as b, compileMarkup as c, stripPugErrorOverlay as d, ensureStartingSlash as e, createLogger as f, generateId as g, logger as l, pugErrorFile as p, replaceWrapperContent as r, sanitizeSpecialCharacters as s };

package/package.json

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