Db: Fixed typing, docs and a simple error

examples/schemas/src/index.ts

@@ -1,8 +1,6 @@
-
-import { setDefaultAdapter, getSchemasWithDefaultAdapter, object, string, schema } from '@palmares/schemas';
+import { getSchemasWithDefaultAdapter, object, schema, setDefaultAdapter, string } from '@palmares/schemas';
 import { ZodSchemaAdapter, z } from '@palmares/zod-schema';
 
-
 setDefaultAdapter(new ZodSchemaAdapter());
 const p = getSchemasWithDefaultAdapter<ZodSchemaAdapter>();
 
@@ -13,10 +11,11 @@ const userSchema = p.object({
   password: p.string().minLength(6),
   company: p.object({
     id: p.number(),
-    name: p.string(),
-  }),
-})
+    name: p.string()
+  })
+});
 
+/*
 const main = async () => {
   const testSchema = p.object({
     companyId: p.number().toRepresentation(async (value) => {
@@ -56,7 +55,7 @@ const main = async () => {
     },
   });
   console.log(value.test.isTest);*/
-  /*const [testeResult, teste2Result, teste3Result, teste4Result] = await Promise.all([
+/*const [testeResult, teste2Result, teste3Result, teste4Result] = await Promise.all([
     objectSchema.parse({
       teste: 10,
     }),
@@ -74,13 +73,13 @@ const main = async () => {
       },
     }),
   ]);*/
-  /*
+/*
   const teste4Result = await objectSchema.parse({
     teste: {
       age: 10,
     },
   });*/
-  /*
+/*
   console.log('______//_______');
   console.log(testeResult.errors);
   console.log(testeResult.parsed);
@@ -93,14 +92,15 @@ const main = async () => {
   console.log(teste3Result.errors);
   console.log(teste3Result.parsed);
   */
-  /*
+/*
   console.log('______//_______');
   console.log(teste4Result.errors);
   console.log(teste4Result.parsed);
   */
-  /*.compile({
+/*.compile({
       testSchema: objectSchema,
-    });*/
+    });* /
 };
 
 main();
+*/

package.json

@@ -30,7 +30,7 @@
     "build:watch": "turbo run build:watch --concurrency 20",
     "build:watch:tests": "turbo run build:watch --filter=@palmares/core --filter=@palmares/tests --filter=@palmares/jest-tests",
     "build:watch:schemas": "turbo run build:watch --filter=@palmares/core --filter=@palmares/schemas --filter=@palmares/zod-schema",
-    "build:watch:databases": "turbo run build:watch --filter=@palmares/core --filter=@palmares/databases --filter=@palmares/drizzle-engine --filter=@palmares/sequelize-engine",
+    "build:watch:databases": "turbo run build:watch --filter=@palmares/core --filter=@palmares/databases",
     "build:watch:server": "turbo run build:watch --filter=@palmares/core --filter=@palmares/server --filter=@palmares/express-adapter",
     "dev": "turbo run dev --parallel",
     "examples:server-express-only": "turbo run dev --parallel --filter=@examples/server-express-only --filter=@palmares/*",

packages/databases/README.md

@@ -96,7 +96,7 @@ export default setDatabaseConfig({
       // @ts-ignore
       path: import.meta.dirname, // If your package.json does not contain the "type": "module" in it, change that to __dirname
       getMigrations: () => [],
-      getModels: () => [authenticatedUsers, questions],
+      getModels: () => [User, Company],
     },
   ],
   std: new NodeStd(),

packages/databases/__tests__/src/drizzle/models.ts

@@ -15,7 +15,7 @@ import {
 } from '@palmares/databases';
 
 import type * as d /*{ Company as DCompany, User as DUser }*/ from '../../.drizzle/schema';
