@tstdl/base 0.92.42 → 0.92.44

package/orm/decorators.d.ts

@@ -47,6 +47,8 @@ export declare function References(type: () => EntityType): PropertyDecorator;
 export declare function Embedded(type: AbstractConstructor, options?: TypedOmit<NonNullable<OrmColumnReflectionData['embedded']>, 'type'>): PropertyDecorator;
 export declare function Unique(name?: string, options?: UniqueReflectionData['options']): PropertyDecorator;
 export declare function Unique(name: string | undefined, columns: [string, ...string[]], options?: UniqueReflectionData['options']): ClassDecorator;
+export declare function Unique(columns: [string, ...string[]], options?: UniqueReflectionData['options']): ClassDecorator;
 export declare function Index(name?: string, options?: IndexReflectionData['options']): PropertyDecorator;
 export declare function Index(name: string | undefined, columns: [string, ...string[]], options?: IndexReflectionData['options']): ClassDecorator;
+export declare function Index(columns: [string, ...string[]], options?: IndexReflectionData['options']): ClassDecorator;
 export {};

package/orm/decorators.js

@@ -1,6 +1,6 @@
 import { createClassDecorator, createDecorator, createPropertyDecorator } from '../reflection/utils.js';
 import { Property } from '../schema/index.js';
-import { isArray } from '../utils/type-guards.js';
+import { assertNotArrayPass, isArray } from '../utils/type-guards.js';
 export function createTableDecorator(data) {
     return createClassDecorator({ data: { orm: data }, mergeData: true });
 }
@@ -24,15 +24,21 @@ export function Embedded(type, options) {
         include: [Property(type), createColumnDecorator({ embedded: { type, ...options } })]
     });
 }
