@utoo/lint 0.4.12 → 0.4.14

package/config.cjs

@@ -1,3 +1,5 @@
+const { isConfigPath, withConfigPath } = require("./lib/config-path.cjs");
+
 let globalIgnoreCount = 0;
 
 function defineConfig(...args) {
@@ -39,11 +41,12 @@ function expandConfigExtends(config, baseConfigName) {
   if (!("extends" in config)) {
     return [config];
   }
-  if (!Array.isArray(config.extends)) {
-    throw new TypeError("The `extends` property must be an array.");
+  if (typeof config.extends !== "string" && !Array.isArray(config.extends)) {
+    throw new TypeError("The `extends` property must be a string or an array.");
   }
 
-  const { extends: extendsList, ...baseConfig } = config;
+  const { extends: extensions, ...baseConfig } = config;
+  const extendsList = typeof extensions === "string" ? [extensions] : extensions;
   const expanded = [];
   for (const [index, extension] of flattenConfigArgs(resolveConfigExtends(config, extendsList)).entries()) {
     if ("basePath" in extension) {
@@ -65,6 +68,14 @@ function resolveConfigExtends(config, extendsList) {
     if (typeof extension !== "string") {
       return extension;
     }
+    if (isConfigPath(extension)) {
+      return withConfigPath(extension, (loaded) => {
+        const resolved = flattenConfigArgs([loaded]).flatMap((entry, index) =>
+          expandConfigExtends(entry, `${extension}[${index}]`)
+        );
+        return withConfigNames(resolved, extension);
+      });
+    }
     const pluginConfig = pluginConfigForName(config, extension);
     if (!pluginConfig) {
       const { namespace, configName } = splitPluginConfigName(extension);
@@ -133,7 +144,7 @@ function extendConfigFiles(baseFiles = [], extensionFiles = []) {
 
 function isGlobalIgnores(config) {
   const keys = Object.keys(config);
-  return keys.includes("ignores") && keys.every((key) => key === "name" || key === "ignores");
+  return keys.includes("ignores") && keys.every((key) => key === "name" || key === "ignores" || key === "__utooLintConfigName");
 }
 
 function withConfigNames(config, name) {

package/config.js

@@ -1,3 +1,5 @@
+import { isConfigPath, withConfigPath } from "./lib/config-path.cjs";
+
 let globalIgnoreCount = 0;
 
 export function defineConfig(...args) {
@@ -39,11 +41,12 @@ function expandConfigExtends(config, baseConfigName) {
   if (!("extends" in config)) {
     return [config];
   }
-  if (!Array.isArray(config.extends)) {
-    throw new TypeError("The `extends` property must be an array.");
+  if (typeof config.extends !== "string" && !Array.isArray(config.extends)) {
+    throw new TypeError("The `extends` property must be a string or an array.");
   }
 
-  const { extends: extendsList, ...baseConfig } = config;
+  const { extends: extensions, ...baseConfig } = config;
+  const extendsList = typeof extensions === "string" ? [extensions] : extensions;
   const expanded = [];
   for (const [index, extension] of flattenConfigArgs(resolveConfigExtends(config, extendsList)).entries()) {
     if ("basePath" in extension) {
@@ -65,6 +68,14 @@ function resolveConfigExtends(config, extendsList) {
     if (typeof extension !== "string") {
       return extension;
     }
+    if (isConfigPath(extension)) {
+      return withConfigPath(extension, (loaded) => {
+        const resolved = flattenConfigArgs([loaded]).flatMap((entry, index) =>
+          expandConfigExtends(entry, `${extension}[${index}]`)
+        );
+        return withConfigNames(resolved, extension);
+      });
+    }
     const pluginConfig = pluginConfigForName(config, extension);
     if (!pluginConfig) {
       const { namespace, configName } = splitPluginConfigName(extension);
@@ -133,7 +144,7 @@ function extendConfigFiles(baseFiles = [], extensionFiles = []) {
 
 function isGlobalIgnores(config) {
   const keys = Object.keys(config);
-  return keys.includes("ignores") && keys.every((key) => key === "name" || key === "ignores");
+  return keys.includes("ignores") && keys.every((key) => key === "name" || key === "ignores" || key === "__utooLintConfigName");
 }
 
 function withConfigNames(config, name) {

package/index.d.ts

@@ -102,7 +102,7 @@ export interface ConfigObject {
   parserOptions?: Record<string, unknown>;
   globals?: Record<string, unknown>;
   env?: Record<string, unknown>;
-  extends?: Array<string | ConfigObject | ConfigObject[]>;
+  extends?: string | Array<string | ConfigObject | ConfigObject[]>;
   basePath?: string;
   [key: string]: unknown;
 }

package/lib/config-path.cjs

@@ -0,0 +1,34 @@
+"use strict";
+
+const { realpathSync } = require("node:fs");
+const { isAbsolute } = require("node:path");
+
+// Shared by the ESM and CommonJS helpers, including helpers imported by a
+// preset. Keep the entry active while its own extends are being expanded.
+const activePaths = [];
+
+function isConfigPath(value) {
+  return isAbsolute(value);
+}
+
+function withConfigPath(configPath, expand) {
+  const canonicalPath = realpathSync(configPath);
+  if (activePaths.includes(canonicalPath)) {
+    throw new TypeError(`Circular config extends: ${[...activePaths, canonicalPath].join(" -> ")}`);
+  }
+  activePaths.push(canonicalPath);
+  try {
+    // Load executable presets with the same Node/TypeScript support used by
+    // the application config. Do not load jiti for object-only configurations.
+    const { readConfigModule } = require("./config-module.cjs");
+    const value = readConfigModule(canonicalPath);
+    if (value === null || typeof value !== "object") {
+      throw new TypeError(`Config file "${configPath}" must export a config object or array, received ${typeof value}.`);
+    }
+    return expand(value);
+  } finally {
+    activePaths.pop();
+  }
+}
+
+module.exports = { isConfigPath, withConfigPath };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@utoo/lint",
-  "version": "0.4.12",
+  "version": "0.4.14",
   "description": "High-performance JavaScript and TypeScript linter powered by Yuku",
   "license": "MIT",
   "repository": {
@@ -74,11 +74,11 @@
     "use-at-your-own-risk.js"
   ],
   "optionalDependencies": {
-    "@utoo/lint-darwin-arm64": "0.4.12",
-    "@utoo/lint-darwin-x64": "0.4.12",
-    "@utoo/lint-linux-arm64": "0.4.12",
-    "@utoo/lint-linux-x64": "0.4.12",
-    "@utoo/lint-win32-x64": "0.4.12"
+    "@utoo/lint-darwin-arm64": "0.4.14",
+    "@utoo/lint-darwin-x64": "0.4.14",
+    "@utoo/lint-linux-arm64": "0.4.14",
+    "@utoo/lint-linux-x64": "0.4.14",
+    "@utoo/lint-win32-x64": "0.4.14"
   },
   "dependencies": {
     "@eslint/eslintrc": "2.1.4",