performance fix 2

comigor · Mar 1, 2022 · 5202ac2 · 5202ac2
1 parent 6412324
commit 5202ac2
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 7.3.2-beta
+
+- performance improvements-2
+
 ## 7.3.1-beta
 
 - performance improvements

diff --git a/lib/generator.dart b/lib/generator.dart
@@ -316,10 +316,13 @@ Make sure your query is correct and your schema is updated.''');
 
   final nextClassName = aliasedContext.fullPathName();
 
-  final dartTypeName = gql.buildTypeName(fieldType, context.options,
-      dartType: true,
-      replaceLeafWith: ClassName.fromPath(path: nextClassName),
-      schema: context.schema);
+  final dartTypeName = gql.buildTypeName(
+    fieldType,
+    context.options,
+    dartType: true,
+    replaceLeafWith: ClassName.fromPath(path: nextClassName),
+    typeDefinitionNodeVisitor: context.typeDefinitionNodeVisitor,
+  );
 
   logFn(context, aliasedContext.align + 1,
       '${aliasedContext.path}[${aliasedContext.currentType!.name.value}][${aliasedContext.currentClassName} ${aliasedContext.currentFieldName}] ${fieldAlias == null ? '' : '($fieldAlias) '}-> ${dartTypeName.namePrintable}');
@@ -360,8 +363,12 @@ Make sure your query is correct and your schema is updated.''');
 
     if (scalar?.customParserImport != null &&
         nextType.name.value == scalar?.graphQLType) {
-      final graphqlTypeName = gql.buildTypeName(fieldType, context.options,
-          dartType: false, schema: context.schema);
+      final graphqlTypeName = gql.buildTypeName(
+        fieldType,
+        context.options,
+        dartType: false,
+        typeDefinitionNodeVisitor: context.typeDefinitionNodeVisitor,
+      );
 
       jsonKeyAnnotation['fromJson'] =
           'fromGraphQL${graphqlTypeName.parserSafe}ToDart${dartTypeName.parserSafe}';
@@ -376,10 +383,12 @@ Make sure your query is correct and your schema is updated.''');
 
     if (fieldType is ListTypeNode) {
       final innerDartTypeName = gql.buildTypeName(
-          fieldType.type, context.options,
-          dartType: true,
-          replaceLeafWith: ClassName.fromPath(path: nextClassName),
-          schema: context.schema);
+        fieldType.type,
+        context.options,
+        dartType: true,
+        replaceLeafWith: ClassName.fromPath(path: nextClassName),
+        typeDefinitionNodeVisitor: context.typeDefinitionNodeVisitor,
+      );
       jsonKeyAnnotation['unknownEnumValue'] =
           '${innerDartTypeName.dartTypeSafe}.${artemisUnknown.name.namePrintable}';
     } else {

diff --git a/lib/generator/graphql_helpers.dart b/lib/generator/graphql_helpers.dart
@@ -36,12 +36,10 @@ TypeName buildTypeName(
   GeneratorOptions options, {
   bool dartType = true,
   Name? replaceLeafWith,
-  DocumentNode? schema,
+  required TypeDefinitionNodeVisitor typeDefinitionNodeVisitor,
 }) {
   if (node is NamedTypeNode) {
-    final typeVisitor = TypeDefinitionNodeVisitor();
-    schema!.accept(typeVisitor);
-    final type = typeVisitor.getByName(node.name.value);
+    final type = typeDefinitionNodeVisitor.getByName(node.name.value);
 
     if (type != null) {
       if (type is ScalarTypeDefinitionNode) {
@@ -78,8 +76,13 @@ TypeName buildTypeName(
   }
 
   if (node is ListTypeNode) {
-    final typeName = buildTypeName(node.type, options,
-        dartType: dartType, replaceLeafWith: replaceLeafWith, schema: schema);
+    final typeName = buildTypeName(
+      node.type,
+      options,
+      dartType: dartType,
+      replaceLeafWith: replaceLeafWith,
+      typeDefinitionNodeVisitor: typeDefinitionNodeVisitor,
+    );
     return ListOfTypeName(
       typeName: typeName,
       isNonNull: node.isNonNull,

diff --git a/lib/visitor/generator_visitor.dart b/lib/visitor/generator_visitor.dart
@@ -158,10 +158,13 @@ class GeneratorVisitor extends RecursiveVisitor {
         )
         .fullPathName();
 
-    final dartTypeName = gql.buildTypeName(node.type, context.options,
-        dartType: true,
-        replaceLeafWith: ClassName.fromPath(path: nextClassName),
-        schema: context.schema);
+    final dartTypeName = gql.buildTypeName(
+      node.type,
+      context.options,
+      dartType: true,
+      replaceLeafWith: ClassName.fromPath(path: nextClassName),
+      typeDefinitionNodeVisitor: context.typeDefinitionNodeVisitor,
+    );
 
     final jsonKeyAnnotation = <String, String>{};
 
@@ -170,10 +173,12 @@ class GeneratorVisitor extends RecursiveVisitor {
       final variableNodeType = node.type;
       if (variableNodeType is ListTypeNode) {
         final innerDartTypeName = gql.buildTypeName(
-            variableNodeType.type, context.options,
-            dartType: true,
-            replaceLeafWith: ClassName.fromPath(path: nextClassName),
-            schema: context.schema);
+          variableNodeType.type,
+          context.options,
+          dartType: true,
+          replaceLeafWith: ClassName.fromPath(path: nextClassName),
+          typeDefinitionNodeVisitor: context.typeDefinitionNodeVisitor,
+        );
         jsonKeyAnnotation['unknownEnumValue'] =
             '${EnumName(name: innerDartTypeName.name).dartTypeSafe}.${artemisUnknown.name.namePrintable}';
       } else {
@@ -192,7 +197,7 @@ class GeneratorVisitor extends RecursiveVisitor {
           node.type,
           context.options,
           dartType: false,
-          schema: context.schema,
+          typeDefinitionNodeVisitor: context.typeDefinitionNodeVisitor,
         );
 
         jsonKeyAnnotation['fromJson'] =

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: artemis
-version: 7.3.1-beta
+version: 7.3.2-beta
 
 description: Build dart types from GraphQL schemas and queries (using Introspection Query).
 homepage: https://github.com/comigor/artemis