Update API to latest version of neo4j-graphql (#329)

Author: Andy2003

.run/AsciidocReformater.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="org.neo4j.graphql.tools.AsciidocReformater" type="JetRunConfigurationType" nameIsGenerated="true">
+  <configuration default="false" name="AsciidocReformater" type="JetRunConfigurationType" nameIsGenerated="true">
     <option name="MAIN_CLASS_NAME" value="org.neo4j.graphql.tools.AsciidocReformater" />
     <module name="neo4j-graphql-java" />
     <shortenClasspath name="NONE" />
@@ -8,4 +8,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>

.run/JsTemplateDeleter.run.xml

@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="JsTemplateDeleter" type="JetRunConfigurationType" nameIsGenerated="true">
+    <option name="MAIN_CLASS_NAME" value="org.neo4j.graphql.tools.JsTemplateDeleter" />
+    <module name="neo4j-graphql-java" />
+    <shortenClasspath name="NONE" />
+    <option name="WORKING_DIRECTORY" value="$MODULE_WORKING_DIR$" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>

.run/JsTestCaseSync.run.xml

@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="org.neo4j.graphql.tools.JsTestCaseSync" type="JetRunConfigurationType" nameIsGenerated="true">
+  <configuration default="false" name="JsTestCaseSync" type="JetRunConfigurationType" nameIsGenerated="true">
     <option name="MAIN_CLASS_NAME" value="org.neo4j.graphql.tools.JsTestCaseSync" />
     <module name="neo4j-graphql-java" />
     <shortenClasspath name="NONE" />
@@ -8,4 +8,4 @@
       <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>

core/src/main/kotlin/org/atteo/evo/inflector/EnglischInflector.kt

@@ -8,6 +8,7 @@ object EnglischInflector : English() {
         workaround_irregular("person", "people")
         // TODO
         workaround_irregular("two", "twos")
+        workaround_irregular("aircraft", "aircraft")
     }
 
     private fun workaround_irregular(singular: String, plural: String) {

core/src/main/kotlin/org/neo4j/graphql/Constants.kt

@@ -25,7 +25,7 @@ object Constants {
     const val CURSOR_FIELD = "cursor"
     const val NODE_FIELD = "node"
     const val RELATIONSHIP_FIELD = "relationship"
-    const val TYPENAME_IN = "typename_IN"
+    const val TYPENAME_IN = "typename"
 
     const val RESOLVE_TYPE = TYPE_NAME
     const val RESOLVE_ID = "__id"
@@ -60,7 +60,6 @@ object Constants {
         RelationshipDirective.NAME,
     )
 
-    const val OPTIONS = "options"
     const val WHERE = "where"
 
     object Types {
@@ -71,7 +70,6 @@ object Constants {
         val Boolean = TypeName("Boolean")
 
         val PageInfo = TypeName("PageInfo")
-        val QueryOptions = TypeName("QueryOptions")
         val SortDirection = TypeName("SortDirection")
         val PointDistance = TypeName("PointDistance")
         val CartesianPointDistance = TypeName("CartesianPointDistance")

core/src/main/kotlin/org/neo4j/graphql/QueryContext.kt

@@ -14,21 +14,27 @@ data class QueryContext @JvmOverloads constructor(
     private var paramKeysPerValues = mutableMapOf<String, MutableMap<Any?, Parameter<*>>>()
 
     fun resolve(string: String): String {
-        return contextParams?.let { params ->
-            CONTEXT_VARIABLE_PATTERN.replace(string) {
-                val path = it.groups[1] ?: it.groups[2] ?: throw IllegalStateException("expected a group")
-                val parts = path.value.split(".")
-                var o: Any = params
-                for (part in parts) {
-                    if (o is Map<*, *>) {
-                        o = o[part] ?: return@replace ""
+        return CONTEXT_VARIABLE_PATTERN.replace(string) {
+            val path = it.groups[1] ?: it.groups[2] ?: throw IllegalStateException("expected a group")
+            val parts = path.value.split(".")
+            var o: Any? = null
+            for ((index, part) in parts.withIndex()) {
+                if (index == 0) {
+                    if (part == "context") {
+                        o = contextParams
+                        continue
                     } else {
-                        TODO("only maps are currently supported")
+                        TODO("query context does not provide a `$part`")
                     }
                 }
-                return@replace o.toString()
+                if (o is Map<*, *>) {
+                    o = o[part] ?: return@replace ""
+                } else {
+                    TODO("only maps are currently supported")
+                }
             }
-        } ?: string
+            return@replace o.toString()
+        }
     }
 
     fun getNextVariable(relationField: RelationField) = getNextVariable(
@@ -61,6 +67,8 @@ data class QueryContext @JvmOverloads constructor(
         const val KEY = "Neo4jGraphQLQueryContext"
 
         private const val PATH_PATTERN = "([a-zA-Z_][a-zA-Z_0-9]*(?:.[a-zA-Z_][a-zA-Z_0-9]*)*)"
+
+        // matches ${path} or $path
         private val CONTEXT_VARIABLE_PATTERN = Regex("\\\$(?:\\{$PATH_PATTERN}|$PATH_PATTERN)")
     }
 }

core/src/main/kotlin/org/neo4j/graphql/domain/Node.kt

@@ -37,15 +37,15 @@ class Node(
     }
 
     fun asCypherNode(queryContext: QueryContext?, name: String? = null) =
-        Cypher.node(mainLabel, additionalLabels(queryContext)).let {
+        Cypher.node(mapLabelWithContext(mainLabel, queryContext), additionalLabels(queryContext)).let {
             when {
                 name != null -> it.named(name)
                 else -> it
             }
         }
 
     fun asCypherNode(queryContext: QueryContext?, name: SymbolicName) =
-        Cypher.node(mainLabel, additionalLabels(queryContext)).named(name)
+        Cypher.node(mapLabelWithContext(mainLabel, queryContext), additionalLabels(queryContext)).named(name)
 
 }
 

core/src/main/kotlin/org/neo4j/graphql/domain/NodeFactory.kt

@@ -22,7 +22,7 @@ object NodeFactory {
         val schemeDirectives =
             typeDefinitionRegistry.schemaExtensionDefinitions?.map { it.directives }?.flatten() ?: emptyList()
         val annotations = Annotations(schemeDirectives + definition.directives, typeDefinitionRegistry, definition.name)
-        if (annotations.relationshipProperties != null) {
+        if (annotations.node == null || annotations.relationshipProperties != null) {
             return null
         }
         val interfaces = definition.implements.mapNotNull { interfaceFactory(it.name()) }

core/src/main/kotlin/org/neo4j/graphql/domain/directives/RelationshipDirective.kt

@@ -26,7 +26,7 @@ class RelationshipDirective private constructor(
 
             val queryDirection =
                 directive.readArgument(RelationshipDirective::queryDirection) { RelationField.QueryDirection.valueOf((it as EnumValue).name) }
-                    ?: RelationField.QueryDirection.DEFAULT_DIRECTED
+                    ?: RelationField.QueryDirection.DIRECTED
 
             return RelationshipDirective(direction, type, properties, queryDirection)
         }

core/src/main/kotlin/org/neo4j/graphql/domain/fields/PointField.kt

@@ -31,12 +31,13 @@ class PointField(
     override val predicateDefinitions: Map<String, ScalarPredicateDefinition> = initPredicates()
     override val whereType
         get() = when (coordinateType) {
-            CoordinateType.GEOGRAPHIC -> POINT_INPUT_TYPE.asType()
-            CoordinateType.CARTESIAN -> CARTESIAN_POINT_INPUT_TYPE.asType()
+            CoordinateType.GEOGRAPHIC -> TypeName(POINT_INPUT_TYPE)
+            CoordinateType.CARTESIAN -> TypeName(CARTESIAN_POINT_INPUT_TYPE)
         }
 
     private fun initPredicates(): Map<String, ScalarPredicateDefinition> {
         val result = mutableMapOf<String, ScalarPredicateDefinition>()
+            .add(FieldOperator.IMPLICIT_EQUAL, deprecated = "Please use the explicit _EQ version")
             .add(FieldOperator.EQUAL)
         if (isList()) {
             result.addIncludesResolver(FieldOperator.INCLUDES)
@@ -77,7 +78,7 @@ class PointField(
                 val paramPointArray = Cypher.listWith(p).`in`(parameter).returning(Cypher.point(p))
                 op.conditionCreator(property, paramPointArray)
             },
-            type = whereType.NonNull.List
+            type = whereType.makeRequired(type.isRequired()).List
         )
     }
 
@@ -88,7 +89,7 @@ class PointField(
                 val paramPoint = Cypher.point(parameter)
                 op.conditionCreator(property, paramPoint)
             },
-            type = whereType.inner()
+            type = whereType
         )
     }