@jesscss/plugin-scss 2.0.0-alpha.8 → 2.0.0-alpha.9

package/README.md

@@ -25,10 +25,9 @@ preview, not a promise.
 
 ## Status
 
-**Alpha / experimental.** Part of [Jess](https://github.com/jesscss/jess), the
-ground-up rewrite of Less.js (Jess *is* Less.js v5). The programmatic
-plugin/compiler API is **not yet stabilized** — the `jess` / `lessc` CLIs are the
-public surface for the alpha, and they target Less.
+**Alpha / experimental.** Part of [Jess](https://github.com/jesscss/jess). The
+programmatic plugin/compiler API is **not yet stabilized** — the `jess` CLI is
+the documented public surface for the alpha, and it targets Less today.
 
 - Project overview & positioning: <https://github.com/jesscss/jess#readme>
 - Docs: <https://jesscss.github.io/> (currently pre-alpha content)

package/lib/index.cjs

@@ -2,38 +2,13 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-//#region \0rolldown/runtime.js
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-//#endregion
 let _jesscss_core = require("@jesscss/core");
-let _jesscss_scss_parser_jess = require("@jesscss/scss-parser/jess");
-let node_path = require("node:path");
-node_path = __toESM(node_path);
+let _jesscss_scss_parser = require("@jesscss/scss-parser");
 let _jesscss_style_resolver = require("@jesscss/style-resolver");
 //#region src/index.ts
 var ScssPlugin = class extends _jesscss_core.AbstractPlugin {
 	name = "scss";
 	supportedExtensions = [".scss"];
-	parser;
 	unitMode;
 	equalityMode;
 	constructor(opts = {}) {
@@ -41,77 +16,28 @@ var ScssPlugin = class extends _jesscss_core.AbstractPlugin {
 		this.opts = opts;
 		this.unitMode = opts.unitMode ?? "preserve";
 		this.equalityMode = opts.equalityMode ?? "sass";
-		this.parser = new _jesscss_scss_parser_jess.Parser();
 	}
 	expandImport(importPath) {
 		return (0, _jesscss_style_resolver.expandScssImportCandidates)(importPath);
 	}
-	safeParse(filePath, source, parseOptions) {
-		const allowExtendSelectors = this.opts.allowExtendSelectors ?? parseOptions?.compilerOptions?.allowExtendSelectors ?? ["simple"];
-		const context = new _jesscss_core.TreeContext({
-			file: {
-				name: node_path.default.basename(filePath),
-				path: node_path.default.dirname(filePath),
-				fullPath: filePath,
-				source
-			},
-			plugin: this,
-			allowExtendSelectors,
-			unitMode: this.unitMode,
-			equalityMode: this.equalityMode,
-			collapseNesting: this.opts.collapseNesting ?? false
-		});
-		const errors = [];
-		const warnings = [];
-		let tree;
+	safeParse(filePath, source) {
 		try {
-			const parseResult = this.parser.parse(source, "Stylesheet", { context });
-			tree = parseResult.tree;
-			if (parseResult.errors.length) for (const error of parseResult.errors) {
-				const line = error.token?.startLine ?? 1;
-				const diagnostic = (0, _jesscss_core.toDiagnostic)((0, _jesscss_core.getErrorFromParser)([error], void 0, filePath, source, { file: context.file }));
-				if (!diagnostic.lines) diagnostic.lines = (0, _jesscss_core.extractRelevantLines)(source, line);
-				if ("errors" in diagnostic) errors.push(diagnostic);
-				else warnings.push(diagnostic);
-			}
-			const lexErrors = parseResult.lexerResult?.errors ?? [];
-			if (lexErrors.length) for (const lexError of lexErrors) {
-				const line = typeof lexError.line === "number" ? lexError.line : 1;
-				const diagnostic = (0, _jesscss_core.toDiagnostic)((0, _jesscss_core.getErrorFromParser)([], [lexError], filePath, source, { file: context.file }));
-				if (!diagnostic.lines) diagnostic.lines = (0, _jesscss_core.extractRelevantLines)(source, line);
-				if ("errors" in diagnostic) errors.push(diagnostic);
-				else warnings.push(diagnostic);
-			}
+			return {
+				document: (0, _jesscss_scss_parser.parse)(source),
+				errors: [],
+				warnings: []
+			};
 		} catch (error) {
-			if (error instanceof _jesscss_core.JessError) {
-				const diagnostic = (0, _jesscss_core.toDiagnostic)(error);
-				if ("errors" in diagnostic) errors.push(diagnostic);
-				else warnings.push(diagnostic);
-			} else {
-				const message = error instanceof Error ? error.message : "Unknown parsing error";
-				errors.push({
-					code: "internal/unknown",
-					phase: "parse",
-					message,
-					reason: message,
-					fix: "Check the file syntax and ensure it is valid.",
-					file: context.file,
-					filePath,
-					line: 1,
-					column: 1,
-					lines: (0, _jesscss_core.extractRelevantLines)(source, 1)
-				});
-			}
 			return {
-				errors,
-				warnings
+				errors: [(0, _jesscss_core.parserDiagnostic)({
+					dialect: "SCSS",
+					error,
+					filePath,
+					source
+				})],
+				warnings: []
 			};
 		}
-		return {
-			tree,
-			errors,
-			warnings
-		};
 	}
 };
 const scssPlugin = ((opts) => new ScssPlugin(opts));

package/lib/index.d.ts

@@ -0,0 +1,34 @@
+import { AbstractPlugin, type ISafeParseResult, type EqualityMode, type UnitMode } from '@jesscss/core';
+export type ScssPluginOptions = {
+    allowExtendSelectors?: ExtendSelectorKind[];
+    /**
+     * Compatibility input retained on this frontend's option object. The shared
+     * evaluator reads the resolved Context compile/input option; configuring a
+     * Compiler should use `compile.unitMode` or matched input options.
+     */
+    unitMode?: UnitMode;
+    /**
+     * Compatibility input retained on this frontend's option object. It does not
+     * select a separate SCSS evaluator; configure the shared evaluator through
+     * Context compile/input options.
+     */
+    equalityMode?: EqualityMode;
+    /**
+     * Whether to collapse nested selectors (flatten nesting during print).
+     * This is a Jess output option, not a Sass option.
+     */
+    collapseNesting?: boolean;
+};
+type ExtendSelectorKind = 'simple' | 'basic' | 'pseudo' | 'complex' | 'compound';
+export declare class ScssPlugin extends AbstractPlugin {
+    opts: ScssPluginOptions;
+    name: string;
+    supportedExtensions: string[];
+    unitMode: UnitMode;
+    equalityMode: EqualityMode;
+    constructor(opts?: ScssPluginOptions);
+    expandImport(importPath: string): string[];
+    safeParse(filePath: string, source: string): ISafeParseResult;
+}
+declare const scssPlugin: (opts?: ScssPluginOptions) => ScssPlugin;
+export default scssPlugin;

package/lib/index.js

@@ -1,12 +1,10 @@
-import { AbstractPlugin, JessError, TreeContext, extractRelevantLines, getErrorFromParser, toDiagnostic } from "@jesscss/core";
-import { Parser } from "@jesscss/scss-parser/jess";
-import path from "node:path";
+import { AbstractPlugin, parserDiagnostic } from "@jesscss/core";
+import { parse } from "@jesscss/scss-parser";
 import { expandScssImportCandidates } from "@jesscss/style-resolver";
 //#region src/index.ts
 var ScssPlugin = class extends AbstractPlugin {
 	name = "scss";
 	supportedExtensions = [".scss"];
-	parser;
 	unitMode;
 	equalityMode;
 	constructor(opts = {}) {
@@ -14,77 +12,28 @@ var ScssPlugin = class extends AbstractPlugin {
 		this.opts = opts;
 		this.unitMode = opts.unitMode ?? "preserve";
 		this.equalityMode = opts.equalityMode ?? "sass";
-		this.parser = new Parser();
 	}
 	expandImport(importPath) {
 		return expandScssImportCandidates(importPath);
 	}
-	safeParse(filePath, source, parseOptions) {
-		const allowExtendSelectors = this.opts.allowExtendSelectors ?? parseOptions?.compilerOptions?.allowExtendSelectors ?? ["simple"];
-		const context = new TreeContext({
-			file: {
-				name: path.basename(filePath),
-				path: path.dirname(filePath),
-				fullPath: filePath,
-				source
-			},
-			plugin: this,
-			allowExtendSelectors,
-			unitMode: this.unitMode,
-			equalityMode: this.equalityMode,
-			collapseNesting: this.opts.collapseNesting ?? false
-		});
-		const errors = [];
-		const warnings = [];
-		let tree;
+	safeParse(filePath, source) {
 		try {
-			const parseResult = this.parser.parse(source, "Stylesheet", { context });
-			tree = parseResult.tree;
-			if (parseResult.errors.length) for (const error of parseResult.errors) {
-				const line = error.token?.startLine ?? 1;
-				const diagnostic = toDiagnostic(getErrorFromParser([error], void 0, filePath, source, { file: context.file }));
-				if (!diagnostic.lines) diagnostic.lines = extractRelevantLines(source, line);
-				if ("errors" in diagnostic) errors.push(diagnostic);
-				else warnings.push(diagnostic);
-			}
-			const lexErrors = parseResult.lexerResult?.errors ?? [];
-			if (lexErrors.length) for (const lexError of lexErrors) {
-				const line = typeof lexError.line === "number" ? lexError.line : 1;
-				const diagnostic = toDiagnostic(getErrorFromParser([], [lexError], filePath, source, { file: context.file }));
-				if (!diagnostic.lines) diagnostic.lines = extractRelevantLines(source, line);
-				if ("errors" in diagnostic) errors.push(diagnostic);
-				else warnings.push(diagnostic);
-			}
+			return {
+				document: parse(source),
+				errors: [],
+				warnings: []
+			};
 		} catch (error) {
-			if (error instanceof JessError) {
-				const diagnostic = toDiagnostic(error);
-				if ("errors" in diagnostic) errors.push(diagnostic);
-				else warnings.push(diagnostic);
-			} else {
-				const message = error instanceof Error ? error.message : "Unknown parsing error";
-				errors.push({
-					code: "internal/unknown",
-					phase: "parse",
-					message,
-					reason: message,
-					fix: "Check the file syntax and ensure it is valid.",
-					file: context.file,
-					filePath,
-					line: 1,
-					column: 1,
-					lines: extractRelevantLines(source, 1)
-				});
-			}
 			return {
-				errors,
-				warnings
+				errors: [parserDiagnostic({
+					dialect: "SCSS",
+					error,
+					filePath,
+					source
+				})],
+				warnings: []
 			};
 		}
-		return {
-			tree,
-			errors,
-			warnings
-		};
 	}
 };
 const scssPlugin = ((opts) => new ScssPlugin(opts));

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "description": "An SCSS stylesheet engine for Jess",
-  "version": "2.0.0-alpha.8",
+  "version": "2.0.0-alpha.9",
   "main": "lib/index.cjs",
   "types": "lib/index.d.ts",
   "exports": {
@@ -19,9 +19,9 @@
     "lib"
   ],
   "dependencies": {
-    "@jesscss/core": "2.0.0-alpha.8",
-    "@jesscss/scss-parser": "2.0.0-alpha.8",
-    "@jesscss/style-resolver": "2.0.0-alpha.8"
+    "@jesscss/core": "2.0.0-alpha.9",
+    "@jesscss/scss-parser": "2.0.0-alpha.9",
+    "@jesscss/style-resolver": "2.0.0-alpha.9"
   },
   "devDependencies": {},
   "author": "Matthew Dean <matthew-dean@users.noreply.github.com>",
@@ -35,7 +35,7 @@
   "scripts": {
     "ci": "pnpm build && pnpm test",
     "build": "pnpm compile",
-    "compile": "tsdown --tsconfig tsconfig.build.json --no-dts && tsc -p tsconfig.build.json --emitDeclarationOnly --noCheck",
+    "compile": "tsdown --tsconfig tsconfig.build.json --no-dts && tsc -p tsconfig.build.json --emitDeclarationOnly",
     "test": "vitest --run --passWithNoTests",
     "lint:fix": "eslint --fix '**/*.{js,ts}'",
     "lint": "eslint '**/*.{js,ts}'"