@infrab4a/connect 3.2.4 → 3.2.5-beta.0

package/infra/hasura-graphql/mixins/helpers/attribute-option.helper.d.ts

@@ -4,7 +4,7 @@ declare type FindByAttributeResult<MBase extends ModelBaseStructure<MBase>, Attr
     attributeName: Attribute;
 };
 export declare class AttributeOptionHelper {
-    static FindByAttribute: <MBase extends ModelBaseStructure<any, any>, Attribute extends NonFunctionAndIdentifierPropertyNames<MBase>>(attributeName: Attribute, fields: HasuraGraphQLFields<MBase>) => FindByAttributeResult<MBase, Attribute>;
+    static FindByAttribute: <MBase extends ModelBaseStructure<any, any>, Attribute extends NonFunctionAndIdentifierPropertyNames<MBase> = NonFunctionAndIdentifierPropertyNames<MBase>>(attributeName: Attribute, fields: HasuraGraphQLFields<MBase>) => FindByAttributeResult<MBase, Attribute>;
     static CheckIsColumnOption: <Model extends ModelBaseStructure<any, any>, ParentModel extends ModelBaseStructure<any, any>>(fieldValue: ColumnOptions<Model, ParentModel, any>) => fieldValue is ColumnOptions<Model, ParentModel, any>;
     static FindColumnOptionFromList: <Model extends ModelBaseStructure<any, any>, ParentModel extends ModelBaseStructure<any, any>>(columnName: string, fields: HasuraGraphQLFields<ParentModel>) => ColumnOptions<Model, ParentModel, any> & {
         attributeName: NonFunctionAndIdentifierPropertyNames<ParentModel>;

package/infra/hasura-graphql/mixins/helpers/bind-filter-query.helper.d.ts

@@ -0,0 +1,10 @@
+import { ModelBaseStructure, NonFunctionAndIdentifierPropertyNames, NonFunctionPropertyNames, RepositoryFindFielters, RepositoryFindFieltersOptions } from '../../../../domain';
+import { HasuraGraphQLWhere } from '../../enums';
+import { ColumnOptions, HasuraGraphQLFields, VariableOptions } from '../../types';
+export declare class BindFilterQueryHelper {
+    static MakeGraphQLWhere: <MBase extends ModelBaseStructure<any, any>>(filter: RepositoryFindFielters<MBase>, fields: HasuraGraphQLFields<MBase>) => VariableOptions;
+    static BuildWhereSentence: <MBase extends ModelBaseStructure<any, any>>(field: NonFunctionAndIdentifierPropertyNames<MBase>, options: RepositoryFindFieltersOptions<MBase, NonFunctionPropertyNames<MBase, keyof MBase>>, fields: HasuraGraphQLFields<MBase>) => VariableOptions;
+    static BuildOperatorSentence: <MBase extends ModelBaseStructure<any, any>>(options: RepositoryFindFieltersOptions<MBase, any>, fieldOption: ColumnOptions<any, any>) => VariableOptions;
+    static GetHasuraOperator: <MBase extends ModelBaseStructure<any, any>>(options: RepositoryFindFieltersOptions<MBase, NonFunctionPropertyNames<MBase, keyof MBase>>, fieldOption: ColumnOptions<any, any>) => HasuraGraphQLWhere;
+    static GetHasuraJsonbOperator: <MBase extends ModelBaseStructure<any, any>>(options: RepositoryFindFieltersOptions<MBase, NonFunctionPropertyNames<MBase, keyof MBase>>) => HasuraGraphQLWhere;
+}

package/infra/hasura-graphql/mixins/helpers/index.d.ts

@@ -1,3 +1,4 @@
 export * from './attribute-option.helper';
-export * from './graphql-field.helper';
+export * from './bind-filter-query.helper';
 export * from './filter-option.helper';
+export * from './graphql-field.helper';

package/infra/hasura-graphql/mixins/with-find-hasura-graphql.mixin.d.ts

@@ -1,7 +1,6 @@
-import { ModelBaseStructure, NonFunctionAndIdentifierPropertyNames, NonFunctionPropertyNames, RepositoryFindFielters, RepositoryFindFieltersOptions, RepositoryFindResult, RepositoryLimitOptions, RepositoryOrderBy } from '../../../domain';
+import { ModelBaseStructure, NonFunctionPropertyNames, RepositoryFindFielters, RepositoryFindResult, RepositoryLimitOptions, RepositoryOrderBy } from '../../../domain';
 import { MixinCtor } from '../../../utils';
-import { HasuraGraphQLWhere } from '../enums';
-import { ColumnOptions, GraphQLRepository, HasuraGraphQLFields, VariableOptions } from '../types';
+import { GraphQLRepository } from '../types';
 export declare const withFindHasuraGraphQL: <MBase extends ModelBaseStructure<any, any>, TMixinBase extends MixinCtor<GraphQLRepository<MBase>, any[]>>(MixinBase: MixinCtor<GraphQLRepository<MBase>, any[]> & TMixinBase) => {
     new (...args: any[]): {
         find(options?: {
@@ -10,20 +9,15 @@ export declare const withFindHasuraGraphQL: <MBase extends ModelBaseStructure<an
             limits?: RepositoryLimitOptions<MBase>;
             orderBy?: RepositoryOrderBy<MBase>;
         }): Promise<RepositoryFindResult<MBase>>;
-        makeGraphQLWhere: (filter: RepositoryFindFielters<MBase>, fields: HasuraGraphQLFields<MBase>) => VariableOptions;
-        buildWhereSentence: (field: NonFunctionAndIdentifierPropertyNames<MBase>, options: RepositoryFindFieltersOptions<MBase, NonFunctionPropertyNames<MBase, keyof MBase>>, fields: HasuraGraphQLFields<MBase>) => VariableOptions;
-        buildOperatorSentence: (options: RepositoryFindFieltersOptions<MBase, any>, fieldOption: ColumnOptions<any, any>) => VariableOptions;
-        getHasuraOperator: (options: RepositoryFindFieltersOptions<MBase, NonFunctionPropertyNames<MBase, keyof MBase>>, fieldOption: ColumnOptions<any, any>) => HasuraGraphQLWhere;
-        getHasuraJsonbOperator: (options: RepositoryFindFieltersOptions<MBase, NonFunctionPropertyNames<MBase, keyof MBase>>) => HasuraGraphQLWhere;
         tableName: string;
-        model: import("../../../domain").BaseModelBuilder<MBase, NonFunctionAndIdentifierPropertyNames<MBase>, MBase & {
+        model: import("../../../domain").BaseModelBuilder<MBase, import("../../../domain").NonFunctionAndIdentifierPropertyNames<MBase>, MBase & {
             prototype: unknown;
         }>;
-        fields: HasuraGraphQLFields<MBase>;
+        fields: import("../types").HasuraGraphQLFields<MBase>;
         endpoint: string;
         authOptions: import("../types").HasuraGraphQLAuthOptions;
-        mutation: <ReturnFields = any>(operation: string, fields?: string[] | HasuraGraphQLFields<MBase>, variables?: VariableOptions) => Promise<ReturnFields>;
-        query: <ReturnFields_1 = any>(operation: string | import("../types").GraphQLParams<MBase>[], fields?: string[] | HasuraGraphQLFields<MBase>, variables?: VariableOptions) => Promise<ReturnFields_1>;
+        mutation: <ReturnFields = any>(operation: string, fields?: string[] | import("../types").HasuraGraphQLFields<MBase>, variables?: import("../types").VariableOptions) => Promise<ReturnFields>;
+        query: <ReturnFields_1 = any>(operation: string | import("../types").GraphQLParams<MBase>[], fields?: string[] | import("../types").HasuraGraphQLFields<MBase>, variables?: import("../types").VariableOptions) => Promise<ReturnFields_1>;
         getAttributeGraphQLTypeOf: <FieldValue>(value: FieldValue) => string;
         convertDataFromHasura: (data: Record<string, string | number>) => MBase;
         convertDataToHasura(instance: MBase, update?: boolean): Record<string, string | number>;

package/infra/hasura-graphql/types/hasura-graphql-fields.type.d.ts

@@ -1,9 +1,13 @@
-import { ModelBaseStructure, NonFunctionAndIdentifierPropertyNames, RepositoryFindField } from '../../../domain';
+import { ModelBaseStructure, NestedRepositoryFindFieltersOptions, NonFunctionAndIdentifierPropertyNames, RepositoryFindField } from '../../../domain';
 import { PropType } from '../../../utils';
 import { HasuraGraphQLColumnType } from '../enums';
 export declare type ColumnOptions<FieldType, Model, ValueFrom = any> = {
     type?: HasuraGraphQLColumnType;
     columnName?: string;
+    filters?: {
+        filterType: HasuraGraphQLColumnType | string;
+        filters: NestedRepositoryFindFieltersOptions<FieldType>;
+    };
     fields?: HasuraGraphQLFields<FieldType extends any[] ? FieldType[number] : FieldType>;
     foreignKeyColumn?: Partial<Record<NonFunctionAndIdentifierPropertyNames<FieldType extends any[] ? FieldType[number] : FieldType>, NonFunctionAndIdentifierPropertyNames<Model> | (string & {})>> | {};
     from?: (value: ValueFrom | ValueFrom[], data?: any) => FieldType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infrab4a/connect",
-  "version": "3.2.4",
+  "version": "3.2.5-beta.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
@@ -13,7 +13,7 @@
     "class-transformer": "^0.5.1",
     "date-fns": "^2.28.0",
     "firebase": "7.24.0",
-    "gql-query-builder": "^3.7.0",
+    "gql-query-builder": "3.7.0",
     "lodash": "^4.17.21",
     "reflect-metadata": "^0.1.13",
     "ts-custom-error": "3.2.2",