@tstdl/base 0.93.27 → 0.93.28

package/orm/decorators.d.ts

@@ -202,14 +202,14 @@ export declare function Unique<T extends AnyEntity>(columns: Columns<T>, options
  * @param name Optional name for the index.
  * @param options Additional index options (e.g., method, uniqueness, conditions).
  */
-export declare function Index<T extends BaseEntity = any>(options?: IndexReflectionData<T>['options']): PropertyDecorator;
+export declare function Index<T extends BaseEntity = BaseEntity>(options?: IndexReflectionData<T>['options']): PropertyDecorator;
 /**
  * Define a composite index on multiple columns.
  * @template T The entity type.
  * @param columns An array of property names (or tuples with direction) included in the index.
  * @param options Additional index options.
  */
-export declare function Index<T extends BaseEntity = any>(columns: Columns<T>, options?: IndexReflectionData<T>['options']): ClassDecorator;
+export declare function Index<T extends BaseEntity>(columns: NonNullable<IndexReflectionData<T>['columns']>, options?: IndexReflectionData<T>['options']): ClassDecorator;
 /**
  * Automatically expire records after a certain time to live (TTL) based on the createTimestamp metadata. Requires extension of {@link Entity} instead of {@link BaseEntity}.
  * @param ttl Time To Live in milliseconds.

package/orm/decorators.js

@@ -1,7 +1,7 @@
 import { createClassDecorator, createDecorator, createPropertyDecorator } from '../reflection/index.js';
 import { Property } from '../schema/index.js';
 import { filterUndefinedObjectProperties, objectEntries, propertyNameOf } from '../utils/object/index.js';
-import { isArray, isString, isUndefined } from '../utils/type-guards.js';
+import { isArray, isFunction, isString, isUndefined } from '../utils/type-guards.js';
 /**
  * Merges ORM reflection data into the target's metadata.
  * @param metadata The metadata object for the class or property.
@@ -122,7 +122,7 @@ export function Unique(columnsOrOptions, options) {
     return createColumnDecorator({ unique: { options: columnsOrOptions } });
 }
 export function Index(columnsOrOptions, options) {
-    if (isArray(columnsOrOptions)) {
+    if (isArray(columnsOrOptions) || isFunction(columnsOrOptions)) {
         return createTableDecorator({ index: [{ columns: columnsOrOptions, options }] });
     }
     return createColumnDecorator({ index: { options: columnsOrOptions } });

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

@@ -73,7 +73,6 @@ export function _getDrizzleTableFromType(type, fallbackSchemaName) {
             return column;
         });
         const indexFn = (data.options?.unique == true) ? uniqueIndex : index;
-        console.log({ name: data.options?.name ?? getIndexName(tableName, columns, { naming: data.options?.naming }) });
         let builder = indexFn(data.options?.name ?? getIndexName(tableName, columns, { naming: data.options?.naming })).using(data.options?.using ?? 'btree', ...columns);
         if (isDefined(data.options?.where)) {
             const query = convertQuery(data.options.where(table), table, columnDefinitionsMap);

package/package.json

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