@tstdl/base 0.90.92 → 0.91.0-beta2

package/api/types.d.ts

@@ -91,7 +91,7 @@ export type ApiEndpointParametersSchema<T extends ApiDefinition, K extends ApiEn
 export type ApiEndpointBodySchema<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = NonUndefinable<ApiEndpoint<T, K>['body']>;
 export type ApiEndpointResultSchema<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = NonUndefinable<ApiEndpoint<T, K>['result']>;
 export type ApiBinaryType = typeof Uint8Array | typeof Blob | typeof ReadableStream<any>;
-export type ApiInputType<T extends SchemaTestable> = T extends ApiBinaryType ? (Uint8Array | Blob | ReadableStream<Uint8Array>) : T extends typeof ServerSentEvents ? ServerSentEventsSource : T extends SchemaTestable ? SchemaOutput<T> : never;
+export type ApiInputType<T extends SchemaTestable> = T extends ApiBinaryType ? InstanceType<ApiBinaryType> : T extends typeof ServerSentEvents ? ServerSentEventsSource : T extends SchemaTestable ? SchemaOutput<T> : never;
 export type ApiOutputType<T extends SchemaTestable> = T extends typeof ReadableStream ? ReadableStream<Uint8Array> : T extends SchemaTestable ? SchemaOutput<T> : never;
 export type ApiParameters<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = ApiInputType<ApiEndpointParametersSchema<T, K>>;
 export type ApiClientBody<T extends ApiDefinition, K extends ApiEndpointKeys<T>> = ApiInputType<ApiEndpointBodySchema<T, K>>;

package/authentication/authentication.api.d.ts

@@ -1,10 +1,9 @@
-import type { ApiDefinition } from '../api/types.js';
+import { type ApiDefinition } from '../api/types.js';
+import { type ObjectSchema, type ObjectSchemaOrType } from '../schema/index.js';
 import type { SchemaTestable } from '../schema/schema.js';
-import type { ObjectSchema, ObjectSchemaOrType } from '../schema/types/types.js';
 import type { Record } from '../types.js';
 import type { TokenPayload } from './index.js';
 import { SecretCheckResult } from './models/secret-check-result.model.js';
-import { TokenPayloadBase } from './models/token-payload-base.model.js';
 export declare const dontWaitForValidToken: unique symbol;
 type GetAuthenticationApiEndpointsDefinition<AdditionalTokenPayload extends Record = Record<never>, AuthenticationData = void, AdditionalInitSecretResetData extends Record = Record<never>> = typeof getAuthenticationApiEndpointsDefinition<AdditionalTokenPayload, AuthenticationData, AdditionalInitSecretResetData>;
 type AuthenticationApiEndpointsDefinition<AdditionalTokenPayload extends Record = Record<never>, AuthenticationData = void, AdditionalInitSecretResetData extends Record = Record<never>> = ReturnType<GetAuthenticationApiEndpointsDefinition<AdditionalTokenPayload, AuthenticationData, AdditionalInitSecretResetData>>;
@@ -20,7 +19,7 @@ export declare const authenticationApiDefinition: {
                 secret: string;
                 data: unknown;
             }>;
