@kiwano/core 2.0.1 → 2.0.3

package/dist/entity/createInputObjectType.d.ts

@@ -4,8 +4,10 @@ import { EntityType } from "./entitySchema";
 export declare class CreateInputObjectTypeBuilder extends InputObjectTypeBuilder {
     protected _entityObjectType: EntityType;
     protected _exclude: Set<string>;
+    protected _include: Set<string>;
     constructor(name: BuilderName, entityType: EntityType);
     exclude(...fieldNames: string[]): this;
+    include(...fieldNames: string[]): this;
     finalizeInputObjectType(context: FinalizeContext, info: InputObjectTypeBuilderInfo): Promise<any>;
 }
 export declare function createInputObjectType(name: BuilderName, entityType: EntityType): CreateInputObjectTypeBuilder;

package/dist/entity/createInputObjectType.js

@@ -9,12 +9,17 @@ class CreateInputObjectTypeBuilder extends inputObjectType_1.InputObjectTypeBuil
     constructor(name, entityType) {
         super(name);
         this._exclude = new Set();
+        this._include = new Set();
         this._entityObjectType = entityType;
     }
     exclude(...fieldNames) {
         fieldNames.forEach(name => this._exclude.add(name));
         return this;
     }
+    include(...fieldNames) {
+        fieldNames.forEach(name => this._include.add(name));
+        return this;
+    }
     async finalizeInputObjectType(context, info) {
         await super.finalizeInputObjectType(context, info);
         const entity = this._entityObjectType instanceof objectType_1.ObjectTypeBuilder ? this._entityObjectType : this._entityObjectType();
@@ -22,7 +27,10 @@ class CreateInputObjectTypeBuilder extends inputObjectType_1.InputObjectTypeBuil
         const existingFieldNames = info.fields.map(field => field.name);
         for (let field of entityInfo.fields) {
             const fieldInfo = field.info();
-            if (this._exclude.has(fieldInfo.name) || !(0, util_1.isTypeInput)(fieldInfo.type, context.rootSchema) || (0, util_1.isFieldId)(fieldInfo) || existingFieldNames.indexOf(fieldInfo.name) >= 0) {
+            if (!(0, util_1.isTypeInput)(fieldInfo.type, context.rootSchema) || (0, util_1.isFieldId)(fieldInfo) || existingFieldNames.indexOf(fieldInfo.name) >= 0) {
+                continue;
+            }
+            if (this._exclude.has(fieldInfo.name) || (this._include.size > 0 && !this._include.has(fieldInfo.name))) {
                 continue;
             }
             const inputField = new inputField_1.InputFieldBuilder(fieldInfo.name, fieldInfo.type);

package/dist/entity/updateInputObjectType.d.ts

@@ -4,8 +4,10 @@ import { EntityType } from "./entitySchema";
 export declare class UpdateInputObjectTypeBuilder extends InputObjectTypeBuilder {
     protected _entityObjectType: EntityType;
     protected _exclude: Set<string>;
+    protected _include: Set<string>;
     constructor(name: BuilderName, entityType: EntityType);
     exclude(...fieldNames: string[]): this;
+    include(...fieldNames: string[]): this;
     finalizeInputObjectType(context: FinalizeContext, info: InputObjectTypeBuilderInfo): Promise<any>;
 }
 export declare function updateInputObjectType(name: BuilderName, entityType: EntityType): UpdateInputObjectTypeBuilder;

package/dist/entity/updateInputObjectType.js

@@ -9,12 +9,17 @@ class UpdateInputObjectTypeBuilder extends inputObjectType_1.InputObjectTypeBuil
     constructor(name, entityType) {
         super(name);
         this._exclude = new Set();
+        this._include = new Set();
         this._entityObjectType = entityType;
     }
     exclude(...fieldNames) {
         fieldNames.forEach(name => this._exclude.add(name));
         return this;
     }
+    include(...fieldNames) {
+        fieldNames.forEach(name => this._include.add(name));
+        return this;
+    }
     async finalizeInputObjectType(context, info) {
         await super.finalizeInputObjectType(context, info);
         const entity = this._entityObjectType instanceof objectType_1.ObjectTypeBuilder ? this._entityObjectType : this._entityObjectType();
@@ -22,7 +27,10 @@ class UpdateInputObjectTypeBuilder extends inputObjectType_1.InputObjectTypeBuil
         const existingFieldNames = info.fields.map(field => field.name);
         for (let field of entityInfo.fields) {
             const fieldInfo = field.info();
-            if (this._exclude.has(fieldInfo.name) || !(0, util_1.isTypeInput)(fieldInfo.type, context.rootSchema) || existingFieldNames.indexOf(fieldInfo.name) >= 0) {
+            if (!(0, util_1.isTypeInput)(fieldInfo.type, context.rootSchema) || existingFieldNames.indexOf(fieldInfo.name) >= 0) {
+                continue;
+            }
+            if (this._exclude.has(fieldInfo.name) || (this._include.size > 0 && !this._include.has(fieldInfo.name))) {
                 continue;
             }
             const inputField = new inputField_1.InputFieldBuilder(fieldInfo.name, fieldInfo.type);

package/dist/plugin/filter/equals.d.ts

@@ -6,9 +6,10 @@ import { Plugin } from "../common";
 import { BuildContext } from "../../Builder";
 export interface EqualsFilterPluginOptions {
     multi?: boolean;
+    manual?: boolean;
     fields?: EqualsFilterPluginFieldConfig[];
     exclude?: string[];
-    include?: EqualsFilterPluginFieldConfig[];
+    include?: string[];
     argumentName?: string;
     inputName?: (typeName: string) => string;
 }
@@ -22,9 +23,11 @@ export declare class EqualsFilterPlugin implements Plugin {
     constructor(options?: EqualsFilterPluginOptions);
     multi(): this;
     multi(multi: boolean): this;
+    manual(): this;
+    manual(manual: boolean): this;
     field(name: string, type: InputFieldType): this;
     exclude(...fieldNames: string[]): this;
-    include(name: string, type: InputFieldType): this;
+    include(...fieldNames: string[]): this;
     argumentName(name: string): this;
     inputName(nameFactory: (typeName: string) => string): this;
     beforeBuildField(builder: FieldBuilder, context: BuildContext, info: FieldBuilderInfo): void;

package/dist/plugin/filter/equals.js

@@ -11,6 +11,7 @@ const util_1 = require("../../util");
 const PluginError_1 = __importDefault(require("../PluginError"));
 exports.defaultEqualsFilterPluginOptions = {
     multi: false,
+    manual: false,
     argumentName: 'filter',
     inputName: typeName => `${typeName}EqualsFilter`,
 };
@@ -25,6 +26,10 @@ class EqualsFilterPlugin {
         this._options.multi = multi;
         return this;
     }
+    manual(manual = true) {
+        this._options.manual = manual;
+        return this;
+    }
     field(name, type) {
         if (!this._options.fields) {
             this._options.fields = [];
@@ -36,8 +41,8 @@ class EqualsFilterPlugin {
         fieldNames.forEach(name => this._options.exclude.push(name));
         return this;
     }
-    include(name, type) {
-        this._options.include.push({ name, type });
+    include(...fieldNames) {
+        fieldNames.forEach(name => this._options.include.push(name));
         return this;
     }
     argumentName(name) {
@@ -55,7 +60,7 @@ class EqualsFilterPlugin {
         const typeName = info.type.toString();
         const inputTypeName = this._options.inputName(typeName);
         let targetObjectType;
-        if (!this._options.fields) {
+        if (!this._options.manual) {
             targetObjectType = context.rootSchema.findType(typeName, true);
             if (!targetObjectType) {
                 throw new PluginError_1.default(`Filter target object ${typeName} not found`);
@@ -69,26 +74,28 @@ class EqualsFilterPlugin {
         builder.arg(this._options.argumentName, inputTypeName, _ => _.description(`Configuration for how the nodes should be filtered`));
     }
     _createFilterInputType(context, name, targetObjectType) {
+        var _a;
         const inputObjectType = (0, inputObjectType_1.default)(name)
             .description(`Configuration for how the nodes should be filtered`);
         let fields = new Set();
         if (targetObjectType) {
             for (let field of targetObjectType.info().fields) {
                 const fieldInfo = field.info();
-                if (!fieldInfo.list && (0, util_1.isTypeInput)(fieldInfo.type, context.rootSchema)) {
-                    fields.add({
-                        name: field.name,
-                        type: fieldInfo.type
-                    });
+                if (fieldInfo.list || !(0, util_1.isTypeInput)(fieldInfo.type, context.rootSchema)) {
+                    continue;
                 }
+                if (((_a = this._options.include) === null || _a === void 0 ? void 0 : _a.length) && !this._options.include.includes(field.name)) {
+                    continue;
+                }
+                fields.add({
+                    name: field.name,
+                    type: fieldInfo.type
+                });
             }
         }
-        else if (this._options.fields) {
+        if (this._options.fields) {
             this._options.fields.forEach(field => fields.add(field));
         }
-        if (this._options.include) {
-            this._options.include.forEach(field => fields.add(field));
-        }
         const extraFields = this._getExtraFieldConfigs(context, name, targetObjectType);
         if (extraFields) {
             extraFields.forEach(extraField => fields.add(extraField));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kiwano/core",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",