@jesscss/plugin-less 2.0.0-alpha.6 → 2.0.0-alpha.7

package/lib/index.cjs

@@ -27,12 +27,27 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 let _jesscss_core = require("@jesscss/core");
 let _jesscss_fns = require("@jesscss/fns");
 _jesscss_fns = __toESM(_jesscss_fns);
-let _jesscss_less_parser = require("@jesscss/less-parser");
+let _jesscss_less_parser_jess = require("@jesscss/less-parser/jess");
 let node_path = require("node:path");
 node_path = __toESM(node_path);
 let node_module = require("node:module");
 let _jesscss_style_resolver = require("@jesscss/style-resolver");
 //#region src/index.ts
+/**
+* The Less plugin's default option values — the single source of truth for the
+* v5 defaults. The `LessPlugin` constructor fills any unset option from here,
+* and the `lessc` CLI imports the same object so its defaults can never drift
+* from the engine's. Note `collapseNesting: false` — v5 preserves nesting by
+* default (Less 4.x flattened; that is now an explicit opt-in).
+*/
+const lessPluginDefaults = {
+	mathMode: "parens-division",
+	unitMode: "preserve",
+	equalityMode: "less",
+	leakyScope: true,
+	bubbleRootAtRules: true,
+	collapseNesting: false
+};
 var LessPlugin = class extends _jesscss_core.AbstractPlugin {
 	name = "less";
 	supportedExtensions = [".less"];
@@ -40,7 +55,7 @@ var LessPlugin = class extends _jesscss_core.AbstractPlugin {
 	mathMode;
 	unitMode;
 	equalityMode;
-	leakyRules;
+	leakyScope;
 	bubbleRootAtRules;
 	collapseNesting;
 	constructor(opts = {}) {
@@ -52,25 +67,43 @@ var LessPlugin = class extends _jesscss_core.AbstractPlugin {
 		else if (opts.math === 1 || opts.math === "parens-division") mathMode = "parens-division";
 		else if (opts.math === 2 || opts.math === "parens" || opts.math === "strict") mathMode = "parens";
 		else mathMode = "parens";
-		else mathMode = "parens-division";
+		else mathMode = lessPluginDefaults.mathMode;
 		this.mathMode = mathMode;
 		let unitMode;
 		if (opts.unitMode !== void 0) unitMode = opts.unitMode;
 		else if (opts.strictUnits === true) unitMode = "strict";
-		else unitMode = "preserve";
+		else unitMode = lessPluginDefaults.unitMode;
 		this.unitMode = unitMode;
-		this.equalityMode = opts.equalityMode ?? "coerce";
-		this.leakyRules = opts.leakyRules ?? true;
-		this.bubbleRootAtRules = opts.bubbleRootAtRules ?? true;
-		this.collapseNesting = opts.collapseNesting ?? false;
-		this.parser = new _jesscss_less_parser.Parser();
+		this.equalityMode = opts.equalityMode ?? lessPluginDefaults.equalityMode;
+		this.leakyScope = opts.leakyScope ?? lessPluginDefaults.leakyScope;
+		this.bubbleRootAtRules = opts.bubbleRootAtRules ?? lessPluginDefaults.bubbleRootAtRules;
+		this.collapseNesting = opts.collapseNesting ?? lessPluginDefaults.collapseNesting;
+		this.parser = new _jesscss_less_parser_jess.Parser();
+	}
+	createTreeContext(filePath, source) {
+		return new _jesscss_core.TreeContext({
+			file: {
+				name: node_path.default.basename(filePath),
+				path: node_path.default.dirname(filePath),
+				fullPath: filePath,
+				source
+			},
+			mathMode: this.mathMode,
+			unitMode: this.unitMode,
+			equalityMode: this.equalityMode,
+			plugin: this,
+			allowExtendSelectors: this.opts.allowExtendSelectors,
+			collapseNesting: this.collapseNesting,
+			leakyScope: this.leakyScope,
+			bubbleRootAtRules: this.bubbleRootAtRules
+		});
 	}
 	_registerFunctions(tree) {
 		const registeredNames = [];
 		for (const [key, value] of Object.entries(_jesscss_fns)) {
 			if (typeof value !== "function") continue;
 			const runtimeName = value.name || key;
-			tree.register("function", new _jesscss_core.JsFunction({
+			tree.setFunctionBinding(runtimeName, new _jesscss_core.JsFunction({
 				name: runtimeName,
 				fn: value
 			}));
@@ -123,29 +156,18 @@ var LessPlugin = class extends _jesscss_core.AbstractPlugin {
 		}
 		return out;
 	}
-	safeParse(filePath, source, parseOptions) {
-		const context = new _jesscss_core.TreeContext({
-			file: {
-				name: node_path.default.basename(filePath),
-				path: node_path.default.dirname(filePath),
-				fullPath: filePath,
-				source
-			},
-			mathMode: this.mathMode,
-			unitMode: this.unitMode,
-			equalityMode: this.equalityMode,
-			plugin: this,
-			allowExtendSelectors: this.opts.allowExtendSelectors,
-			collapseNesting: this.collapseNesting,
-			leakyRules: this.leakyRules,
-			bubbleRootAtRules: this.bubbleRootAtRules
-		});
+	safeParse(filePath, source, _parseOptions) {
+		const context = this.createTreeContext(filePath, source);
 		const errors = [];
 		const warnings = [];
 		let tree;
 		try {
-			const parseResult = this.parser.parse(source, "stylesheet", { context });
+			const parseResult = this.parser.parse(source, "Stylesheet", { context });
 			tree = parseResult.tree;
+			const parsedContext = parseResult.context ?? context;
+			if (tree) tree._treeContext = parsedContext;
+			context.opts.trivia = parseResult.trivia;
+			context.opts.liftedCommentRanges = parseResult.liftedCommentRanges;
 			if ("warnings" in parseResult && parseResult.warnings) for (const warning of parseResult.warnings) {
 				const line = warning.token?.startLine ?? 1;
 				const column = warning.token?.startColumn ?? 1;
@@ -162,21 +184,12 @@ var LessPlugin = class extends _jesscss_core.AbstractPlugin {
 					lines: (0, _jesscss_core.extractRelevantLines)(source, line)
 				});
 			}
-			if (parseResult.errors.length || parseResult.lexerResult?.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);
-				}
-				if (parseResult.lexerResult?.errors) for (const lexError of parseResult.lexerResult.errors) {
-					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);
-				}
+			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);
 			}
 		} catch (error) {
 			if (error instanceof _jesscss_core.JessError) {
@@ -217,3 +230,4 @@ const lessPlugin = ((opts) => {
 //#endregion
 exports.LessPlugin = LessPlugin;
 exports.default = lessPlugin;
+exports.lessPluginDefaults = lessPluginDefaults;

package/lib/index.d.ts

@@ -1,27 +1,40 @@
-import { AbstractPlugin, ISafeParseResult } from "@jesscss/core";
-import { Parser } from "@jesscss/less-parser";
-import { EqualityMode, LessOptions, LessOptions as LessOptions$1, MathMode, UnitMode } from "styles-config";
-
-//#region src/index.d.ts
-declare class LessPlugin extends AbstractPlugin {
-  opts: LessOptions$1;
-  name: string;
-  supportedExtensions: string[];
-  parser: Parser;
-  mathMode: MathMode;
-  unitMode: UnitMode;
-  equalityMode: EqualityMode;
-  leakyRules: boolean;
-  bubbleRootAtRules: boolean;
-  collapseNesting: boolean;
-  constructor(opts?: LessOptions$1);
-  private _registerFunctions;
-  expandImport(importPath: string, currentDir: string): string[];
-  resolve(filePath: string | string[], currentDir: string, searchPaths: string[]): string[];
-  safeParse(filePath: string, source: string, parseOptions?: {
-    compilerOptions?: Record<string, any>;
-  }): ISafeParseResult;
+import { AbstractPlugin, type ISafeParseResult, type SafeParseOptions } from '@jesscss/core';
+import type { EqualityMode, MathMode, UnitMode, LessOptions } from 'styles-config';
+import { Parser } from '@jesscss/less-parser/jess';
+export type LessPluginOptions = LessOptions;
+/**
+ * The Less plugin's default option values — the single source of truth for the
+ * v5 defaults. The `LessPlugin` constructor fills any unset option from here,
+ * and the `lessc` CLI imports the same object so its defaults can never drift
+ * from the engine's. Note `collapseNesting: false` — v5 preserves nesting by
+ * default (Less 4.x flattened; that is now an explicit opt-in).
+ */
+export declare const lessPluginDefaults: {
+    readonly mathMode: MathMode;
+    readonly unitMode: UnitMode;
+    readonly equalityMode: EqualityMode;
+    readonly leakyScope: true;
+    readonly bubbleRootAtRules: true;
+    readonly collapseNesting: false;
+};
+export declare class LessPlugin extends AbstractPlugin {
+    opts: LessPluginOptions;
+    name: string;
+    supportedExtensions: string[];
+    parser: Parser;
+    mathMode: MathMode;
+    unitMode: UnitMode;
+    equalityMode: EqualityMode;
+    leakyScope: boolean;
+    bubbleRootAtRules: boolean;
+    collapseNesting: boolean;
+    constructor(opts?: LessPluginOptions);
+    private createTreeContext;
+    private _registerFunctions;
+    expandImport(importPath: string, currentDir: string): string[];
+    resolve(filePath: string | string[], currentDir: string, searchPaths: string[]): string[];
+    safeParse(filePath: string, source: string, _parseOptions?: SafeParseOptions): ISafeParseResult;
 }
-declare const lessPlugin: (opts?: LessOptions$1) => LessPlugin;
-//#endregion
-export { type LessOptions, LessPlugin, lessPlugin as default };
+export type { LessOptions } from 'styles-config';
+declare const lessPlugin: (opts?: LessPluginOptions) => LessPlugin;
+export default lessPlugin;

package/lib/index.js

@@ -1,10 +1,25 @@
 import { createRequire } from "node:module";
 import { AbstractPlugin, JessError, JsFunction, TreeContext, extractRelevantLines, getErrorFromParser, toDiagnostic } from "@jesscss/core";
 import * as lessFunctions from "@jesscss/fns";
-import { Parser } from "@jesscss/less-parser";
+import { Parser } from "@jesscss/less-parser/jess";
 import path from "node:path";
 import { expandLessImportCandidates } from "@jesscss/style-resolver";
 //#region src/index.ts
+/**
+* The Less plugin's default option values — the single source of truth for the
+* v5 defaults. The `LessPlugin` constructor fills any unset option from here,
+* and the `lessc` CLI imports the same object so its defaults can never drift
+* from the engine's. Note `collapseNesting: false` — v5 preserves nesting by
+* default (Less 4.x flattened; that is now an explicit opt-in).
+*/
+const lessPluginDefaults = {
+	mathMode: "parens-division",
+	unitMode: "preserve",
+	equalityMode: "less",
+	leakyScope: true,
+	bubbleRootAtRules: true,
+	collapseNesting: false
+};
 var LessPlugin = class extends AbstractPlugin {
 	name = "less";
 	supportedExtensions = [".less"];
@@ -12,7 +27,7 @@ var LessPlugin = class extends AbstractPlugin {
 	mathMode;
 	unitMode;
 	equalityMode;
-	leakyRules;
+	leakyScope;
 	bubbleRootAtRules;
 	collapseNesting;
 	constructor(opts = {}) {
@@ -24,25 +39,43 @@ var LessPlugin = class extends AbstractPlugin {
 		else if (opts.math === 1 || opts.math === "parens-division") mathMode = "parens-division";
 		else if (opts.math === 2 || opts.math === "parens" || opts.math === "strict") mathMode = "parens";
 		else mathMode = "parens";
-		else mathMode = "parens-division";
+		else mathMode = lessPluginDefaults.mathMode;
 		this.mathMode = mathMode;
 		let unitMode;
 		if (opts.unitMode !== void 0) unitMode = opts.unitMode;
 		else if (opts.strictUnits === true) unitMode = "strict";
-		else unitMode = "preserve";
+		else unitMode = lessPluginDefaults.unitMode;
 		this.unitMode = unitMode;
-		this.equalityMode = opts.equalityMode ?? "coerce";
-		this.leakyRules = opts.leakyRules ?? true;
-		this.bubbleRootAtRules = opts.bubbleRootAtRules ?? true;
-		this.collapseNesting = opts.collapseNesting ?? false;
+		this.equalityMode = opts.equalityMode ?? lessPluginDefaults.equalityMode;
+		this.leakyScope = opts.leakyScope ?? lessPluginDefaults.leakyScope;
+		this.bubbleRootAtRules = opts.bubbleRootAtRules ?? lessPluginDefaults.bubbleRootAtRules;
+		this.collapseNesting = opts.collapseNesting ?? lessPluginDefaults.collapseNesting;
 		this.parser = new Parser();
 	}
+	createTreeContext(filePath, source) {
+		return new TreeContext({
+			file: {
+				name: path.basename(filePath),
+				path: path.dirname(filePath),
+				fullPath: filePath,
+				source
+			},
+			mathMode: this.mathMode,
+			unitMode: this.unitMode,
+			equalityMode: this.equalityMode,
+			plugin: this,
+			allowExtendSelectors: this.opts.allowExtendSelectors,
+			collapseNesting: this.collapseNesting,
+			leakyScope: this.leakyScope,
+			bubbleRootAtRules: this.bubbleRootAtRules
+		});
+	}
 	_registerFunctions(tree) {
 		const registeredNames = [];
 		for (const [key, value] of Object.entries(lessFunctions)) {
 			if (typeof value !== "function") continue;
 			const runtimeName = value.name || key;
-			tree.register("function", new JsFunction({
+			tree.setFunctionBinding(runtimeName, new JsFunction({
 				name: runtimeName,
 				fn: value
 			}));
@@ -95,29 +128,18 @@ var LessPlugin = class extends AbstractPlugin {
 		}
 		return out;
 	}
-	safeParse(filePath, source, parseOptions) {
-		const context = new TreeContext({
-			file: {
-				name: path.basename(filePath),
-				path: path.dirname(filePath),
-				fullPath: filePath,
-				source
-			},
-			mathMode: this.mathMode,
-			unitMode: this.unitMode,
-			equalityMode: this.equalityMode,
-			plugin: this,
-			allowExtendSelectors: this.opts.allowExtendSelectors,
-			collapseNesting: this.collapseNesting,
-			leakyRules: this.leakyRules,
-			bubbleRootAtRules: this.bubbleRootAtRules
-		});
+	safeParse(filePath, source, _parseOptions) {
+		const context = this.createTreeContext(filePath, source);
 		const errors = [];
 		const warnings = [];
 		let tree;
 		try {
-			const parseResult = this.parser.parse(source, "stylesheet", { context });
+			const parseResult = this.parser.parse(source, "Stylesheet", { context });
 			tree = parseResult.tree;
+			const parsedContext = parseResult.context ?? context;
+			if (tree) tree._treeContext = parsedContext;
+			context.opts.trivia = parseResult.trivia;
+			context.opts.liftedCommentRanges = parseResult.liftedCommentRanges;
 			if ("warnings" in parseResult && parseResult.warnings) for (const warning of parseResult.warnings) {
 				const line = warning.token?.startLine ?? 1;
 				const column = warning.token?.startColumn ?? 1;
@@ -134,21 +156,12 @@ var LessPlugin = class extends AbstractPlugin {
 					lines: extractRelevantLines(source, line)
 				});
 			}
-			if (parseResult.errors.length || parseResult.lexerResult?.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);
-				}
-				if (parseResult.lexerResult?.errors) for (const lexError of parseResult.lexerResult.errors) {
-					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);
-				}
+			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);
 			}
 		} catch (error) {
 			if (error instanceof JessError) {
@@ -187,4 +200,4 @@ const lessPlugin = ((opts) => {
 	return new LessPlugin(opts);
 });
 //#endregion
-export { LessPlugin, lessPlugin as default };
+export { LessPlugin, lessPlugin as default, lessPluginDefaults };

package/lib/options.d.ts

@@ -0,0 +1,5 @@
+/**
+ * @deprecated Import LessOptions from 'styles-config' instead.
+ * This type is kept for backward compatibility but will be removed in a future version.
+ */
+export type { LessOptions } from 'styles-config';

package/package.json

@@ -5,13 +5,12 @@
     "access": "public"
   },
   "description": "A Less stylesheet engine for Jess",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.7",
   "main": "lib/index.cjs",
   "types": "lib/index.d.ts",
   "exports": {
     ".": {
       "types": "./lib/index.d.ts",
-      "source": "./src/index.ts",
       "import": "./lib/index.js",
       "require": "./lib/index.cjs"
     },
@@ -21,11 +20,11 @@
     "lib"
   ],
   "dependencies": {
-    "@jesscss/core": "2.0.0-alpha.6",
-    "@jesscss/fns": "2.0.0-alpha.6",
-    "@jesscss/less-parser": "2.0.0-alpha.6",
-    "@jesscss/style-resolver": "2.0.0-alpha.6",
-    "styles-config": "2.0.0-alpha.6"
+    "@jesscss/core": "2.0.0-alpha.7",
+    "@jesscss/fns": "2.0.0-alpha.7",
+    "@jesscss/less-parser": "2.0.0-alpha.7",
+    "@jesscss/style-resolver": "2.0.0-alpha.7",
+    "styles-config": "2.0.0-alpha.7"
   },
   "devDependencies": {},
   "author": "Matthew Dean <matthew-dean@users.noreply.github.com>",
@@ -38,7 +37,7 @@
   "scripts": {
     "ci": "pnpm build && pnpm test",
     "build": "pnpm compile",
-    "compile": "tsdown --tsconfig tsconfig.build.json",
+    "compile": "tsdown --tsconfig tsconfig.build.json --no-dts && tsc -p tsconfig.build.json --emitDeclarationOnly --noCheck",
     "test": "vitest --run --passWithNoTests",
     "lint:fix": "eslint --fix '**/*.{js,ts}'",
     "lint": "eslint '**/*.{js,ts}'"

package/lib/index.d.cts

@@ -1,27 +0,0 @@
-import { AbstractPlugin, ISafeParseResult } from "@jesscss/core";
-import { EqualityMode, LessOptions, LessOptions as LessOptions$1, MathMode, UnitMode } from "styles-config";
-import { Parser } from "@jesscss/less-parser";
-
-//#region src/index.d.ts
-declare class LessPlugin extends AbstractPlugin {
-  opts: LessOptions$1;
-  name: string;
-  supportedExtensions: string[];
-  parser: Parser;
-  mathMode: MathMode;
-  unitMode: UnitMode;
-  equalityMode: EqualityMode;
-  leakyRules: boolean;
-  bubbleRootAtRules: boolean;
-  collapseNesting: boolean;
-  constructor(opts?: LessOptions$1);
-  private _registerFunctions;
-  expandImport(importPath: string, currentDir: string): string[];
-  resolve(filePath: string | string[], currentDir: string, searchPaths: string[]): string[];
-  safeParse(filePath: string, source: string, parseOptions?: {
-    compilerOptions?: Record<string, any>;
-  }): ISafeParseResult;
-}
-declare const lessPlugin: (opts?: LessOptions$1) => LessPlugin;
-//#endregion
-export { type LessOptions, LessPlugin, lessPlugin as default };