Lint

L-Mario564 · Nov 27, 2024 · 22c5562 · 22c5562
1 parent cf7e8fc
commit 22c5562
Show file tree

Hide file tree

Showing 29 changed files with 144 additions and 147 deletions.
diff --git a/drizzle-orm/src/pg-core/columns/common.ts b/drizzle-orm/src/pg-core/columns/common.ts
@@ -4,7 +4,6 @@ import type {
 	ColumnBuilderExtraConfig,
 	ColumnBuilderRuntimeConfig,
 	ColumnDataType,
-	GeneratedColumnConfig,
 	HasGenerated,
 	MakeColumnConfig,
 } from '~/column-builder.ts';

diff --git a/drizzle-orm/src/pg-core/columns/varchar.ts b/drizzle-orm/src/pg-core/columns/varchar.ts
@@ -1,7 +1,7 @@
 import type { ColumnBuilderBaseConfig, ColumnBuilderRuntimeConfig, MakeColumnConfig } from '~/column-builder.ts';
 import type { ColumnBaseConfig } from '~/column.ts';
 import { entityKind } from '~/entity.ts';
-import { type AnyPgTable, pgTable } from '~/pg-core/table.ts';
+import type { AnyPgTable } from '~/pg-core/table.ts';
 import { getColumnNameAndConfig, type Writable } from '~/utils.ts';
 import { PgColumn, PgColumnBuilder } from './common.ts';
 

diff --git a/drizzle-typebox/src/column.ts b/drizzle-typebox/src/column.ts
@@ -40,19 +40,19 @@ import type {
 	PgVector,
 } from 'drizzle-orm/pg-core';
 import type { SQLiteInteger, SQLiteReal, SQLiteText } from 'drizzle-orm/sqlite-core';
-import { CONSTANTS } from './constants';
-import { isColumnType, isWithEnum } from './utils';
-import type { BufferSchema, JsonSchema } from './utils';
+import { CONSTANTS } from './constants.ts';
+import { isColumnType, isWithEnum } from './utils.ts';
+import type { BufferSchema, JsonSchema } from './utils.ts';
 
 export const literalSchema = t.Union([t.String(), t.Number(), t.Boolean(), t.Null()]);
 export const jsonSchema: JsonSchema = t.Recursive((self) =>
 	t.Union([literalSchema, t.Array(self), t.Record(t.String(), self)])
 ) as any;
-TypeRegistry.Set('Buffer', (_, value) => value instanceof Buffer);
+TypeRegistry.Set('Buffer', (_, value) => value instanceof Buffer); // eslint-disable-line no-instanceof/no-instanceof
 export const bufferSchema: BufferSchema = { [Kind]: 'Buffer', type: 'buffer' } as any;
 
 export function mapEnumValues(values: string[]) {
-	return values.reduce((acc, value) => ({ ...acc, [value]: value }), {});
+	return Object.fromEntries(values.map((value) => [value, value]));
 }
 
 /** @internal */
