@jesscss/scss-parser 2.0.0-alpha.11 → 2.0.0-alpha.13

package/lib/index.cjs

@@ -1,111 +1,18 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_grammar = require("./grammar.cjs");
-let parseman = require("parseman");
-let _jesscss_core_ast = require("@jesscss/core/ast");
-//#region src/ast/lower-user-function-calls.ts
+const require_parse_with = require("./chunks/parse-with.cjs");
+let src_grammar_ast_js = require("./grammar/ast.cjs");
+//#region src/index.ts
 /**
-* SCSS call-site lowering: a user `@function f(...)` was lowered (in the grammar)
-* to a `$var`-bound value lambda (`AnonymousMixin` with `params`). A CALL to that
-* function — `f(2)` — parses as an ordinary `FunctionCall`, indistinguishable at
-* the leaf from a builtin Sass call (`darken(...)`). This post-parse pass rewrites
-* every `FunctionCall` whose name is a USER-defined `@function` into the shared
-* `$f(args)` invoke form (a `Reference` with a `Call` step on the bound variable),
-* so it reaches the general "call a value-lambda" evaluator path. Builtin Sass
-* functions are left as `FunctionCall`s and continue to route to `fns`.
+* Parse SCSS directly into the canonical AST v2 document.
 *
-* User-function names are collected from the WHOLE document first (Sass hoists and
-* effectively globalises function definitions), so a call may precede its `@function`.
-* The only SCSS construct that binds an `AnonymousMixin` to a `$var` is `@function`,
-* so "a VariableDeclaration whose value is an AnonymousMixin" is an exact marker.
-*/
-function isRecord(value) {
-	return typeof value === "object" && value !== null;
-}
-function isFunctionCall(value) {
-	return isRecord(value) && value.type === "FunctionCall" && typeof value.name === "string" && Array.isArray(value.args);
-}
-/** A non-array value slot is a single value node. */
-function isValueNode(slot) {
-	return !Array.isArray(slot);
-}
-function isStylesheet$1(value) {
-	return isRecord(value) && value.type === "Stylesheet" && Array.isArray(value.children);
-}
-/** Collect every user `@function` name: a VariableDeclaration bound to an
-*  AnonymousMixin (the only SCSS shape that produces one). */
-function collectUserFunctionNames(node, into) {
-	if (Array.isArray(node)) {
-		for (const child of node) collectUserFunctionNames(child, into);
-		return;
-	}
-	if (!isRecord(node)) return;
-	if (node.type === "VariableDeclaration" && typeof node.name === "string" && isRecord(node.value) && node.value.type === "AnonymousMixin") into.add(node.name);
-	for (const key of Object.keys(node)) collectUserFunctionNames(node[key], into);
-}
-/** Best-effort authored spelling of a call argument, for a Reference `raw`
-*  fallback (only ever emitted if the invoke fails to resolve). */
-function argRaw(slot) {
-	if (!isValueNode(slot)) return slot.map(argRaw).join(" ");
-	if (slot.type === "VariableReference") return `$${slot.name}`;
-	if ("src" in slot && typeof slot.src === "string") return slot.src;
-	return "";
-}
-/** Deep-transform the tree, rewriting user-function `FunctionCall`s (post-order,
-*  so nested user calls inside the args lower first). Non-AST scalars pass through. */
-function rewrite(node, userFns) {
-	if (Array.isArray(node)) return node.map((child) => rewrite(child, userFns));
-	if (!isRecord(node)) return node;
-	const out = {};
-	for (const key of Object.keys(node)) out[key] = rewrite(node[key], userFns);
-	if (isFunctionCall(out) && userFns.has(out.name)) {
-		const args = out.args.map((value) => ({ value }));
-		const raw = `${out.name}(${out.args.map(argRaw).join(", ")})`;
-		return (0, _jesscss_core_ast.reference)((0, _jesscss_core_ast.variableReference)(out.name, "live"), [{
-			type: "Call",
-			args
-		}], raw);
-	}
-	return out;
-}
-/**
-* Rewrite user-`@function` call sites in a parsed SCSS document to `$f(args)`
-* lambda invokes. Returns the document unchanged when it defines no user function.
+* Spans carry offsets only. For `startLine`/`startColumn` facts import `parse`
+* from `@jesscss/scss-parser/positions` — the same function bound to the
+* line-aware compiled table. This entry never loads that table.
 */
