editorconfig 2.0.0 → 2.0.1

package/eslint.config.mjs

@@ -0,0 +1,13 @@
+import base from '@cto.af/eslint-config';
+import ts from '@cto.af/eslint-config/ts.js';
+
+export default [
+  {
+    ignores: [
+      'lib/**',
+      '**/*.d.ts',
+    ],
+  },
+  ...base,
+  ...ts,
+];

package/lib/cli.d.ts

@@ -1,5 +1,5 @@
+import * as editorconfig from './index.js';
 import { type OutputConfiguration } from 'commander';
-import * as editorconfig from './';
 /**
  * Command line interface for editorconfig.  Pulled out into a separate module
  * to make it easier to test.

package/lib/cli.js

@@ -15,19 +15,30 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = cli;
+const editorconfig = __importStar(require("./index.js"));
 const commander_1 = require("commander");
-const editorconfig = __importStar(require("./"));
 const package_json_1 = __importDefault(require("../package.json"));
 /**
  * Default output routine, goes to stdout.
@@ -53,13 +64,12 @@ async function cli(args, testing) {
     let writeOut = writeStdOut;
     if (testing) {
         if (testing.writeOut) {
-            // eslint-disable-next-line @typescript-eslint/unbound-method
-            writeOut = testing.writeOut;
+            ({ writeOut } = testing);
         }
         program.configureOutput(testing);
         program.exitOverride();
     }
-    program.version('EditorConfig Node.js Core Version ' + package_json_1.default.version, '-v, --version', 'Display version information')
+    program.version(`EditorConfig Node.js Core Version ${package_json_1.default.version}`, '-v, --version', 'Display version information')
         .showHelpAfterError()
         .argument('<FILEPATH...>', 'Files to find configuration for.  Can be a hyphen (-) if you want path(s) to be read from stdin.')
         .option('-f <path>', 'Specify conf filename other than \'.editorconfig\'')
@@ -88,7 +98,7 @@ async function cli(args, testing) {
         }
         return p;
     }
-    return await processAll().then((parsed) => {
+    return processAll().then(parsed => {
         const header = parsed.length > 1;
         parsed.forEach((props, i) => {
             if (header) {
@@ -108,4 +118,3 @@ async function cli(args, testing) {
         return parsed;
     });
 }
-exports.default = cli;

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="node" />
+import { Buffer } from 'node:buffer';
 import { Minimatch } from 'minimatch';
 export interface KnownProps {
     end_of_line?: 'lf' | 'crlf' | 'unset';
@@ -63,36 +63,36 @@ export declare function parseBuffer(data: Buffer): ParseStringResult;
  * @deprecated Use {@link ParseBuffer} instead.
  */
 export declare function parseString(data: string): ParseStringResult;
+/**
+ * For any pair, a value of `unset` removes the effect of that pair, even if
+ * it has been set before.  This method modifies the properties object in
+ * place to remove any property that has a value of `unset`.
+ *
+ * @param props Properties object to modify.
+ */
+export declare function unset(props: Props): void;
 /**
  * Low-level interface, which exists only for backward-compatibility.
  * Deprecated.
  *
  * @param filepath The name of the target file, relative to process.cwd().
- * @param files A promise for a list of objects describing the files.
+ * @param files A list of objects describing the files.
  * @param options All options
  * @returns The properties found for filepath
  * @deprecated
  */
-export declare function parseFromFiles(filepath: string, files: Promise<ECFile[]>, options?: ParseOptions): Promise<Props>;
+export declare function parseFromFilesSync(filepath: string, files: ECFile[], options?: ParseOptions): Props;
 /**
  * Low-level interface, which exists only for backward-compatibility.
  * Deprecated.
  *
  * @param filepath The name of the target file, relative to process.cwd().
- * @param files A list of objects describing the files.
+ * @param files A promise for a list of objects describing the files.
  * @param options All options
  * @returns The properties found for filepath
  * @deprecated
  */
