metal-orm 1.1.11 → 1.1.16

package/src/dto/openapi/generators/dto.ts

@@ -1,91 +1,91 @@
-import type { TableDef } from '../../../schema/table.js';
-import type { EntityConstructor } from '../../../orm/entity-metadata.js';
-import type { OpenApiSchema, OpenApiDialect } from '../types.js';
-import { columnToOpenApiSchema } from './column.js';
-import { getColumnMap } from './base.js';
-
-export function dtoToOpenApiSchema<T extends TableDef | EntityConstructor, TExclude extends PropertyKey>(
-  target: T,
-  exclude?: TExclude[],
-  dialect: OpenApiDialect = 'openapi-3.1'
-): OpenApiSchema {
-  const columns = getColumnMap(target);
-  const properties: Record<string, OpenApiSchema> = {};
-  const required: string[] = [];
-
-  for (const [key, col] of Object.entries(columns)) {
-    if (exclude?.includes(key as TExclude)) {
-      continue;
-    }
-
-    properties[key] = columnToOpenApiSchema(col, dialect);
-
-    if (col.notNull || col.primary) {
-      required.push(key);
-    }
-  }
-
-  return {
-    type: 'object',
-    properties,
-    ...(required.length > 0 && { required }),
-  };
-}
-
-export function createDtoToOpenApiSchema<T extends TableDef | EntityConstructor, TExclude extends PropertyKey>(
-  target: T,
-  exclude?: TExclude[],
-  dialect: OpenApiDialect = 'openapi-3.1'
-): OpenApiSchema {
-  const columns = getColumnMap(target);
-  const properties: Record<string, OpenApiSchema> = {};
-  const required: string[] = [];
-
-  for (const [key, col] of Object.entries(columns)) {
-    if (exclude?.includes(key as TExclude)) {
-      continue;
-    }
-
-    if (col.autoIncrement || col.generated) {
-      continue;
-    }
-
-    properties[key] = columnToOpenApiSchema(col, dialect);
-
-    if (col.notNull && !col.default) {
-      required.push(key);
-    }
-  }
-
-  return {
-    type: 'object',
-    properties,
-    ...(required.length > 0 && { required }),
-  };
-}
-
-export function updateDtoToOpenApiSchema<T extends TableDef | EntityConstructor, TExclude extends PropertyKey>(
-  target: T,
-  exclude?: TExclude[],
-  dialect: OpenApiDialect = 'openapi-3.1'
-): OpenApiSchema {
-  const columns = getColumnMap(target);
-  const properties: Record<string, OpenApiSchema> = {};
-
-  for (const [key, col] of Object.entries(columns)) {
-    if (exclude?.includes(key as TExclude)) {
-      continue;
-    }
-
-    if (col.autoIncrement || col.generated) {
-      continue;
-    }
-
-    properties[key] = columnToOpenApiSchema(col, dialect);
-  }
-
-  return {
-    type: 'object',
-    properties,
-  };
-}
+import type { TableDef } from '../../../schema/table.js';
+import type { EntityConstructor } from '../../../orm/entity-metadata.js';
+import type { OpenApiSchema, OpenApiDialect } from '../types.js';
+import { columnToOpenApiSchema } from './column.js';
+import { getColumnMap } from './base.js';
+
+export function dtoToOpenApiSchema<T extends TableDef | EntityConstructor, TExclude extends PropertyKey>(
+  target: T,
+  exclude?: TExclude[],
+  dialect: OpenApiDialect = 'openapi-3.1'
+): OpenApiSchema {
+  const columns = getColumnMap(target);
+  const properties: Record<string, OpenApiSchema> = {};
+  const required: string[] = [];
+
+  for (const [key, col] of Object.entries(columns)) {
+    if (exclude?.includes(key as TExclude)) {
+      continue;
+    }
+
+    properties[key] = columnToOpenApiSchema(col, dialect);
+
+    if (col.notNull || col.primary) {
+      required.push(key);
+    }
+  }
+
+  return {
+    type: 'object',
+    properties,
+    ...(required.length > 0 && { required }),
+  };
+}
+
+export function createDtoToOpenApiSchema<T extends TableDef | EntityConstructor, TExclude extends PropertyKey>(
+  target: T,
+  exclude?: TExclude[],
+  dialect: OpenApiDialect = 'openapi-3.1'
+): OpenApiSchema {
+  const columns = getColumnMap(target);
+  const properties: Record<string, OpenApiSchema> = {};
+  const required: string[] = [];
+
+  for (const [key, col] of Object.entries(columns)) {
+    if (exclude?.includes(key as TExclude)) {
+      continue;
+    }
+
+    if (col.autoIncrement || col.generated) {
+      continue;
+    }
+
+    properties[key] = columnToOpenApiSchema(col, dialect);
+
+    if (col.notNull && !col.default) {
+      required.push(key);
+    }
+  }
+
+  return {
+    type: 'object',
+    properties,
+    ...(required.length > 0 && { required }),
+  };
+}
+
+export function updateDtoToOpenApiSchema<T extends TableDef | EntityConstructor, TExclude extends PropertyKey>(
+  target: T,
+  exclude?: TExclude[],
+  dialect: OpenApiDialect = 'openapi-3.1'
+): OpenApiSchema {
+  const columns = getColumnMap(target);
+  const properties: Record<string, OpenApiSchema> = {};
+
+  for (const [key, col] of Object.entries(columns)) {
+    if (exclude?.includes(key as TExclude)) {
+      continue;
+    }
+
+    if (col.autoIncrement || col.generated) {
+      continue;
+    }
+
+    properties[key] = columnToOpenApiSchema(col, dialect);
+  }
+
+  return {
+    type: 'object',
+    properties,
+  };
+}