@@ -202,8 +202,8 @@ function numberColumnToSchema(column: Column, t: typeof typebox): TSchema {
 
 function bigintColumnToSchema(column: Column, t: typeof typebox): TSchema {
 	const unsigned = column.getSQLType().includes('unsigned');
-	let min = unsigned ? 0n : CONSTANTS.INT64_MIN;
-	let max = unsigned ? CONSTANTS.INT64_UNSIGNED_MAX : CONSTANTS.INT64_MAX;
+	const min = unsigned ? 0n : CONSTANTS.INT64_MIN;
+	const max = unsigned ? CONSTANTS.INT64_UNSIGNED_MAX : CONSTANTS.INT64_MAX;
 
 	return t.BigInt({
 		minimum: min,

diff --git a/drizzle-typebox/src/column.types.ts b/drizzle-typebox/src/column.types.ts
@@ -1,13 +1,6 @@
 import type * as t from '@sinclair/typebox';
 import type { Assume, Column } from 'drizzle-orm';
-import type {
-	ArrayHasAtLeastOneValue,
-	BufferSchema,
-	ColumnIsGeneratedAlwaysAs,
-	IsNever,
-	Json,
-	JsonSchema,
-} from './utils';
+import type { ArrayHasAtLeastOneValue, BufferSchema, ColumnIsGeneratedAlwaysAs, IsNever, JsonSchema } from './utils.ts';
 
 export type GetEnumValuesFromColumn<TColumn extends Column> = TColumn['_'] extends { enumValues: [string, ...string[]] }
 	? TColumn['_']['enumValues']

diff --git a/drizzle-typebox/src/index.ts b/drizzle-typebox/src/index.ts
@@ -1,2 +1,2 @@
-export * from './schema';
-export * from './schema.types';
+export * from './schema.ts';
+export * from './schema.types.ts';
diff --git a/drizzle-typebox/src/schema.ts b/drizzle-typebox/src/schema.ts
@@ -3,15 +3,15 @@ import type { TSchema } from '@sinclair/typebox';
 import { Column, getTableColumns, getViewSelectedFields, is, isTable, isView, SQL } from 'drizzle-orm';
 import type { Table, View } from 'drizzle-orm';
 import type { PgEnum } from 'drizzle-orm/pg-core';
-import { columnToSchema, mapEnumValues } from './column';
+import { columnToSchema, mapEnumValues } from './column.ts';
+import type { Conditions } from './schema.types.internal.ts';
 import type {
 	CreateInsertSchema,
 	CreateSchemaFactoryOptions,
 	CreateSelectSchema,
 	CreateUpdateSchema,
-} from './schema.types';
-import type { Conditions } from './schema.types.internal';
-import { isPgEnum } from './utils';
+} from './schema.types.ts';
+import { isPgEnum } from './utils.ts';
 
 function getColumns(tableLike: Table | View) {
 	return isTable(tableLike) ? getTableColumns(tableLike) : getViewSelectedFields(tableLike);
@@ -39,7 +39,7 @@ function handleColumns(
 		}
 
 		const column = is(selected, Column) ? selected : undefined;
-		const schema = !!column ? columnToSchema(column, factory?.typeboxInstance ?? t) : t.Any();
+		const schema = column ? columnToSchema(column, factory?.typeboxInstance ?? t) : t.Any();
 		const refined = typeof refinement === 'function' ? refinement(schema) : schema;
 
 		if (conditions.never(column)) {

diff --git a/drizzle-typebox/src/schema.types.internal.ts b/drizzle-typebox/src/schema.types.internal.ts
@@ -1,7 +1,7 @@
 import type * as t from '@sinclair/typebox';
 import type { Assume, Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
-import type { GetBaseColumn, GetEnumValuesFromColumn, GetTypeboxType, HandleColumn } from './column.types';
-import type { GetSelection, RemoveNever } from './utils';
+import type { GetBaseColumn, GetEnumValuesFromColumn, GetTypeboxType, HandleColumn } from './column.types.ts';
+import type { GetSelection, RemoveNever } from './utils.ts';
 
 export interface Conditions {
 	never: (column?: Column) => boolean;

diff --git a/drizzle-typebox/src/schema.types.ts b/drizzle-typebox/src/schema.types.ts
@@ -1,8 +1,8 @@
 import type * as t from '@sinclair/typebox';
 import type { Table, View } from 'drizzle-orm';
 import type { PgEnum } from 'drizzle-orm/pg-core';
-import type { EnumValuesToEnum } from './column.types';
-import type { BuildRefine, BuildSchema, NoUnknownKeys } from './schema.types.internal';
+import type { EnumValuesToEnum } from './column.types.ts';
+import type { BuildRefine, BuildSchema, NoUnknownKeys } from './schema.types.internal.ts';
 
 export interface CreateSelectSchema {
 	<TTable extends Table>(table: TTable): BuildSchema<'select', TTable['_']['columns'], undefined>;

diff --git a/drizzle-typebox/src/utils.ts b/drizzle-typebox/src/utils.ts
@@ -1,7 +1,7 @@
 import type { Kind, Static, TSchema } from '@sinclair/typebox';
 import type { Column, SelectedFieldsFlat, Table, View } from 'drizzle-orm';
 import type { PgEnum } from 'drizzle-orm/pg-core';
-import type { literalSchema } from './column';
+import type { literalSchema } from './column.ts';
 
 export function isColumnType<T extends Column>(column: Column, columnTypes: string[]): column is T {
 	return columnTypes.includes(column.columnType);

diff --git a/drizzle-typebox/tests/mysql.test.ts b/drizzle-typebox/tests/mysql.test.ts
@@ -1,5 +1,5 @@
 import { Type as t } from '@sinclair/typebox';
-import { Equal, sql } from 'drizzle-orm';
+import { type Equal, sql } from 'drizzle-orm';
 import { int, mysqlSchema, mysqlTable, mysqlView, serial, text } from 'drizzle-orm/mysql-core';
 import { test } from 'vitest';
 import { jsonSchema } from '~/column.ts';

diff --git a/drizzle-typebox/tests/pg.test.ts b/drizzle-typebox/tests/pg.test.ts
@@ -1,5 +1,5 @@
 import { Type as t } from '@sinclair/typebox';
-import { Equal, sql } from 'drizzle-orm';
+import { type Equal, sql } from 'drizzle-orm';
 import { integer, pgEnum, pgMaterializedView, pgSchema, pgTable, pgView, serial, text } from 'drizzle-orm/pg-core';
 import { test } from 'vitest';
 import { jsonSchema } from '~/column.ts';

diff --git a/drizzle-typebox/tests/sqlite.test.ts b/drizzle-typebox/tests/sqlite.test.ts
@@ -1,5 +1,5 @@
 import { Type as t } from '@sinclair/typebox';
-import { Equal, sql } from 'drizzle-orm';
+import { type Equal, sql } from 'drizzle-orm';
 import { int, sqliteTable, sqliteView, text } from 'drizzle-orm/sqlite-core';
 import { test } from 'vitest';
 import { bufferSchema, jsonSchema } from '~/column.ts';

diff --git a/drizzle-valibot/src/column.ts b/drizzle-valibot/src/column.ts
@@ -39,20 +39,20 @@ import type {
 } from 'drizzle-orm/pg-core';
 import type { SQLiteInteger, SQLiteReal, SQLiteText } from 'drizzle-orm/sqlite-core';
 import * as v from 'valibot';
-import { CONSTANTS } from './constants';
-import { isColumnType, isWithEnum } from './utils';
-import type { Json } from './utils';
+import { CONSTANTS } from './constants.ts';
+import { isColumnType, isWithEnum } from './utils.ts';
+import type { Json } from './utils.ts';
 
 export const literalSchema = v.union([v.string(), v.number(), v.boolean(), v.null()]);
 export const jsonSchema: v.GenericSchema<Json> = v.union([
 	literalSchema,
 	v.array(v.lazy(() => jsonSchema)),
 	v.record(v.string(), v.lazy(() => jsonSchema)),
 ]);
-export const bufferSchema: v.GenericSchema<Buffer> = v.custom<Buffer>((v) => v instanceof Buffer);
+export const bufferSchema: v.GenericSchema<Buffer> = v.custom<Buffer>((v) => v instanceof Buffer); // eslint-disable-line no-instanceof/no-instanceof
 
 export function mapEnumValues(values: string[]) {
-	return values.reduce((acc, value) => ({ ...acc, [value]: value }), {});
+	return Object.fromEntries(values.map((value) => [value, value]));
 }
 
 /** @internal */
@@ -185,8 +185,8 @@ function numberColumnToSchema(column: Column): v.GenericSchema {
 
 function bigintColumnToSchema(column: Column): v.GenericSchema {
 	const unsigned = column.getSQLType().includes('unsigned');
-	let min = unsigned ? 0n : CONSTANTS.INT64_MIN;
-	let max = unsigned ? CONSTANTS.INT64_UNSIGNED_MAX : CONSTANTS.INT64_MAX;
+	const min = unsigned ? 0n : CONSTANTS.INT64_MIN;
+	const max = unsigned ? CONSTANTS.INT64_UNSIGNED_MAX : CONSTANTS.INT64_MAX;
 
 	return v.pipe(v.bigint(), v.minValue(min), v.maxValue(max));
 }

diff --git a/drizzle-valibot/src/column.types.ts b/drizzle-valibot/src/column.types.ts
@@ -1,7 +1,12 @@
 import type { Assume, Column } from 'drizzle-orm';
-import { PgArray, PgBinaryVector, PgVarchar } from 'drizzle-orm/pg-core';
 import type * as v from 'valibot';
-import type { ArrayHasAtLeastOneValue, ColumnIsGeneratedAlwaysAs, IsNever, Json, RemoveNeverElements } from './utils';
+import type {
+	ArrayHasAtLeastOneValue,
+	ColumnIsGeneratedAlwaysAs,
+	IsNever,
+	Json,
+	RemoveNeverElements,
+} from './utils.ts';
 
 export type GetEnumValuesFromColumn<TColumn extends Column> = TColumn['_'] extends { enumValues: [string, ...string[]] }
 	? TColumn['_']['enumValues']

diff --git a/drizzle-valibot/src/index.ts b/drizzle-valibot/src/index.ts
@@ -1,2 +1,2 @@
-export * from './schema';
-export * from './schema.types';
+export * from './schema.ts';
+export * from './schema.types.ts';
diff --git a/drizzle-valibot/src/schema.ts b/drizzle-valibot/src/schema.ts
@@ -2,10 +2,10 @@ import { Column, getTableColumns, getViewSelectedFields, is, isTable, isView, SQ
 import type { Table, View } from 'drizzle-orm';
 import type { PgEnum } from 'drizzle-orm/pg-core';
 import * as v from 'valibot';
-import { columnToSchema, mapEnumValues } from './column';
-import type { CreateInsertSchema, CreateSelectSchema, CreateUpdateSchema } from './schema.types';
-import type { Conditions } from './schema.types.internal';
-import { isPgEnum } from './utils';
+import { columnToSchema, mapEnumValues } from './column.ts';
+import type { Conditions } from './schema.types.internal.ts';
+import type { CreateInsertSchema, CreateSelectSchema, CreateUpdateSchema } from './schema.types.ts';
+import { isPgEnum } from './utils.ts';
 
 function getColumns(tableLike: Table | View) {
 	return isTable(tableLike) ? getTableColumns(tableLike) : getViewSelectedFields(tableLike);
@@ -32,7 +32,7 @@ function handleColumns(
 		}
 
 		const column = is(selected, Column) ? selected : undefined;
-		const schema = !!column ? columnToSchema(column) : v.any();
+		const schema = column ? columnToSchema(column) : v.any();
 		const refined = typeof refinement === 'function' ? refinement(schema) : schema;
 
 		if (conditions.never(column)) {

diff --git a/drizzle-valibot/src/schema.types.internal.ts b/drizzle-valibot/src/schema.types.internal.ts
@@ -6,8 +6,8 @@ import type {
 	GetEnumValuesFromColumn,
 	GetValibotType,
 	HandleColumn,
-} from './column.types';
-import type { GetSelection, RemoveNever } from './utils';
+} from './column.types.ts';
+import type { GetSelection, RemoveNever } from './utils.ts';
 
 export interface Conditions {
 	never: (column?: Column) => boolean;

diff --git a/drizzle-valibot/src/schema.types.ts b/drizzle-valibot/src/schema.types.ts
@@ -1,8 +1,8 @@
 import type { Table, View } from 'drizzle-orm';
 import type { PgEnum } from 'drizzle-orm/pg-core';
 import type * as v from 'valibot';
-import type { EnumValuesToEnum } from './column.types';
-import type { BuildRefine, BuildSchema, NoUnknownKeys } from './schema.types.internal';
+import type { EnumValuesToEnum } from './column.types.ts';
+import type { BuildRefine, BuildSchema, NoUnknownKeys } from './schema.types.internal.ts';
 
 export interface CreateSelectSchema {
 	<TTable extends Table>(table: TTable): BuildSchema<'select', TTable['_']['columns'], undefined>;

diff --git a/drizzle-valibot/src/utils.ts b/drizzle-valibot/src/utils.ts
@@ -1,7 +1,7 @@
 import type { Column, SelectedFieldsFlat, Table, View } from 'drizzle-orm';
 import type { PgEnum } from 'drizzle-orm/pg-core';
 import type * as v from 'valibot';
-import type { literalSchema } from './column';
+import type { literalSchema } from './column.ts';
 
 export function isColumnType<T extends Column>(column: Column, columnTypes: string[]): column is T {
 	return columnTypes.includes(column.columnType);

diff --git a/drizzle-valibot/tests/mysql.test.ts b/drizzle-valibot/tests/mysql.test.ts
@@ -1,4 +1,4 @@
-import { Equal, sql } from 'drizzle-orm';
+import { type Equal, sql } from 'drizzle-orm';
 import { int, mysqlSchema, mysqlTable, mysqlView, serial, text } from 'drizzle-orm/mysql-core';
 import * as v from 'valibot';
 import { test } from 'vitest';
@@ -199,12 +199,12 @@ test('refine table - select', (t) => {
 
 	const result = createSelectSchema(table, {
 		c2: (schema) => v.pipe(schema, v.maxValue(1000)),
-		c3: v.pipe(v.string(), v.transform((v) => Number(v))),
+		c3: v.pipe(v.string(), v.transform(Number)),
 	});
 	const expected = v.object({
 		c1: v.nullable(intSchema),
 		c2: v.pipe(intSchema, v.maxValue(1000)),
-		c3: v.pipe(v.string(), v.transform((v) => Number(v))),
+		c3: v.pipe(v.string(), v.transform(Number)),
 	});
 	expectSchemaShape(t, expected).from(result);
 	Expect<Equal<typeof result, typeof expected>>();
@@ -220,12 +220,12 @@ test('refine table - insert', (t) => {
 
 	const result = createInsertSchema(table, {
 		c2: (schema) => v.pipe(schema, v.maxValue(1000)),
-		c3: v.pipe(v.string(), v.transform((v) => Number(v))),
+		c3: v.pipe(v.string(), v.transform(Number)),
 	});
 	const expected = v.object({
 		c1: v.optional(v.nullable(intSchema)),
 		c2: v.pipe(intSchema, v.maxValue(1000)),
-		c3: v.pipe(v.string(), v.transform((v) => Number(v))),
+		c3: v.pipe(v.string(), v.transform(Number)),
 	});
 	expectSchemaShape(t, expected).from(result);
 	Expect<Equal<typeof result, typeof expected>>();
@@ -241,12 +241,12 @@ test('refine table - update', (t) => {
 
 	const result = createUpdateSchema(table, {
 		c2: (schema) => v.pipe(schema, v.maxValue(1000)),
-		c3: v.pipe(v.string(), v.transform((v) => Number(v))),
+		c3: v.pipe(v.string(), v.transform(Number)),
 	});
 	const expected = v.object({
 		c1: v.optional(v.nullable(intSchema)),
 		c2: v.optional(v.pipe(intSchema, v.maxValue(1000))),
-		c3: v.pipe(v.string(), v.transform((v) => Number(v))),
+		c3: v.pipe(v.string(), v.transform(Number)),
 	});
 	expectSchemaShape(t, expected).from(result);
 	Expect<Equal<typeof result, typeof expected>>();
@@ -277,29 +277,29 @@ test('refine view - select', (t) => {
 
 	const result = createSelectSchema(view, {
 		c2: (schema) => v.pipe(schema, v.maxValue(1000)),
-		c3: v.pipe(v.string(), v.transform((v) => Number(v))),
+		c3: v.pipe(v.string(), v.transform(Number)),
 		nested: {
 			c5: (schema) => v.pipe(schema, v.maxValue(1000)),
-			c6: v.pipe(v.string(), v.transform((v) => Number(v))),
+			c6: v.pipe(v.string(), v.transform(Number)),
 		},
 		table: {
 			c2: (schema) => v.pipe(schema, v.maxValue(1000)),
-			c3: v.pipe(v.string(), v.transform((v) => Number(v))),
+			c3: v.pipe(v.string(), v.transform(Number)),
 		},
 	});
 	const expected = v.object({
 		c1: v.nullable(intSchema),
 		c2: v.nullable(v.pipe(intSchema, v.maxValue(1000))),
-		c3: v.pipe(v.string(), v.transform((v) => Number(v))),
+		c3: v.pipe(v.string(), v.transform(Number)),
 		nested: v.object({
 			c4: v.nullable(intSchema),
 			c5: v.nullable(v.pipe(intSchema, v.maxValue(1000))),
-			c6: v.pipe(v.string(), v.transform((v) => Number(v))),
+			c6: v.pipe(v.string(), v.transform(Number)),
 		}),
 		table: v.object({
 			c1: v.nullable(intSchema),
 			c2: v.nullable(v.pipe(intSchema, v.maxValue(1000))),
-			c3: v.pipe(v.string(), v.transform((v) => Number(v))),
+			c3: v.pipe(v.string(), v.transform(Number)),
 			c4: v.nullable(intSchema),
 			c5: v.nullable(intSchema),
 			c6: v.nullable(intSchema),