-function lowerUserFunctionCalls(sheet) {
-	const userFns = /* @__PURE__ */ new Set();
-	collectUserFunctionNames(sheet.children, userFns);
-	if (userFns.size === 0) return sheet;
-	const lowered = rewrite(sheet, userFns);
-	if (!isStylesheet$1(lowered)) throw new TypeError("SCSS user-function lowering did not preserve the Stylesheet root.");
-	return lowered;
-}
-//#endregion
-//#region src/index.ts
-/** Structured failure from the public direct SCSS parser. */
-var ScssParseError = class extends SyntaxError {
-	code = "parse/syntax-error";
-	offset;
-	expected;
-	constructor(offset, expected) {
-		const detail = expected.length > 0 ? ` Expected: ${expected.join(", ")}.` : "";
-		super(`SCSS parser error.${detail}`);
-		this.name = "ScssParseError";
-		this.offset = offset;
-		this.expected = expected;
-	}
-};
-function isStylesheet(value) {
-	return typeof value === "object" && value !== null && "type" in value && value.type === "Stylesheet" && "children" in value && Array.isArray(value.children);
-}
-/** Parse SCSS directly into the canonical AST v2 document. */
 function parse(input) {
-	const entry = require_grammar.scssAstGrammar.Stylesheet;
-	const trivia = require_grammar.scssAstGrammar.whitespace;
-	if (entry === void 0 || trivia === void 0) throw new TypeError("SCSS AST grammar is missing its public document entry.");
-	const result = (0, parseman.run)(entry, input, { trivia });
-	if (!result.ok || result.unconsumedFrom !== null || !isStylesheet(result.value)) throw new ScssParseError(result.ok ? result.unconsumedFrom ?? result.span.end : result.span.start, result.expected);
-	return (0, _jesscss_core_ast.withTriviaMap)((0, _jesscss_core_ast.withSourceSpan)(lowerUserFunctionCalls(result.value), result.span), (0, _jesscss_core_ast.createTriviaMapFromParseman)(input, result.triviaMap));
+	return require_parse_with.parseWith(src_grammar_ast_js.scssGrammar, input);
 }
 //#endregion
-exports.ScssParseError = ScssParseError;
+exports.ScssImportPostludeError = require_parse_with.ScssImportPostludeError;
+exports.ScssParseError = require_parse_with.ScssParseError;
 exports.parse = parse;

package/lib/index.d.ts

@@ -1,10 +1,10 @@
-import { type Stylesheet } from '@jesscss/core/ast';
-/** Structured failure from the public direct SCSS parser. */
-export declare class ScssParseError extends SyntaxError {
-    readonly code: 'parse/syntax-error';
-    readonly offset: number;
-    readonly expected: readonly string[];
-    constructor(offset: number, expected: readonly string[]);
-}
-/** Parse SCSS directly into the canonical AST v2 document. */
+import type { Stylesheet } from '@jesscss/core/ast';
+export { ScssImportPostludeError, ScssParseError } from './parse-error.js';
+/**
+ * Parse SCSS directly into the canonical AST v2 document.
+ *
+ * Spans carry offsets only. For `startLine`/`startColumn` facts import `parse`
+ * from `@jesscss/scss-parser/positions` — the same function bound to the
+ * line-aware compiled table. This entry never loads that table.
+ */
 export declare function parse(input: string): Stylesheet;

package/lib/index.js

