@navecss/core 0.4.0 → 0.6.0

package/dist/bin.js

@@ -1,17 +1,20 @@
 #!/usr/bin/env node
-import { runCheck } from './chunk-XQQCDUV6.js';
-import { splitByteOrderMark, foldedText } from './chunk-2A7IUZBH.js';
-import { formatFinding } from './chunk-UANF3FGO.js';
-import { validateExtendAtomsHostFree } from './chunk-LQSGQ2OA.js';
+import { runCheck } from './chunk-CTFEYJBE.js';
+import { splitByteOrderMark } from './chunk-2TNTYI4L.js';
+import { foldedText, orderWarningTexts } from './chunk-R6R5DSTT.js';
+import { formatFinding } from './chunk-ZNTNLGEC.js';
+import { validateExtendAtomsHostFree } from './chunk-B5CWZIBK.js';
 import { resolveExtendSpecifier, applyExtendModule } from './chunk-NKUZNRF4.js';
-import { snapshotExtendMap, expandText } from './chunk-LADFXRWQ.js';
-import { createPositionFinder, tokenize, atKeywordName } from './chunk-NFS2REPQ.js';
+import { snapshotExtendMap, expandText } from './chunk-KDLLTOAM.js';
+import { createPositionFinder, atKeywordName } from './chunk-UVHGEVMV.js';
 import './chunk-SYNQJNVB.js';
 import './chunk-CUL5PLPI.js';