-export declare function parseFromFilesSync(filepath: string, files: ECFile[], options?: ParseOptions): Props;
-/**
- * For any pair, a value of `unset` removes the effect of that pair, even if
- * it has been set before.  This method modifies the properties object in
- * place to remove any property that has a value of `unset`.
- *
- * @param props Properties object to modify.
- */
-export declare function unset(props: Props): void;
+export declare function parseFromFiles(filepath: string, files: Promise<ECFile[]>, options?: ParseOptions): Promise<Props>;
 /**
  * Find all of the properties from matching sections in config files in the
  * same directory or toward the root of the filesystem.

package/lib/index.js

@@ -15,25 +15,41 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.matcher = exports.parseSync = exports.parse = exports.unset = exports.parseFromFilesSync = exports.parseFromFiles = exports.parseString = exports.parseBuffer = void 0;
-const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
+exports.parseBuffer = parseBuffer;
+exports.parseString = parseString;
+exports.unset = unset;
+exports.parseFromFilesSync = parseFromFilesSync;
+exports.parseFromFiles = parseFromFiles;
+exports.parse = parse;
+exports.parseSync = parseSync;
+exports.matcher = matcher;
+const fs = __importStar(require("node:fs"));
+const path = __importStar(require("node:path"));
 const semver = __importStar(require("semver"));
-const minimatch_1 = require("minimatch");
 const wasm_1 = require("@one-ini/wasm");
-// @ts-ignore So we can set the rootDir to be 'lib', without processing
-// package.json
+const node_buffer_1 = require("node:buffer");
+const minimatch_1 = require("minimatch");
 const package_json_1 = __importDefault(require("../package.json"));
 const escapedSep = new RegExp(path.sep.replace(/\\/g, '\\\\'), 'g');
 const matchOptions = { matchBase: true, dot: true };
@@ -81,7 +97,6 @@ function parseBuffer(data) {
     }
     return res;
 }
-exports.parseBuffer = parseBuffer;
 /**
  * Parses a string.  If possible, you should always use ParseBuffer instead,
  * since this function does a UTF16-to-UTF8 conversion first.
@@ -91,9 +106,8 @@ exports.parseBuffer = parseBuffer;
  * @deprecated Use {@link ParseBuffer} instead.
  */
 function parseString(data) {
-    return parseBuffer(Buffer.from(data));
+    return parseBuffer(node_buffer_1.Buffer.from(data));
 }
-exports.parseString = parseString;
 /**
  * Gets a list of *potential* filenames based on the path of the target
  * filename.
@@ -121,23 +135,23 @@ function getConfigFileNames(filepath, options) {
 function processMatches(matches, version) {
     // Set indent_size to 'tab' if indent_size is unspecified and
     // indent_style is set to 'tab'.
-    if ('indent_style' in matches
-        && matches.indent_style === 'tab'
-        && !('indent_size' in matches)
-        && semver.gte(version, '0.10.0')) {
+    if ('indent_style' in matches &&
+        matches.indent_style === 'tab' &&
+        !('indent_size' in matches) &&
+        semver.gte(version, '0.10.0')) {
         matches.indent_size = 'tab';
     }
     // Set tab_width to indent_size if indent_size is specified and
     // tab_width is unspecified
-    if ('indent_size' in matches
-        && !('tab_width' in matches)
-        && matches.indent_size !== 'tab') {
+    if ('indent_size' in matches &&
+        !('tab_width' in matches) &&
+        matches.indent_size !== 'tab') {
         matches.tab_width = matches.indent_size;
     }
     // Set indent_size to tab_width if indent_size is 'tab'
-    if ('indent_size' in matches
-        && 'tab_width' in matches
-        && matches.indent_size === 'tab') {
+    if ('indent_size' in matches &&
+        'tab_width' in matches &&
+        matches.indent_size === 'tab') {
         matches.indent_size = matches.tab_width;
     }
     return matches;
@@ -153,9 +167,11 @@ function buildFullGlob(pathPrefix, glob) {
         default:
             break;
     }
+    //
     // braces_escaped_backslash2
     // backslash_not_on_windows
     glob = glob.replace(/\\\\/g, '\\\\\\\\');
+    //
     // star_star_over_separator{1,3,5,6,9,15}
     glob = glob.replace(/\*\*/g, '{*,**/**/**}');
     // NOT path.join.  Must stay in forward slashes.