package/src/dto/openapi/generators/filter.ts

@@ -1,75 +1,75 @@
-import type { TableDef } from '../../../schema/table.js';
-import type { ColumnDef } from '../../../schema/column-types.js';
-import type { EntityConstructor } from '../../../orm/entity-metadata.js';
-import type { OpenApiSchema, OpenApiDialect } from '../types.js';
-import { columnTypeToOpenApiType, columnTypeToOpenApiFormat } from '../type-mappings.js';
-import { getColumnMap } from './base.js';
-import { applyNullability, isNullableColumn } from '../utilities.js';
-
-function filterFieldToOpenApiSchema(col: ColumnDef): OpenApiSchema {
-  const openApiType = columnTypeToOpenApiType(col);
-  const openApiFormat = columnTypeToOpenApiFormat(col);
-
-  const filterProperties: Record<string, OpenApiSchema> = {};
-
-  filterProperties.equals = { type: openApiType, format: openApiFormat };
-  filterProperties.not = { type: openApiType, format: openApiFormat };
-  filterProperties.in = { type: 'array', items: { type: openApiType, format: openApiFormat } };
-  filterProperties.notIn = { type: 'array', items: { type: openApiType, format: openApiFormat } };
-
-  const isNumeric = openApiType === 'integer' || openApiType === 'number';
-  const isDateOrTime = openApiType === 'string' && (openApiFormat === 'date' || openApiFormat === 'date-time');
-  const isString = openApiType === 'string' && !isDateOrTime;
-
-  if (isNumeric) {
-    filterProperties.lt = { type: openApiType, format: openApiFormat };
-    filterProperties.lte = { type: openApiType, format: openApiFormat };
-    filterProperties.gt = { type: openApiType, format: openApiFormat };
-    filterProperties.gte = { type: openApiType, format: openApiFormat };
-  }
-
-  if (isDateOrTime) {
-    filterProperties.lt = { type: openApiType, format: openApiFormat };
-    filterProperties.lte = { type: openApiType, format: openApiFormat };
-    filterProperties.gt = { type: openApiType, format: openApiFormat };
-    filterProperties.gte = { type: openApiType, format: openApiFormat };
-  }
-
-  if (isString) {
-    filterProperties.contains = { type: 'string' };
-    filterProperties.startsWith = { type: 'string' };
-    filterProperties.endsWith = { type: 'string' };
-    filterProperties.mode = { type: 'string', enum: ['default', 'insensitive'] };
-  }
-
-  return {
-    type: 'object',
-    properties: filterProperties,
-  };
-}
-
-export function columnToFilterSchema(
-  col: ColumnDef,
-  dialect: OpenApiDialect = 'openapi-3.1'
-): OpenApiSchema {
-  const filterSchema = filterFieldToOpenApiSchema(col);
-  const nullable = isNullableColumn(col);
-  return applyNullability(filterSchema, nullable, dialect);
-}
-
-export function whereInputToOpenApiSchema<T extends TableDef | EntityConstructor>(
-  target: T,
-  dialect: OpenApiDialect = 'openapi-3.1'
-): OpenApiSchema {
-  const columns = getColumnMap(target);
-  const properties: Record<string, OpenApiSchema> = {};
-
-  for (const [key, col] of Object.entries(columns)) {
-    properties[key] = columnToFilterSchema(col, dialect);
-  }
-
-  return {
-    type: 'object',
-    properties,
-  };
-}
+import type { TableDef } from '../../../schema/table.js';
+import type { ColumnDef } from '../../../schema/column-types.js';
+import type { EntityConstructor } from '../../../orm/entity-metadata.js';
+import type { OpenApiSchema, OpenApiDialect } from '../types.js';
+import { columnTypeToOpenApiType, columnTypeToOpenApiFormat } from '../type-mappings.js';
+import { getColumnMap } from './base.js';
+import { applyNullability, isNullableColumn } from '../utilities.js';
+
+function filterFieldToOpenApiSchema(col: ColumnDef): OpenApiSchema {
+  const openApiType = columnTypeToOpenApiType(col);
+  const openApiFormat = columnTypeToOpenApiFormat(col);
+
+  const filterProperties: Record<string, OpenApiSchema> = {};
+
+  filterProperties.equals = { type: openApiType, format: openApiFormat };
+  filterProperties.not = { type: openApiType, format: openApiFormat };
+  filterProperties.in = { type: 'array', items: { type: openApiType, format: openApiFormat } };
+  filterProperties.notIn = { type: 'array', items: { type: openApiType, format: openApiFormat } };
+
+  const isNumeric = openApiType === 'integer' || openApiType === 'number';
+  const isDateOrTime = openApiType === 'string' && (openApiFormat === 'date' || openApiFormat === 'date-time');
+  const isString = openApiType === 'string' && !isDateOrTime;
+
+  if (isNumeric) {
+    filterProperties.lt = { type: openApiType, format: openApiFormat };
+    filterProperties.lte = { type: openApiType, format: openApiFormat };
+    filterProperties.gt = { type: openApiType, format: openApiFormat };
+    filterProperties.gte = { type: openApiType, format: openApiFormat };
+  }
+
+  if (isDateOrTime) {
+    filterProperties.lt = { type: openApiType, format: openApiFormat };
+    filterProperties.lte = { type: openApiType, format: openApiFormat };
+    filterProperties.gt = { type: openApiType, format: openApiFormat };
+    filterProperties.gte = { type: openApiType, format: openApiFormat };
+  }
+
+  if (isString) {
+    filterProperties.contains = { type: 'string' };
+    filterProperties.startsWith = { type: 'string' };
+    filterProperties.endsWith = { type: 'string' };
+    filterProperties.mode = { type: 'string', enum: ['default', 'insensitive'] };
+  }
+
+  return {
+    type: 'object',
+    properties: filterProperties,
+  };
+}
+
+export function columnToFilterSchema(
+  col: ColumnDef,
+  dialect: OpenApiDialect = 'openapi-3.1'
+): OpenApiSchema {
+  const filterSchema = filterFieldToOpenApiSchema(col);
+  const nullable = isNullableColumn(col);
+  return applyNullability(filterSchema, nullable, dialect);
+}
+
+export function whereInputToOpenApiSchema<T extends TableDef | EntityConstructor>(
+  target: T,
+  dialect: OpenApiDialect = 'openapi-3.1'
+): OpenApiSchema {
+  const columns = getColumnMap(target);
+  const properties: Record<string, OpenApiSchema> = {};
+
+  for (const [key, col] of Object.entries(columns)) {
+    properties[key] = columnToFilterSchema(col, dialect);
+  }
+
+  return {
+    type: 'object',
+    properties,
+  };
+}