@lenne.tech/ng-base 14.0.4 → 14.0.5

package/fesm2020/lenne.tech-ng-base-shared.mjs

@@ -1,5 +1,4 @@
-import { GraphQLInputObjectType, GraphQLNonNull, GraphQLList, buildClientSchema, getIntrospectionQuery } from 'graphql';
-import { cloneDeep } from '@apollo/client/utilities';
+import { GraphQLInputObjectType, GraphQLScalarType, GraphQLEnumType, GraphQLNonNull, GraphQLList, buildClientSchema, getIntrospectionQuery } from 'graphql';
 import * as i0 from '@angular/core';
 import { Directive, Inject, Input, HostListener, Injectable, InjectionToken } from '@angular/core';
 import * as i2 from '@angular/common';
@@ -423,6 +422,7 @@ class GraphQLType extends Standard {
     constructor() {
         super(...arguments);
         this.type = '';
+        this.fields = {};
         this.isRequired = false;
         this.isItemRequired = false;
         this.isList = false;
@@ -515,10 +515,10 @@ class GraphQLMeta {
             }
         }
         const func = this.getFunction(functionName, { type });
-        const result = {};
+        const result = new GraphQLType();
         if (func?.args) {
             func.args.forEach((item) => {
-                result[item.name] = this.getDeepType(item.type);
+                result.fields[item.name] = this.getDeepType(item.type);
             });
         }
         // Set cache
@@ -591,21 +591,47 @@ class GraphQLMeta {
     getType(name) {
         return this.schema.getType(name);
     }
+    /**
+     * Get (deep) type name
+     */
+    getTypeName(type) {
+        if (type instanceof GraphQLInputObjectType ||
+            type instanceof GraphQLScalarType ||
+            type instanceof GraphQLEnumType) {
+            return type.name;
+        }
+        else if (type.type) {
+            return this.getTypeName(type.type);
+        }
+        else if (type.ofType) {
+            return this.getTypeName(type.ofType);
+        }
+        else {
+            return type.name;
+        }
+    }
     /**
      * Get deep type data
      */
-    getDeepType(type, prepared = new WeakMap(), setMetaData = false) {
+    getDeepType(type, prepared = {}, setMetaData = false) {
         // Check type
         if (!type) {
             return type;
         }
         // Infinite regress protection
-        const preparedObject = {};
+        const typeName = this.getTypeName(type);
+        const graphQLType = GraphQLType.map({
+            type: this.getTypeName(type),
+        });
         // Check prepared
         if (typeof type === 'object') {
-            const preparedType = prepared.get(type);
+            const preparedType = prepared[typeName];
+            // Work with cached type
             if (preparedType) {
-                const clone = cloneDeep(preparedType);
+                // Create a new object to protect own isXXX information
+                const clone = Object.assign({}, preparedType);
+                // But use fields as reference to get future changes via prepared caching
+                clone.fields = preparedType.fields;
                 // Disable meta flags for sub objects
                 if (type?.type instanceof GraphQLInputObjectType ||
                     (type?.type instanceof GraphQLNonNull && type?.type?.ofType instanceof GraphQLInputObjectType && setMetaData)) {
@@ -639,25 +665,29 @@ class GraphQLMeta {
                 }
                 return clone;
             }
-            // Set prepared
-            prepared.set(type, preparedObject);
+            // Set prepared cache for GraphQL types
+            // (type names start with uppercase letters as opposed to property names that start with lowercase letters)
+            if (type.name && type.name[0].toUpperCase() === type.name[0] && !prepared[type.name]) {
+                prepared[type.name] = graphQLType;
+            }
         }
         // Search deeper
         if (type.ofType) {
             const ofTypeResult = this.getDeepType(type.ofType, prepared, setMetaData);
-            Object.assign(preparedObject, ofTypeResult);
-            return ofTypeResult;
+            Object.assign(graphQLType, ofTypeResult);
+            return graphQLType;
         }
         // Process fields
         if (type._fields) {
-            const result = {};
+            const fields = {};
             for (const [key, value] of Object.entries(type._fields)) {
-                result[key] = this.getDeepType(value, prepared, true);
+                fields[key] = this.getDeepType(value, prepared, true);
             }
-            Object.assign(preparedObject, result);
-            return result;
+            // Assign and not replace to preserve updates in the cache
+            Object.assign(graphQLType.fields, fields);
+            return graphQLType;
         }
-        // Get type name
+        // Process type
         if (type.type) {
             const typeResult = this.getDeepType(type.type, prepared, setMetaData);
             // Disable meta flags for sub objects
@@ -691,25 +721,20 @@ class GraphQLMeta {
                     }
                 }
             }
-            Object.assign(preparedObject, typeResult);
-            return typeResult;
+            Object.assign(graphQLType, typeResult);
+            return graphQLType;
         }
-        // Initialize GraphQLType
-        const graphqlType = GraphQLType.map({
-            type: type.name,
-        });
         // Set enum values
         if (!!type._values) {
-            graphqlType.isEnum = true;
+            graphQLType.isEnum = true;
             for (const [key, value] of Object.entries(type._nameLookup)) {
                 if (!value.isDeprecated) {
-                    graphqlType.validEnums.push(key);
+                    graphQLType.validEnums.push(key);
                 }
             }
         }
         // Finish
-        prepared.set(type, graphqlType);
-        return graphqlType;
+        return graphQLType;
     }
 }
 
@@ -1285,7 +1310,7 @@ class GraphQLService {
                         fieldsData.usedFields.sort();
                         fieldsData.schemaFields.sort();
                         const filtered = fieldsData.schemaFields.filter((field) => !fieldsData.usedFields.includes(field));
-                        const unused = this.graphQLTypeCollectionToStringArray(allowedFields).filter((field) => !fieldsData.usedFields.includes(field));
+                        const unused = this.graphQLTypeToStringArray(allowedFields).filter((field) => !fieldsData.usedFields.includes(field));
                         console.log({ fieldsData, filtered, unused });
                     }
                     fields = fieldsData.fieldsString;
@@ -1311,7 +1336,7 @@ class GraphQLService {
                     argsData.usedArgs.sort();
                     argsData.schemaArgs.sort();
                     const filtered = argsData.schemaArgs.filter((field) => !argsData.usedArgs.includes(field));
-                    const unused = this.graphQLTypeCollectionToStringArray(allowedArgs)
+                    const unused = this.graphQLTypeToStringArray(allowedArgs)
                         .sort()
                         .filter((field) => !argsData.usedArgs.includes(field));
                     console.log({ argsData, filtered, unused });
@@ -1378,25 +1403,21 @@ class GraphQLService {
     /**
      * Get fields / args from IGraphQLTypeCollection
      */
-    graphQLTypeCollectionToStringArray(collection, current = '', result = [], cacheNode = []) {
-        if (collection) {
-            if (collection instanceof GraphQLType) {
-                result.push(current);
-            }
-            else {
-                if (current?.includes('.')) {
-                    cacheNode.push(current.split('.')[1]);
-                }
-                else if (current) {
-                    cacheNode.push(current);
-                }
-                for (const key of Object.keys(collection)) {
-                    if (current === key || cacheNode.includes(key)) {
-                        continue;
-                    }
-                    this.graphQLTypeCollectionToStringArray(collection[key], current ? current + '.' + key : key, result, cacheNode);
-                }
+    graphQLTypeToStringArray(graphQLType, current = '', result = [], cacheNode = []) {
+        if (!graphQLType) {
+            return result;
+        }
+        if (current?.includes('.')) {
+            cacheNode.push(current.split('.')[1]);
+        }
+        else if (current) {
+            cacheNode.push(current);
+        }
+        for (const key of Object.keys(graphQLType.fields)) {
+            if (current === key || cacheNode.includes(key)) {
+                continue;
             }
+            this.graphQLTypeToStringArray(graphQLType.fields[key], current ? current + '.' + key : key, result, cacheNode);
         }
         return result;
     }
@@ -1421,18 +1442,18 @@ class GraphQLService {
         const result = [];
         // Process array
         if (Array.isArray(args)) {
-            const allowedKeys = allowed ? Object.keys(allowed) : null;
+            const allowedKeys = allowed ? Object.keys(allowed.fields) : null;
             for (const item of args) {
                 let key = null;
                 if (allowed) {
-                    if (allowed.length < 1) {
+                    if (!allowedKeys || allowedKeys.length < 1) {
                         break;
                     }
-                    key = allowedKeys?.shift();
+                    key = allowedKeys.shift();
                 }
                 // Process value
                 result.push(this.prepareArguments(item, {
-                    allowed: key ? allowed[key] : null,
+                    allowed: key ? allowed.fields[key] : null,
                     level: level + 1,
                     parent: parent + key + '.',
                     schemaArgs,
@@ -1464,7 +1485,7 @@ class GraphQLService {
                 schemaArgs.push(currentKey);
                 // If the allowed key handling is enabled and the current key is not included in the list of allowed keys,
                 // the current key will be skipped
-                if (allowed && !allowed[key]) {
+                if (allowed && !allowed.fields[key]) {
                     continue;
                 }
                 // Skip value if not exists
@@ -1487,7 +1508,7 @@ class GraphQLService {
                     result.push(key +
                         ': [' +
                         value.map((item) => this.prepareArguments(item, {
-                            allowed: allowed[key],
+                            allowed: allowed.fields[key],
                             level: level + 1,
                             parent: currentKey + '.',
                             schemaArgs,
@@ -1505,7 +1526,7 @@ class GraphQLService {
                 // Value is a string
                 else if (typeof value === 'string') {
                     // Enum (doesn't need quotation marks)
-                    if (allowed[key].isEnum) {
+                    if (allowed.fields[key].isEnum) {
                         additionalResult += value;
                     }
                     // String
@@ -1520,7 +1541,7 @@ class GraphQLService {
                 // Others
                 else {
                     additionalResult += this.prepareArguments(value, {
-                        allowed: allowed[key],
+                        allowed: allowed.fields[key],
                         level: level + 1,
                         parent: currentKey + '.',
                         schemaArgs,
@@ -1569,8 +1590,7 @@ class GraphQLService {
         }
         // Process string
         if (typeof fields === 'string') {
-            if (allowed &&
-                ((typeof allowed === 'string' && allowed !== fields) || (typeof allowed === 'object' && !allowed[fields]))) {
+            if (allowed && !allowed.fields[fields]) {
                 return { fieldsString, schemaFields, usedFields };
             }
             return { fieldsString: '\n' + ' '.repeat(spaces).repeat(tab) + fields, schemaFields, usedFields };
@@ -1593,14 +1613,14 @@ class GraphQLService {
                 }
                 const currentPath = parent + item;
                 schemaFields.push(currentPath);
-                if (allowed && !allowed?.[item]) {
+                if (allowed && !allowed.fields[item]) {
                     continue;
                 }
                 usedFields.push(currentPath);
                 fieldsString =
                     fieldsString +
                         this.prepareFields(item, {
-                            allowed: typeof allowed?.[item] === 'object' && !(allowed?.[item] instanceof GraphQLType) ? allowed?.[item] : item,
+                            allowed: null,
                             parent: currentPath + '.',
                             spaces,
                             schemaFields,
@@ -1614,7 +1634,7 @@ class GraphQLService {
             for (const [key, val] of Object.entries(fields)) {
                 const currentPath = parent + key;
                 schemaFields.push(currentPath);
-                if (allowed && !allowed[key]) {
+                if (allowed && !allowed.fields[key]) {
                     continue;
                 }
                 usedFields.push(currentPath);
@@ -1630,7 +1650,7 @@ class GraphQLService {
                             ' ' +
                             '{' +
                             this.prepareFields(val, {
-                                allowed: typeof allowed?.[key] === 'object' && !(allowed?.[key] instanceof GraphQLType) ? allowed?.[key] : key,
+                                allowed: allowed.fields[key],
                                 parent: currentPath + '.',
                                 spaces,
                                 schemaFields,