@luvio/graphql-parser 0.128.0 → 0.130.0

package/dist/luvioGraphqlParser.js

@@ -12788,7 +12788,7 @@ function gql(literals, ...subs) {
     return updateReferenceMapAndGetKey(insertFragments(document, inputSubstitutionFragments));
 }
 
-const DIRECTIVE_RECORD_CATEGORY = {
+const DIRECTIVE_RECORD_QUERY_CATEGORY = {
     kind: 'Directive',
     name: {
         kind: 'Name',
@@ -12809,6 +12809,27 @@ const DIRECTIVE_RECORD_CATEGORY = {
         },
     ],
 };
+const DIRECTIVE_CHILD_RELATIONSHIP_CATEGORY = {
+    kind: 'Directive',
+    name: {
+        kind: 'Name',
+        value: 'category',
+    },
+    arguments: [
+        {
+            kind: 'Argument',
+            name: {
+                kind: 'Name',
+                value: 'name',
+            },
+            value: {
+                kind: 'StringValue',
+                value: 'childRelationship',
+                block: false,
+            },
+        },
+    ],
+};
 const DIRECTIVE_PARENT_CATEGORY = {
     kind: 'Directive',
     name: {
@@ -12830,15 +12851,22 @@ const DIRECTIVE_PARENT_CATEGORY = {
         },
     ],
 };
-function substituteDirectives(directives, index, nodeName) {
+function substituteDirectives(directives, index, selection, parentNode) {
     if (directives[index].name.value === CUSTOM_DIRECTIVE_CONNECTION) {
-        // replace the custom directive node with the metaschema directive node
-        // @ts-ignore - Document is read only
-        directives[index] = DIRECTIVE_RECORD_CATEGORY;
+        if (parentNode !== undefined &&
+            parentNode.kind === 'Field' &&
+            parentNode.name.value === 'uiapi') {
+            // @ts-ignore - Document is read only
+            directives[index] = DIRECTIVE_RECORD_QUERY_CATEGORY;
+        }
+        else {
+            // @ts-ignore - Document is read only
+            directives[index] = DIRECTIVE_CHILD_RELATIONSHIP_CATEGORY;
+        }
     }
     else if (directives[index].name.value === CUSTOM_DIRECTIVE_RESOURCE) {
-        // node gets its type from @category recordQuery
-        if (nodeName === 'node') {
+        // node gets its type from @category recordQuery or @category childRelationship
+        if (selection.kind === 'Field' && selection.name.value === 'node') {
             // @ts-ignore - Document is read only
             directives.splice(index, 1);
         }
@@ -12858,34 +12886,31 @@ function isCustomDirective(node) {
         node.name.value === CUSTOM_DIRECTIVE_RESOURCE);
 }
 /**
- * Traverses a selection set and it's nested selections,
+ * Traverses a selection and it's nested selections,
  * to find any legacy custom directives and substitute them with metaschema directives
- * @param node - SelectionSetNode
- * @returns SelectionSetNode
+ * @param node - SelectionNode
+ * @returns void
  */
-function traverseSelectionSet(node) {
-    if (node === undefined) {
+function traverseSelection(node, parentNode) {
+    if (node === undefined || node.kind === 'FragmentSpread' || node.selectionSet === undefined) {
         return;
     }
-    for (const selection of node.selections) {
-        // FragmentSpreadNode doesn't have a selection set
-        // which should be handled at this methods entry point
-        const { directives, selectionSet } = selection;
-        let selectionName;
-        if (selection.kind !== 'InlineFragment') {
-            selectionName = selection.name.value;
-        }
-        if (directives !== undefined && directives.length > 0) {
-            // we follow this pattern instead of map to preserve the order of directives
-            // order of directives may be significant as per graphql spec
-            const index = directives.findIndex(isCustomDirective);
-            if (index !== -1) {
-                substituteDirectives(directives, index, selectionName);
-            }
+    const { selectionSet } = node;
+    for (const selection of selectionSet.selections) {
+        replaceCustomDirectives(selection, parentNode);
+        traverseSelection(selection, node);
+    }
+}
+function replaceCustomDirectives(selection, parentNode) {
+    const { directives } = selection;
+    if (directives !== undefined && directives.length > 0) {
+        // we follow this pattern instead of map to preserve the order of directives
+        // order of directives may be significant as per graphql spec
+        const index = directives.findIndex(isCustomDirective);
+        if (index !== -1) {
+            substituteDirectives(directives, index, selection, parentNode);
         }
-        traverseSelectionSet(selectionSet);
     }
-    return node;
 }
 /**
  * Accepts a document node and replaces the legacy custom directives with metaschema directives "in-place"
@@ -12897,16 +12922,12 @@ function metaschemaMapper(doc) {
     // so we have to explicitly cast the definitions for ts
     const { definitions } = doc;
     for (const def of definitions) {
-        const { directives, selectionSet } = def;
-        if (directives !== undefined && directives.length > 0) {
-            // we are making an assumption here that only one custom directive can be applied to a node
-            // we can revisit if this condition changes
-            const index = directives.findIndex(isCustomDirective);
-            if (index !== -1) {
-                substituteDirectives(directives, index, undefined);
-            }
-        }
-        traverseSelectionSet(selectionSet);
+        const { selectionSet } = def;
+        // This is just iterating through the top level 'Query' operations. There should never be any custom
+        // directives at this level, as RecordQuery is actually a field lower in the schema. So we can skip looking for them.
+        selectionSet.selections.forEach((selection) => {
+            traverseSelection(selection);
+        });
     }
 }
 

package/dist/luvioGraphqlParser.mjs

@@ -12784,7 +12784,7 @@ function gql(literals, ...subs) {
     return updateReferenceMapAndGetKey(insertFragments(document, inputSubstitutionFragments));
 }
 
-const DIRECTIVE_RECORD_CATEGORY = {
+const DIRECTIVE_RECORD_QUERY_CATEGORY = {
     kind: 'Directive',
     name: {
         kind: 'Name',
@@ -12805,6 +12805,27 @@ const DIRECTIVE_RECORD_CATEGORY = {
         },
     ],
 };
+const DIRECTIVE_CHILD_RELATIONSHIP_CATEGORY = {
+    kind: 'Directive',
+    name: {
+        kind: 'Name',
+        value: 'category',
+    },
+    arguments: [
+        {
+            kind: 'Argument',
+            name: {
+                kind: 'Name',
+                value: 'name',
+            },
+            value: {
+                kind: 'StringValue',
+                value: 'childRelationship',
+                block: false,
+            },
+        },
+    ],
+};
 const DIRECTIVE_PARENT_CATEGORY = {
     kind: 'Directive',
     name: {
@@ -12826,15 +12847,22 @@ const DIRECTIVE_PARENT_CATEGORY = {
         },
     ],
 };
-function substituteDirectives(directives, index, nodeName) {
+function substituteDirectives(directives, index, selection, parentNode) {
     if (directives[index].name.value === CUSTOM_DIRECTIVE_CONNECTION) {
-        // replace the custom directive node with the metaschema directive node
-        // @ts-ignore - Document is read only
-        directives[index] = DIRECTIVE_RECORD_CATEGORY;
+        if (parentNode !== undefined &&
+            parentNode.kind === 'Field' &&
+            parentNode.name.value === 'uiapi') {
+            // @ts-ignore - Document is read only
+            directives[index] = DIRECTIVE_RECORD_QUERY_CATEGORY;
+        }
+        else {
+            // @ts-ignore - Document is read only
+            directives[index] = DIRECTIVE_CHILD_RELATIONSHIP_CATEGORY;
+        }
     }
     else if (directives[index].name.value === CUSTOM_DIRECTIVE_RESOURCE) {
-        // node gets its type from @category recordQuery
-        if (nodeName === 'node') {
+        // node gets its type from @category recordQuery or @category childRelationship
+        if (selection.kind === 'Field' && selection.name.value === 'node') {
             // @ts-ignore - Document is read only
             directives.splice(index, 1);
         }
@@ -12854,34 +12882,31 @@ function isCustomDirective(node) {
         node.name.value === CUSTOM_DIRECTIVE_RESOURCE);
 }
 /**
- * Traverses a selection set and it's nested selections,
+ * Traverses a selection and it's nested selections,
  * to find any legacy custom directives and substitute them with metaschema directives
- * @param node - SelectionSetNode
- * @returns SelectionSetNode
+ * @param node - SelectionNode
+ * @returns void
  */
-function traverseSelectionSet(node) {
-    if (node === undefined) {
+function traverseSelection(node, parentNode) {
+    if (node === undefined || node.kind === 'FragmentSpread' || node.selectionSet === undefined) {
         return;
     }
-    for (const selection of node.selections) {
-        // FragmentSpreadNode doesn't have a selection set
-        // which should be handled at this methods entry point
-        const { directives, selectionSet } = selection;
-        let selectionName;
-        if (selection.kind !== 'InlineFragment') {
-            selectionName = selection.name.value;
-        }
-        if (directives !== undefined && directives.length > 0) {
-            // we follow this pattern instead of map to preserve the order of directives
-            // order of directives may be significant as per graphql spec
-            const index = directives.findIndex(isCustomDirective);
-            if (index !== -1) {
-                substituteDirectives(directives, index, selectionName);
-            }
+    const { selectionSet } = node;
+    for (const selection of selectionSet.selections) {
+        replaceCustomDirectives(selection, parentNode);
+        traverseSelection(selection, node);
+    }
+}
+function replaceCustomDirectives(selection, parentNode) {
+    const { directives } = selection;
+    if (directives !== undefined && directives.length > 0) {
+        // we follow this pattern instead of map to preserve the order of directives
+        // order of directives may be significant as per graphql spec
+        const index = directives.findIndex(isCustomDirective);
+        if (index !== -1) {
+            substituteDirectives(directives, index, selection, parentNode);
         }
-        traverseSelectionSet(selectionSet);
     }
-    return node;
 }
 /**
  * Accepts a document node and replaces the legacy custom directives with metaschema directives "in-place"
@@ -12893,16 +12918,12 @@ function metaschemaMapper(doc) {
     // so we have to explicitly cast the definitions for ts
     const { definitions } = doc;
     for (const def of definitions) {
-        const { directives, selectionSet } = def;
-        if (directives !== undefined && directives.length > 0) {
-            // we are making an assumption here that only one custom directive can be applied to a node
-            // we can revisit if this condition changes
-            const index = directives.findIndex(isCustomDirective);
-            if (index !== -1) {
-                substituteDirectives(directives, index, undefined);
-            }
-        }
-        traverseSelectionSet(selectionSet);
+        const { selectionSet } = def;
+        // This is just iterating through the top level 'Query' operations. There should never be any custom
+        // directives at this level, as RecordQuery is actually a field lower in the schema. So we can skip looking for them.
+        selectionSet.selections.forEach((selection) => {
+            traverseSelection(selection);
+        });
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@luvio/graphql-parser",
-    "version": "0.128.0",
+    "version": "0.130.0",
     "description": "GraphQL parser for Luvio GraphQL adapter support",
     "repository": {
         "type": "git",