@@ -1,109 +1,15 @@
-import { scssAstGrammar } from "./grammar.js";
-import { run } from "parseman";
-import { createTriviaMapFromParseman, reference, variableReference, withSourceSpan, withTriviaMap } from "@jesscss/core/ast";
-//#region src/ast/lower-user-function-calls.ts
+import { n as ScssImportPostludeError, r as ScssParseError, t as parseWith } from "./chunks/parse-with.js";
+import { scssGrammar } from "./grammar/ast.js";
+//#region src/index.ts
 /**
-* SCSS call-site lowering: a user `@function f(...)` was lowered (in the grammar)
-* to a `$var`-bound value lambda (`AnonymousMixin` with `params`). A CALL to that
-* function — `f(2)` — parses as an ordinary `FunctionCall`, indistinguishable at
-* the leaf from a builtin Sass call (`darken(...)`). This post-parse pass rewrites
-* every `FunctionCall` whose name is a USER-defined `@function` into the shared
-* `$f(args)` invoke form (a `Reference` with a `Call` step on the bound variable),
-* so it reaches the general "call a value-lambda" evaluator path. Builtin Sass
-* functions are left as `FunctionCall`s and continue to route to `fns`.
+* Parse SCSS directly into the canonical AST v2 document.
 *
-* User-function names are collected from the WHOLE document first (Sass hoists and
-* effectively globalises function definitions), so a call may precede its `@function`.
-* The only SCSS construct that binds an `AnonymousMixin` to a `$var` is `@function`,
-* so "a VariableDeclaration whose value is an AnonymousMixin" is an exact marker.
-*/
-function isRecord(value) {
-	return typeof value === "object" && value !== null;
-}
-function isFunctionCall(value) {
-	return isRecord(value) && value.type === "FunctionCall" && typeof value.name === "string" && Array.isArray(value.args);
-}
-/** A non-array value slot is a single value node. */
-function isValueNode(slot) {
-	return !Array.isArray(slot);
-}
-function isStylesheet$1(value) {
-	return isRecord(value) && value.type === "Stylesheet" && Array.isArray(value.children);
-}
-/** Collect every user `@function` name: a VariableDeclaration bound to an
-*  AnonymousMixin (the only SCSS shape that produces one). */
-function collectUserFunctionNames(node, into) {
-	if (Array.isArray(node)) {
-		for (const child of node) collectUserFunctionNames(child, into);
-		return;
-	}
-	if (!isRecord(node)) return;
-	if (node.type === "VariableDeclaration" && typeof node.name === "string" && isRecord(node.value) && node.value.type === "AnonymousMixin") into.add(node.name);
-	for (const key of Object.keys(node)) collectUserFunctionNames(node[key], into);
-}
-/** Best-effort authored spelling of a call argument, for a Reference `raw`
-*  fallback (only ever emitted if the invoke fails to resolve). */
-function argRaw(slot) {
-	if (!isValueNode(slot)) return slot.map(argRaw).join(" ");
-	if (slot.type === "VariableReference") return `$${slot.name}`;
-	if ("src" in slot && typeof slot.src === "string") return slot.src;
-	return "";
-}
-/** Deep-transform the tree, rewriting user-function `FunctionCall`s (post-order,
-*  so nested user calls inside the args lower first). Non-AST scalars pass through. */
-function rewrite(node, userFns) {
-	if (Array.isArray(node)) return node.map((child) => rewrite(child, userFns));
-	if (!isRecord(node)) return node;
-	const out = {};
-	for (const key of Object.keys(node)) out[key] = rewrite(node[key], userFns);
-	if (isFunctionCall(out) && userFns.has(out.name)) {
-		const args = out.args.map((value) => ({ value }));
-		const raw = `${out.name}(${out.args.map(argRaw).join(", ")})`;
-		return reference(variableReference(out.name, "live"), [{
-			type: "Call",
-			args
-		}], raw);
-	}
-	return out;
-}
-/**
-* Rewrite user-`@function` call sites in a parsed SCSS document to `$f(args)`
-* lambda invokes. Returns the document unchanged when it defines no user function.
+* Spans carry offsets only. For `startLine`/`startColumn` facts import `parse`
+* from `@jesscss/scss-parser/positions` — the same function bound to the
+* line-aware compiled table. This entry never loads that table.
 */
-function lowerUserFunctionCalls(sheet) {
-	const userFns = /* @__PURE__ */ new Set();
-	collectUserFunctionNames(sheet.children, userFns);
-	if (userFns.size === 0) return sheet;
-	const lowered = rewrite(sheet, userFns);
-	if (!isStylesheet$1(lowered)) throw new TypeError("SCSS user-function lowering did not preserve the Stylesheet root.");
-	return lowered;
-}
-//#endregion
-//#region src/index.ts
-/** Structured failure from the public direct SCSS parser. */
-var ScssParseError = class extends SyntaxError {
-	code = "parse/syntax-error";
-	offset;
-	expected;
-	constructor(offset, expected) {
-		const detail = expected.length > 0 ? ` Expected: ${expected.join(", ")}.` : "";
-		super(`SCSS parser error.${detail}`);
-		this.name = "ScssParseError";
-		this.offset = offset;
-		this.expected = expected;
-	}
-};
-function isStylesheet(value) {
-	return typeof value === "object" && value !== null && "type" in value && value.type === "Stylesheet" && "children" in value && Array.isArray(value.children);
-}
-/** Parse SCSS directly into the canonical AST v2 document. */
 function parse(input) {
-	const entry = scssAstGrammar.Stylesheet;
-	const trivia = scssAstGrammar.whitespace;
-	if (entry === void 0 || trivia === void 0) throw new TypeError("SCSS AST grammar is missing its public document entry.");
-	const result = run(entry, input, { trivia });
-	if (!result.ok || result.unconsumedFrom !== null || !isStylesheet(result.value)) throw new ScssParseError(result.ok ? result.unconsumedFrom ?? result.span.end : result.span.start, result.expected);
-	return withTriviaMap(withSourceSpan(lowerUserFunctionCalls(result.value), result.span), createTriviaMapFromParseman(input, result.triviaMap));
+	return parseWith(scssGrammar, input);
 }
 //#endregion