-export function Unique(name, columnsOrOptions, options) {
+export function Unique(nameOrColumns, columnsOrOptions, options) {
+    if (isArray(nameOrColumns)) {
+        return createTableDecorator({ unique: [{ columns: nameOrColumns, options: assertNotArrayPass(columnsOrOptions) }] });
+    }
     if (isArray(columnsOrOptions)) {
-        return createTableDecorator({ unique: [{ name, columns: columnsOrOptions, options }] });
+        return createTableDecorator({ unique: [{ name: nameOrColumns, columns: columnsOrOptions, options }] });
     }
-    return createColumnDecorator({ unique: { name, options: columnsOrOptions ?? options } });
+    return createColumnDecorator({ unique: { name: nameOrColumns, options: columnsOrOptions ?? options } });
 }
-export function Index(name, columnsOrOptions, options) {
+export function Index(nameOrColumns, columnsOrOptions, options) {
+    if (isArray(nameOrColumns)) {
+        return createTableDecorator({ index: [{ columns: nameOrColumns, options: assertNotArrayPass(columnsOrOptions) }] });
+    }
     if (isArray(columnsOrOptions)) {
-        return createTableDecorator({ index: [{ name, columns: columnsOrOptions, options }] });
+        return createTableDecorator({ index: [{ name: nameOrColumns, columns: columnsOrOptions, options }] });
     }
-    return createColumnDecorator({ index: { name, options: columnsOrOptions ?? options } });
+    return createColumnDecorator({ index: { name: nameOrColumns, options: columnsOrOptions ?? options } });
 }

package/orm/server/drizzle/schema-converter.js

@@ -46,7 +46,7 @@ export function _getDrizzleTableFromType(type, schemaName, tableName = getDefaul
             return column;
         });
         const indexFn = (data.options?.unique == true) ? uniqueIndex : index;
-        return indexFn().using(data.options?.using ?? 'btree', ...columns);
+        return indexFn(data.name).using(data.options?.using ?? 'btree', ...columns);
     }
     const columnEntries = columnDefinitions.map((entry) => [entry.name, entry.type]);
     const drizzleSchema = dbSchema.table(tableName, fromEntries(columnEntries), (table) => [

package/orm/types.d.ts

@@ -3,7 +3,7 @@ import type { boolean, date, doublePrecision, integer, jsonb, PgColumnBuilder, P
 import type { GetTagMetadata, Tagged, UnwrapTagged } from 'type-fest';
 import { Array, Integer } from '../schema/index.js';
 import type { AbstractConstructor, EnumerationObject, EnumerationValue, ObjectLiteral, UnionToTuple } from '../types.js';
-import { Embedded, Unique } from './decorators.js';
+import { Column, Embedded, Index, PrimaryKey, References, Unique } from './decorators.js';
 import { Json, NumericDate, Timestamp, Uuid } from './schemas/index.js';
 export type IsPrimaryKey<T> = T extends Tagged<unknown, 'column', PgColumnBuilderBase> ? Tagged<UnwrapTagged<T>, 'column', DrizzleIsPrimaryKey<GetTagMetadata<T, 'column'>>> : Tagged<T, 'column', ColumnBuilder<T>>;
 export type HasDefault<T> = T extends Tagged<unknown, 'column', PgColumnBuilderBase> ? Tagged<UnwrapTagged<T>, 'column', DrizzleHasDefault<GetTagMetadata<T, 'column'>>> : Tagged<T, 'column', ColumnBuilder<T>>;
@@ -28,4 +28,4 @@ export type DoublePrecision = Tagged<number, 'column', ReturnType<typeof doubleP
 export type Boolean = Tagged<number, 'column', ReturnType<typeof boolean>>;
 export type NumericDate = Tagged<number, 'column', ReturnType<typeof date>>;
 export type Timestamp = Tagged<number, 'column', ReturnType<typeof timestamp>>;
-export { Array, Embedded, Integer, Json, NumericDate, Timestamp, Unique, Uuid };
+export { Array, Column, Embedded, Index, Integer, Json, NumericDate, PrimaryKey, References, Timestamp, Unique, Uuid };

package/orm/types.js

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-redeclare, @typescript-eslint/naming-convention */
 import { Array, Integer } from '../schema/index.js';
-import { Embedded, Unique } from './decorators.js';
+import { Column, Embedded, Index, PrimaryKey, References, Unique } from './decorators.js';
 import { Json, NumericDate, Timestamp, Uuid } from './schemas/index.js';
-export { Array, Embedded, Integer, Json, NumericDate, Timestamp, Unique, Uuid };
+export { Array, Column, Embedded, Index, Integer, Json, NumericDate, PrimaryKey, References, Timestamp, Unique, Uuid };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.42",
+  "version": "0.92.44",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -124,11 +124,11 @@
     "luxon": "^3.5",
     "reflect-metadata": "^0.2",
     "rxjs": "^7.8",
-    "type-fest": "4.33"
+    "type-fest": "4.35"
   },
   "devDependencies": {
     "@mxssfd/typedoc-theme": "1.1",
-    "@stylistic/eslint-plugin": "3.0",
+    "@stylistic/eslint-plugin": "3.1",
     "@types/chroma-js": "2.4",
     "@types/koa__router": "12.0",
     "@types/luxon": "3.4",
@@ -137,14 +137,13 @@
     "@types/node": "22",
     "@types/nodemailer": "6.4",
     "@types/pg": "8.11",
-    "@typescript-eslint/eslint-plugin": "8.22",
+    "@typescript-eslint/eslint-plugin": "8.24",
     "concurrently": "9.1",
     "drizzle-kit": "0.30",
     "eslint": "8.57",
-    "eslint-import-resolver-typescript": "3.7",
+    "eslint-import-resolver-typescript": "3.8",
     "eslint-plugin-import": "2.31",
     "tsc-alias": "1.8",
-    "tsx": "^4.19.2",
     "typedoc": "0.27",
     "typedoc-plugin-missing-exports": "3.1",
     "typescript": "5.7"
@@ -152,7 +151,6 @@
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.17",
     "@google/generative-ai": "^0.21",
-    "@koa/router": "^13.1",
     "@tstdl/angular": "^0.92",
     "@zxcvbn-ts/core": "^3.0",
     "@zxcvbn-ts/language-common": "^3.0",
@@ -161,14 +159,13 @@
     "chroma-js": "^2.6",
     "drizzle-orm": "^0.39",
     "handlebars": "^4.7",
-    "koa": "^2.15",
     "minio": "^8.0",
     "mjml": "^4.15",
     "mongodb": "^6.13",
     "nodemailer": "^6.10",
     "pg": "^8.13",
     "playwright": "^1.50",
-    "preact": "^10.25",
+    "preact": "^10.26",
     "preact-render-to-string": "^6.5",
     "undici": "^7.3",
     "urlpattern-polyfill": "^10.0"