Merge branch '4.0.0' into update-cypher-builder

Author: angrykoala

packages/graphql-toolbox/package.json

@@ -49,9 +49,9 @@
         "@dnd-kit/core": "6.0.8",
         "@dnd-kit/modifiers": "6.0.1",
         "@dnd-kit/sortable": "7.0.2",
-        "@graphiql/react": "0.18.0",
-        "@neo4j-ndl/base": "1.8.5",
-        "@neo4j-ndl/react": "1.8.9",
+        "@graphiql/react": "0.19.0",
+        "@neo4j-ndl/base": "1.8.8",
+        "@neo4j-ndl/react": "1.8.13",
         "@neo4j/graphql": "3.23.1",
         "@neo4j/introspector": "1.0.3",
         "classnames": "2.3.2",
@@ -77,7 +77,7 @@
         "@types/lodash.debounce": "4.0.7",
         "@types/markdown-it": "12.2.3",
         "@types/prettier": "2.7.3",
-        "@types/react-dom": "18.2.6",
+        "@types/react-dom": "18.2.7",
         "@types/webpack": "5.28.1",
         "autoprefixer": "10.4.14",
         "compression-webpack-plugin": "10.0.0",

packages/graphql-toolbox/src/modules/SchemaView/SchemaView.tsx

@@ -193,7 +193,7 @@ export const SchemaView = ({ onSchemaChange }: Props) => {
 
     const onSubmit = () => {
         if (!editorView) return;
-        const value = editorView?.state.doc.toString();
+        const value = Array.from(editorView?.state.doc).toString();
         if (value) {
             buildSchema(value).catch(() => null);
         }

packages/graphql-toolbox/src/types.ts

@@ -65,7 +65,7 @@ export {};
 declare global {
     interface Window {
         neo4jDesktopApi: {
-            getContext: () => Promise<Record<string, unknown> | unknown>;
+            getContext: () => Promise<unknown>;
         };
         Canny: any;
         CannyIsLoaded: boolean;

packages/graphql/src/classes/Node.ts

@@ -73,27 +73,11 @@ export interface NodeConstructor extends GraphElementConstructor {
     globalIdFieldIsInt?: boolean;
 }
 
-type MutableField =
-    | PrimitiveField
-    | CustomScalarField
-    | CustomEnumField
-    | UnionField
-    | ObjectField
-    | TemporalField
-    | PointField
-    | CypherField;
-
-type AuthableField =
-    | PrimitiveField
-    | CustomScalarField
-    | CustomEnumField
-    | UnionField
-    | ObjectField
-    | TemporalField
-    | PointField
-    | CypherField;
-
-type ConstrainableField = PrimitiveField | CustomScalarField | CustomEnumField | TemporalField | PointField;
+type MutableField = PrimitiveField | CustomScalarField | CustomEnumField | UnionField | TemporalField | CypherField;
+
+type AuthableField = PrimitiveField | CustomScalarField | CustomEnumField | UnionField | TemporalField | CypherField;
+
+type ConstrainableField = PrimitiveField | CustomScalarField | CustomEnumField | TemporalField;
 
 export type RootTypeFieldNames = {
     create: string;

packages/graphql/src/classes/Subgraph.ts

@@ -34,6 +34,7 @@ import { translateResolveReference } from "../translate/translate-resolve-refere
 import type { Context, Node } from "../types";
 import { execute } from "../utils";
 import getNeo4jResolveTree from "../utils/get-neo4j-resolve-tree";
+import { isInArray } from "../utils/is-in-array";
 
 // TODO fetch the directive names from the spec
 const federationDirectiveNames = [
@@ -48,22 +49,14 @@ const federationDirectiveNames = [
     "tag",
     "composeDirective",
     "interfaceObject",
-];
+] as const;
 
 type FederationDirectiveName = (typeof federationDirectiveNames)[number];
 
-type FullyQualifiedFederationDirectiveName = `federation__${FederationDirectiveName}`;
-
 type ReferenceResolver = (reference, context: Context, info: GraphQLResolveInfo) => Promise<unknown>;
 
-const isFederationDirectiveName = (name: string): name is FederationDirectiveName =>
-    federationDirectiveNames.includes(name);
-
 export class Subgraph {
-    private importArgument: Map<
-        FederationDirectiveName,
-        FederationDirectiveName | FullyQualifiedFederationDirectiveName | string
-    >;
+    private importArgument: Map<FederationDirectiveName, string>;
     private typeDefs: TypeSource;
     private linkExtension: SchemaExtensionNode;
 
@@ -96,7 +89,6 @@ export class Subgraph {
     }
 
     public getFullyQualifiedDirectiveName(name: FederationDirectiveName): string {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return this.importArgument.get(name)!;
     }
 
@@ -225,7 +217,7 @@ export class Subgraph {
                     if (value.kind === Kind.STRING) {
                         const trimmedName = this.trimDirectiveName(value.value);
 
-                        if (!isFederationDirectiveName(trimmedName)) {
+                        if (!isInArray(federationDirectiveNames, trimmedName)) {
                             throw new Error(`Encountered unknown Apollo Federation directive ${value.value}`);
                         }
 
@@ -239,7 +231,7 @@ export class Subgraph {
                         if (name?.value.kind === Kind.STRING) {
                             const trimmedName = this.trimDirectiveName(name.value.value);
 
-                            if (!isFederationDirectiveName(trimmedName)) {
+                            if (!isInArray(federationDirectiveNames, trimmedName)) {
                                 throw new Error(`Encountered unknown Apollo Federation directive ${name.value.value}`);
                             }
 

packages/graphql/src/classes/utils/asserts-indexes-and-constraints.ts

@@ -250,7 +250,6 @@ async function getMissingConstraints({
             const property = field.dbPropertyNameUnescaped || field.fieldName;
             if (node.getAllLabels().every((label) => !existingConstraints[label]?.includes(property))) {
                 missingConstraints.push({
-                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                     constraintName: field.unique!.constraintName,
                     label: node.getMainLabel(),
                     property,

packages/graphql/src/graphql/scalars/Duration.ts

@@ -71,7 +71,6 @@ export const parseDuration = (
         hours: hourUnit = 0,
         minutes: minuteUnit = 0,
         seconds: secondUnit = 0,
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     } = match.groups!;
 
     const years = +yearUnit;

packages/graphql/src/schema/aggregations/aggregation-types-mapper.ts

@@ -82,7 +82,7 @@ export class AggregationTypesMapper {
 
         const aggregationSelectionTypeMatrix: Array<{
             name: string;
-            fields?: Record<string, any | string>;
+            fields?: Record<string, any>;
             directives?: string[];
         }> = [
             {

packages/graphql/src/schema/get-custom-resolvers.ts

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import type { DocumentNode, ObjectTypeDefinitionNode } from "graphql";
+import { Kind, type DocumentNode, type ObjectTypeDefinitionNode } from "graphql";
 import { isRootType } from "../utils/is-root-type";
 
 interface CustomResolvers {
@@ -30,7 +30,7 @@ interface CustomResolvers {
 
 function getCustomResolvers(document: DocumentNode): CustomResolvers {
     const customResolvers = (document.definitions || []).reduce((res: CustomResolvers, definition) => {
-        if (definition.kind !== "ObjectTypeDefinition") {
+        if (definition.kind !== Kind.OBJECT_TYPE_DEFINITION) {
             return res;
         }
 

packages/graphql/src/schema/get-cypher-meta.ts

@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import type { DirectiveNode, FieldDefinitionNode } from "graphql";
+import { Kind, type DirectiveNode, type FieldDefinitionNode } from "graphql";
 
 type CypherMeta = {
     statement: string;
@@ -46,7 +46,7 @@ function parseStatementFlag(directive: DirectiveNode): string {
     if (!stmtArg) {
         throw new Error("@cypher statement required");
     }
-    if (stmtArg.value.kind !== "StringValue") {
+    if (stmtArg.value.kind !== Kind.STRING) {
         throw new Error("@cypher statement is not a string");
     }
 
@@ -58,7 +58,7 @@ function parseColumnNameFlag(directive: DirectiveNode): string {
     if (!stmtArg) {
         throw new Error("@cypher columnName required");
     }
-    if (stmtArg.value.kind !== "StringValue") {
+    if (stmtArg.value.kind !== Kind.STRING) {
         throw new Error("@cypher columnName is not a string");
     }