Merge branch 'main' into typescript

Author: 43081j

eslint.config.js

@@ -1,10 +1,20 @@
 import jsdoc from "eslint-plugin-jsdoc";
 import {configs as tseslintConfigs} from 'typescript-eslint';
+import eslintjs from "@eslint/js";
+
+const {configs: eslintConfigs} = eslintjs;
 
 export default [
-  ...tseslintConfigs.recommended,
   jsdoc.configs["flat/recommended"],
+  eslintConfigs["recommended"],
+  ...tseslintConfigs.recommended,
   {
+    languageOptions: {
+      // if we ever use more globals than this, pull in the `globals` package
+      globals: {
+        console: false
+      }
+    },
     rules: {
       "jsdoc/require-param-description": "off",
       "jsdoc/require-returns-description": "off",
@@ -16,8 +26,9 @@ export default [
       "prefer-rest-params": "off",
       "@typescript-eslint/no-unused-expressions": "off",
       "@typescript-eslint/no-unused-vars": ["error", {
+        "argsIgnorePattern": "^_",
         "caughtErrorsIgnorePattern": "^_"
-      }]
+      }],
     },
   },
 ];

package-lock.json

@@ -36,14 +36,14 @@
     "prebuild": "npm run clean",
     "build": "npm run build:esm",
     "build:esm": "esbuild --bundle --format=esm --keep-names --outfile=chai.js src/chai.ts",
-    "format": "prettier --write lib",
+    "format": "prettier --write src",
     "pretest": "npm run lint && npm run build",
     "test": "npm run test-node && npm run test-chrome",
     "test-node": "mocha --require ./test/bootstrap/index.js --reporter dot test/*.js",
     "test-chrome": "web-test-runner --playwright",
     "lint": "npm run lint:js && npm run lint:format && npm run lint:types",
     "lint:js": "eslint src",
-    "lint:format": "prettier --check lib",
+    "lint:format": "prettier --check src",
     "lint:types": "tsc --noEmit",
     "clean": "rm -rf chai.js coverage lib"
   },
