@kiwano/core 0.0.1 → 0.0.6

package/plugin/MultiPlugin.js

@@ -94,53 +94,53 @@ class MultiPlugin {
     afterBuildSchema(builder, schema) {
         this.executeSync('afterBuildSchema', plugin => plugin.afterBuildSchema(builder, schema));
     }
-    beforeBuildObjectType(builder, context) {
-        this.executeSync('beforeBuildObjectType', plugin => plugin.beforeBuildObjectType(builder, context));
+    beforeBuildObjectType(builder, context, info) {
+        this.executeSync('beforeBuildObjectType', plugin => plugin.beforeBuildObjectType(builder, context, info));
     }
-    afterBuildObjectType(builder, context, objectType) {
-        this.executeSync('afterBuildObjectType', plugin => plugin.afterBuildObjectType(builder, context, objectType));
+    afterBuildObjectType(builder, context, info, objectType) {
+        this.executeSync('afterBuildObjectType', plugin => plugin.afterBuildObjectType(builder, context, info, objectType));
     }
-    beforeBuildInputObjectType(builder, context) {
-        this.executeSync('beforeBuildInputObjectType', plugin => plugin.beforeBuildInputObjectType(builder, context));
+    beforeBuildInputObjectType(builder, context, info) {
+        this.executeSync('beforeBuildInputObjectType', plugin => plugin.beforeBuildInputObjectType(builder, context, info));
     }
-    afterBuildInputObjectType(builder, context, inputObjectType) {
-        this.executeSync('afterBuildInputObjectType', plugin => plugin.afterBuildInputObjectType(builder, context, inputObjectType));
+    afterBuildInputObjectType(builder, context, info, inputObjectType) {
+        this.executeSync('afterBuildInputObjectType', plugin => plugin.afterBuildInputObjectType(builder, context, info, inputObjectType));
     }
-    beforeBuildEnumType(builder, context) {
-        this.executeSync('beforeBuildEnumType', plugin => plugin.beforeBuildEnumType(builder, context));
+    beforeBuildEnumType(builder, context, info) {
+        this.executeSync('beforeBuildEnumType', plugin => plugin.beforeBuildEnumType(builder, context, info));
     }
-    afterBuildEnumType(builder, context, enumType) {
-        this.executeSync('afterBuildEnumType', plugin => plugin.afterBuildEnumType(builder, context, enumType));
+    afterBuildEnumType(builder, context, info, enumType) {
+        this.executeSync('afterBuildEnumType', plugin => plugin.afterBuildEnumType(builder, context, info, enumType));
     }
-    beforeBuildEnumValue(builder, context) {
-        this.executeSync('beforeBuildEnumValue', plugin => plugin.beforeBuildEnumValue(builder, context));
+    beforeBuildEnumValue(builder, context, info) {
+        this.executeSync('beforeBuildEnumValue', plugin => plugin.beforeBuildEnumValue(builder, context, info));
     }
-    afterBuildEnumValue(builder, context, enumValue) {
-        this.executeSync('afterBuildEnumValue', plugin => plugin.afterBuildEnumValue(builder, context, enumValue));
+    afterBuildEnumValue(builder, context, info, enumValue) {
+        this.executeSync('afterBuildEnumValue', plugin => plugin.afterBuildEnumValue(builder, context, info, enumValue));
     }
-    beforeBuildUnionType(builder, context) {
-        this.executeSync('beforeBuildUnionType', plugin => plugin.beforeBuildUnionType(builder, context));
+    beforeBuildUnionType(builder, context, info) {
+        this.executeSync('beforeBuildUnionType', plugin => plugin.beforeBuildUnionType(builder, context, info));
     }
-    afterBuildUnionType(builder, context, unionType) {
-        this.executeSync('afterBuildUnionType', plugin => plugin.afterBuildUnionType(builder, context, unionType));
+    afterBuildUnionType(builder, context, info, unionType) {
+        this.executeSync('afterBuildUnionType', plugin => plugin.afterBuildUnionType(builder, context, info, unionType));
     }
-    beforeBuildField(builder, context) {
-        this.executeSync('beforeBuildField', plugin => plugin.beforeBuildField(builder, context));
+    beforeBuildField(builder, context, info) {
+        this.executeSync('beforeBuildField', plugin => plugin.beforeBuildField(builder, context, info));
     }
-    afterBuildField(builder, context, field) {
-        this.executeSync('afterBuildField', plugin => plugin.afterBuildField(builder, context, field));
+    afterBuildField(builder, context, info, field) {
+        this.executeSync('afterBuildField', plugin => plugin.afterBuildField(builder, context, info, field));
     }
-    beforeBuildInputField(builder, context) {
-        this.executeSync('beforeBuildInputField', plugin => plugin.beforeBuildInputField(builder, context));
+    beforeBuildInputField(builder, context, info) {
+        this.executeSync('beforeBuildInputField', plugin => plugin.beforeBuildInputField(builder, context, info));
     }
-    afterBuildInputField(builder, context, inputField) {
-        this.executeSync('afterBuildInputField', plugin => plugin.afterBuildInputField(builder, context, inputField));
+    afterBuildInputField(builder, context, info, inputField) {
+        this.executeSync('afterBuildInputField', plugin => plugin.afterBuildInputField(builder, context, info, inputField));
     }
-    beforeBuildArgument(builder, context) {
-        this.executeSync('beforeBuildArgument', plugin => plugin.beforeBuildArgument(builder, context));
+    beforeBuildArgument(builder, context, info) {
+        this.executeSync('beforeBuildArgument', plugin => plugin.beforeBuildArgument(builder, context, info));
     }
-    afterBuildArgument(builder, context, argument) {
-        this.executeSync('afterBuildArgument', plugin => plugin.afterBuildArgument(builder, context, argument));
+    afterBuildArgument(builder, context, info, argument) {
+        this.executeSync('afterBuildArgument', plugin => plugin.afterBuildArgument(builder, context, info, argument));
     }
 }
 exports.MultiPlugin = MultiPlugin;

package/plugin/acl/{Acl.d.ts → acl.d.ts}

@@ -1,3 +1,7 @@
+import { AclMiddlewareOptions } from "./middleware";
+import { Plugin } from "../common";
+import { SchemaBuilder } from "../../schema";
+import { GraphQLSchema } from "graphql";
 export declare type AclRoleIdentifier = string | number;
 interface AclRoleConfig {
     identifier: AclRoleIdentifier;
@@ -17,16 +21,17 @@ export interface AclValidateConfig {
     allowedRoles?: AclRoleIdentifier[];
 }
 export declare type AclValidateConfigType = AclValidateConfig | AclRoleIdentifier | AclRoleIdentifier[];
-export interface AclOptions {
+export interface AclOptions extends AclMiddlewareOptions {
     defaultAction?: AclAction;
     learn?: boolean;
 }
 export declare const defaultAclOptions: AclOptions;
-export declare abstract class AbstractAcl<OT extends AclOptions> {
-    protected _options: OT;
+export declare class AclPlugin implements Plugin {
+    protected _options: AclOptions;
     protected _roles: Map<AclRoleIdentifier, AclRoleConfig>;
     protected _allowRules: Map<string, AclRuleConfig>;
     protected _denyRules: Map<string, AclRuleConfig>;
+    constructor(options?: AclOptions);
     defaultAction(action: AclAction): this;
     learn(learn?: boolean): this;
     role(identifier: AclRoleIdentifier, parent?: AclRoleIdentifier): this;
@@ -35,13 +40,16 @@ export declare abstract class AbstractAcl<OT extends AclOptions> {
     isAllowed(role: AclRoleIdentifier, resource: string): boolean;
     isRoleIncluded(role: AclRoleIdentifier, compareRoles: Set<AclRoleIdentifier>): boolean;
     validate(config: AclValidateConfigType, role?: string): boolean;
-    middleware(config?: AclValidateConfigType): any;
+    middleware(config?: AclValidateConfigType): (req: any, res: any, next: any) => void;
+    rolePath(path: string): this;
+    onForbidden(handler: (resource: string) => void): this;
+    beforeBuildSchema(builder: SchemaBuilder): void;
+    afterBuildSchema(builder: SchemaBuilder, schema: GraphQLSchema): void;
+    protected addRules(resource: string, allowed: Set<string>, denied: Set<string>): void;
     protected _findRules(resource: string, collection: Map<string, AclRuleConfig>): AclRuleConfig[];
     protected _learnRoles(roles: Set<AclRoleIdentifier>): void;
     protected _getRoleList(roleConfig: AclRoleConfig): AclRoleIdentifier[];
     protected _getRuleConfig(name: string, roles: Set<AclRoleIdentifier>): AclRuleConfig;
 }
-export declare class Acl extends AbstractAcl<AclOptions> {
-    constructor(options?: AclOptions);
-}
-export default Acl;
+export declare function aclPlugin(options?: AclOptions): AclPlugin;
+export default aclPlugin;

package/plugin/acl/{Acl.js → acl.js}

@@ -3,13 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Acl = exports.AbstractAcl = exports.defaultAclOptions = exports.AclAction = void 0;
-const isArray_1 = __importDefault(require("lodash/isArray"));
-const isString_1 = __importDefault(require("lodash/isString"));
-const isNumber_1 = __importDefault(require("lodash/isNumber"));
-const sortBy_1 = __importDefault(require("lodash/sortBy"));
-const escapeRegExp_1 = __importDefault(require("lodash/escapeRegExp"));
-const defaults_1 = __importDefault(require("lodash/defaults"));
+exports.aclPlugin = exports.AclPlugin = exports.defaultAclOptions = exports.AclAction = void 0;
+const lodash_1 = require("lodash");
 const middleware_1 = require("./middleware");
 const FrameworkError_1 = __importDefault(require("../../error/FrameworkError"));
 var AclAction;
@@ -21,11 +16,12 @@ exports.defaultAclOptions = {
     defaultAction: AclAction.DENY,
     learn: true
 };
-class AbstractAcl {
-    constructor() {
+class AclPlugin {
+    constructor(options) {
         this._roles = new Map();
         this._allowRules = new Map();
         this._denyRules = new Map();
+        this._options = lodash_1.defaults(options || {}, middleware_1.defaultAclMiddlewareOptions, exports.defaultAclOptions);
     }
     defaultAction(action) {
         this._options.defaultAction = action;
@@ -42,7 +38,7 @@ class AbstractAcl {
         return this;
     }
     allow(resource, roles) {
-        const parsedRoles = new Set(isArray_1.default(roles) ? roles : [roles]);
+        const parsedRoles = new Set(lodash_1.isArray(roles) ? roles : [roles]);
         if (this._options.learn) {
             this._learnRoles(parsedRoles);
         }
@@ -56,7 +52,7 @@ class AbstractAcl {
         return this;
     }
     deny(resource, roles) {
-        const parsedRoles = new Set(isArray_1.default(roles) ? roles : [roles]);
+        const parsedRoles = new Set(lodash_1.isArray(roles) ? roles : [roles]);
         if (this._options.learn) {
             this._learnRoles(parsedRoles);
         }
@@ -73,7 +69,7 @@ class AbstractAcl {
         let determinedAction = this._options.defaultAction;
         const allowRules = this._findRules(resource, this._allowRules);
         const denyRules = this._findRules(resource, this._denyRules);
-        const rules = sortBy_1.default([
+        const rules = lodash_1.sortBy([
             ...allowRules.map(rule => ({ rule, action: AclAction.ALLOW })),
             ...denyRules.map(rule => ({ rule, action: AclAction.DENY })),
         ], rule => rule.rule.name.length);
@@ -102,10 +98,10 @@ class AbstractAcl {
     }
     validate(config, role = null) {
         let parsedConfig;
-        if (isArray_1.default(config)) {
+        if (lodash_1.isArray(config)) {
             parsedConfig = { allowedRoles: config };
         }
-        else if (isString_1.default(config) || isNumber_1.default(config)) {
+        else if (lodash_1.isString(config) || lodash_1.isNumber(config)) {
             parsedConfig = { allowedRoles: [config] };
         }
         else if (config) {
@@ -123,12 +119,43 @@ class AbstractAcl {
         return allowed;
     }
     middleware(config = null) {
-        return middleware_1.expressAclMiddleware(this, config);
+        return middleware_1.expressAclMiddleware(this, config, this._options);
+    }
+    rolePath(path) {
+        this._options.rolePath = path;
+        return this;
+    }
+    onForbidden(handler) {
+        this._options.onForbidden = handler;
+        return this;
+    }
+    beforeBuildSchema(builder) {
+        // Add middleware
+        builder.use(middleware_1.graphQLAclMiddleware(this, null, this._options));
+    }
+    afterBuildSchema(builder, schema) {
+        // Add rules
+        for (let type of builder.getObjectTypes()) {
+            const typeInfo = type.info();
+            this.addRules(`${type.name}.*`, typeInfo.allowedRoles, typeInfo.deniedRoles);
+            for (let field of type.info().fields) {
+                const fieldInfo = field.info();
+                this.addRules(`${type.name}.${field.name}`, fieldInfo.allowedRoles, fieldInfo.deniedRoles);
+            }
+        }
+    }
+    addRules(resource, allowed, denied) {
+        if (allowed.size > 0) {
+            this.allow(resource, Array.from(allowed));
+        }
+        if (denied.size > 0) {
+            this.deny(resource, Array.from(denied));
+        }
     }
     _findRules(resource, collection) {
         const allRules = Array.from(collection.values());
         return allRules.filter(rule => {
-            if (isString_1.default(rule.resource)) {
+            if (lodash_1.isString(rule.resource)) {
                 return rule.resource === resource;
             }
             else if (rule.resource instanceof RegExp) {
@@ -159,7 +186,7 @@ class AbstractAcl {
     _getRuleConfig(name, roles) {
         let resource = name;
         if (name.indexOf('*') >= 0) {
-            const pattern = escapeRegExp_1.default(name).replace('\\*', '(.*)');
+            const pattern = lodash_1.escapeRegExp(name).replace('\\*', '(.*)');
             resource = new RegExp(`^${pattern}$`);
         }
         return {
@@ -169,12 +196,9 @@ class AbstractAcl {
         };
     }
 }
-exports.AbstractAcl = AbstractAcl;
-class Acl extends AbstractAcl {
-    constructor(options) {
-        super();
-        this._options = defaults_1.default(options || {}, exports.defaultAclOptions);
-    }
+exports.AclPlugin = AclPlugin;
+function aclPlugin(options) {
+    return new AclPlugin(options);
 }
-exports.Acl = Acl;
-exports.default = Acl;
+exports.aclPlugin = aclPlugin;
+exports.default = aclPlugin;

package/plugin/acl/index.d.ts

@@ -1,5 +1,2 @@
-import plugin from "./plugin";
-export * from './Acl';
+export * from './acl';
 export * from './middleware';
-export * from './plugin';
-export default plugin;

package/plugin/acl/index.js

@@ -9,12 +9,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const plugin_1 = __importDefault(require("./plugin"));
-__exportStar(require("./Acl"), exports);
+__exportStar(require("./acl"), exports);
 __exportStar(require("./middleware"), exports);
-__exportStar(require("./plugin"), exports);
-exports.default = plugin_1.default;

package/plugin/acl/middleware.d.ts

@@ -1,11 +1,11 @@
 import { Path } from "graphql/jsutils/Path";
-import Acl, { AclValidateConfigType } from "./Acl";
+import { AclValidateConfigType, AclPlugin } from "./acl";
 import { Middleware } from "../../common";
 export interface AclMiddlewareOptions {
     rolePath?: string;
     onForbidden?: (resource: string) => void;
 }
 export declare const defaultAclMiddlewareOptions: AclMiddlewareOptions;
-export declare function expressAclMiddleware(acl: Acl, config?: AclValidateConfigType, options?: AclMiddlewareOptions): (req: any, res: any, next: any) => void;
-export declare function graphQLAclMiddleware(acl: Acl, config?: AclValidateConfigType, options?: AclMiddlewareOptions): Middleware;
+export declare function expressAclMiddleware(acl: AclPlugin, config?: AclValidateConfigType, options?: AclMiddlewareOptions): (req: any, res: any, next: any) => void;
+export declare function graphQLAclMiddleware(acl: AclPlugin, config?: AclValidateConfigType, options?: AclMiddlewareOptions): Middleware;
 export declare function getPathResource(path: Path): string;

package/plugin/acl/middleware.js

@@ -1,27 +1,24 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPathResource = exports.graphQLAclMiddleware = exports.expressAclMiddleware = exports.defaultAclMiddlewareOptions = void 0;
-const defaults_1 = __importDefault(require("lodash/defaults"));
-const get_1 = __importDefault(require("lodash/get"));
+const lodash_1 = require("lodash");
 const resolver_1 = require("../../error/resolver");
 exports.defaultAclMiddlewareOptions = {
-    rolePath: "session.role",
-    onForbidden: resource => { throw new resolver_1.ForbiddenError(`No access to ${resource}`, { test: 'j' }); }
+    rolePath: "role",
+    onForbidden: resource => { throw new resolver_1.ForbiddenError(`No access to ${resource}`); }
 };
 function expressAclMiddleware(acl, config = null, options = null) {
     const fullOptions = getOptions(options);
     return (req, res, next) => {
         var _a;
+        const fullPath = req.baseUrl + req.path;
         if (!config) {
-            config = { resource: req.path };
+            config = { resource: fullPath };
         }
-        const role = (_a = get_1.default(req, fullOptions.rolePath)) !== null && _a !== void 0 ? _a : null;
+        const role = (_a = lodash_1.get(req, fullOptions.rolePath)) !== null && _a !== void 0 ? _a : null;
         const allowed = acl.validate(config, role);
         if (!allowed) {
-            options.onForbidden(req.path);
+            fullOptions.onForbidden(fullPath);
         }
         next();
     };
@@ -36,10 +33,10 @@ function graphQLAclMiddleware(acl, config = null, options = null) {
         if (!config) {
             parsedConfig = { resource: pathResource };
         }
-        const role = (_a = get_1.default(context, fullOptions.rolePath)) !== null && _a !== void 0 ? _a : null;
+        const role = (_a = lodash_1.get(context, fullOptions.rolePath)) !== null && _a !== void 0 ? _a : null;
         const allowed = acl.validate(parsedConfig, role);
         if (!allowed) {
-            options.onForbidden(pathResource);
+            fullOptions.onForbidden(pathResource);
         }
         return resolve(root, args, context, info);
     };
@@ -50,5 +47,5 @@ function getPathResource(path) {
 }
 exports.getPathResource = getPathResource;
 function getOptions(options) {
-    return defaults_1.default({}, options || {}, exports.defaultAclMiddlewareOptions);
+    return lodash_1.defaults({}, options || {}, exports.defaultAclMiddlewareOptions);
 }

package/plugin/common.d.ts

@@ -34,20 +34,20 @@ export interface Plugin {
     afterBuild?(rootBuilder: AbstractSchemaBuilder<any>, schema: GraphQLSchema): any;
     beforeBuildSchema?(builder: AbstractSchemaBuilder<any>): any;
     afterBuildSchema?(builder: AbstractSchemaBuilder<any>, schema: GraphQLSchema): any;
-    beforeBuildObjectType?(builder: ObjectTypeBuilder, context: BuildContext): any;
-    afterBuildObjectType?(builder: ObjectTypeBuilder, context: BuildContext, objectType: GraphQLObjectType): any;
-    beforeBuildInputObjectType?(builder: InputObjectTypeBuilder, context: BuildContext): any;
-    afterBuildInputObjectType?(builder: InputObjectTypeBuilder, context: BuildContext, inputObjectType: GraphQLInputObjectType): any;
-    beforeBuildEnumType?(builder: EnumTypeBuilder, context: BuildContext): any;
-    afterBuildEnumType?(builder: EnumTypeBuilder, context: BuildContext, enumType: GraphQLEnumType): any;
-    beforeBuildEnumValue?(builder: EnumValueBuilder, context: BuildContext): any;
-    afterBuildEnumValue?(builder: EnumValueBuilder, context: BuildContext, enumValue: GraphQLEnumValueConfig): any;
-    beforeBuildUnionType?(builder: UnionTypeBuilder, context: BuildContext): any;
-    afterBuildUnionType?(builder: UnionTypeBuilder, context: BuildContext, unionType: GraphQLUnionType): any;
-    beforeBuildField?(builder: FieldBuilder, context: BuildContext): any;
-    afterBuildField?(builder: FieldBuilder, context: BuildContext, field: GraphQLFieldConfig<any, any>): any;
-    beforeBuildInputField?(builder: InputFieldBuilder, context: BuildContext): any;
-    afterBuildInputField?(builder: InputFieldBuilder, context: BuildContext, inputField: GraphQLInputFieldConfig): any;
-    beforeBuildArgument?(builder: ArgumentBuilder, context: BuildContext): any;
-    afterBuildArgument?(builder: ArgumentBuilder, context: BuildContext, argument: GraphQLArgumentConfig): any;
+    beforeBuildObjectType?(builder: ObjectTypeBuilder, context: BuildContext, info: ObjectTypeBuilderInfo): any;
+    afterBuildObjectType?(builder: ObjectTypeBuilder, context: BuildContext, info: ObjectTypeBuilderInfo, objectType: GraphQLObjectType): any;
+    beforeBuildInputObjectType?(builder: InputObjectTypeBuilder, context: BuildContext, info: InputObjectTypeBuilderInfo): any;
+    afterBuildInputObjectType?(builder: InputObjectTypeBuilder, context: BuildContext, info: InputObjectTypeBuilderInfo, inputObjectType: GraphQLInputObjectType): any;
+    beforeBuildEnumType?(builder: EnumTypeBuilder, context: BuildContext, info: EnumTypeBuilderInfo): any;
+    afterBuildEnumType?(builder: EnumTypeBuilder, context: BuildContext, info: EnumTypeBuilderInfo, enumType: GraphQLEnumType): any;
+    beforeBuildEnumValue?(builder: EnumValueBuilder, context: BuildContext, info: EnumValueBuilderInfo): any;
+    afterBuildEnumValue?(builder: EnumValueBuilder, context: BuildContext, info: EnumValueBuilderInfo, enumValue: GraphQLEnumValueConfig): any;
+    beforeBuildUnionType?(builder: UnionTypeBuilder, context: BuildContext, info: UnionTypeBuilderInfo): any;
+    afterBuildUnionType?(builder: UnionTypeBuilder, context: BuildContext, info: UnionTypeBuilderInfo, unionType: GraphQLUnionType): any;
+    beforeBuildField?(builder: FieldBuilder, context: BuildContext, info: FieldBuilderInfo): any;
+    afterBuildField?(builder: FieldBuilder, context: BuildContext, info: FieldBuilderInfo, field: GraphQLFieldConfig<any, any>): any;
+    beforeBuildInputField?(builder: InputFieldBuilder, context: BuildContext, info: InputFieldBuilderInfo): any;
+    afterBuildInputField?(builder: InputFieldBuilder, context: BuildContext, info: InputFieldBuilderInfo, inputField: GraphQLInputFieldConfig): any;
+    beforeBuildArgument?(builder: ArgumentBuilder, context: BuildContext, info: ArgumentBuilderInfo): any;
+    afterBuildArgument?(builder: ArgumentBuilder, context: BuildContext, info: ArgumentBuilderInfo, argument: GraphQLArgumentConfig): any;
 }

package/plugin/filter/equals.d.ts

@@ -1,4 +1,4 @@
-import { FieldBuilder } from "../../field";
+import { FieldBuilder, FieldBuilderInfo } from "../../field";
 import { InputObjectTypeBuilder } from "../../inputObjectType";
 import { ObjectTypeBuilder } from "../../objectType";
 import { InputFieldType } from "../../inputField";
@@ -27,7 +27,7 @@ export declare class EqualsFilterPlugin implements Plugin {
     include(name: string, type: InputFieldType): this;
     argumentName(name: string): this;
     inputName(nameFactory: (typeName: string) => string): this;
-    beforeBuildField(builder: FieldBuilder, context: BuildContext): void;
+    beforeBuildField(builder: FieldBuilder, context: BuildContext, info: FieldBuilderInfo): void;
     protected _createFilterInputType(context: BuildContext, name: string, targetObjectType?: ObjectTypeBuilder): InputObjectTypeBuilder;
     protected _getExtraFieldConfigs(context: BuildContext, name: string, targetObjectType?: ObjectTypeBuilder): Set<EqualsFilterPluginFieldConfig>;
 }

package/plugin/filter/equals.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.equalsFilterPlugin = exports.EqualsFilterPlugin = exports.defaultEqualsFilterPluginOptions = void 0;
-const defaults_1 = __importDefault(require("lodash/defaults"));
+const lodash_1 = require("lodash");
 const inputObjectType_1 = __importDefault(require("../../inputObjectType"));
 const objectType_1 = require("../../objectType");
 const util_1 = require("../../util");
@@ -16,7 +16,7 @@ exports.defaultEqualsFilterPluginOptions = {
 };
 class EqualsFilterPlugin {
     constructor(options) {
-        this._options = defaults_1.default(options || {}, exports.defaultEqualsFilterPluginOptions, {
+        this._options = lodash_1.defaults(options || {}, exports.defaultEqualsFilterPluginOptions, {
             exclude: [],
             include: []
         });
@@ -48,8 +48,7 @@ class EqualsFilterPlugin {
         this._options.inputName = nameFactory;
         return this;
     }
-    beforeBuildField(builder, context) {
-        const info = builder.info();
+    beforeBuildField(builder, context, info) {
         if (!info.list) {
             return;
         }

package/plugin/filter/search.d.ts

@@ -1,4 +1,4 @@
-import { FieldBuilder } from "../../field";
+import { FieldBuilder, FieldBuilderInfo } from "../../field";
 import { Plugin } from "../common";
 import { BuildContext } from "../../Builder";
 export interface SearchFilterPluginOptions {
@@ -8,7 +8,7 @@ export declare const defaultSearchFilterPluginOptions: SearchFilterPluginOptions
 export declare class SearchFilterPlugin implements Plugin {
     protected _options: SearchFilterPluginOptions;
     constructor(options?: SearchFilterPluginOptions);
-    beforeBuildField(builder: FieldBuilder, context: BuildContext): void;
+    beforeBuildField(builder: FieldBuilder, context: BuildContext, info: FieldBuilderInfo): void;
 }
 export declare function searchFilterPlugin(): SearchFilterPlugin;
 export default searchFilterPlugin;

package/plugin/filter/search.js

@@ -1,19 +1,15 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchFilterPlugin = exports.SearchFilterPlugin = exports.defaultSearchFilterPluginOptions = void 0;
-const defaults_1 = __importDefault(require("lodash/defaults"));
+const lodash_1 = require("lodash");
 exports.defaultSearchFilterPluginOptions = {
     argumentName: 'search'
 };
 class SearchFilterPlugin {
     constructor(options) {
-        this._options = defaults_1.default(options || {}, exports.defaultSearchFilterPluginOptions);
+        this._options = lodash_1.defaults(options || {}, exports.defaultSearchFilterPluginOptions);
     }
-    beforeBuildField(builder, context) {
-        const info = builder.info();
+    beforeBuildField(builder, context, info) {
         if (!info.list) {
             return;
         }

package/plugin/pagination/connection.d.ts

@@ -1,4 +1,4 @@
-import { FieldBuilder } from "../../field";
+import { FieldBuilder, FieldBuilderInfo } from "../../field";
 import { ObjectTypeBuilder } from "../../objectType";
 import { Plugin } from "../common";
 import { BuildContext } from "../../Builder";
@@ -6,7 +6,7 @@ export declare class ConnectionPaginationPlugin implements Plugin {
     protected _totalCount: boolean;
     totalCount(): this;
     totalCount(totalCount: boolean): this;
-    beforeBuildField(builder: FieldBuilder, context: BuildContext): void;
+    beforeBuildField(builder: FieldBuilder, context: BuildContext, info: FieldBuilderInfo): void;
     protected _createPageInfoObjectType(): ObjectTypeBuilder;
     protected _createConnectionObjectType(name: string, edgeTypeName: string): ObjectTypeBuilder;
     protected _createEdgeObjectType(name: string, typeName: string): ObjectTypeBuilder;

package/plugin/pagination/connection.js

@@ -34,8 +34,7 @@ class ConnectionPaginationPlugin {
         this._totalCount = totalCount;
         return this;
     }
-    beforeBuildField(builder, context) {
-        const info = builder.info();
+    beforeBuildField(builder, context, info) {
         if (!info.list) {
             return;
         }

package/plugin/pagination/firstAfter.d.ts

@@ -1,8 +1,8 @@
-import { FieldBuilder } from "../../field";
+import { FieldBuilder, FieldBuilderInfo } from "../../field";
 import { Plugin } from "../common";
 import { BuildContext } from "../../Builder";
 export declare class FirstAfterPaginationPlugin implements Plugin {
-    beforeBuildField(builder: FieldBuilder, context: BuildContext): void;
+    beforeBuildField(builder: FieldBuilder, context: BuildContext, info: FieldBuilderInfo): void;
 }
 export declare function firstAfterPaginationPlugin(): FirstAfterPaginationPlugin;
 export default firstAfterPaginationPlugin;

package/plugin/pagination/firstAfter.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.firstAfterPaginationPlugin = exports.FirstAfterPaginationPlugin = void 0;
 class FirstAfterPaginationPlugin {
-    beforeBuildField(builder, context) {
-        const info = builder.info();
+    beforeBuildField(builder, context, info) {
         if (!info.list) {
             return;
         }

package/plugin/pagination/items.d.ts

@@ -1,9 +1,9 @@
-import { FieldBuilder } from "../../field";
+import { FieldBuilder, FieldBuilderInfo } from "../../field";
 import { ObjectTypeBuilder } from "../../objectType";
 import { Plugin } from "../common";
 import { BuildContext } from "../../Builder";
 export declare class ItemsPaginationPlugin implements Plugin {
-    beforeBuildField(builder: FieldBuilder, context: BuildContext): void;
+    beforeBuildField(builder: FieldBuilder, context: BuildContext, info: FieldBuilderInfo): void;
     protected _createListObjectType(name: string, typeName: string): ObjectTypeBuilder;
 }
 export declare function itemsPaginationPlugin(): ItemsPaginationPlugin;

package/plugin/pagination/items.js

@@ -26,8 +26,7 @@ exports.itemsPaginationPlugin = exports.ItemsPaginationPlugin = void 0;
 const objectType_1 = __importStar(require("../../objectType"));
 const PluginError_1 = __importDefault(require("../PluginError"));
 class ItemsPaginationPlugin {
-    beforeBuildField(builder, context) {
-        const info = builder.info();
+    beforeBuildField(builder, context, info) {
         if (!info.list) {
             return;
         }

package/plugin/pagination/offsetLimit.d.ts

@@ -1,8 +1,8 @@
-import { FieldBuilder } from "../../field";
+import { FieldBuilder, FieldBuilderInfo } from "../../field";
 import { Plugin } from "../common";
 import { BuildContext } from "../../Builder";
 export declare class OffsetLimitPaginationPlugin implements Plugin {
-    beforeBuildField(builder: FieldBuilder, context: BuildContext): void;
+    beforeBuildField(builder: FieldBuilder, context: BuildContext, info: FieldBuilderInfo): void;
 }
 export declare function offsetLimitPaginationPlugin(): OffsetLimitPaginationPlugin;
 export default offsetLimitPaginationPlugin;

package/plugin/pagination/offsetLimit.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.offsetLimitPaginationPlugin = exports.OffsetLimitPaginationPlugin = void 0;
 class OffsetLimitPaginationPlugin {
-    beforeBuildField(builder, context) {
-        const info = builder.info();
+    beforeBuildField(builder, context, info) {
         if (!info.list) {
             return;
         }

package/plugin/sort/sort.d.ts

@@ -1,4 +1,4 @@
-import { FieldBuilder } from "../../field";
+import { FieldBuilder, FieldBuilderInfo } from "../../field";
 import { InputObjectTypeBuilder } from "../../inputObjectType";
 import { EnumTypeBuilder } from "../../enumType";
 import { ObjectTypeBuilder } from "../../objectType";
@@ -34,7 +34,7 @@ export declare class SortPlugin implements Plugin {
     argumentName(name: string): this;
     inputName(nameFactory: (typeName: string) => string): this;
     fieldEnumName(nameFactory: (typeName: string) => string): this;
-    beforeBuildField(builder: FieldBuilder, context: BuildContext): void;
+    beforeBuildField(builder: FieldBuilder, context: BuildContext, info: FieldBuilderInfo): void;
     protected _createSortInputType(name: string, enumName: string): InputObjectTypeBuilder;
     protected _createSortFieldEnum(context: BuildContext, name: string, typeName: string, targetObjectType?: ObjectTypeBuilder): EnumTypeBuilder;
     protected _createSortDirectionEnum(): EnumTypeBuilder;

package/plugin/sort/sort.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sortPlugin = exports.SortPlugin = exports.defaultSortPluginOptions = exports.SortDirection = void 0;
-const defaults_1 = __importDefault(require("lodash/defaults"));
+const lodash_1 = require("lodash");
 const inputObjectType_1 = __importDefault(require("../../inputObjectType"));
 const enumType_1 = __importDefault(require("../../enumType"));
 const objectType_1 = require("../../objectType");
@@ -24,7 +24,7 @@ exports.defaultSortPluginOptions = {
 };
 class SortPlugin {
     constructor(options) {
-        this._options = defaults_1.default(options || {}, exports.defaultSortPluginOptions, {
+        this._options = lodash_1.defaults(options || {}, exports.defaultSortPluginOptions, {
             exclude: [],
             include: []
         });
@@ -64,8 +64,7 @@ class SortPlugin {
         this._options.fieldEnumName = nameFactory;
         return this;
     }
-    beforeBuildField(builder, context) {
-        const info = builder.info();
+    beforeBuildField(builder, context, info) {
         if (!info.list) {
             return;
         }