-export { ScssParseError, parse };
+export { ScssImportPostludeError, ScssParseError, parse };

package/lib/parse-error.d.ts

@@ -0,0 +1,43 @@
+/**
+ * The public SCSS parse failure lives in its own module so that both AST
+ * entries — `.` and `./positions` — can export it without either one reaching
+ * the other's compiled grammar table. A class declared in an entry cannot be
+ * re-exported by a sibling entry without dragging that entry's imports along.
+ */
+/** Structured failure from the public direct SCSS parser. */
+export declare class ScssParseError extends SyntaxError {
+    readonly code: "parse/syntax-error";
+    readonly offset: number;
+    readonly expected: readonly string[];
+    readonly line?: number;
+    readonly column?: number;
+    readonly endLine?: number;
+    readonly endColumn?: number;
+    readonly reason?: string;
+    readonly fix?: string;
+    constructor(offset: number, expected: readonly string[], options?: {
+        message?: string;
+        reason?: string;
+        fix?: string;
+        line?: number;
+        column?: number;
+        endLine?: number;
+        endColumn?: number;
+    });
+}
+/**
+ * A media/layer/supports postlude belongs to the plain CSS `@import` form only.
+ *
+ * Once the parser has decided an `@import` is compile-time — a Sass partial
+ * rather than a `.css` file or a URL — a trailing query has nothing left to
+ * describe: the partial's rules are spliced into this document, not linked as a
+ * separate CSS resource.
+ */
+export declare class ScssImportPostludeError extends SyntaxError {
+    readonly code: "parse/import-postlude-on-compile-time-import";
+    readonly offset: number;
+    readonly endOffset: number;
+    readonly reason = "A media, layer, or supports query is only valid on a plain CSS @import.";
+    readonly fix = "Drop the query, or wrap the import in an explicit @media/@supports/@layer block.";
+    constructor(offset: number, endOffset: number);
+}

package/lib/parse-with.d.ts

@@ -0,0 +1,5 @@
+import { type Stylesheet } from '@jesscss/core/ast';
+import type { scssGrammar } from './grammar/ast.js';
+/** The rule map both compiled SCSS AST variants expose. */
+export type ScssAstGrammar = typeof scssGrammar;
+export declare function parseWith(grammar: ScssAstGrammar, input: string): Stylesheet;

package/lib/positions.cjs

@@ -0,0 +1,12 @@
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_parse_with = require("./chunks/parse-with.cjs");
+let src_grammar_ast_positions_js = require("./grammar/ast/positions.cjs");
+//#region src/positions.ts
+/** Parse SCSS into the canonical AST v2 document with line/column facts. */
+function parse(input) {
+	return require_parse_with.parseWith(src_grammar_ast_positions_js.scssPositionsGrammar, input);
+}
+//#endregion
+exports.ScssImportPostludeError = require_parse_with.ScssImportPostludeError;
+exports.ScssParseError = require_parse_with.ScssParseError;
+exports.parse = parse;

package/lib/positions.js

@@ -0,0 +1,9 @@
+import { n as ScssImportPostludeError, r as ScssParseError, t as parseWith } from "./chunks/parse-with.js";
+import { scssPositionsGrammar } from "./grammar/ast/positions.js";
+//#region src/positions.ts
+/** Parse SCSS into the canonical AST v2 document with line/column facts. */
+function parse(input) {
+	return parseWith(scssPositionsGrammar, input);
+}
+//#endregion
+export { ScssImportPostludeError, ScssParseError, parse };

package/lib/trivia-labels.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Root-trivia label selection for the SCSS grammar.
+ *
+ * This is a plain fact about the grammar's trivia arm labels, so it lives in a
+ * leaf module with no imports. Reading it from the CST entry instead would make
+ * every consumer of the package entry load the compiled CST grammar tables:
+ * Node's ESM loader does not tree-shake, so an unused named import still
+ * executes the module it is taken from, and each table is multiple megabytes.
+ */
+export declare const commentTriviaLabels: readonly ["comment"];

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "description": "",
-  "version": "2.0.0-alpha.11",
+  "version": "2.0.0-alpha.13",
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },
@@ -16,15 +16,45 @@
       "import": "./lib/index.js",
       "require": "./lib/index.cjs"
     },