+import { tokenize } from './chunk-2K5EBBF2.js';
 import './chunk-GZL2VW7C.js';
 import { parseArgs } from 'util';
 import { realpathSync, watch, existsSync, statSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
 import path2 from 'path';
+import { createHash } from 'crypto';
 
 // src/bin-usage.ts
 var USAGE = `Usage:
@@ -197,9 +200,10 @@ function expandOne(pair, extend, outputs) {
       ...bareImportDiagnostics(text, source, pair.out, outputs)
     ];
     const report = foldedText(problems, source, extend);
-    return report === void 0 ? { kind: "expanded", css: bom + result.css } : { kind: "problems", report };
+    const warnings = orderWarningTexts(result.warnings, source);
+    return report === void 0 ? { kind: "expanded", css: bom + result.css, warnings } : { kind: "problems", report, warnings };
   } catch (error) {
-    return { kind: "problems", report: `${source}: ${error.message}` };
+    return { kind: "problems", report: `${source}: ${error.message}`, warnings: [] };
   }
 }
 function statusOf(unreadable, reports) {
@@ -225,40 +229,110 @@ function writeOutputs(outputs) {
 }
 function expandPass(job, extend) {
   const reports = [];
+  const warnings = [];
   const unreadable = [];
   const outputs = [];
   const outPaths = new Set(job.pairs.map((pair) => path2.resolve(pair.out)));
   for (const pair of job.pairs) {
     const outcome = expandOne(pair, extend, outPaths);
-    if (outcome.kind === "unreadable") unreadable.push(pair.source);
-    else if (outcome.kind === "problems") reports.push(outcome.report);
+    if (outcome.kind === "unreadable") {
+      unreadable.push(pair.source);
+      continue;
+    }
+    warnings.push(...outcome.warnings);
+    if (outcome.kind === "problems") reports.push(outcome.report);
     else outputs.push({ css: outcome.css, pair });
   }
   const status = statusOf(unreadable, reports);
-  if (status !== 0) return { expanded: [], reports, status, unreadable, writeFailure: void 0 };
+  if (status !== 0) {
+    return { expanded: [], reports, status, unreadable, warnings, writeFailure: void 0 };
+  }
   const { written, writeFailure } = writeOutputs(outputs);
   return {
     expanded: written,
     reports,
     status: writeFailure === void 0 ? 0 : 2,
     unreadable,
+    warnings,
     writeFailure
   };
 }
 var SETTLE_MS = 40;
+var POLL_MS = 1e3;
+function stampOf(file) {
+  try {
+    const { ino, mtimeMs, size } = statSync(file);
+    return `${String(ino)}:${String(mtimeMs)}:${String(size)}`;
+  } catch {
+    return "";
+  }
+}
+function digestOf(file) {
+  try {
+    return createHash("sha256").update(readFileSync(file)).digest("hex");
+  } catch {
+    return "";
+  }
+}
+var START_WINDOW_MS = 2e3;
+function isModifiedSince(file, ms) {
+  try {
+    return Math.floor(statSync(file).mtimeMs / 1e3) >= Math.floor(ms / 1e3);
+  } catch {
+    return false;
+  }
+}
+function seenFiles(files, startMs) {
+  const stamps = /* @__PURE__ */ new Map();
+  const digests = /* @__PURE__ */ new Map();
+  for (const file of files) {
+    stamps.set(file, stampOf(file));
+    if (isModifiedSince(file, startMs - START_WINDOW_MS)) digests.set(file, digestOf(file));
+  }
+  return {
+    isStampChanged: () => [...files].some((file) => stampOf(file) !== stamps.get(file)),
+    isContentChanged: (named) => {
+      let isChanged = false;
+      for (const file of named) {
+        const before = digests.get(file);
+        if (before === void 0 || stampOf(file) !== stamps.get(file)) continue;
+        const digest = digestOf(file);
+        if (digest !== before) isChanged = true;
+        digests.set(file, digest);
+      }
+      return isChanged;
+    },
+    record: () => {
+      for (const file of files) {
+        const stamp = stampOf(file);
+        if (stamp !== stamps.get(file)) digests.set(file, digestOf(file));
+        stamps.set(file, stamp);
+      }
+    }
+  };
+}
 function watchFiles(files, onChange) {
   const wanted = new Set(files.map((file) => path2.resolve(file)));
+  const seen = seenFiles(wanted, Date.now());
   let timer;
+  const named = /* @__PURE__ */ new Set();
+  const settle = () => {
+    const files2 = [...named];
+    named.clear();
+    if (!seen.isStampChanged() && !seen.isContentChanged(files2)) return;
+    seen.record();
+    onChange();
+  };
   const schedule = () => {
     clearTimeout(timer);
-    timer = setTimeout(onChange, SETTLE_MS);
+    timer = setTimeout(settle, SETTLE_MS);
   };
-  const watchedNames = new Set(wanted);
+  const watchedNames = new Map([...wanted].map((file) => [file, file]));
   const directories = new Set([...wanted].map((file) => path2.dirname(file)));
   for (const file of wanted) {
     try {
       const target = realpathSync(file);
-      watchedNames.add(target);
+      if (!watchedNames.has(target)) watchedNames.set(target, file);
       directories.add(path2.dirname(target));
     } catch {
     }
@@ -268,7 +342,11 @@ function watchFiles(files, onChange) {
     for (const directory of directories) {
       watchers.push(
         watch(directory, (_event, name) => {
-          if (name === null || watchedNames.has(path2.join(directory, name))) schedule();
+          const file = name === null ? void 0 : watchedNames.get(path2.join(directory, name));
+          if (name !== null && file === void 0) return;
+          const files2 = file === void 0 ? wanted : [file];
+          for (const each of files2) named.add(each);
+          schedule();
         })
       );
     }
@@ -276,8 +354,12 @@ function watchFiles(files, onChange) {
     for (const watcher of watchers) watcher.close();
     throw error;
   }
+  const poll = setInterval(() => {
+    if (seen.isStampChanged()) schedule();
+  }, POLL_MS);
   return () => {
     clearTimeout(timer);
+    clearInterval(poll);
     for (const watcher of watchers) watcher.close();
   };
 }
@@ -294,6 +376,7 @@ async function loadExtend(file, cache) {
 }
 function print(result) {
   for (const { source, out } of result.expanded) console.log(`Expanded ${source} to ${out}.`);
+  for (const warning of result.warnings) console.error(warning);
   for (const report of result.reports) console.error(report);
   for (const source of result.unreadable) {
     console.error(`Could not read ${source}, so no file was written.`);

package/dist/check.d.ts

@@ -28,4 +28,5 @@ interface CheckResult {
  */
 declare function check(options: CheckOptions): Promise<CheckResult>;
 
-export { type CheckOptions, type CheckResult, type Finding, check };
+export { check };
+export type { CheckOptions, CheckResult, Finding };

package/dist/check.js

@@ -1,6 +1,7 @@
-import { runCheck } from './chunk-XQQCDUV6.js';
-import './chunk-UANF3FGO.js';
-import './chunk-NFS2REPQ.js';
+import { runCheck } from './chunk-CTFEYJBE.js';
+import './chunk-ZNTNLGEC.js';
+import './chunk-UVHGEVMV.js';
+import './chunk-2K5EBBF2.js';
 
 // src/directive/check.ts
 async function check(options) {

package/dist/{chunk-NFS2REPQ.js → chunk-2K5EBBF2.js}

@@ -1,193 +1,3 @@
-// src/directive/expand-text-diagnostics.ts
-function lineStartOffsets(text) {
-  const starts = [0];
-  let i = 0;
-  while (i < text.length) {
-    const c = text[i];
-    if (c === "\r") {
-      i++;
-      if (text[i] === "\n") i++;
-      starts.push(i);
-      continue;
-    }
-    if (c === "\n" || c === "\f") {
-      i++;
-      starts.push(i);
-      continue;
-    }
-    i++;
-  }
-  return starts;
-}
-function lastAtOrBefore(starts, offset) {
-  let low = 0;
-  let high = starts.length - 1;
-  while (low < high) {
-    const mid = low + high + 1 >> 1;
-    if (starts[mid] <= offset) low = mid;
-    else high = mid - 1;
-  }
-  return low;
-}
-function createPositionFinder(text) {
-  const starts = lineStartOffsets(text);
-  return (offset) => {
-    const line = lastAtOrBefore(starts, offset);
-    return { line: line + 1, column: offset - starts[line] };
-  };
-}
-function reportDiagnostics(diagnostics, css, options) {
-  const onUnknown = options.onUnknown ?? "error";
-  if (onUnknown === "ignore") return [];
-  const severity = onUnknown === "warn" ? "warning" : "error";
-  const positionAt = createPositionFinder(css);
-  return diagnostics.map((diagnostic) => {
-    const position = positionAt(diagnostic.offset);
-    return {
-      ...diagnostic,
-      severity,
-      ...options.from !== void 0 && { file: options.from },
-      line: position.line,
-      column: position.column + 1
-    };
-  });
-}
-
-// src/directive/bracket-match.ts
-var OPENERS = /* @__PURE__ */ new Set(["(-token", "[-token", "function-token", "{-token"]);
-var CLOSERS = /* @__PURE__ */ new Set([")-token", "]-token", "}-token"]);
-function isMirrorCloser(openerType, closerType) {
-  if (closerType === ")-token") return openerType === "(-token" || openerType === "function-token";
-  if (closerType === "]-token") return openerType === "[-token";
-  return openerType === "{-token";
-}
-function matchBrackets(tokens) {
-  const closerFor = new Int32Array(tokens.length).fill(-1);
-  const opens = [];
-  for (const [i, token] of tokens.entries()) {
-    const { type } = token;
-    if (OPENERS.has(type)) {
-      opens.push(i);
-      continue;
-    }
-    if (!CLOSERS.has(type)) continue;
-    const openIndex = opens.at(-1);
-    if (openIndex === void 0 || !isMirrorCloser(tokens[openIndex].type, type)) continue;
-    opens.pop();
-    closerFor[openIndex] = i;
-  }
-  return closerFor;
-}
-function matchedCloseWithin(closerFor, openIndex, limit) {
-  const closeIndex = closerFor[openIndex];
-  return closeIndex !== -1 && closeIndex < limit ? closeIndex : void 0;
-}
-
-// src/directive/block-reader.ts
-function scanItem(tokens, start, limit, closerFor) {
-  let i = start;
-  while (i < limit) {
-    const type = tokens[i].type;
-    if (OPENERS.has(type)) {
-      const closeIndex = matchedCloseWithin(closerFor, i, limit);
-      if (type === "{-token") {
-        return {
-          end: closeIndex === void 0 ? limit : closeIndex + 1,
-          consumedSemicolon: false,
-          trailingBlock: { openIndex: i, closeIndex }
-        };
-      }
-      i = closeIndex === void 0 ? limit : closeIndex + 1;
-      continue;
-    }
-    if (CLOSERS.has(type)) {
-      if (i === start) return { end: i + 1, consumedSemicolon: false };
-      i++;
-      continue;
-    }
-    if (type === "semicolon-token") return { end: i + 1, consumedSemicolon: true };
-    i++;
-  }
-  return { end: i, consumedSemicolon: false };
-}
-function scanCustomPropertyValue(tokens, start, limit, closerFor) {
-  let i = start;
-  while (i < limit) {
-    const type = tokens[i].type;
-    if (OPENERS.has(type)) {
-      const closeIndex = matchedCloseWithin(closerFor, i, limit);
-      i = closeIndex === void 0 ? limit : closeIndex + 1;
-      continue;
-    }
-    if (type === "semicolon-token") return i + 1;
-    i++;
-  }
-  return i;
-}
-function isColonSoonAfter(tokens, i, limit) {
-  let j = i;
-  while (j < limit && (tokens[j].type === "whitespace-token" || tokens[j].type === "comment")) j++;
-  return tokens[j]?.type === "colon-token";
-}
-function isCustomPropertyName(token) {
-  return token.type === "ident-token" && (token.structured?.value).startsWith("--");
-}
-function atKeywordName(token) {
-  return (token.structured?.value).toLowerCase();
-}
-function toDeclarationItem(start, end) {
-  return { kind: "declaration", start, end };
-}
-function preludeEndOffset(tokens, start, scan, preludeStart) {
-  if (scan.trailingBlock) return tokens[scan.trailingBlock.openIndex].startIndex;
-  const lastContentIndex = scan.consumedSemicolon ? scan.end - 2 : scan.end - 1;
-  return lastContentIndex >= start ? tokens[lastContentIndex].endIndex : preludeStart;
-}
-function toAtRuleItem(tokens, start, scan) {
-  const nameToken = tokens[start];
-  const preludeStart = tokens[start + 1]?.startIndex ?? nameToken.endIndex;
-  return {
-    kind: "at-rule",
-    start,
-    end: scan.end,
-    atKeyword: atKeywordName(nameToken),
-    preludeOffset: preludeStart,
-    preludeEndOffset: preludeEndOffset(tokens, start + 1, scan, preludeStart),
-    ...scan.trailingBlock && {
-      blockStart: scan.trailingBlock.openIndex + 1,
-      blockEnd: scan.trailingBlock.closeIndex ?? scan.end
-    }
-  };
-}
-function toRuleOrInvalidItem(start, scan) {
-  if (!scan.trailingBlock) return { kind: "invalid", start, end: scan.end };
-  return {
-    kind: "rule",
-    start,
-    end: scan.end,
-    blockStart: scan.trailingBlock.openIndex + 1,
-    blockEnd: scan.trailingBlock.closeIndex ?? scan.end
-  };
-}
-function readItem(tokens, start, limit, closerFor) {
-  const first = tokens[start];
-  if (first.type === "at-keyword-token") {
-    return toAtRuleItem(tokens, start, scanItem(tokens, start + 1, limit, closerFor));
-  }
-  if (first.type === "ident-token" && isColonSoonAfter(tokens, start + 1, limit)) {
-    if (isCustomPropertyName(first)) {
-      return toDeclarationItem(start, scanCustomPropertyValue(tokens, start + 1, limit, closerFor));
-    }
-    const scan = scanItem(tokens, start + 1, limit, closerFor);
-    if (!scan.trailingBlock) return toDeclarationItem(start, scan.end);
-    return toRuleOrInvalidItem(start, scan);
-  }
-  return toRuleOrInvalidItem(start, scanItem(tokens, start, limit, closerFor));
-}
-function isNaveAtKeyword(token) {
-  return token.type === "at-keyword-token" && atKeywordName(token) === "nave";
-}
-
 // src/directive/tokenizer/comment.ts
 function tryConsumeComment(s, start) {
   if (s.peek() !== "/" || s.peek(1) !== "*") return void 0;
@@ -744,4 +554,4 @@ function tokenize(css) {
   return tokens;
 }
 
-export { OPENERS, atKeywordName, createPositionFinder, isNaveAtKeyword, matchBrackets, readItem, reportDiagnostics, tokenize };
+export { tokenize };

package/dist/chunk-2TNTYI4L.js

@@ -0,0 +1,7 @@
+// src/byte-order-mark.ts
+var BYTE_ORDER_MARK = "\uFEFF";
+function splitByteOrderMark(raw) {
+  return raw.startsWith(BYTE_ORDER_MARK) ? { bom: BYTE_ORDER_MARK, text: raw.slice(BYTE_ORDER_MARK.length) } : { bom: "", text: raw };
+}
+
+export { splitByteOrderMark };

package/dist/{chunk-LQSGQ2OA.js → chunk-B5CWZIBK.js}

@@ -1,5 +1,6 @@
-import { walkExtendAtoms, hasEscapedCommentOpener, isOnlyInert, hasTopLevelComment, hasUnstrippedTrailingSpace, hasUnstrippedLeadingSpace, lastNonWhitespace, isInert, hasPaddedComment, hasBrokenString, hasUrl, hasStrayCurlyCloser, anchorSelectorList, hasEscapedWhitespace, hasHtmlBreakout, hasTopLevelColon } from './chunk-LADFXRWQ.js';
-import { tokenize, matchBrackets, readItem } from './chunk-NFS2REPQ.js';
+import { walkExtendAtoms, hasEscapedCommentOpener, isOnlyInert, hasTopLevelComment, hasUnstrippedTrailingSpace, hasUnstrippedLeadingSpace, lastNonWhitespace, isInert, hasPaddedComment, hasBrokenString, hasUrl, hasStrayCurlyCloser, anchorSelectorList, hasEscapedWhitespace, hasHtmlBreakout, hasTopLevelColon } from './chunk-KDLLTOAM.js';
+import { matchBrackets, readItem } from './chunk-UVHGEVMV.js';
+import { tokenize } from './chunk-2K5EBBF2.js';
 
 // src/validate-extend-host-free.ts
 function readSoleBlockItem(text) {

package/dist/{chunk-XQQCDUV6.js → chunk-CTFEYJBE.js}

@@ -1,4 +1,4 @@
-import { findingsInText } from './chunk-UANF3FGO.js';
+import { findingsInText } from './chunk-ZNTNLGEC.js';
 import { readFile, stat, realpath, readdir } from 'fs/promises';
 import path from 'path';