-            result: ObjectSchema<TokenPayloadBase>;
+            result: ObjectSchema<TokenPayload<import("type-fest").EmptyObject>>;
             credentials: true;
             data: {
                 [dontWaitForValidToken]: boolean;
@@ -32,7 +31,7 @@ export declare const authenticationApiDefinition: {
             parameters: ObjectSchema<{
                 data: unknown;
             }>;
-            result: ObjectSchema<TokenPayloadBase>;
+            result: ObjectSchema<TokenPayload<import("type-fest").EmptyObject>>;
             credentials: true;
             data: {
                 [dontWaitForValidToken]: boolean;
@@ -45,7 +44,7 @@ export declare const authenticationApiDefinition: {
                 subject: string;
                 data: unknown;
             }>;
-            result: ObjectSchema<TokenPayloadBase>;
+            result: ObjectSchema<TokenPayload<import("type-fest").EmptyObject>>;
             credentials: true;
             data: {
                 [dontWaitForValidToken]: boolean;
@@ -57,7 +56,7 @@ export declare const authenticationApiDefinition: {
             parameters: ObjectSchema<{
                 data: unknown;
             }>;
-            result: ObjectSchema<TokenPayloadBase>;
+            result: ObjectSchema<TokenPayload<import("type-fest").EmptyObject>>;
             credentials: true;
             data: {
                 [dontWaitForValidToken]: boolean;
@@ -66,7 +65,7 @@ export declare const authenticationApiDefinition: {
         endSession: {
             resource: string;
             method: "POST";
-            result: import("../schema/types/types.js").ValueSchema<"ok">;
+            result: import("../schema/index.js").LiteralSchema<"ok">;
             credentials: true;
             data: {
                 [dontWaitForValidToken]: boolean;
@@ -77,9 +76,9 @@ export declare const authenticationApiDefinition: {
             method: "POST";
             parameters: ObjectSchema<{
                 subject: string;
-                data: import("../types.js").ObjectLiteral;
+                data: import("type-fest").EmptyObject;
             }>;
-            result: import("../schema/types/types.js").ValueSchema<"ok">;
+            result: import("../schema/index.js").LiteralSchema<"ok">;
         };
         resetSecret: {
             resource: string;
@@ -88,7 +87,7 @@ export declare const authenticationApiDefinition: {
                 token: string;
                 newSecret: string;
             }>;
-            result: import("../schema/types/types.js").ValueSchema<"ok">;
+            result: import("../schema/index.js").LiteralSchema<"ok">;
         };
         checkSecret: {
             resource: string;
@@ -100,11 +99,11 @@ export declare const authenticationApiDefinition: {
         };
         timestamp: {
             resource: string;
-            result: import("../schema/types/types.js").ValueSchema<number>;
+            result: import("../schema/index.js").NumberSchema;
         };
     };
 };
-export declare function getAuthenticationApiDefinition<AdditionalTokenPayload extends Record, AuthenticationData, AdditionalInitSecretResetData, AdditionalEndpoints>(additionalTokenPayloadSchema: ObjectSchemaOrType<AdditionalTokenPayload>, authenticationDataSchema: SchemaTestable<AuthenticationData>, initSecretResetDataSchema: ObjectSchemaOrType<AdditionalInitSecretResetData>, resource?: string, additionalEndpoints?: AdditionalEndpoints): {
+export declare function getAuthenticationApiDefinition<AdditionalTokenPayload extends Record, AuthenticationData, AdditionalInitSecretResetData extends Record, AdditionalEndpoints>(additionalTokenPayloadSchema: ObjectSchemaOrType<AdditionalTokenPayload>, authenticationDataSchema: SchemaTestable<AuthenticationData>, initSecretResetDataSchema: ObjectSchemaOrType<AdditionalInitSecretResetData>, resource?: string, additionalEndpoints?: AdditionalEndpoints): {
     resource: string;
     endpoints: {
         getToken: {
@@ -161,7 +160,7 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload ex
         endSession: {
             resource: string;
             method: "POST";
-            result: import("../schema/types/types.js").ValueSchema<"ok">;
+            result: import("../schema/index.js").LiteralSchema<"ok">;
             credentials: true;
             data: {
                 [dontWaitForValidToken]: boolean;
@@ -174,7 +173,7 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload ex
                 subject: string;
                 data: AdditionalInitSecretResetData;
             }>;
-            result: import("../schema/types/types.js").ValueSchema<"ok">;
+            result: import("../schema/index.js").LiteralSchema<"ok">;
         };
         resetSecret: {
             resource: string;
@@ -183,7 +182,7 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload ex
                 token: string;
                 newSecret: string;
             }>;
-            result: import("../schema/types/types.js").ValueSchema<"ok">;
+            result: import("../schema/index.js").LiteralSchema<"ok">;
         };
         checkSecret: {
             resource: string;
@@ -195,11 +194,11 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload ex
         };
         timestamp: {
             resource: string;
-            result: import("../schema/types/types.js").ValueSchema<number>;
+            result: import("../schema/index.js").NumberSchema;
         };
     };
 };
-export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenPayload extends Record, AuthenticationData, AdditionalInitSecretResetData>(additionalTokenPayloadSchema: ObjectSchemaOrType<AdditionalTokenPayload>, authenticationDataSchema: SchemaTestable<AuthenticationData>, additionalInitSecretResetDataSchema: ObjectSchemaOrType<AdditionalInitSecretResetData>): {
+export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenPayload extends Record, AuthenticationData, AdditionalInitSecretResetData extends Record>(additionalTokenPayloadSchema: ObjectSchemaOrType<AdditionalTokenPayload>, authenticationDataSchema: SchemaTestable<AuthenticationData>, additionalInitSecretResetDataSchema: ObjectSchemaOrType<AdditionalInitSecretResetData>): {
     getToken: {
         resource: string;
         method: "POST";
@@ -254,7 +253,7 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
     endSession: {
         resource: string;
         method: "POST";
-        result: import("../schema/types/types.js").ValueSchema<"ok">;
+        result: import("../schema/index.js").LiteralSchema<"ok">;
         credentials: true;
         data: {
             [dontWaitForValidToken]: boolean;
@@ -267,7 +266,7 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
             subject: string;
             data: AdditionalInitSecretResetData;
         }>;
-        result: import("../schema/types/types.js").ValueSchema<"ok">;
+        result: import("../schema/index.js").LiteralSchema<"ok">;
     };
     resetSecret: {
         resource: string;
@@ -276,7 +275,7 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
             token: string;
             newSecret: string;
         }>;
-        result: import("../schema/types/types.js").ValueSchema<"ok">;
+        result: import("../schema/index.js").LiteralSchema<"ok">;
     };
     checkSecret: {
         resource: string;
@@ -288,7 +287,7 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
     };
     timestamp: {
         resource: string;
-        result: import("../schema/types/types.js").ValueSchema<number>;
+        result: import("../schema/index.js").NumberSchema;
     };
 };
 export {};

package/authentication/authentication.api.js

@@ -1,10 +1,5 @@
 import { defineApi } from '../api/types.js';
-import { assign } from '../schema/schemas/assign.js';
-import { literal } from '../schema/schemas/literal.js';
-import { number } from '../schema/schemas/number.js';
-import { emptyObjectSchema, explicitObject, object } from '../schema/schemas/object.js';
-import { string } from '../schema/schemas/string.js';
-import { unknown } from '../schema/schemas/unknown.js';
+import { assign, emptyObjectSchema, explicitObject, literal, number, object, string, unknown } from '../schema/index.js';
 import { SecretCheckResult } from './models/secret-check-result.model.js';
 import { TokenPayloadBase } from './models/token-payload-base.model.js';
 export const dontWaitForValidToken = Symbol('dontWaitForValidToken');

package/authentication/client/api.client.d.ts

@@ -1,10 +1,9 @@
-import type { ApiClient } from '../../api/client/index.js';
-import type { SchemaTestable } from '../../schema/schema.js';
-import type { ObjectSchemaOrType } from '../../schema/types/types.js';
+import { ApiClient } from '../../api/client/index.js';
+import { ObjectSchemaOrType, SchemaTestable } from '../../schema/index.js';
 import type { Record } from '../../types.js';
-import type { AuthenticationApiDefinition } from '../authentication.api.js';
+import { AuthenticationApiDefinition } from '../authentication.api.js';
 export declare function getAuthenticationApiClient<AdditionalTokenPayload extends Record, AuthenticationData, AdditionalInitSecretResetData extends Record>(additionalTokenPayloadSchema: ObjectSchemaOrType<AdditionalTokenPayload>, authenticationDataSchema: SchemaTestable<AuthenticationData>, additionalInitSecretResetData: ObjectSchemaOrType<AdditionalInitSecretResetData>): ApiClient<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData, AdditionalInitSecretResetData>>;
-declare const defaultAuthenticationApiClient: ApiClient<AuthenticationApiDefinition<import("../../types.js").ObjectLiteral, unknown, import("../../types.js").ObjectLiteral>>;
+declare const defaultAuthenticationApiClient: ApiClient<AuthenticationApiDefinition<import("type-fest").EmptyObject, unknown, import("type-fest").EmptyObject>>;
 export declare class AuthenticationApiClient extends defaultAuthenticationApiClient {
 }
 export {};

package/authentication/client/api.client.js

@@ -6,8 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { compileClient } from '../../api/client/index.js';
 import { ReplaceClass, Singleton } from '../../injector/index.js';
-import { emptyObjectSchema } from '../../schema/schemas/object.js';
-import { unknown } from '../../schema/schemas/unknown.js';
+import { emptyObjectSchema, unknown } from '../../schema/index.js';
 import { getAuthenticationApiDefinition } from '../authentication.api.js';
 export function getAuthenticationApiClient(additionalTokenPayloadSchema, authenticationDataSchema, additionalInitSecretResetData) {
     const definition = getAuthenticationApiDefinition(additionalTokenPayloadSchema, authenticationDataSchema, additionalInitSecretResetData);

package/authentication/client/http-client.middleware.d.ts

@@ -1,4 +1,4 @@
 import type { HttpClientMiddleware } from '../../http/client/middleware.js';
-import type { ValueOrAsyncProvider } from '../../utils/value-or-provider.js';
+import { type ValueOrAsyncProvider } from '../../utils/value-or-provider.js';
 import type { AuthenticationClientService } from './authentication.service.js';
 export declare function waitForAuthenticationCredentialsMiddleware(authenticationServiceOrProvider: ValueOrAsyncProvider<AuthenticationClientService>): HttpClientMiddleware;

package/browser/pdf-options.js

@@ -7,8 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Enumeration } from '../schema/schemas/enumeration.js';
-import { Optional } from '../schema/schemas/optional.js';
+import { Enumeration, Optional, Union } from '../schema/index.js';
 export var PdfFormat;
 (function (PdfFormat) {
     PdfFormat["Letter"] = "letter";
@@ -30,19 +29,19 @@ export class PdfMarginObject {
     left;
 }
 __decorate([
-    Optional([Number, String]),
+    Union(Number, String, { optional: true }),
     __metadata("design:type", Object)
 ], PdfMarginObject.prototype, "top", void 0);
 __decorate([
-    Optional([Number, String]),
+    Union(Number, String, { optional: true }),
     __metadata("design:type", Object)
 ], PdfMarginObject.prototype, "bottom", void 0);
 __decorate([
-    Optional([Number, String]),
+    Union(Number, String, { optional: true }),
     __metadata("design:type", Object)
 ], PdfMarginObject.prototype, "right", void 0);
 __decorate([
-    Optional([Number, String]),
+    Union(Number, String, { optional: true }),
     __metadata("design:type", Object)
 ], PdfMarginObject.prototype, "left", void 0);
 export class PdfRenderOptions {
@@ -75,11 +74,11 @@ __decorate([
     __metadata("design:type", String)
 ], PdfRenderOptions.prototype, "format", void 0);
 __decorate([
-    Optional([String, Number]),
+    Union(String, Number, { optional: true }),
     __metadata("design:type", Object)
 ], PdfRenderOptions.prototype, "width", void 0);
 __decorate([
-    Optional([String, Number]),
+    Union(String, Number, { optional: true }),
     __metadata("design:type", Object)
 ], PdfRenderOptions.prototype, "height", void 0);
 __decorate([
@@ -87,7 +86,7 @@ __decorate([
     __metadata("design:type", Number)
 ], PdfRenderOptions.prototype, "scale", void 0);
 __decorate([
-    Optional([String, Number, PdfMarginObject]),
+    Union(String, Number, PdfMarginObject, { optional: true }),
     __metadata("design:type", Object)
 ], PdfRenderOptions.prototype, "margin", void 0);
 __decorate([

package/errors/custom.error.d.ts

@@ -1,23 +1,23 @@
 export type CustomErrorOptions = {
     /**
-     * name of error
+     * Name of error
      *
      * defaults to static {@link CustomErrorStatic.errorName} if set and constructor (class) name if unset.
      */
     name?: string;
     /**
-     * error message
+     * Error message
      */
     message?: string;
     /**
-     * stack trace
+     * Stack trace
      */
     stack?: string;
     /**
-     * cause for error
+     * Cause for error
      */
     cause?: Error;
-    /** skip {@link Error} super call, which improves speed but looses stack trace */
+    /** Skip {@link Error} super call, which improves speed but looses stack trace */
     fast?: boolean | undefined;
 };
 export declare abstract class CustomError extends Error {

package/examples/api/basic-overview.js

@@ -18,7 +18,7 @@ import { configureHttpClient } from '../../http/client/module.js';
 import { configureNodeHttpServer } from '../../http/server/node/module.js';
 import { inject } from '../../injector/inject.js';
 import { WebServerModule } from '../../module/modules/web-server.module.js';
-import { Property, array, boolean, number, object } from '../../schema/index.js';
+import { Number, Property, array, boolean, number, object } from '../../schema/index.js';
 import { timeout } from '../../utils/timing.js';
 import { Agent } from 'undici';
 class User {
@@ -26,7 +26,7 @@ class User {
     name;
 }
 __decorate([
-    Property({ coerce: true }),
+    Number({ coerce: true }),
     __metadata("design:type", Number)
 ], User.prototype, "id", void 0);
 __decorate([
@@ -92,11 +92,11 @@ async function clientTest() {
     console.log(allUsersAfterDelete);
     Application.requestShutdown();
 }
-async function main() {
+function main() {
     configureNodeHttpServer();
     configureApiServer({ controllers: [UserApi] });
     configureUndiciHttpClientAdapter({ dispatcher: new Agent({ keepAliveMaxTimeout: 1 }) });
     configureHttpClient({ baseUrl: 'http://localhost:8000' });
     Application.run(WebServerModule, clientTest);
 }
-void main();
+main();

package/http/client/http-client-request.d.ts

@@ -1,7 +1,6 @@
 import { type CancellationSignal } from '../../cancellation/index.js';
 import { dispose, type Disposable } from '../../disposable/index.js';
-import type { OneOrMany } from '../../schema/index.js';
-import type { Record, TypedOmit, UndefinableJson, UndefinableJsonObject } from '../../types.js';
+import type { OneOrMany, Record, TypedOmit, UndefinableJson, UndefinableJsonObject } from '../../types.js';
 import { HttpForm, type HttpFormObject } from '../http-form.js';
 import { HttpHeaders, type HttpHeadersObject } from '../http-headers.js';
 import { HttpQuery, type HttpQueryObject } from '../http-query.js';

package/http/client/module.d.ts

@@ -5,7 +5,7 @@ import type { HttpClientMiddleware } from './middleware.js';
 export type HttpClientModuleConfig = HttpClientOptions & {
     adapter?: Type<HttpClientAdapter>;
     /**
-     * middlewares to add
+     * Middlewares to add
      */
     middleware?: OneOrMany<HttpClientMiddleware>;
 };

package/image-service/image-service.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { Coerce, Enumeration, Optional } from '../schema/index.js';
+import { Enumeration, Number, Optional } from '../schema/index.js';
 export var ImageResizeMode;
 (function (ImageResizeMode) {
     ImageResizeMode["Fit"] = "fit";
@@ -49,13 +49,11 @@ __decorate([
     __metadata("design:type", String)
 ], ImageOptions.prototype, "resizeMode", void 0);
 __decorate([
-    Optional(),
-    Coerce(),
+    Number({ optional: true, coerce: true }),
     __metadata("design:type", Number)
 ], ImageOptions.prototype, "width", void 0);
 __decorate([
-    Optional(),
-    Coerce(),
+    Number({ optional: true, coerce: true }),
     __metadata("design:type", Number)
 ], ImageOptions.prototype, "height", void 0);
 __decorate([
@@ -64,8 +62,7 @@ __decorate([
     __metadata("design:type", String)
 ], ImageOptions.prototype, "origin", void 0);
 __decorate([
-    Optional(),
-    Coerce(),
+    Number({ optional: true, coerce: true }),
     __metadata("design:type", Number)
 ], ImageOptions.prototype, "quality", void 0);
 __decorate([

package/mail/mail.client.d.ts

@@ -1,5 +1,4 @@
-import type { Resolvable } from '../injector/index.js';
-import { resolveArgumentType } from '../injector/index.js';
+import { resolveArgumentType, type Resolvable } from '../injector/index.js';
 import type { MailData, MailSendResult } from './models/index.js';
 export declare class MailClientAuthConfig {
     user: string;
@@ -8,6 +7,7 @@ export declare class MailClientAuthConfig {
 export declare class MailClientConfig {
     host: string;
     port: number;
+    /** Enable TLS (if not defined it is automatically set depending on port) */
     secure?: boolean;
     auth?: MailClientAuthConfig;
 }

package/mail/mail.client.js

@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { Property } from '../schema/decorators/property.js';
-import { BooleanProperty } from '../schema/schemas/boolean.js';
+import { Boolean } from '../schema/index.js';
 import { Optional } from '../schema/schemas/optional.js';
 export class MailClientAuthConfig {
     user;
@@ -25,7 +25,7 @@ __decorate([
 export class MailClientConfig {
     host;
     port;
-    /* enable TLS (if not defined it is automatically set depending on port) */
+    /** Enable TLS (if not defined it is automatically set depending on port) */
     secure;
     auth;
 }
@@ -38,9 +38,7 @@ __decorate([
     __metadata("design:type", Number)
 ], MailClientConfig.prototype, "port", void 0);
 __decorate([
-    BooleanProperty({ optional: true })
-    /* enable TLS (if not defined it is automatically set depending on port) */
-    ,
+    Boolean({ optional: true }),
     __metadata("design:type", Boolean)
 ], MailClientConfig.prototype, "secure", void 0);
 __decorate([

package/orm/decorators.d.ts

@@ -0,0 +1 @@
+export declare function PrimaryKey(): PropertyDecorator;

package/orm/decorators.js

@@ -0,0 +1,4 @@
+import { createPropertyDecorator } from '../reflection/utils.js';
+export function PrimaryKey() {
+    return createPropertyDecorator({ data: { orm: { primaryKey: true } }, mergeData: true });
+}

package/orm/entity.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { NumberProperty, Property, any, record } from '../schema/index.js';
+import { Number, Property, any, record } from '../schema/index.js';
 export class EntityMetadata {
     revision;
     revisionTimestamp;
@@ -28,11 +28,11 @@ __decorate([
     __metadata("design:type", Number)
 ], EntityMetadata.prototype, "createTimestamp", void 0);
 __decorate([
-    NumberProperty({ nullable: true }),
+    Number({ nullable: true }),
     __metadata("design:type", Object)
 ], EntityMetadata.prototype, "deleteTimestamp", void 0);
 __decorate([
-    Property({ schema: record(any(), any()) }),
+    Property(record(any(), any())),
     __metadata("design:type", Object)
 ], EntityMetadata.prototype, "attributes", void 0);
 export class Entity {

package/orm/index.d.ts

@@ -1,3 +1,7 @@
+export * from './decorators.js';
 export * from './entity.js';
 export * from './query.js';
 export * from './repository.js';
+export * from './schema-converter.js';
+export * from './schema.js';
+export * from './types.js';

package/orm/index.js

@@ -1,3 +1,7 @@
+export * from './decorators.js';
 export * from './entity.js';
 export * from './query.js';
 export * from './repository.js';
+export * from './schema-converter.js';
+export * from './schema.js';
+export * from './types.js';

package/orm/repository.d.ts

@@ -19,7 +19,8 @@ export type EntityMetadataUpdate = {
 export type EntityUpdate<T extends Entity> = Partial<TypedOmit<T, 'metadata'>> & EntityMetadataUpdate;
 export declare abstract class EntityRepository<T extends Entity = Entity> {
     readonly type: Type<T>;
-    abstract load(id: string): Promise<T>;
+    readonly database: import("drizzle-orm/node-postgres").NodePgDatabase<Record<string, never>>;
+    load(_id: string): Promise<T>;
     abstract tryLoad(id: string): Promise<T | undefined>;
     abstract loadByFilter(query: Query<T>, options?: LoadOptions<T>): Promise<T>;
     abstract tryLoadByFilter(query: Query<T>, options?: LoadOptions<T>): Promise<T | undefined>;
@@ -33,7 +34,6 @@ export declare abstract class EntityRepository<T extends Entity = Entity> {
     abstract countByFilter(query: Query<T>): Promise<number>;
     abstract has(id: string): Promise<boolean>;
     abstract hasByFilter(query: Query<T>): Promise<boolean>;
-    abstract hasMany(ids: string[]): Promise<string[]>;
     abstract hasAll(ids: string[]): Promise<boolean>;
     abstract insert(entity: NewEntity<T>): Promise<T>;
     abstract insertMany(entities: NewEntity<T>[]): Promise<T[]>;
@@ -41,10 +41,8 @@ export declare abstract class EntityRepository<T extends Entity = Entity> {
     abstract updateByFilter(query: Query<T>, update: EntityUpdate<T>): Promise<void>;
     abstract updateMany(ids: string[], update: EntityUpdate<T>): Promise<void>;
     abstract updateManyByFilter(filter: Query<T>, update: EntityUpdate<T>): Promise<void>;
-    abstract delete<U extends T>(entity: U): Promise<boolean>;
-    abstract deleteMany<U extends T>(entities: U[]): Promise<number>;
-    abstract deleteById(id: string): Promise<boolean>;
-    abstract deleteManyById(ids: string[]): Promise<number>;
-    abstract deleteByFilter<U extends T = T>(query: Query<U>): Promise<boolean>;
-    abstract deleteManyByFilter<U extends T = T>(query: Query<U>): Promise<number>;
+    abstract delete(id: string): Promise<boolean>;
+    abstract deleteMany(ids: string[]): Promise<number>;
+    abstract deleteByFilter(query: Query<T>): Promise<boolean>;
+    abstract deleteManyByFilter(query: Query<T>): Promise<number>;
 }

package/orm/repository.js

@@ -1,4 +1,11 @@
+import { NotImplementedError } from '../errors/not-implemented.error.js';
+import { drizzle } from 'drizzle-orm/node-postgres';
 export const repositoryType = Symbol('repositoryType');
 export class EntityRepository {
     type;
+    database = drizzle(null);
+    async load(_id) {
+        // const result = await this.database.select({ name2: mySchemaUsers.name }).from(mySchemaUsers).leftJoin();
+        throw new NotImplementedError();
+    }
 }

package/orm/schema-converter.d.ts

@@ -0,0 +1,83 @@
+import { boolean, doublePrecision, text, type PgTableWithColumns } from 'drizzle-orm/pg-core';
+import type { GetTagMetadata, SnakeCase, Tagged } from 'type-fest';
+import type { Type } from '../types.js';
+import { BuildColumns, NotNull } from 'drizzle-orm';
+import type { DbSchemaStatic } from './schema.js';
+import { Integer } from './types.js';
+export declare const mySchema: import("drizzle-orm/pg-core").PgSchema<"my_schema">;
+export declare const colors: import("drizzle-orm/pg-core").PgEnum<["red", "green", "blue"]>;
+export declare const mySchemaUsers: PgTableWithColumns<{
+    name: "users";
+    schema: "my_schema";
+    columns: {
+        id: import("drizzle-orm/pg-core").PgColumn<{
+            name: "id";
+            tableName: "users";
+            dataType: "string";
+            columnType: "PgUUID";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+        }, {}, {}>;
+        name: import("drizzle-orm/pg-core").PgColumn<{
+            name: "name";
+            tableName: "users";
+            dataType: "string";
+            columnType: "PgText";
+            data: string;
+            driverParam: string;
+            notNull: false;
+            hasDefault: false;
+            enumValues: [string, ...string[]];
+            baseColumn: never;
+        }, {}, {}>;
+        age: import("drizzle-orm/pg-core").PgColumn<{
+            name: "";
+            tableName: "users";
+            dataType: "number";
+            columnType: "PgInteger";
+            data: number;
+            driverParam: string | number;
+            notNull: false;
+            hasDefault: false;
+            enumValues: undefined;
+            baseColumn: never;
+        }, {}, {}>;
+        color: import("drizzle-orm/pg-core").PgColumn<{
+            name: "color";
+            tableName: "users";
+            dataType: "string";
+            columnType: "PgEnumColumn";
+            data: "red" | "green" | "blue";
+            driverParam: string;
+            notNull: false;
+            hasDefault: true;
+            enumValues: ["red", "green", "blue"];
+            baseColumn: never;
+        }, {}, {}>;
+    };
+    dialect: "pg";
+}>;
+type ColumnBase<Name extends string, T> = T extends Tagged<T, 'column', any> ? GetTagMetadata<T, 'column'> : T extends string ? ReturnType<typeof text<Name, string, [string, ...string[]]>> : T extends number ? ReturnType<typeof doublePrecision<Name>> : T extends boolean ? ReturnType<typeof boolean<Name>> : never;
+type Column<Name extends string, T> = null extends T ? ColumnBase<Name, T> : NotNull<ColumnBase<Name, T>>;
+export declare function getDrizzleSchemaFromType<T extends Type & DbSchemaStatic>(type: T): PgTableWithColumns<{
+    name: SnakeCase<T['entityName']>;
+    schema: '';
+    columns: BuildColumns<T['entityName'], {
+        [P in keyof InstanceType<T>]: Column<Extract<P, string>, InstanceType<T>[P]>;
+    }, 'pg'>;
+    dialect: '';
+}>;
+export declare class Entity2 {
+    id: string;
+}
+export declare class User extends Entity2 {
+    static entityName: 'UserData';
+    name: string;
+    age: Integer<'age'> | null;
+    hasAge: boolean;
+}
+export {};