+    "./positions": {
+      "types": "./lib/positions.d.ts",
+      "import": "./lib/positions.js",
+      "require": "./lib/positions.cjs"
+    },
     "./cst": {
       "types": "./lib/cst.d.ts",
       "import": "./lib/cst.js",
       "require": "./lib/cst.cjs"
     },
+    "./cst/positions": {
+      "types": "./lib/cst/positions.d.ts",
+      "import": "./lib/cst/positions.js",
+      "require": "./lib/cst/positions.cjs"
+    },
     "./grammar": {
-      "types": "./lib/grammar.d.ts",
-      "import": "./lib/grammar.js",
-      "require": "./lib/grammar.cjs"
+      "types": "./lib/grammar/ast.d.ts",
+      "import": "./lib/grammar/ast.js",
+      "require": "./lib/grammar/ast.cjs"
+    },
+    "./grammar/ast": {
+      "types": "./lib/grammar/ast.d.ts",
+      "import": "./lib/grammar/ast.js",
+      "require": "./lib/grammar/ast.cjs"
+    },
+    "./grammar/ast/positions": {
+      "types": "./lib/grammar/ast/positions.d.ts",
+      "import": "./lib/grammar/ast/positions.js",
+      "require": "./lib/grammar/ast/positions.cjs"
+    },
+    "./grammar/cst": {
+      "types": "./lib/grammar/cst.d.ts",
+      "import": "./lib/grammar/cst.js",
+      "require": "./lib/grammar/cst.cjs"
+    },
+    "./grammar/cst/positions": {
+      "types": "./lib/grammar/cst/positions.d.ts",
+      "import": "./lib/grammar/cst/positions.js",
+      "require": "./lib/grammar/cst/positions.cjs"
     },
     "./package.json": "./package.json"
   },
@@ -32,11 +62,11 @@
     "lib"
   ],
   "dependencies": {
-    "@jesscss/css-parser": "2.0.0-alpha.11"
+    "@jesscss/css-parser": "2.0.0-alpha.13"
   },
   "peerDependencies": {
-    "parseman": "^0.41.0",
-    "@jesscss/core": "2.0.0-alpha.11"
+    "parseman": "^0.50.5",
+    "@jesscss/core": "2.0.0-alpha.13"
   },
   "peerDependenciesMeta": {
     "@jesscss/core": {
@@ -44,10 +74,10 @@
     }
   },
   "devDependencies": {
-    "parseman": "^0.41.0",
+    "parseman": "^0.50.5",
     "sass-spec": "github:sass/sass-spec",
-    "@jesscss/parser-shared": "0.0.0",
-    "@jesscss/core": "2.0.0-alpha.11"
+    "@jesscss/core": "2.0.0-alpha.13",
+    "@jesscss/parser-shared": "2.0.0-alpha.13"
   },
   "author": "Matthew Dean <matthew-dean@users.noreply.github.com>",
   "license": "MIT",
@@ -61,7 +91,7 @@
     "postinstall": "node ./scripts/materialize-sass-spec-cache.cjs",
     "ci": "pnpm build && pnpm test",
     "build": "pnpm --filter @jesscss/parser-shared build && pnpm compile",
-    "compile": "tsdown --tsconfig tsconfig.build.json --no-dts && tsc -p tsconfig.build.json --emitDeclarationOnly --noCheck",
+    "compile": "node -e \"require('node:fs').rmSync('lib',{recursive:true,force:true})\" && tsdown --tsconfig tsconfig.build.json --no-dts && tsc -p tsconfig.build.json --emitDeclarationOnly --noCheck",
     "dev": "tsdown --tsconfig tsconfig.build.json --no-dts --watch",
     "sass-spec:cache": "node ./scripts/materialize-sass-spec-cache.cjs",
     "test": "vitest --run --passWithNoTests",

package/lib/ast/lower-user-function-calls.d.ts

@@ -1,6 +0,0 @@
-import type { Stylesheet } from '@jesscss/core/ast';
-/**
- * Rewrite user-`@function` call sites in a parsed SCSS document to `$f(args)`
- * lambda invokes. Returns the document unchanged when it defines no user function.
- */
-export declare function lowerUserFunctionCalls(sheet: Stylesheet): Stylesheet;