@tstdl/base 0.92.43 → 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.92.43",
+  "version": "0.92.44",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"