@@ -172,7 +188,7 @@ function buildFullGlob(pathPrefix, glob) {
 function normalizeProps(options) {
     const props = {};
     for (const key in options) {
-        if (options.hasOwnProperty(key)) {
+        if (Object.prototype.hasOwnProperty.call(options, key)) {
             const value = options[key];
             const key2 = key.toLowerCase();
             let value2 = value;
@@ -183,8 +199,11 @@ function normalizeProps(options) {
             try {
                 value2 = JSON.parse(String(value));
             }
-            catch (e) { }
+            catch (_e) {
+                // Ignored
+            }
             if (typeof value2 === 'undefined' || value2 === null) {
+                //
                 // null and undefined are values specific to JSON (no special meaning
                 // in editorconfig) & should just be returned as regular strings.
                 value2 = String(value);
@@ -205,7 +224,8 @@ function normalizeProps(options) {
  * @returns Processed file with globs pre-computed.
  */
 function processFileContents(filepath, contents, options) {
-    let res;
+    let res = undefined;
+    // eslint-disable-next-line no-negated-condition
     if (!contents) {
         // Negative cache
         res = {
@@ -236,7 +256,7 @@ function processFileContents(filepath, contents, options) {
             name ? buildFullGlob(pathPrefix, name) : null,
         ]);
         res = {
-            root: !!globbed[0][1].root,
+            root: Boolean(globbed[0][1].root), // Global section: globbed[0]
             name: filepath,
             config: globbed,
         };
@@ -285,7 +305,7 @@ function getConfigSync(filepath, options) {
             return cached;
         }
     }
-    let contents;
+    let contents = undefined;
     try {
         contents = fs.readFileSync(filepath);
     }
@@ -359,47 +379,21 @@ function opts(filepath, options = {}) {
     ];
 }
 /**
- * Low-level interface, which exists only for backward-compatibility.
- * Deprecated.
- *
- * @param filepath The name of the target file, relative to process.cwd().
- * @param files A promise for a list of objects describing the files.
- * @param options All options
- * @returns The properties found for filepath
- * @deprecated
- */
-async function parseFromFiles(filepath, files, options = {}) {
-    return parseFromFilesSync(filepath, await files, options);
-}
-exports.parseFromFiles = parseFromFiles;
-/**
- * Low-level interface, which exists only for backward-compatibility.
- * Deprecated.
+ * For any pair, a value of `unset` removes the effect of that pair, even if
+ * it has been set before.  This method modifies the properties object in
+ * place to remove any property that has a value of `unset`.
  *
- * @param filepath The name of the target file, relative to process.cwd().
- * @param files A list of objects describing the files.
- * @param options All options
- * @returns The properties found for filepath
- * @deprecated
+ * @param props Properties object to modify.
  */
-function parseFromFilesSync(filepath, files, options = {}) {
-    const [resolvedFilePath, processedOptions] = opts(filepath, options);
-    const configs = [];
-    for (const ecf of files) {
-        let cfg;
-        if (!options.cache || !(cfg = options.cache.get(ecf.name))) { // Single "="!
-            cfg = processFileContents(ecf.name, ecf.contents, processedOptions);
-        }
-        if (!cfg.notfound) {
-            configs.push(cfg);
-        }
-        if (cfg.root) {
-            break;
+function unset(props) {
+    const keys = Object.keys(props);
+    for (const k of keys) {
+        if (props[k] === 'unset') {
+            // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+            delete props[k];
         }
     }
-    return combine(resolvedFilePath, configs, processedOptions);
 }
-exports.parseFromFilesSync = parseFromFilesSync;
 /**
  * Combine the pre-parsed results of all matching config file sections, in
  * order.
@@ -412,7 +406,7 @@ exports.parseFromFilesSync = parseFromFilesSync;
 function combine(filepath, configs, options) {
     const ret = configs.reverse().reduce((props, processed) => {
         for (const [name, body, glob] of processed.config) {
-            if (glob && glob.match(filepath)) {
+            if (glob === null || glob === void 0 ? void 0 : glob.match(filepath)) {
                 Object.assign(props, body);
                 if (options.files) {
                     options.files.push({
@@ -430,21 +424,46 @@ function combine(filepath, configs, options) {
     return processMatches(ret, options.version);
 }
 /**
- * For any pair, a value of `unset` removes the effect of that pair, even if
- * it has been set before.  This method modifies the properties object in
- * place to remove any property that has a value of `unset`.
+ * Low-level interface, which exists only for backward-compatibility.
+ * Deprecated.
  *
- * @param props Properties object to modify.
+ * @param filepath The name of the target file, relative to process.cwd().
+ * @param files A list of objects describing the files.
+ * @param options All options
+ * @returns The properties found for filepath
+ * @deprecated
  */
-function unset(props) {
-    const keys = Object.keys(props);
-    for (const k of keys) {
-        if (props[k] === 'unset') {
-            delete props[k];
+function parseFromFilesSync(filepath, files, options = {}) {
+    const [resolvedFilePath, processedOptions] = opts(filepath, options);
+    const configs = [];
+    for (const ecf of files) {
+        let cfg = undefined;
+        if (!options.cache || !(cfg = options.cache.get(ecf.name))) { // Single "="!
+            cfg = processFileContents(ecf.name, ecf.contents, processedOptions);
+        }
+        if (!cfg.notfound) {
+            configs.push(cfg);
+        }
+        if (cfg.root) {
+            break;
         }
     }
+    return combine(resolvedFilePath, configs, processedOptions);
+}
+/**
+ * Low-level interface, which exists only for backward-compatibility.
+ * Deprecated.
+ *
+ * @param filepath The name of the target file, relative to process.cwd().
+ * @param files A promise for a list of objects describing the files.
+ * @param options All options
+ * @returns The properties found for filepath
+ * @deprecated
+ */
+async function parseFromFiles(filepath, files, options = {}) {
+    // eslint-disable-next-line @typescript-eslint/no-deprecated
+    return parseFromFilesSync(filepath, await files, options);
 }
-exports.unset = unset;
 /**
  * Find all of the properties from matching sections in config files in the
  * same directory or toward the root of the filesystem.
@@ -459,7 +478,6 @@ async function parse(filepath, options = {}) {
     const configs = await getAllConfigs(filepaths, processedOptions);
     return combine(resolvedFilePath, configs, processedOptions);
 }
-exports.parse = parse;
 /**
  * Find all of the properties from matching sections in config files in the
  * same directory or toward the root of the filesystem.  Synchronous.
@@ -474,7 +492,6 @@ function parseSync(filepath, options = {}) {
     const configs = getAllConfigsSync(filepaths, processedOptions);
     return combine(resolvedFilePath, configs, processedOptions);
 }
-exports.parseSync = parseSync;
 /**
  * I think this may be of limited utility at the moment, but I need something
  * like this for testing.  As such, the interface of this may change without
@@ -489,11 +506,10 @@ exports.parseSync = parseSync;
  * @private
  */
 function matcher(options, ...buffers) {
-    const processedOptions = opts('', options)[1];
+    const [_fileName, processedOptions] = opts('', options);
     const configs = buffers.map((buf, i) => processFileContents(path.join(processedOptions.root, `buffer-${i}`), buf, processedOptions));
     return (filepath) => {
         const resolvedFilePath = path.resolve(filepath);
         return combine(resolvedFilePath, configs, processedOptions);
     };
 }
-exports.matcher = matcher;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "editorconfig",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "EditorConfig File Locator and Interpreter for Node.js",
   "keywords": [
     "editorconfig",
@@ -17,21 +17,6 @@
     "bin": "./bin",
     "lib": "./lib"
   },
-  "scripts": {
-    "clean": "rimraf lib cmake_install.cmake CTestTestfile.cmake Makefile",
-    "prebuild": "npm run clean",
-    "build": "cmake . && tsc",
-    "pretest": "npm run build && npm run lint",
-    "test": "npm run test:all",
-    "test:all": "mocha && ctest . --preset Test",
-    "precoverage": "npm run build -- --inlineSourceMap",
-    "coverage": "c8 npm run test:all",
-    "postcoverage": "npm run build",
-    "ci": "npm run coverage -- -- -VV --output-on-failure",
-    "lint": "eslint . --ext ts",
-    "prepub": "npm run lint && npm run build",
-    "pub": "npm publish"
-  },
   "repository": {
     "type": "git",
     "url": "git://github.com/editorconfig/editorconfig-core-js.git"
@@ -40,37 +25,12 @@
   "author": "EditorConfig Team",
   "license": "MIT",
   "dependencies": {
-    "@one-ini/wasm": "0.1.1",
-    "commander": "^11.0.0",
-    "minimatch": "9.0.2",
-    "semver": "^7.5.3"
-  },
-  "devDependencies": {
-    "@types/chai": "4.3.5",
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.3.3",
-    "@types/semver": "^7.5.0",
-    "@typescript-eslint/eslint-plugin": "5.60.1",
-    "@typescript-eslint/parser": "5.60.1",
-    "c8": "8.0.0",
-    "chai": "4.3.7",
-    "eslint": "8.44.0",
-    "eslint-plugin-jsdoc": "46.4.3",
-    "mocha": "^10.2.0",
-    "rimraf": "^5.0.1",
-    "typescript": "^5.1.6"
-  },
-  "pnpm": {
-    "overrides": {
-      "semver": ">=7.5.3",
-      "word-wrap": "npm:@aashutoshrathi/word-wrap"
-    }
-  },
-  "overrides": {
-    "semver": "$semver",
-    "word-wrap": "npm:@aashutoshrathi/word-wrap"
+    "@one-ini/wasm": "0.2.0",
+    "commander": "^13.1.0",
+    "minimatch": "10.0.1",
+    "semver": "^7.7.1"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   }
 }