type-graphql 2.0.0-rc.2 → 2.0.0-rc.4

package/build/cjs/schema/schema-generator.js

@@ -6,7 +6,6 @@ const graphql_1 = require("graphql");
 const errors_1 = require("../errors");
 const types_1 = require("../helpers/types");
 const getMetadataStorage_1 = require("../metadata/getMetadataStorage");
-const metadata_storage_1 = require("../metadata/metadata-storage");
 const create_1 = require("../resolvers/create");
 const graphql_version_1 = require("../utils/graphql-version");
 const build_context_1 = require("./build-context");
@@ -14,7 +13,7 @@ const definition_node_1 = require("./definition-node");
 const utils_1 = require("./utils");
 class SchemaGenerator {
     static generateFromMetadata(options) {
-        this.metadataStorage = Object.assign(new metadata_storage_1.MetadataStorage(), (0, getMetadataStorage_1.getMetadataStorage)());
+        this.metadataStorage = (0, getMetadataStorage_1.getMetadataStorage)().clone();
         this.metadataStorage.build(options);
         this.checkForErrors(options);
         build_context_1.BuildContext.create(options);
@@ -32,6 +31,11 @@ class SchemaGenerator {
         });
         build_context_1.BuildContext.reset();
         this.usedInterfaceTypes = new Set();
+        this.objectTypesInfoMap = new Map();
+        this.inputTypesInfoMap = new Map();
+        this.interfaceTypesInfoMap = new Map();
+        this.enumTypesInfoMap = new Map();
+        this.unionTypesInfoMap = new Map();
         if (!options.skipCheck) {
             const { errors } = (0, graphql_1.graphqlSync)({ schema: finalSchema, source: (0, graphql_1.getIntrospectionQuery)() });
             if (errors) {
@@ -62,15 +66,15 @@ class SchemaGenerator {
             : defaultValueFromInitializer;
     }
     static buildTypesInfo(resolvers) {
-        this.unionTypesInfo = this.metadataStorage.unions.map(unionMetadata => {
+        this.unionTypesInfoMap = new Map(this.metadataStorage.unions.map(unionMetadata => {
             const unionObjectTypesInfo = [];
             const typesThunk = () => {
                 unionObjectTypesInfo.push(...unionMetadata
                     .getClassTypes()
-                    .map(objectTypeCls => this.objectTypesInfo.find(type => type.target === objectTypeCls)));
+                    .map(objectTypeCls => this.objectTypesInfoMap.get(objectTypeCls)));
                 return unionObjectTypesInfo.map(it => it.type);
             };
-            return {
+            const unionTypeInfo = {
                 unionSymbol: unionMetadata.symbol,
                 type: new graphql_1.GraphQLUnionType({
                     name: unionMetadata.name,
@@ -90,10 +94,11 @@ class SchemaGenerator {
                         },
                 }),
             };
-        });
-        this.enumTypesInfo = this.metadataStorage.enums.map(enumMetadata => {
+            return [unionMetadata.symbol, unionTypeInfo];
+        }));
+        this.enumTypesInfoMap = new Map(this.metadataStorage.enums.map(enumMetadata => {
             const enumMap = (0, types_1.getEnumValuesMap)(enumMetadata.enumObj);
-            return {
+            const enumTypeInfo = {
                 enumObj: enumMetadata.enumObj,
                 type: new graphql_1.GraphQLEnumType({
                     name: enumMetadata.name,
@@ -109,17 +114,18 @@ class SchemaGenerator {
                     }, {}),
                 }),
             };
-        });
-        this.objectTypesInfo = this.metadataStorage.objectTypes.map(objectType => {
+            return [enumMetadata.enumObj, enumTypeInfo];
+        }));
+        this.objectTypesInfoMap = new Map(this.metadataStorage.objectTypes.map(objectType => {
             const objectSuperClass = Object.getPrototypeOf(objectType.target);
             const hasExtended = objectSuperClass.prototype !== undefined;
             const getSuperClassType = () => {
-                const superClassTypeInfo = this.objectTypesInfo.find(type => type.target === objectSuperClass) ??
-                    this.interfaceTypesInfo.find(type => type.target === objectSuperClass);
+                const superClassTypeInfo = this.objectTypesInfoMap.get(objectSuperClass) ??
+                    this.interfaceTypesInfoMap.get(objectSuperClass);
                 return superClassTypeInfo ? superClassTypeInfo.type : undefined;
             };
             const interfaceClasses = objectType.interfaceClasses || [];
-            return {
+            const objectTypeInfo = {
                 metadata: objectType,
                 target: objectType.target,
                 type: new graphql_1.GraphQLObjectType({
@@ -129,7 +135,7 @@ class SchemaGenerator {
                     extensions: objectType.extensions,
                     interfaces: () => {
                         let interfaces = interfaceClasses.map(interfaceClass => {
-                            const interfaceTypeInfo = this.interfaceTypesInfo.find(info => info.target === interfaceClass);
+                            const interfaceTypeInfo = this.interfaceTypesInfoMap.get(interfaceClass);
                             if (!interfaceTypeInfo) {
                                 throw new Error(`Cannot find interface type metadata for class '${interfaceClass.name}' ` +
                                     `provided in 'implements' option for '${objectType.target.name}' object type class. ` +
@@ -195,28 +201,30 @@ class SchemaGenerator {
                     },
                 }),
             };
-        });
-        this.interfaceTypesInfo = this.metadataStorage.interfaceTypes.map(interfaceType => {
+            return [objectType.target, objectTypeInfo];
+        }));
+        this.interfaceTypesInfoMap = new Map(this.metadataStorage.interfaceTypes.map(interfaceType => {
             const interfaceSuperClass = Object.getPrototypeOf(interfaceType.target);
             const hasExtended = interfaceSuperClass.prototype !== undefined;
             const getSuperClassType = () => {
-                const superClassTypeInfo = this.interfaceTypesInfo.find(type => type.target === interfaceSuperClass);
+                const superClassTypeInfo = this.interfaceTypesInfoMap.get(interfaceSuperClass);
                 return superClassTypeInfo ? superClassTypeInfo.type : undefined;
             };
             const implementingObjectTypesTargets = this.metadataStorage.objectTypes
                 .filter(objectType => objectType.interfaceClasses &&
                 objectType.interfaceClasses.includes(interfaceType.target))
                 .map(objectType => objectType.target);
-            const implementingObjectTypesInfo = this.objectTypesInfo.filter(objectTypesInfo => implementingObjectTypesTargets.includes(objectTypesInfo.target));
-            return {
+            const implementingObjectTypesInfo = [...this.objectTypesInfoMap.values()].filter(objectTypesInfo => implementingObjectTypesTargets.includes(objectTypesInfo.target));
+            const interfaceTypeInfo = {
                 metadata: interfaceType,
                 target: interfaceType.target,
                 type: new graphql_1.GraphQLInterfaceType({
                     name: interfaceType.name,
                     description: interfaceType.description,
                     astNode: (0, definition_node_1.getInterfaceTypeDefinitionNode)(interfaceType.name, interfaceType.directives),
+                    extensions: interfaceType.extensions,
                     interfaces: () => {
-                        let interfaces = (interfaceType.interfaceClasses || []).map(interfaceClass => this.interfaceTypesInfo.find(info => info.target === interfaceClass).type);
+                        let interfaces = (interfaceType.interfaceClasses || []).map(interfaceClass => this.interfaceTypesInfoMap.get(interfaceClass).type);
                         if (hasExtended) {
                             const superClass = getSuperClassType();
                             if (superClass) {
@@ -276,15 +284,16 @@ class SchemaGenerator {
                         },
                 }),
             };
-        });
-        this.inputTypesInfo = this.metadataStorage.inputTypes.map(inputType => {
+            return [interfaceType.target, interfaceTypeInfo];
+        }));
+        this.inputTypesInfoMap = new Map(this.metadataStorage.inputTypes.map(inputType => {
             const objectSuperClass = Object.getPrototypeOf(inputType.target);
             const getSuperClassType = () => {
-                const superClassTypeInfo = this.inputTypesInfo.find(type => type.target === objectSuperClass);
+                const superClassTypeInfo = this.inputTypesInfoMap.get(objectSuperClass);
                 return superClassTypeInfo ? superClassTypeInfo.type : undefined;
             };
             const inputInstance = new inputType.target();
-            return {
+            const inputTypeInfo = {
                 target: inputType.target,
                 type: new graphql_1.GraphQLInputObjectType({
                     name: inputType.name,
@@ -319,7 +328,8 @@ class SchemaGenerator {
                     astNode: (0, definition_node_1.getInputObjectTypeDefinitionNode)(inputType.name, inputType.directives),
                 }),
             };
-        });
+            return [inputType.target, inputTypeInfo];
+        }));
     }
     static buildRootQueryType(resolvers) {
         const queriesHandlers = this.filterHandlersByResolvers(this.metadataStorage.queries, resolvers);
@@ -349,8 +359,8 @@ class SchemaGenerator {
         });
     }
     static buildOtherTypes(orphanedTypes) {
-        const autoRegisteredObjectTypesInfo = this.objectTypesInfo.filter(typeInfo => typeInfo.metadata.interfaceClasses?.some(interfaceClass => {
-            const implementedInterfaceInfo = this.interfaceTypesInfo.find(it => it.target === interfaceClass);
+        const autoRegisteredObjectTypesInfo = [...this.objectTypesInfoMap.values()].filter(typeInfo => typeInfo.metadata.interfaceClasses?.some(interfaceClass => {
+            const implementedInterfaceInfo = this.interfaceTypesInfoMap.get(interfaceClass);
             if (!implementedInterfaceInfo) {
                 return false;
             }
@@ -363,9 +373,9 @@ class SchemaGenerator {
             return true;
         }));
         return [
-            ...this.filterTypesInfoByOrphanedTypesAndExtractType(this.objectTypesInfo, orphanedTypes),
-            ...this.filterTypesInfoByOrphanedTypesAndExtractType(this.interfaceTypesInfo, orphanedTypes),
-            ...this.filterTypesInfoByOrphanedTypesAndExtractType(this.inputTypesInfo, orphanedTypes),
+            ...this.filterTypesInfoByOrphanedTypesAndExtractType([...this.objectTypesInfoMap.values()], orphanedTypes),
+            ...this.filterTypesInfoByOrphanedTypesAndExtractType([...this.interfaceTypesInfoMap.values()], orphanedTypes),
+            ...this.filterTypesInfoByOrphanedTypesAndExtractType([...this.inputTypesInfoMap.values()], orphanedTypes),
             ...autoRegisteredObjectTypesInfo.map(typeInfo => typeInfo.type),
         ];
     }
@@ -501,26 +511,26 @@ class SchemaGenerator {
         let gqlType;
         gqlType = (0, types_1.convertTypeIfScalar)(type);
         if (!gqlType) {
-            const objectType = this.objectTypesInfo.find(it => it.target === type);
+            const objectType = this.objectTypesInfoMap.get(type);
             if (objectType) {
                 gqlType = objectType.type;
             }
         }
         if (!gqlType) {
-            const interfaceType = this.interfaceTypesInfo.find(it => it.target === type);
+            const interfaceType = this.interfaceTypesInfoMap.get(type);
             if (interfaceType) {
                 this.usedInterfaceTypes.add(interfaceType.target);
                 gqlType = interfaceType.type;
             }
         }
         if (!gqlType) {
-            const enumType = this.enumTypesInfo.find(it => it.enumObj === type);
+            const enumType = this.enumTypesInfoMap.get(type);
             if (enumType) {
                 gqlType = enumType.type;
             }
         }
         if (!gqlType) {
-            const unionType = this.unionTypesInfo.find(it => it.unionSymbol === type);
+            const unionType = this.unionTypesInfoMap.get(type);
             if (unionType) {
                 gqlType = unionType.type;
             }
@@ -535,13 +545,13 @@ class SchemaGenerator {
         let gqlType;
         gqlType = (0, types_1.convertTypeIfScalar)(type);
         if (!gqlType) {
-            const inputType = this.inputTypesInfo.find(it => it.target === type);
+            const inputType = this.inputTypesInfoMap.get(type);
             if (inputType) {
                 gqlType = inputType.type;
             }
         }
         if (!gqlType) {
-            const enumType = this.enumTypesInfo.find(it => it.enumObj === type);
+            const enumType = this.enumTypesInfoMap.get(type);
             if (enumType) {
                 gqlType = enumType.type;
             }
@@ -570,9 +580,9 @@ class SchemaGenerator {
     }
 }
 exports.SchemaGenerator = SchemaGenerator;
-SchemaGenerator.objectTypesInfo = [];
-SchemaGenerator.inputTypesInfo = [];
-SchemaGenerator.interfaceTypesInfo = [];
-SchemaGenerator.enumTypesInfo = [];
-SchemaGenerator.unionTypesInfo = [];
+SchemaGenerator.objectTypesInfoMap = new Map();
+SchemaGenerator.inputTypesInfoMap = new Map();
+SchemaGenerator.interfaceTypesInfoMap = new Map();
+SchemaGenerator.enumTypesInfoMap = new Map();
+SchemaGenerator.unionTypesInfoMap = new Map();
 SchemaGenerator.usedInterfaceTypes = new Set();

package/build/cjs/schema/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFieldMetadataFromObjectType = exports.getFieldMetadataFromInputType = void 0;
+exports.getFieldMetadataFromInputType = getFieldMetadataFromInputType;
+exports.getFieldMetadataFromObjectType = getFieldMetadataFromObjectType;
 function getFieldMetadataFromInputType(type) {
     const fieldInfo = type.getFields();
     const typeFields = Object.keys(fieldInfo).reduce((fieldsMap, fieldName) => {
@@ -15,7 +16,6 @@ function getFieldMetadataFromInputType(type) {
     }, {});
     return typeFields;
 }
-exports.getFieldMetadataFromInputType = getFieldMetadataFromInputType;
 function getFieldMetadataFromObjectType(type) {
     const fieldInfo = type.getFields();
     const typeFields = Object.keys(fieldInfo).reduce((fieldsMap, fieldName) => {
@@ -36,4 +36,3 @@ function getFieldMetadataFromObjectType(type) {
     }, {});
     return typeFields;
 }
-exports.getFieldMetadataFromObjectType = getFieldMetadataFromObjectType;

package/build/cjs/shim.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphQLTimestamp = exports.GraphQLISODateTime = exports.ID = exports.Float = exports.Int = exports.UseMiddleware = exports.createUnionType = exports.Subscription = exports.Root = exports.Resolver = exports.Query = exports.ObjectType = exports.Mutation = exports.InterfaceType = exports.InputType = exports.Info = exports.FieldResolver = exports.Field = exports.registerEnumType = exports.Extensions = exports.Directive = exports.Ctx = exports.createResolverClassMiddlewareDecorator = exports.createMethodMiddlewareDecorator = exports.createParameterDecorator = exports.Authorized = exports.ArgsType = exports.Args = exports.Arg = exports.dummyDecorator = exports.dummyFn = exports.dummyValue = void 0;
+exports.GraphQLTimestamp = exports.GraphQLISODateTime = exports.ID = exports.Float = exports.Int = exports.UseMiddleware = exports.createUnionType = exports.Subscription = exports.Root = exports.Resolver = exports.Query = exports.ObjectType = exports.Mutation = exports.InterfaceType = exports.InputType = exports.Info = exports.FieldResolver = exports.Field = exports.registerEnumType = exports.Extensions = exports.Directive = exports.Ctx = exports.createResolverClassMiddlewareDecorator = exports.createMethodMiddlewareDecorator = exports.createParameterDecorator = exports.Authorized = exports.ArgsType = exports.Args = exports.Arg = exports.dummyValue = void 0;
+exports.dummyFn = dummyFn;
+exports.dummyDecorator = dummyDecorator;
 exports.dummyValue = "";
 function dummyFn() { }
-exports.dummyFn = dummyFn;
 function dummyDecorator() {
     return dummyFn;
 }
-exports.dummyDecorator = dummyDecorator;
 exports.Arg = dummyDecorator;
 exports.Args = dummyDecorator;
 exports.ArgsType = dummyDecorator;

package/build/cjs/utils/buildSchema.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildSchemaSync = exports.buildSchema = void 0;
+exports.buildSchema = buildSchema;
+exports.buildSchemaSync = buildSchemaSync;
 const tslib_1 = require("tslib");
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const schema_generator_1 = require("../schema/schema-generator");
@@ -33,7 +34,6 @@ async function buildSchema(options) {
     }
     return schema;
 }
-exports.buildSchema = buildSchema;
 function buildSchemaSync(options) {
     const resolvers = loadResolvers(options);
     const schema = schema_generator_1.SchemaGenerator.generateFromMetadata({ ...options, resolvers });
@@ -43,4 +43,3 @@ function buildSchemaSync(options) {
     }
     return schema;
 }
-exports.buildSchemaSync = buildSchemaSync;

package/build/cjs/utils/buildTypeDefsAndResolvers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildTypeDefsAndResolversSync = exports.buildTypeDefsAndResolvers = void 0;
+exports.buildTypeDefsAndResolvers = buildTypeDefsAndResolvers;
+exports.buildTypeDefsAndResolversSync = buildTypeDefsAndResolversSync;
 const graphql_1 = require("graphql");
 const buildSchema_1 = require("./buildSchema");
 const createResolversMap_1 = require("./createResolversMap");
@@ -13,9 +14,7 @@ async function buildTypeDefsAndResolvers(options) {
     const schema = await (0, buildSchema_1.buildSchema)(options);
     return createTypeDefsAndResolversMap(schema);
 }
-exports.buildTypeDefsAndResolvers = buildTypeDefsAndResolvers;
 function buildTypeDefsAndResolversSync(options) {
     const schema = (0, buildSchema_1.buildSchemaSync)(options);
     return createTypeDefsAndResolversMap(schema);
 }
-exports.buildTypeDefsAndResolversSync = buildTypeDefsAndResolversSync;

package/build/cjs/utils/createResolversMap.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createResolversMap = void 0;
+exports.createResolversMap = createResolversMap;
 const graphql_1 = require("graphql");
 function generateTypeResolver(abstractType, schema) {
     if (abstractType.resolveType) {
@@ -69,4 +69,3 @@ function createResolversMap(schema) {
         return resolversMap;
     }, {});
 }
-exports.createResolversMap = createResolversMap;

package/build/cjs/utils/emitSchemaDefinitionFile.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.emitSchemaDefinitionFile = exports.emitSchemaDefinitionFileSync = exports.defaultPrintSchemaOptions = void 0;
+exports.defaultPrintSchemaOptions = void 0;
+exports.emitSchemaDefinitionFileSync = emitSchemaDefinitionFileSync;
+exports.emitSchemaDefinitionFile = emitSchemaDefinitionFile;
 const graphql_1 = require("graphql");
 const filesystem_1 = require("../helpers/filesystem");
 exports.defaultPrintSchemaOptions = {
@@ -21,9 +23,7 @@ function emitSchemaDefinitionFileSync(schemaFilePath, schema, options = exports.
     const schemaFileContent = getSchemaFileContent(schema, options);
     (0, filesystem_1.outputFileSync)(schemaFilePath, schemaFileContent);
 }
-exports.emitSchemaDefinitionFileSync = emitSchemaDefinitionFileSync;
 async function emitSchemaDefinitionFile(schemaFilePath, schema, options = exports.defaultPrintSchemaOptions) {
     const schemaFileContent = getSchemaFileContent(schema, options);
     await (0, filesystem_1.outputFile)(schemaFilePath, schemaFileContent);
 }
-exports.emitSchemaDefinitionFile = emitSchemaDefinitionFile;

package/build/cjs/utils/graphql-version.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureInstalledCorrectGraphQLPackage = exports.graphQLPeerDependencyVersion = void 0;
+exports.graphQLPeerDependencyVersion = void 0;
+exports.ensureInstalledCorrectGraphQLPackage = ensureInstalledCorrectGraphQLPackage;
 const tslib_1 = require("tslib");
 const graphql = tslib_1.__importStar(require("graphql"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const errors_1 = require("../errors");
-exports.graphQLPeerDependencyVersion = "^16.8.1";
+exports.graphQLPeerDependencyVersion = "^16.12.0";
 function ensureInstalledCorrectGraphQLPackage() {
     if (!semver_1.default.satisfies(graphql.version, exports.graphQLPeerDependencyVersion)) {
         throw new errors_1.UnmetGraphQLPeerDependencyError(graphql.version, exports.graphQLPeerDependencyVersion);
     }
 }
-exports.ensureInstalledCorrectGraphQLPackage = ensureInstalledCorrectGraphQLPackage;

package/build/cjs/utils/isPromiseLike.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPromiseLike = void 0;
+exports.isPromiseLike = isPromiseLike;
 function isPromiseLike(value) {
     return value != null && typeof value.then === "function";
 }
-exports.isPromiseLike = isPromiseLike;

package/build/esm/helpers/types.js

@@ -66,7 +66,13 @@ export function convertToType(Target, data) {
     if (Array.isArray(data)) {
         return data.map(item => convertToType(Target, item));
     }
-    return Object.assign(new Target(), data);
+    const instance = new Target();
+    for (const key of Object.keys(instance)) {
+        if (instance[key] === undefined && !(key in data)) {
+            delete instance[key];
+        }
+    }
+    return Object.assign(instance, data);
 }
 export function getEnumValuesMap(enumObject) {
     const enumKeys = Object.keys(enumObject).filter(key => Number.isNaN(parseInt(key, 10)));