Fix optional import

Author: porada

src/config-base/eslint.test.ts

@@ -18,7 +18,8 @@ test('is a valid ESLint config', async () => {
 });
 
 test('skips parser options when `typescript-eslint` is unavailable', async () => {
-	vi.doMock('typescript-eslint', () => ({}));
+	/* @ts-expect-error */
+	vi.doMock('typescript-eslint', () => undefined);
 
 	const { default: config } = await import('./eslint.ts');
 

src/types/oxlint.d.ts

@@ -1,5 +1,8 @@
 import type { ExternalPluginEntry, OxlintConfig, OxlintOverride } from 'oxlint';
+import type { StandardConfigOptions } from './common.d.ts';
 
 export type OxlintOverrideEntry = Pick<OxlintOverride, 'rules'>;
 
 export type OxlintPluginEntry = Exclude<ExternalPluginEntry, string>;
+
+export type StandardConfig = OxlintConfig & StandardConfigOptions;

src/types/oxlint.test-d.ts

@@ -1,4 +1,9 @@
-import type { OxlintOverrideEntry, OxlintPluginEntry } from './oxlint.d.ts';
+import type { StandardConfigOptions } from './common.d.ts';
+import type {
+	OxlintOverrideEntry,
+	OxlintPluginEntry,
+	StandardConfig,
+} from './oxlint.d.ts';
 import { expectTypeOf, test } from 'vitest';
 
 test('exposes valid types', () => {
@@ -8,4 +13,8 @@ test('exposes valid types', () => {
 	expectTypeOf<OxlintPluginEntry>().toBeObject();
 	expectTypeOf<OxlintPluginEntry>().toHaveProperty('name');
 	expectTypeOf<OxlintPluginEntry>().toHaveProperty('specifier');
+
+	expectTypeOf<StandardConfig>().toBeObject();
+	expectTypeOf<StandardConfig>().toHaveProperty('react');
+	expectTypeOf<StandardConfig>().not.toEqualTypeOf<StandardConfigOptions>();
 });

src/utilities/define-oxlint-config/index.test.ts

@@ -1,9 +1,13 @@
 import { defineConfig as standardDefineConfig } from '@standard-config/oxlint';
-import { expect, test, vi } from 'vitest';
+import { beforeEach, expect, test, vi } from 'vitest';
 import oxlintConfigBase from '../../config-base/oxlint.ts';
 import oxlintConfigBaseReact from '../../config-react/oxlint.ts';
 import defineOxlintConfig from './index.ts';
 
+beforeEach(() => {
+	vi.resetModules();
+});
+
 vi.mock(import('@standard-config/oxlint'), async (importActual) => {
 	const actual = await importActual();
 
@@ -42,3 +46,12 @@ test('forwards the `react` option', () => {
 		},
 	});
 });
+
+test('throws when `@standard-config/oxlint` is unavailable', async () => {
+	/* @ts-expect-error */
+	vi.doMock('@standard-config/oxlint', () => undefined);
+
+	const { default: defineOxlintConfig } = await import('./index.ts');
+
+	expect(() => defineOxlintConfig()).toThrowError('@standard-config/oxlint');
+});

src/utilities/define-oxlint-config/index.ts

@@ -1,15 +1,31 @@
 import type { OxlintConfig } from 'oxlint';
-import { defineConfig as standardDefineConfig } from '@standard-config/oxlint';
+import type { StandardConfig } from '../../types/oxlint.d.ts';
 import oxlintConfigBase from '../../config-base/oxlint.ts';
 import oxlintConfigBaseReact from '../../config-react/oxlint.ts';
 
+/* oxlint-disable-next-line typescript/consistent-type-imports */
+let oxlintConfig: typeof import('@standard-config/oxlint') | undefined;
+
+try {
+	oxlintConfig = await import('@standard-config/oxlint');
+} catch {}
+
 /**
  * Wrapper around `defineConfig` from `@standard-config/oxlint` that combines
  * Standard Config’s Oxlint and ESLint configs, with optional overrides.
  */
 export default function defineOxlintConfig(
-	...configs: Parameters<typeof standardDefineConfig>
+	...configs: StandardConfig[]
 ): OxlintConfig {
+	const { defineConfig } = oxlintConfig ?? {};
+
+	if (typeof defineConfig !== 'function') {
+		/* oxlint-disable-next-line eslint-plugin-unicorn/prefer-type-error */
+		throw new Error(
+			'Standard Config error: `@standard-config/oxlint` is missing'
+		);
+	}
+
 	let includeReactConfig = false;
 
 	for (const { react } of configs) {
@@ -18,7 +34,7 @@ export default function defineOxlintConfig(
 		}
 	}
 
-	return standardDefineConfig(
+	return defineConfig(
 		includeReactConfig ? oxlintConfigBaseReact : oxlintConfigBase,
 		...configs
 	);