less 5.0.0-alpha.1 → 5.0.0-alpha.10

package/lib/options.js

@@ -5,27 +5,19 @@
 
 import lessPlugin from '@jesscss/plugin-less';
 import { lessCompatPlugin } from '@jesscss/plugin-less-compat';
+import { logger } from './logger.js';
 
 const unsupportedAlphaOptions = new Map([
-  ['sourceMap', 'source maps are not supported'],
-  ['sourceMapFilename', 'source maps are not supported'],
-  ['sourceMapRootpath', 'source maps are not supported'],
-  ['sourceMapBasepath', 'source maps are not supported'],
-  ['sourceMapURL', 'source maps are not supported'],
-  ['sourceMapFileInline', 'source maps are not supported'],
   ['globalVars', 'global variable injection is not supported'],
   ['modifyVars', 'modify-var injection is not supported'],
-  ['strictUnits', 'strict unit mode is not supported'],
-  ['rootpath', 'URL rootpath rewriting is not supported'],
-  ['rewriteUrls', 'URL rewriting is not supported'],
-  ['urlArgs', 'URL argument rewriting is not supported'],
   ['javascriptEnabled', 'JavaScript evaluation is not supported'],
-  ['compress', 'compressed output is not supported'],
 ]);
 
 function validateAlphaOptions(options) {
   for (const [name, reason] of unsupportedAlphaOptions) {
-    if (Object.prototype.hasOwnProperty.call(options, name)) {
+    // A falsy value is the 4.x default ("off") and requests nothing, so it is
+    // a no-op here; only an actual request for the feature is unsupported.
+    if (options[name]) {
       throw new Error(`${name} is not supported: ${reason}`);
     }
   }
@@ -62,6 +54,55 @@ function stableStringify(value, seen = new WeakSet()) {
   return `{${entries.join(',')}}`;
 }
 
+/**
+ * `collapseNesting` accepts `false` (keep authored nesting — the v5 default),
+ * `'native'` (CSS Nesting desugaring: parent wrapped in `:is()`, child selector
+ * lists distributed, specificity-faithful), `'compact'` (like `'native'` but
+ * also folds same-combinator descendant runs into one `:is()`), or the
+ * deprecated boolean `true` (alias for `'native'`). Anything else is rejected.
+ * @param {unknown} value
+ * @returns {boolean|'native'|'compact'}
+ */
+function resolveCollapseNesting(value) {
+  if (value === false || value === true || value === 'native' || value === 'compact') {
+    return value;
+  }
+  throw new Error(
+    `collapseNesting must be false, 'native', 'compact', or true `
+    + `(deprecated alias for 'native'); got ${JSON.stringify(value)}`
+  );
+}
+
+/**
+ * Build the compiler's `output.sourceMap` value from Less options. Source maps
+ * are enabled when `sourceMap` is truthy; the object form (or the flat legacy
+ * `sourceMap*` options) configures the details. Returns `undefined` when no
+ * source map is requested.
+ * @param {import('./options.js').LessRenderOptions} opts
+ * @returns {undefined | true | Record<string, unknown>}
+ */
+function resolveSourceMap(opts) {
+  if (!opts.sourceMap) {
+    return undefined;
+  }
+  const config = (typeof opts.sourceMap === 'object' && opts.sourceMap !== null)
+    ? { ...opts.sourceMap }
+    : {};
+  // Fold the flat legacy `sourceMap*` options into the object form the compiler
+  // reads; an explicit object sub-option wins over its flat alias.
+  const flat = [
+    'sourceMapURL', 'sourceMapFilename', 'sourceMapFullFilename',
+    'sourceMapRootpath', 'sourceMapBasepath', 'sourceMapFileInline',
+    'sourceMapOutputFilename', 'outputSourceFiles', 'disableSourcemapAnnotation'
+  ];
+  for (const key of flat) {
+    if (opts[key] !== undefined && config[key] === undefined) {
+      config[key] = opts[key];
+    }
+  }
+  return Object.keys(config).length > 0 ? config : true;
+}
+
 /**
  * Map Less render options to Jess compiler config.
  * @param {import('./options.js').LessRenderOptions} [options] Less-style options
@@ -81,26 +122,60 @@ export function createLessOptions(options) {
     math === 2 || math === 'parens' || math === 'strict' ? 'parens' :
     'parens-division';
 
-  const plugins = [lessPlugin()];
+  // `unitMode` is the option ('loose' | 'preserve' | 'strict'); `strictUnits`
+  // is its deprecated boolean alias: true → 'strict'; false means "not strict",
+  // i.e. the default ('preserve') — never the Less 4.x 'loose' fold, which only
+  // an explicit `unitMode: 'loose'` selects. Any use warns so the mapping is
+  // never discovered by staring at output. Left unset so the compiler default applies.
+  const unitMode = opts.unitMode !== undefined ? opts.unitMode
+    : opts.strictUnits === true ? 'strict'
+    : undefined;
+  if (opts.strictUnits !== undefined && opts.unitMode === undefined) {
+    logger.warn(
+      `strictUnits is deprecated; use unitMode. strictUnits: ${String(opts.strictUnits)} now means `
+      + `unitMode: '${unitMode ?? 'preserve'}'${opts.strictUnits ? '' : " (Less 4.x unit folding is unitMode: 'loose')"}`
+    );
+  }
+
+  // URL rewriting lives on the Less plugin (it rewrites `url(...)` during
+  // serialization), not in `output`. Only forward keys the caller set so the
+  // plugin's own v5 defaults apply otherwise.
+  const lessPluginOptions = {};
+  if (opts.rootpath !== undefined) lessPluginOptions.rootpath = opts.rootpath;
+  if (opts.rewriteUrls !== undefined) lessPluginOptions.rewriteUrls = opts.rewriteUrls;
+  if (opts.urlArgs !== undefined) lessPluginOptions.urlArgs = opts.urlArgs;
+
+  const plugins = [lessPlugin(lessPluginOptions)];
   if (!skipLessCompat) {
     plugins.push(lessCompatPlugin({ plugins: lessPlugins }));
   }
 
+  // The projection/serialization options the compiler reads off `output`:
+  // `collapseNesting` (nesting flatten mode), `compress` (minified output), and
+  // `sourceMap`. Emitted as a single file-less array entry so an explicit render
+  // option overrides a file-local styles.config for every key (the config merge
+  // appends it as the override default); left `{}` when the caller set none.
+  const outputEntry = {};
+  if (opts.collapseNesting !== undefined) {
+    outputEntry.collapseNesting = resolveCollapseNesting(opts.collapseNesting);
+  }
+  if (opts.compress !== undefined) {
+    outputEntry.compress = opts.compress;
+  }
+  const sourceMap = resolveSourceMap(opts);
+  if (sourceMap !== undefined) {
+    outputEntry.sourceMap = sourceMap;
+  }
+  const output = Object.keys(outputEntry).length > 0 ? [outputEntry] : {};
+
   const configOptions = {
     compile: {
       searchPaths: opts.paths || [],
       mathMode,
+      ...(unitMode !== undefined && { unitMode }),
       plugins,
     },
-    // Less v5 preserves authored nesting unless its explicit compatibility
-    // switch requests flattened CSS. Keep that public Less option at the
-    // wrapper boundary; Jess owns the one renderer and its output mode.
-    // A file's styles.config may use an output array. A file-less output entry
-    // is the compiler's documented per-render override for that shape, so an
-    // explicit public Less option remains authoritative over fixture config.
-    output: Object.prototype.hasOwnProperty.call(opts, 'collapseNesting')
-      ? [{ collapseNesting: opts.collapseNesting === true }]
-      : {},
+    output,
     language: {},
   };
 
@@ -129,6 +204,13 @@ export function mapRenderResult(result, options) {
     css: result.css ?? '',
   };
 
+  // Less 4.x returns the source map as `result.map` (a JSON string) when one was
+  // requested; forward it so `less.render(src, { sourceMap: true })` behaves the
+  // same. The compiler writes the `sourceMappingURL` annotation into `css` itself.
+  if (result.map !== undefined) {
+    out.map = result.map;
+  }
+
   if (result.imports && Array.isArray(result.imports)) {
     out.imports = result.imports;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "less",
-	"version": "5.0.0-alpha.1",
+	"version": "5.0.0-alpha.10",
 	"description": "Leaner CSS",
 	"homepage": "http://lesscss.org",
 	"author": {
@@ -45,14 +45,15 @@
 		"!lib/**/*.map",
 		"dist",
 		"index.cjs",
-		"README.md"
+		"README.md",
+		"V5-STATUS.md"
 	],
 	"engines": {
 		"node": "^20.19.0 || >=22.12.0"
 	},
 	"scripts": {
 		"quicktest": "npm run test:legacy-node",
-		"test:alpha": "npm run typecheck && npm run build && npm run test:lessc && node test/jess-alpha-fast-path.mjs && node test/alpha-support.mjs && node test/alpha-fixtures.mjs",
+		"test:alpha": "npm run typecheck && npm run build && npm run test:lessc && node test/jess-alpha-fast-path.mjs && node test/alpha-support.mjs && node test/alpha-sourcemaps.mjs && node test/alpha-fixtures.mjs",
 		"test:lessc": "node test/lessc-alpha.mjs",
 		"test": "npm run test:alpha",
 		"test:module": "node test/test-es6.js && node test/test-cjs.cjs",
@@ -63,9 +64,10 @@
 		"lint:fix": "eslint '**/*.{ts,js}' --fix",
 		"typecheck": "tsc --noEmit",
 		"build": "node build/rollup.js --dist",
+		"build:browser": "node build/browser-dev.mjs --minify",
 		"benchmark": "node benchmark/benchmark-runner.cjs",
 		"benchmark:all": "node benchmark/run-and-compare.mjs",
-		"prepublishOnly": "npm run typecheck && npm run build && npm run test:lessc"
+		"prepublishOnly": "npm run typecheck && npm run build && npm run build:browser && npm run test:lessc"
 	},
 	"devDependencies": {
 		"@less/test-data": "workspace:*",
@@ -83,6 +85,7 @@
 		"chalk": "^4.1.2",
 		"cosmiconfig": "~9.0.0",
 		"cross-env": "^7.0.3",
+		"esbuild": "^0.25.0",
 		"eslint": "^7.29.0",
 		"fs-extra": "^8.1.0",
 		"glob": "~11.0.3",
@@ -139,16 +142,15 @@
 	"rawcurrent": "https://raw.github.com/less/less.js/v",
 	"sourcearchive": "https://github.com/less/less.js/archive/v",
 	"dependencies": {
-		"@jesscss/compiler": "2.0.0-alpha.11",
-		"@jesscss/core": "2.0.0-alpha.11",
-		"@jesscss/plugin-less": "2.0.0-alpha.11",
-		"@jesscss/plugin-less-compat": "2.0.0-alpha.11",
-		"@jesscss/plugin-node-modules": "2.0.0-alpha.11",
-		"parse-node-version": "^1.0.1",
-		"parseman": "^0.41.0"
+		"@jesscss/compiler": "2.0.0-alpha.23",
+		"@jesscss/core": "2.0.0-alpha.23",
+		"@jesscss/plugin-less": "2.0.0-alpha.23",
+		"@jesscss/plugin-less-compat": "2.0.0-alpha.23",
+		"@jesscss/plugin-node-modules": "2.0.0-alpha.23",
+		"parse-node-version": "^1.0.1"
 	},
 	"peerDependencies": {
-		"@jesscss/plugin-js": "2.0.0-alpha.11"
+		"@jesscss/plugin-js": "2.0.0-alpha.23"
 	},
 	"peerDependenciesMeta": {
 		"@jesscss/plugin-js": {