@tstdl/base 0.91.39 → 0.91.41

package/examples/orm/test.js

@@ -8,3 +8,4 @@ const x = pgSchema('').table('test', {
     id: uuid().defaultRandom().primaryKey()
 });
 await db.insert(x).values({});
+const user = await db.select().from(schema.user);

package/examples/orm/user.model.d.ts

@@ -1,9 +1,16 @@
-import { Entity, Integer } from '../../orm/index.js';
+import { Array, Entity, Integer, Text } from '../../orm/index.js';
+export declare enum Foo {
+    Bar = 0,
+    Baz = 1
+}
 export declare class User extends Entity {
     static entityName: string;
     name: string;
     nickNames: string[];
+    nickNames2: Array<Text>;
     age: Integer | null;
+    age2: number | null;
     hasAge: boolean;
     mail: string;
+    foo: Foo;
 }

package/examples/orm/user.model.js

@@ -7,15 +7,23 @@ 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 { Entity, Integer, Unique } from '../../orm/index.js';
-import { Array, BooleanProperty, StringProperty } from '../../schema/index.js';
+import { Array, Entity, Integer, Unique } from '../../orm/index.js';
+import { BooleanProperty, StringProperty } from '../../schema/index.js';
+export var Foo;
+(function (Foo) {
+    Foo[Foo["Bar"] = 0] = "Bar";
+    Foo[Foo["Baz"] = 1] = "Baz";
+})(Foo || (Foo = {}));
 export class User extends Entity {
     static entityName = 'User';
     name;
     nickNames;
+    nickNames2;
     age;
+    age2;
     hasAge;
     mail;
+    foo;
 }
 __decorate([
     StringProperty(),
@@ -25,10 +33,18 @@ __decorate([
     Array(String),
     __metadata("design:type", Array)
 ], User.prototype, "nickNames", void 0);
+__decorate([
+    Array(String),
+    __metadata("design:type", Object)
+], User.prototype, "nickNames2", void 0);
 __decorate([
     Integer({ nullable: true }),
     __metadata("design:type", Object)
 ], User.prototype, "age", void 0);
+__decorate([
+    BooleanProperty(),
+    __metadata("design:type", Object)
+], User.prototype, "age2", void 0);
 __decorate([
     BooleanProperty(),
     __metadata("design:type", Boolean)

package/orm/types.d.ts

@@ -1,21 +1,22 @@
 import type { HasDefault as DrizzleHasDefault, IsPrimaryKey as DrizzleIsPrimaryKey } from 'drizzle-orm';
-import type { boolean, doublePrecision, integer, PgColumnBuilderBase, text, uuid } from 'drizzle-orm/pg-core';
+import type { boolean, doublePrecision, integer, PgColumnBuilder, PgColumnBuilderBase, text, uuid } from 'drizzle-orm/pg-core';
 import type { GetTagMetadata, Tagged, UnwrapTagged } from 'type-fest';
-import { Integer } from '../schema/index.js';
-import type { Record } from '../types.js';
+import { Integer, Array } from '../schema/index.js';
+import type { ObjectLiteral, Record } from '../types.js';
 import { 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>>;
 export type Nested<T extends Record> = Tagged<T, 'column', {
     nested: T;
 }>;
-export type ColumnBuilder<T, ColumnName extends string = never> = T extends Tagged<T, 'column', any> ? GetTagMetadata<T, 'column'> : T extends string ? string extends ColumnName ? ReturnType<typeof text<ColumnName, string, [string, ...string[]]>> : ReturnType<typeof text<string, [string, ...string[]]>> : T extends number ? string extends ColumnName ? ReturnType<typeof doublePrecision<ColumnName>> : ReturnType<typeof doublePrecision> : T extends boolean ? string extends ColumnName ? ReturnType<typeof boolean<ColumnName>> : ReturnType<typeof boolean> : never;
+export type ColumnBuilder<T, ColumnName extends string = never> = T extends Tagged<T, 'column', any> ? GetTagMetadata<T, 'column'> : T extends string ? string extends ColumnName ? ReturnType<typeof text<ColumnName, string, [string, ...string[]]>> : ReturnType<typeof text<string, [string, ...string[]]>> : T extends number ? string extends ColumnName ? ReturnType<typeof doublePrecision<ColumnName>> : ReturnType<typeof doublePrecision> : T extends boolean ? string extends ColumnName ? ReturnType<typeof boolean<ColumnName>> : ReturnType<typeof boolean> : T extends (infer U)[] ? string extends ColumnName ? ReturnType<ColumnBuilder<U, ColumnName>['array']> : ReturnType<ColumnBuilder<U>['array']> : never;
 export type TypeBuilder<T, ColumnName extends string = never> = [
     ColumnName
 ] extends [never] ? T extends Tagged<any, 'column', PgColumnBuilderBase> ? T : T extends infer U ? Tagged<U, 'column', ColumnBuilder<U>> : never : never;
+export type Array<T extends Tagged<ObjectLiteral, 'column', PgColumnBuilder<any>>> = Tagged<UnwrapTagged<T>[], 'column', ReturnType<GetTagMetadata<T, 'column'>['array']>>;
 export type Text = Tagged<string, 'column', ReturnType<typeof text<string, [string, ...string[]]>>>;
 export type Uuid = Tagged<string, 'column', ReturnType<typeof uuid>>;
 export type Integer = Tagged<number, 'column', ReturnType<typeof integer>>;
 export type DoublePrecision = Tagged<number, 'column', ReturnType<typeof doublePrecision>>;
 export type Boolean = Tagged<number, 'column', ReturnType<typeof boolean>>;
-export { Integer, Uuid };
+export { Integer, Uuid, Array };

package/orm/types.js

@@ -1,4 +1,4 @@
 /* eslint-disable @typescript-eslint/no-redeclare, @typescript-eslint/naming-convention */
-import { Integer } from '../schema/index.js';
+import { Integer, Array } from '../schema/index.js';
 import { Uuid } from './schemas/index.js';
-export { Integer, Uuid };
+export { Integer, Uuid, Array };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.91.39",
+  "version": "0.91.41",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -68,6 +68,7 @@
     "./module": "./module/index.js",
     "./object-storage": "./object-storage/index.js",
     "./openid-connect": "./openid-connect/index.js",
+    "./orm": "./orm/index.js",
     "./password": "./password/index.js",
     "./pdf": "./pdf/index.js",
     "./pool": "./pool/index.js",
@@ -129,7 +130,7 @@
     "@types/pg": "8.11",
     "@typescript-eslint/eslint-plugin": "7.17",
     "concurrently": "9.1",
-    "drizzle-kit": "0.27",
+    "drizzle-kit": "0.28",
     "eslint": "8.57",
     "eslint-import-resolver-typescript": "3.6",
     "eslint-plugin-import": "2.31",

package/schema/schemas/number.js

@@ -22,11 +22,12 @@ export class NumberSchema extends SimpleSchema {
             constraints: [
                 (options?.integer == true) ? (value) => globalThis.Number.isInteger(value) ? ({ success: true }) : ({ success: false, error: 'Value is not an integer.' }) : null,
                 isNumber(options?.minimum) ? (value) => (value >= this.minimum) ? ({ success: true }) : ({ success: false, error: `Value must be more than or equal to ${this.minimum}.` }) : null,
-                isNumber(options?.maximum) ? (value) => (value >= this.maximum) ? ({ success: true }) : ({ success: false, error: `Value must be less than or equal to ${this.maximum}.` }) : null
+                isNumber(options?.maximum) ? (value) => (value <= this.maximum) ? ({ success: true }) : ({ success: false, error: `Value must be less than or equal to ${this.maximum}.` }) : null
             ]
         });
         this.integer = options?.integer ?? false;
         this.minimum = options?.minimum ?? null;
+        this.maximum = options?.maximum ?? null;
     }
 }
 export function number(options) {