@@ -61,6 +61,7 @@
     "pathval": "^2.0.0"
   },
   "devDependencies": {
+    "@eslint/js": "^9.17.0",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@web/dev-server-rollup": "^0.6.1",
     "@web/test-runner": "^0.18.0",

package.json

@@ -27,9 +27,9 @@ type MethodNames<T> = {
 }[keyof T];
 
 const getDefaultValue = <T>(assertion: Assertion<T>): Assertion<T> => {
-    var newAssertion = Assertion.create<T>();
-    util.transferFlags(assertion, newAssertion);
-    return newAssertion;
+  var newAssertion = Assertion.create<T>();
+  util.transferFlags(assertion, newAssertion);
+  return newAssertion;
 };
 
 /*!
@@ -71,7 +71,10 @@ const getDefaultValue = <T>(assertion: Assertion<T>): Assertion<T> => {
  * @param {boolean} lockSsfi (optional) whether or not the ssfi flag is locked
  * @private
  */
-export class Assertion<T, TFlags extends AssertionFlags<T> = AssertionFlags<T>> {
+export class Assertion<
+  T,
+  TFlags extends AssertionFlags<T> = AssertionFlags<T>
+> {
   declare public __flags: TFlags;
   public __methods: Record<string, ChainableBehavior> = {};
 
@@ -94,50 +97,52 @@ export class Assertion<T, TFlags extends AssertionFlags<T> = AssertionFlags<T>>
     ssfi?: Function,
     lockSsfi?: boolean
   ): Assertion<TObj> {
-    return util.proxify(new Assertion<TObj>(
-      obj,
-      msg,
-      ssfi,
-      lockSsfi
-    ));
+    return util.proxify(new Assertion<TObj>(obj, msg, ssfi, lockSsfi));
   }
 
   public static get includeStack(): boolean {
-    console.warn('Assertion.includeStack is deprecated, use chai.config.includeStack instead.');
+    console.warn(
+      'Assertion.includeStack is deprecated, use chai.config.includeStack instead.'
+    );
     return config.includeStack;
   }
 
   public static set includeStack(value: boolean) {
-    console.warn('Assertion.includeStack is deprecated, use chai.config.includeStack instead.');
+    console.warn(
+      'Assertion.includeStack is deprecated, use chai.config.includeStack instead.'
+    );
     config.includeStack = value;
   }
 
   public static get showDiff(): boolean {
-    console.warn('Assertion.showDiff is deprecated, use chai.config.showDiff instead.');
+    console.warn(
+      'Assertion.showDiff is deprecated, use chai.config.showDiff instead.'
+    );
     return config.showDiff;
   }
 
   public static set showDiff(value: boolean) {
-    console.warn('Assertion.showDiff is deprecated, use chai.config.showDiff instead.');
+    console.warn(
+      'Assertion.showDiff is deprecated, use chai.config.showDiff instead.'
+    );
     config.showDiff = value;
   }
 
-  public static addProperty(name: string, fn?: (this: Assertion<unknown>) => unknown): void {
+  public static addProperty(
+    name: string,
+    fn?: (this: Assertion<unknown>) => unknown
+  ): void {
     util.addProperty(this.prototype, name, fn, getDefaultValue);
   }
 
-  public static addMethod<
-    TKey extends PropertyKey
-  >(
+  public static addMethod<TKey extends PropertyKey>(
     name: TKey,
-    fn: TKey extends MethodNames<Assertion<unknown>> ?
-      (
-        this: Assertion<unknown>,
-        ...args: Parameters<Assertion<unknown>[TKey]>
-      ) => (
-        ReturnType<Assertion<unknown>[TKey]> | void
-      ) :
-      ((this: Assertion<unknown>, ...args: never) => unknown)
+    fn: TKey extends MethodNames<Assertion<unknown>>
+      ? (
+          this: Assertion<unknown>,
+          ...args: Parameters<Assertion<unknown>[TKey]>
+        ) => ReturnType<Assertion<unknown>[TKey]> | void
+      : (this: Assertion<unknown>, ...args: never) => unknown
   ): void {
     util.addMethod(this.prototype, name, fn, getDefaultValue);
   }
@@ -164,8 +169,18 @@ export class Assertion<T, TFlags extends AssertionFlags<T> = AssertionFlags<T>>
     util.overwriteMethod(this.prototype, name, fn, getDefaultValue);
   }
 
-  public static overwriteChainableMethod(name: string, fn: Function, chainingBehavior: Function): void {
-    util.overwriteChainableMethod(this.prototype, name, fn, chainingBehavior, getDefaultValue);
+  public static overwriteChainableMethod(
+    name: string,
+    fn: Function,
+    chainingBehavior: Function
+  ): void {
+    util.overwriteChainableMethod(
+      this.prototype,
+      name,
+      fn,
+      chainingBehavior,
+      getDefaultValue
+    );
   }
 
   /**
@@ -199,10 +214,10 @@ export class Assertion<T, TFlags extends AssertionFlags<T> = AssertionFlags<T>>
       msg = util.getMessage(this, arguments);
       var actual = util.getActual(this, arguments);
       var assertionErrorObjectProperties: Record<string, unknown> = {
-          actual: actual
-        , expected: expected
-        , showDiff: showDiff
-        , operator: undefined
+        actual: actual,
+        expected: expected,
+        showDiff: showDiff,
+        operator: undefined
       };
 
       var operator = util.getOperator(this, arguments);
@@ -213,7 +228,8 @@ export class Assertion<T, TFlags extends AssertionFlags<T> = AssertionFlags<T>>
       throw new AssertionError(
         msg,
         assertionErrorObjectProperties,
-        (config.includeStack) ? this.assert : util.flag(this, 'ssfi'));
+        config.includeStack ? this.assert : util.flag(this, 'ssfi')
+      );
     }
   }