@tstdl/base 0.91.38 → 0.91.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.91.38",
+  "version": "0.91.39",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -118,7 +118,7 @@
   },
   "devDependencies": {
     "@mxssfd/typedoc-theme": "1.1",
-    "@stylistic/eslint-plugin": "2.9",
+    "@stylistic/eslint-plugin": "2.10",
     "@types/chroma-js": "2.4",
     "@types/koa__router": "12.0",
     "@types/luxon": "3.4",
@@ -128,8 +128,8 @@
     "@types/nodemailer": "6.4",
     "@types/pg": "8.11",
     "@typescript-eslint/eslint-plugin": "7.17",
-    "concurrently": "9.0",
-    "drizzle-kit": "0.26",
+    "concurrently": "9.1",
+    "drizzle-kit": "0.27",
     "eslint": "8.57",
     "eslint-import-resolver-typescript": "3.6",
     "eslint-plugin-import": "2.31",
@@ -147,7 +147,7 @@
     "@zxcvbn-ts/language-de": "^3.0",
     "@zxcvbn-ts/language-en": "^3.0",
     "chroma-js": "^2.6",
-    "drizzle-orm": "^0.35",
+    "drizzle-orm": "^0.36",
     "handlebars": "^4.7",
     "koa": "^2.15",
     "minio": "^8.0",

package/reflection/types.d.ts

@@ -35,8 +35,8 @@ export type DecoratorMetadataMap = DecoratorTypeMap<{
 export type DecoratorHandlerReturnTypeMap = DecoratorTypeMap<{
     class: void | undefined | Constructor;
     property: void;
-    accessor: void;
-    method: void | PropertyDescriptor;
+    accessor: void | undefined | TypedPropertyDescriptor<any>;
+    method: void | undefined | PropertyDescriptor;
     parameter: void;
     methodParameter: void;
     constructorParameter: void;

package/schema/decorators/types.d.ts

@@ -1,6 +1,7 @@
 import type { Decorator } from '../../reflection/types.js';
 import type { SchemaTestable } from '../schema.js';
 import type { ObjectSchemaFactoryFunction, ObjectSchemaOptions } from '../schemas/object.js';
+export type SchemaClassDecorator = Decorator<'class'>;
 export type SchemaPropertyDecorator = Decorator<'property' | 'accessor'>;
 export type SchemaTypeReflectionData = Partial<Pick<ObjectSchemaOptions, 'mask' | 'unknownProperties' | 'unknownPropertiesKey'>> & {
     schema?: SchemaTestable;

package/schema/schemas/object.d.ts

@@ -1,8 +1,8 @@
 import type { EmptyObject, Merge } from 'type-fest';
 import type { JsonPath } from '../../json-path/json-path.js';
+import { type Decorator } from '../../reflection/index.js';
 import type { AbstractConstructor, OneOrMany, PartialProperty, Record as RecordType, SimplifyObject, Type, TypedOmit } from '../../types.js';
 import { type SchemaPropertyDecoratorOptions } from '../decorators/index.js';
-import type { SchemaPropertyDecorator } from '../decorators/types.js';
 import { type OPTIONAL, Schema, type SchemaOutput, type SchemaTestable, type SchemaTestOptions, type SchemaTestResult } from '../schema.js';
 export type Record<K extends PropertyKey = PropertyKey, V = any> = RecordType<K, V>;
 export type ObjectSchemaFactoryFunction<T> = (data: T) => T;
@@ -85,6 +85,6 @@ export declare function omit<const T extends Record, const K extends keyof T>(sc
 export declare function getSchemaFromReflection<T extends Record>(type: AbstractConstructor<T>): Schema<T>;
 declare function _tryGetSchemaFromReflection<T extends Record>(type: AbstractConstructor<T>): Schema<T> | ObjectSchema<T> | null;
 export declare function getObjectSchema<T extends Record>(schemaOrType: SchemaTestable<T>): ObjectSchema<T>;
-export declare function Record<K extends PropertyKey, V>(key: Schema<K>, value: Schema<V>, options?: TypedOmit<ObjectSchemaOptions<Record<K, V>>, 'unknownProperties' | 'unknownPropertiesKey'> & SchemaPropertyDecoratorOptions): SchemaPropertyDecorator;
+export declare function Record<K extends PropertyKey, V>(key: SchemaTestable<K>, value: SchemaTestable<V>, options?: TypedOmit<ObjectSchemaOptions<Record<K, V>>, 'unknownProperties' | 'unknownPropertiesKey'> & SchemaPropertyDecoratorOptions): Decorator<'class' | 'property' | 'accessor'>;
 export declare const emptyObjectSchema: ObjectSchema<EmptyObject>;
 export {};

package/schema/schemas/object.js

@@ -1,12 +1,12 @@
 /* eslint-disable max-depth */
-import { reflectionRegistry } from '../../reflection/index.js';
+import { createDecorator, reflectionRegistry } from '../../reflection/index.js';
 import { SchemaError } from '../../schema/schema.error.js';
 import { toArray } from '../../utils/array/array.js';
 import { memoizeSingle } from '../../utils/function/memoize.js';
 import { filterObject, mapObjectValues, objectKeys } from '../../utils/object/object.js';
 import { assert, isDefined, isFunction, isLiteralObject, isNotNull, isNotNullOrUndefined, isNull, isObject, isUndefined } from '../../utils/type-guards.js';
 import { typeOf } from '../../utils/type-of.js';
-import { Property } from '../decorators/index.js';
+import { Class, Property } from '../decorators/index.js';
 import { Schema } from '../schema.js';
 import { schemaTestableToSchema } from '../testable.js';
 import { array } from './array.js';
@@ -188,6 +188,13 @@ export function getObjectSchema(schemaOrType) {
     throw new Error('Could not infer ObjectSchema.');
 }
 export function Record(key, value, options) {
-    return Property(record(key, value, options), options);
+    const keySchema = schemaTestableToSchema(key);
+    const valueSchema = schemaTestableToSchema(value);
+    return createDecorator({ class: true, property: true, accessor: true }, (data, _metadata, args) => {
+        if (data.type == 'class') {
+            return Class({ unknownPropertiesKey: keySchema, unknownProperties: valueSchema })(args[0]);
+        }
+        return Property(record(keySchema, valueSchema, options), options)(args[0], args[1], args[2]);
+    });
 }
 export const emptyObjectSchema = explicitObject({});