fix(VisitInfo): now getFieldPathArray correctly split fieldName with dots

Author: nodkz

src/VisitInfo.ts

@@ -42,9 +42,18 @@ export class VisitInfo<TNode extends AstDirNode | AstFileNode | AstRootTypeNode,
     this.node = data.node;
     this.operation = data.operation;
     this.nodeParent = data.nodeParent;
-    this.fieldName = data.fieldName;
-    this.fieldPath = data.fieldPath;
     this.schemaComposer = data.schemaComposer;
+
+    this.fieldPath = data.fieldPath;
+    if (data.fieldName.indexOf('.')) {
+      // if fieldName has dots, then split it
+      const parts = data.fieldName.split('.').filter(Boolean);
+      const fieldName = parts.pop() as string;
+      this.fieldName = fieldName;
+      this.fieldPath.push(...parts);
+    } else {
+      this.fieldName = data.fieldName;
+    }
   }
 
   /**
@@ -95,6 +104,7 @@ export class VisitInfo<TNode extends AstDirNode | AstFileNode | AstRootTypeNode,
       res.push(this.fieldName);
     }
 
+    // slice(1) - remove first element from array
     return opts?.includeOperation ? res : res.slice(1);
   }
 

src/__tests__/VisitInfo-test.ts

@@ -55,6 +55,17 @@ describe('VisitInfo', () => {
       'debug',
       'ping',
     ]);
+
+    const info2 = new VisitInfo({
+      operation: 'query',
+      fieldName: 'namespace.ping',
+      fieldPath: ['query.storage'],
+      node,
+      nodeParent,
+      schemaComposer,
+    });
+    expect(info2.getFieldPathArray()).toEqual(['storage', 'namespace', 'ping']);
+    expect(info2.getFieldPathArray({ omitFieldName: true })).toEqual(['storage', 'namespace']);
   });
 
   it('getFieldPathDotted()', () => {

src/__tests__/astVisitor-test.ts

@@ -145,27 +145,27 @@ describe('astVisitor', () => {
       expect(sortBy(nodes, ['operation', 'name'])).toEqual([
         { operation: 'mutation', name: 'auth', path: ['mutation'] },
         { operation: 'mutation', name: 'create', path: ['mutation', 'user'] },
-        { operation: 'mutation', name: 'list', path: ['mutation', 'logs.nested'] },
+        { operation: 'mutation', name: 'list', path: ['mutation', 'logs', 'nested'] },
         { operation: 'mutation', name: 'login', path: ['mutation', 'auth'] },
         { operation: 'mutation', name: 'logout', path: ['mutation', 'auth'] },
-        { operation: 'mutation', name: 'logs.nested', path: ['mutation'] },
         { operation: 'mutation', name: 'method', path: ['mutation', 'auth', 'nested'] },
+        { operation: 'mutation', name: 'nested', path: ['mutation', 'logs'] },
         { operation: 'mutation', name: 'nested', path: ['mutation', 'auth'] },
         { operation: 'mutation', name: 'update', path: ['mutation', 'user'] },
         { operation: 'mutation', name: 'user', path: ['mutation'] },
-        { operation: 'query', name: 'address.city', path: ['query', 'me'] },
-        { operation: 'query', name: 'address.street', path: ['query', 'me'] },
         { operation: 'query', name: 'auth', path: ['query'] },
+        { operation: 'query', name: 'city', path: ['query', 'me', 'address'] },
         { operation: 'query', name: 'extendedData', path: ['query', 'user'] },
         { operation: 'query', name: 'field', path: ['query'] },
+        { operation: 'query', name: 'index', path: ['query', 'some'] },
         { operation: 'query', name: 'isLoggedIn', path: ['query', 'auth'] },
         { operation: 'query', name: 'me', path: ['query'] },
         { operation: 'query', name: 'method', path: ['query', 'auth', 'nested'] },
         { operation: 'query', name: 'name', path: ['query', 'me'] },
+        { operation: 'query', name: 'nested', path: ['query', 'some'] },
         { operation: 'query', name: 'nested', path: ['query', 'auth'] },
         { operation: 'query', name: 'roles', path: ['query', 'user'] },
-        { operation: 'query', name: 'some.index', path: ['query'] },
-        { operation: 'query', name: 'some.nested', path: ['query'] },
+        { operation: 'query', name: 'street', path: ['query', 'me', 'address'] },
         { operation: 'query', name: 'user', path: ['query'] },
       ]);
     });

src/astVisitor.ts

@@ -81,14 +81,14 @@ export function visitNode(
 
   if (result === VISITOR_REMOVE_NODE) {
     // `null` - means remove node from Ast and do not traverse children
-    delete (info.nodeParent.children as any)[info.fieldName];
+    delete (info.nodeParent.children as any)[info.node.name];
     return;
   } else if (result === VISITOR_SKIP_CHILDREN) {
     // `false` - do not traverse children
     return;
   } else if (result) {
     // replace node
-    (info.nodeParent.children as any)[info.fieldName] = result;
+    (info.nodeParent.children as any)[info.node.name] = result;
   } else {
     // `undefined` - just move further
     result = info.node;