chore: lint fixes (orval-labs#2671)

snebjorn · web-flow · commit 4a687bd84ea4 · 2025-12-22T19:48:31.000-05:00
diff --git a/packages/core/src/generators/__tests__/mutator-test-files/default-anonymous-nested-lambda-0-args.ts b/packages/core/src/generators/__tests__/mutator-test-files/default-anonymous-nested-lambda-0-args.ts
@@ -1,2 +1,2 @@
-/* eslint-disable unicorn/consistent-function-scoping, unicorn/no-anonymous-default-export, @typescript-eslint/no-empty-function */
+/* eslint-disable unicorn/no-anonymous-default-export, @typescript-eslint/no-empty-function */
 export default () => () => {};
diff --git a/packages/core/src/generators/__tests__/mutator-test-files/default-anonymous-nested-lambda-1-args.ts b/packages/core/src/generators/__tests__/mutator-test-files/default-anonymous-nested-lambda-1-args.ts
@@ -1,2 +1,2 @@
-/* eslint-disable unicorn/consistent-function-scoping, unicorn/no-anonymous-default-export, @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars */
+/* eslint-disable unicorn/no-anonymous-default-export, @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars */
 export default () => (param1?: number) => {};
diff --git a/packages/core/src/generators/__tests__/mutator-test-files/default-anonymous-nested-lambda-2-args.ts b/packages/core/src/generators/__tests__/mutator-test-files/default-anonymous-nested-lambda-2-args.ts
@@ -1,2 +1,2 @@
-/* eslint-disable unicorn/consistent-function-scoping, unicorn/no-anonymous-default-export, @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars */
+/* eslint-disable unicorn/no-anonymous-default-export, @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars */
 export default () => (param1?: number, param2?: number) => {};
diff --git a/packages/core/src/generators/__tests__/mutator-test-files/default-anonymous-nested-lambda-3-args.ts b/packages/core/src/generators/__tests__/mutator-test-files/default-anonymous-nested-lambda-3-args.ts
@@ -1,2 +1,2 @@
-/* eslint-disable unicorn/consistent-function-scoping, unicorn/no-anonymous-default-export, @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars */
+/* eslint-disable unicorn/no-anonymous-default-export, @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars */
 export default () => (param1?: number, param2?: number, param3?: number) => {};
diff --git a/packages/core/src/generators/__tests__/mutator-test-files/named-export-tests.ts b/packages/core/src/generators/__tests__/mutator-test-files/named-export-tests.ts
@@ -1,4 +1,4 @@
-/* eslint-disable unicorn/consistent-function-scoping, @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars */
+/* eslint-disable @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars */
 
 export function fn0Param() {}
 export function fn1Param(param1?: number) {}
diff --git a/packages/core/src/generators/imports.ts b/packages/core/src/generators/imports.ts
@@ -16,7 +16,7 @@ interface GenerateImportsOptions {
 }
 
 export function generateImports({
-  imports = [],
+  imports,
   namingConvention = NamingConvention.CAMEL_CASE,
 }: GenerateImportsOptions) {
   if (imports.length === 0) {
@@ -187,7 +187,7 @@ export function addDependency({
 }: AddDependencyOptions) {
   const toAdds = exports.filter((e) => {
     const searchWords = [e.alias, e.name].filter((p) => p?.length).join('|');
-    const pattern = new RegExp(`\\b(${searchWords})\\b`, 'g');
+    const pattern = new RegExp(String.raw`\b(${searchWords})\b`, 'g');
 
     return implementation.match(pattern);
   });
diff --git a/packages/core/src/generators/schema-definition.ts b/packages/core/src/generators/schema-definition.ts
@@ -15,20 +15,11 @@ import type {
   OpenApiSchemaObject,
   OpenApiSchemasObject,
 } from '../types';
-import {
-  conventionName,
-  isString,
-  jsDoc,
-  pascal,
-  sanitize,
-  upath,
-} from '../utils';
+import { conventionName, isString, jsDoc, pascal, sanitize } from '../utils';
 import { generateInterface } from './interface';
 
 /**
  * Extract all types from #/components/schemas
- *
- * @param schemas
  */
 export function generateSchemasDefinition(
   schemas: OpenApiSchemasObject = {},
diff --git a/packages/core/src/getters/combine.ts b/packages/core/src/getters/combine.ts
@@ -145,7 +145,7 @@ export function combineSchemas({
     (acc, subSchema) => {
       // aliasCombinedTypes (v7 compat): create intermediate types like ResponseAnyOf
       // v8 default: propName stays undefined so combined types are inlined directly
-      let propName: string | undefined = undefined;
+      let propName: string | undefined;
       if (context.output.override.aliasCombinedTypes) {
         propName = name ? name + pascal(separator) : undefined;
         if (propName && acc.schemas.length > 0) {
diff --git a/packages/core/src/getters/parameters.ts b/packages/core/src/getters/parameters.ts
@@ -13,7 +13,7 @@ interface GetParametersOptions {
 }
 
 export function getParameters({
-  parameters = [],
+  parameters,
   context,
 }: GetParametersOptions): GetterParameters {
   return parameters.reduce<GetterParameters>(
diff --git a/packages/core/src/getters/query-params.ts b/packages/core/src/getters/query-params.ts
@@ -119,7 +119,7 @@ interface GetQueryParamsOptions {
 }
 
 export function getQueryParams({
-  queryParams = [],
+  queryParams,
   operationName,
   context,
   suffix = 'params',
diff --git a/packages/core/src/resolvers/object.ts b/packages/core/src/resolvers/object.ts
@@ -35,7 +35,7 @@ function resolveObjectOriginal({
     !resolvedValue.isEnum &&
     resolvedValue?.type === 'object' &&
     new RegExp(
-      context.output.override.aliasCombinedTypes ? '{|&|\\|' : '{',
+      context.output.override.aliasCombinedTypes ? String.raw`{|&|\|` : '{',
     ).test(resolvedValue.value)
   ) {
     let model = '';
diff --git a/packages/core/src/utils/string.ts b/packages/core/src/utils/string.ts
@@ -17,7 +17,7 @@ export function stringify(
   }
 
   if (isString(data)) {
-    return `'${data.replaceAll("'", "\\'")}'`;
+    return `'${data.replaceAll("'", String.raw`\'`)}'`;
   }
 
   if (isNumber(data) || isBoolean(data) || isFunction(data)) {
diff --git a/packages/core/src/writers/generate-imports-for-builder.ts b/packages/core/src/writers/generate-imports-for-builder.ts
@@ -8,17 +8,7 @@ export function generateImportsForBuilder(
   imports: GeneratorImport[],
   relativeSchemasPath: string,
 ) {
-  if (!output.indexFiles) {
-    return uniqueBy(imports, (x) => x.name).map((i) => {
-      const baseName = i.isZodSchema && i.schemaName ? i.schemaName : i.name;
-      const name = conventionName(baseName, output.namingConvention);
-      const suffix = i.isZodSchema ? '.zod' : '';
-      return {
-        exports: [i],
-        dependency: upath.joinSafe(relativeSchemasPath, `${name}${suffix}`),
-      };
-    });
-  } else {
+  if (output.indexFiles) {
     const typeScriptTypeImports = imports.filter((i) => !i.isZodSchema);
     const typeScriptTypeImportGroup =
       typeScriptTypeImports.length > 0
@@ -37,5 +27,15 @@ export function generateImportsForBuilder(
         : [];
 
     return [...typeScriptTypeImportGroup, ...zodSchemaImportGroup];
+  } else {
+    return uniqueBy(imports, (x) => x.name).map((i) => {
+      const baseName = i.isZodSchema && i.schemaName ? i.schemaName : i.name;
+      const name = conventionName(baseName, output.namingConvention);
+      const suffix = i.isZodSchema ? '.zod' : '';
+      return {
+        exports: [i],
+        dependency: upath.joinSafe(relativeSchemasPath, `${name}${suffix}`),
+      };
+    });
   }
 }
diff --git a/packages/mock/src/msw/index.ts b/packages/mock/src/msw/index.ts
@@ -162,7 +162,7 @@ export const ${handlerName} = (overrideResponse?: ${returnType} | ((${infoParam}
         ...imports,
         ...response.imports.filter((r) => {
           // Only include imports which are actually used in mock.
-          const reg = new RegExp(`\\b${r.name}\\b`);
+          const reg = new RegExp(String.raw`\b${r.name}\b`);
           return (
             reg.test(handlerImplementation) || reg.test(mockImplementation)
           );
diff --git a/packages/orval/src/client.ts b/packages/orval/src/client.ts
@@ -61,7 +61,7 @@ const getGeneratorClient = (
 };
 
 export const generateClientImports: GeneratorClientImports = ({
-  client = DEFAULT_CLIENT,
+  client,
   implementation,
   imports,
   projectName,
@@ -129,7 +129,7 @@ export const generateClientHeader: GeneratorClientHeader = ({
 };
 
 export const generateClientFooter: GeneratorClientFooter = ({
-  outputClient = DEFAULT_CLIENT,
+  outputClient,
   operationNames,
   hasMutator,
   hasAwaitedType,
diff --git a/packages/orval/src/import-specs.ts b/packages/orval/src/import-specs.ts
@@ -66,7 +66,7 @@ export async function importSpecs(
 
 /**
  * The plugins from `@scalar/json-magic` does not dereference $ref.
- * Instead if fetches them and puts them under x-ext, and changes the $ref to point to #x-ext/<name>.
+ * Instead it fetches them and puts them under x-ext, and changes the $ref to point to #x-ext/<name>.
  * This function dereferences those x-ext $ref's.
  */
 export function dereferenceExternalRef(data: object): object {
diff --git a/packages/orval/src/write-specs.ts b/packages/orval/src/write-specs.ts
@@ -2,20 +2,19 @@ import {
   createSuccessMessage,
   getFileInfo,
   getMockFileExtensionByTypeName,
+  isString,
   jsDoc,
   log,
   type NormalizedOptions,
   type OpenApiInfoObject,
   OutputMode,
-  type SchemaGenerationType,
   upath,
   writeSchemas,
   writeSingleMode,
   type WriteSpecBuilder,
   writeSplitMode,
   writeSplitTagsMode,
   writeTagsMode,
-  isString,
 } from '@orval/core';
 import chalk from 'chalk';
 import { execa, ExecaError } from 'execa';
@@ -44,7 +43,7 @@ export async function writeSpecs(
   options: NormalizedOptions,
   projectName?: string,
 ) {
-  const { info = { title: '', version: 0 }, schemas, target } = builder;
+  const { info, schemas, target } = builder;
   const { output } = options;
   const projectTitle = projectName ?? info.title;
 
diff --git a/packages/orval/src/write-zod-specs.ts b/packages/orval/src/write-zod-specs.ts
@@ -1,6 +1,6 @@
 import {
-  conventionName,
   type ContextSpec,
+  conventionName,
   type GeneratorVerbOptions,
   type NamingConvention,
   type NormalizedOutputOptions,
@@ -36,17 +36,17 @@ async function writeZodSchemaIndex(
   header: string,
   schemaNames: string[],
   namingConvention: NamingConvention,
-  shouldMergeExisting: boolean = false,
+  shouldMergeExisting = false,
 ) {
   const importFileExtension = fileExtension.replace(/\.ts$/, '');
   const indexPath = upath.join(schemasPath, `index${fileExtension}`);
 
   let existingExports = '';
   if (shouldMergeExisting && (await fs.pathExists(indexPath))) {
-    const existingContent = await fs.readFile(indexPath, 'utf-8');
-    const headerMatch = existingContent.match(/^(\/\*\*[\s\S]*?\*\/\n)?/);
+    const existingContent = await fs.readFile(indexPath, 'utf8');
+    const headerMatch = /^(\/\*\*[\s\S]*?\*\/\n)?/.exec(existingContent);
     const headerPart = headerMatch ? headerMatch[0] : '';
-    existingExports = existingContent.substring(headerPart.length).trim();
+    existingExports = existingContent.slice(headerPart.length).trim();
   }
 
   const newExports = schemaNames
diff --git a/packages/query/src/client.ts b/packages/query/src/client.ts
@@ -120,7 +120,7 @@ export const generateAxiosRequestFunction = (
     const propsImplementation =
       mutator?.bodyTypeName && body.definition
         ? toObjectString(props, 'implementation').replace(
-            new RegExp(`(\\w*):\\s?${bodyDefinition}`),
+            new RegExp(String.raw`(\w*):\s?${bodyDefinition}`),
             `$1: ${mutator.bodyTypeName}<${body.definition}>`,
           )
         : toObjectString(props, 'implementation');
diff --git a/packages/query/src/index.ts b/packages/query/src/index.ts
@@ -905,7 +905,7 @@ const generateQueryImplementation = ({
   const queryPropDefinitions = toObjectString(props, 'definition');
   const definedInitialDataQueryPropsDefinitions = toObjectString(
     props.map((prop) => {
-      const regex = new RegExp(`^${prop.name}\\s*\\?:`);
+      const regex = new RegExp(String.raw`^${prop.name}\s*\?:`);
 
       if (!regex.test(prop.definition)) {
         return prop;
@@ -1252,7 +1252,7 @@ const generateQueryHook = async (
     summary,
     deprecated,
   }: GeneratorVerbOptions,
-  { route, override: { operations = {} }, context, output }: GeneratorOptions,
+  { route, override: { operations }, context, output }: GeneratorOptions,
   outputClient: OutputClient | OutputClientFunc,
 ) => {
   let props = _props;

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-/* eslint-disable unicorn/consistent-function-scoping, unicorn/no-anonymous-default-export, @typescript-eslint/no-empty-function */`
	`1`	`+/* eslint-disable unicorn/no-anonymous-default-export, @typescript-eslint/no-empty-function */`
`2`	`2`	`export default () => () => {};`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* eslint-disable unicorn/consistent-function-scoping, @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars */`
	`1`	`+/* eslint-disable @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars */`
`2`	`2`
`3`	`3`	`export function fn0Param() {}`
`4`	`4`	`export function fn1Param(param1?: number) {}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ interface GetParametersOptions {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`export function getParameters({`
`16`		`- parameters = [],`
	`16`	`+ parameters,`
`17`	`17`	`context,`
`18`	`18`	`}: GetParametersOptions): GetterParameters {`
`19`	`19`	`return parameters.reduce<GetterParameters>(`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ interface GetQueryParamsOptions {`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`export function getQueryParams({`
`122`		`- queryParams = [],`
	`122`	`+ queryParams,`
`123`	`123`	`operationName,`
`124`	`124`	`context,`
`125`	`125`	`suffix = 'params',`