-import { ModelOptionsType } from '@palmares/databases';
+import type { ModelOptionsType } from '@palmares/databases';
 
 class Authentication extends Manager<CompanyAbstract> {
   authenticate(username: string, password: string) {
@@ -79,7 +79,7 @@ export class User extends Model<User>() {
     companyId: ForeignKeyField.new({
       onDelete: ON_DELETE.CASCADE,
       relatedName: 'usersOfCompany',
-      relationName: 'company',
+      relationName: 'company2',
       toField: 'id',
       relatedTo: () => Company
     }),

packages/databases/docs/introduction.md

@@ -96,7 +96,7 @@ export default setDatabaseConfig({
       // @ts-ignore
       path: import.meta.dirname, // If your package.json does not contain the "type": "module" in it, change that to __dirname
       getMigrations: () => [],
-      getModels: () => [authenticatedUsers, questions],
+      getModels: () => [User, Company],
     },
   ],
   std: new NodeStd(),

packages/databases/src/domain.ts

@@ -25,7 +25,7 @@ export function loadDatabases(databaseDomains?: DatabaseDomainInterface[]) {
 
 const databaseDomainModifier = domain<{
   getModels: (
-    engineInstance: DatabaseAdapter
+    engineInstance: DatabaseAdapter<any>
   ) =>
     | Promise<Record<string, ReturnType<typeof BaseModel>> | ReturnType<typeof BaseModel>[]>
     | Record<string, ReturnType<typeof BaseModel>>
@@ -99,8 +99,8 @@ export const databasesDomain = domain('@palmares/database', '', {
   // eslint-disable-next-line ts/require-await
   getMigrations: async () => defaultMigrations,
   // eslint-disable-next-line ts/require-await
-  getModels: async (engineInstance: DatabaseAdapter) => {
-    if (engineInstance.migrations) return defaultModels;
+  getModels: async (engineInstance: DatabaseAdapter<any>) => {
+    if (engineInstance.migrations) return defaultModels as any;
     else return [];
   }
 });

packages/databases/src/models/fields/auto.ts

@@ -65,12 +65,12 @@ export function auto(): AutoField<
  * ```
  */
 export class AutoField<
-  TType extends { create: any; read: any; update: any } = {
+  out TType extends { create: any; read: any; update: any } = {
     create: number | undefined | null;
     read: number;
     update: number | undefined | null;
   },
-  TDefinitions extends {
+  out TDefinitions extends {
     hasDefaultValue: boolean;
     unique: boolean;
     auto: boolean;
@@ -97,7 +97,7 @@ export class AutoField<
     engineInstance: DatabaseAdapter;
     customAttributes: any;
   },
-  TFieldOperationTypes = Pick<
+  out TFieldOperationTypes = Pick<
     FieldWithOperationTypeForSearch<number>,
     'lessThan' | 'greaterThan' | 'and' | 'in' | 'or' | 'eq' | 'is' | 'between'
   >

packages/databases/src/models/fields/big-auto.ts

@@ -65,12 +65,12 @@ export function bigAuto(): BigAutoField<
  * ```
  */
 export class BigAutoField<
-  TType extends { create: any; read: any; update: any } = {
+  out TType extends { create: any; read: any; update: any } = {
     create: bigint | number | undefined;
     read: bigint | number;
     update: bigint | number | undefined;
   },
-  TDefinitions extends {
+  out TDefinitions extends {
     unique: boolean;
     auto: boolean;
     allowNull: boolean;
@@ -97,7 +97,7 @@ export class BigAutoField<
     engineInstance: DatabaseAdapter;
     customAttributes: any;
   },
-  TFieldOperationTypes = Pick<
+  out TFieldOperationTypes = Pick<
     FieldWithOperationTypeForSearch<number | bigint>,
     'lessThan' | 'greaterThan' | 'and' | 'in' | 'or' | 'eq' | 'is' | 'between'
   >

packages/databases/src/models/fields/big-integer.ts

@@ -62,12 +62,12 @@ export function bigInt(): BigIntegerField<
  * ```
  */
 export class BigIntegerField<
-  TType extends { create: any; read: any; update: any } = {
+  out TType extends { create: any; read: any; update: any } = {
     create: bigint | number;
     read: bigint | number;
     update: bigint | number;
   },
-  TDefinitions extends {
+  out TDefinitions extends {
     unique: boolean;
     auto: boolean;
     allowNull: boolean;
@@ -94,7 +94,7 @@ export class BigIntegerField<
     engineInstance: DatabaseAdapter;
     customAttributes: any;
   },
-  TFieldOperationTypes = Pick<
+  out TFieldOperationTypes = Pick<
     FieldWithOperationTypeForSearch<number | bigint>,
     'lessThan' | 'greaterThan' | 'and' | 'in' | 'or' | 'eq' | 'is' | 'between'
   >
@@ -350,39 +350,7 @@ export class BigIntegerField<
   > {
     (this.__customAttributes as any) = customAttributes as any;
 
-    return this as unknown as BigIntegerField<
-      TType,
-      {
-        [TKey in Exclude<
-          keyof TDefinitions,
-          | 'underscored'
-          | 'allowNull'
-          | 'dbIndex'
-          | 'unique'
-          | 'isPrimaryKey'
-          | 'auto'
-          | 'defaultValue'
-          | 'databaseName'
-          | 'typeName'
-          | 'engineInstance'
-          | 'customAttributes'
-        >]: TDefinitions[TKey];
-      } & {
-        unique: TDefinitions['unique'];
-        allowNull: TDefinitions['allowNull'];
-        dbIndex: TDefinitions['dbIndex'];
-        underscored: TDefinitions['underscored'];
-        isPrimaryKey: TDefinitions['isPrimaryKey'];
-        auto: TDefinitions['auto'];
-        hasDefaultValue: TDefinitions['hasDefaultValue'];
-        defaultValue: TDefinitions['defaultValue'];
-        databaseName: TDefinitions['databaseName'];
-        typeName: TDefinitions['typeName'];
-        engineInstance: TDefinitions['engineInstance'];
-        customAttributes: TCustomAttributes;
-      },
-      TFieldOperationTypes
-    >;
+    return this as unknown as any;
   }
 
   unique<TUnique extends boolean = true>(

packages/databases/src/models/fields/boolean.ts

@@ -60,12 +60,12 @@ export function bool(): BooleanField<
  * ```
  */
 export class BooleanField<
-  TType extends { create: any; read: any; update: any } = {
+  out TType extends { create: any; read: any; update: any } = {
     create: boolean;
     read: boolean;
     update: boolean;
   },
-  TDefinitions extends {
+  out TDefinitions extends {
     unique: boolean;
     auto: boolean;
     allowNull: boolean;
@@ -92,7 +92,7 @@ export class BooleanField<
     engineInstance: DatabaseAdapter;
     customAttributes: any;
   },
-  TFieldOperationTypes = Pick<FieldWithOperationTypeForSearch<boolean>, 'and' | 'in' | 'or' | 'eq' | 'is'>
+  out TFieldOperationTypes = Pick<FieldWithOperationTypeForSearch<boolean>, 'and' | 'in' | 'or' | 'eq' | 'is'>
 > extends Field<TType, TDefinitions, TFieldOperationTypes> {
   protected $$type = '$PBooleanField';
   protected __typeName = 'BooleanField';

packages/databases/src/models/fields/char.ts

@@ -71,12 +71,12 @@ export function char<const TMaxCharLength extends number>(args: {
  * ```
  */
 export class CharField<
-  TType extends { create: any; read: any; update: any } = {
+  out TType extends { create: any; read: any; update: any } = {
     create: string;
     read: string;
     update: string;
   },
-  TDefinitions extends {
+  out TDefinitions extends {
     unique: boolean;
     auto: boolean;
     allowNull: boolean;
@@ -107,7 +107,7 @@ export class CharField<
     customAttributes: any;
     maxLength: number;
   },
-  TFieldOperationTypes = Pick<FieldWithOperationTypeForSearch<string>, 'like' | 'and' | 'in' | 'or' | 'eq' | 'is'>
+  out TFieldOperationTypes = Pick<FieldWithOperationTypeForSearch<string>, 'like' | 'and' | 'in' | 'or' | 'eq' | 'is'>
 > extends TextField<TType, TDefinitions, TFieldOperationTypes> {
   protected $$type = '$PCharField';
   protected __typeName = 'CharField';

packages/databases/src/models/fields/date.ts

@@ -72,12 +72,12 @@ export function date(): DateField<
  * ```
  */
 export class DateField<
-  TType extends { create: any; read: any; update: any } = {
+  out TType extends { create: any; read: any; update: any } = {
     create: string | Date;
     read: string | Date;
     update: string | Date;
   },
-  TDefinitions extends {
+  out TDefinitions extends {
     unique: boolean;
     auto: boolean;
     allowNull: boolean;
@@ -108,7 +108,7 @@ export class DateField<
     autoNow: boolean;
     autoNowAdd: boolean;
   },
-  TFieldOperationTypes = Pick<
+  out TFieldOperationTypes = Pick<
     FieldWithOperationTypeForSearch<string | Date>,
     'eq' | 'is' | 'greaterThan' | 'lessThan' | 'between' | 'and' | 'or'
   >

packages/databases/src/models/fields/decimal.ts

@@ -76,12 +76,12 @@ export function decimal<const TMaxDigits extends number, const TDecimalPlaces ex
  * ```
  */
 export class DecimalField<
-  TType extends { create: any; read: any; update: any } = {
+  out TType extends { create: any; read: any; update: any } = {
     create: number | string;
     read: number | string;
     update: number | string;
   },
-  TDefinitions extends {
+  out TDefinitions extends {
     unique: boolean;
     auto: boolean;
     allowNull: boolean;
@@ -112,7 +112,7 @@ export class DecimalField<
     maxDigits: number;
     decimalPlaces: number;
   },
-  TFieldOperationTypes = Pick<
+  out TFieldOperationTypes = Pick<
     FieldWithOperationTypeForSearch<number | string>,
     'greaterThan' | 'lessThan' | 'between' | 'and' | 'in' | 'or' | 'eq' | 'is'
   >

packages/databases/src/models/fields/enum.ts

@@ -66,12 +66,12 @@ export function choice<const TChoices extends string[]>(params: {
  * ```
  */
 export class EnumField<
-  TType extends { create: any; read: any; update: any } = {
+  out TType extends { create: any; read: any; update: any } = {
     create: string;
     read: string;
     update: string;
   },
-  TDefinitions extends {
+  out TDefinitions extends {
     unique: boolean;
     auto: boolean;
     allowNull: boolean;
@@ -100,7 +100,7 @@ export class EnumField<
     customAttributes: any;
     choices: string[];
   },
-  TFieldOperationTypes = Pick<FieldWithOperationTypeForSearch<string>, 'and' | 'in' | 'or' | 'eq' | 'is'>
+  out TFieldOperationTypes = Pick<FieldWithOperationTypeForSearch<string>, 'and' | 'in' | 'or' | 'eq' | 'is'>
 > extends Field<TType, TDefinitions, TFieldOperationTypes> {
   protected $$type = '$PEnumField';
   protected __typeName = 'EnumField';

packages/databases/src/models/fields/field.ts

@@ -78,8 +78,8 @@ type AllowedQuery =
  * Generally we do not offer any translation to this type of field.
  */
 export class Field<
-  TType extends { create: any; read: any; update: any } = { create: any; read: any; update: any },
-  TDefinitions extends {
+  in out TType extends { create: any; read: any; update: any } = { create: any; read: any; update: any },
+  in out TDefinitions extends {
     unique: boolean;
     auto: boolean;
     allowNull: boolean;
@@ -106,7 +106,7 @@ export class Field<
     engineInstance: DatabaseAdapter;
     customAttributes: any;
   },
-  TFieldOperationTypes = FieldWithOperationTypeForSearch<any>
+  in out TFieldOperationTypes = FieldWithOperationTypeForSearch<any>
 > {
   protected $$type = '$PField';
   protected __typeName = 'Field';