dev: Use FormFieldsDataLoader to resolve fields instead of instanti…

…ating a new `Model` (#418)

* dev: Use `FormFieldsDataLoader` to resolve fields instead of instantiating a new `Model`

* tests: cleanup

* dev: use `FormsLoader` instead of creating new model

CHANGELOG.md

@@ -5,6 +5,7 @@
 - feat!: Implement `FormField` model and `DataLoader`, and refactor `FormFieldsConnectionResolver` to extend `AbstractConnectionResolver`.
 - feat!: Refactor `FormsConnectionResolver` and `EntriesConnectionResolver` for compatibility with WPGraphQL v1.26.0 improvements.
 - feat!: Narrow `FormField.choices` and `FormField.inputs` field types to their implementations.
+- dev: Use `FormFieldsDataLoader` to resolve fields instead of instantiating a new `Model`.
 - chore!: Bump minimum WPGraphQL version to v1.26.0.
 - chore!: Bump minimum WordPress version to v6.0.0.
 - chore!: Bump minimum Gravity Forms version to v2.7.0.

composer.json

@@ -35,7 +35,7 @@
 		"codeception/phpunit-wrapper": "^9.0",
 		"codeception/util-universalframework": "^1.0",
 		"lucatume/wp-browser": "<3.5",
-		"wp-graphql/wp-graphql-testcase": "~3.0.1",
+		"wp-graphql/wp-graphql-testcase": "~3.3.0",
 		"phpunit/phpunit": "^9.0",
 		"phpstan/phpstan": "^1.2",
 		"phpstan/extension-installer": "^1.1",
@@ -92,7 +92,7 @@
 			"php ./vendor/bin/phpcbf"
 		],
 		"phpstan": [
-			"phpstan analyze --ansi --memory-limit=1G"
+			"phpstan analyze --ansi --memory-limit=1G -v"
 		]
 	},
 	"archive": {

phpstan.neon.dist

@@ -6,7 +6,6 @@ parameters:
 		checkExplicitMixedMissingReturn: true
 		checkFunctionNameCase: true
 		checkInternalClassCaseSensitivity: true
-		checkMissingIterableValueType: false # @todo make true
 		checkTooWideReturnTypesInProtectedAndPublicMethods: true
 		inferPrivatePropertyTypeFromConstructor: true
 		polluteScopeWithAlwaysIterableForeach: false
@@ -15,14 +14,12 @@ parameters:
 		reportStaticMethodSignatures: true
 		reportWrongPhpDocTypeInVarTag: true
 		treatPhpDocTypesAsCertain: false
-		featureToggles:
-			disableRuntimeReflectionProvider: true
 		dynamicConstantNames:
 			- WPGRAPHQL_GF_AUTOLOAD
 		stubFiles:
 			# Simulate added properties
-			- phpstan/class-app-context.stub
-			- phpstan/class-gf-quiz.stub
+			- phpstan/class-app-context.php
+			- phpstan/class-gf-quiz.php
 		bootstrapFiles:
 			- phpstan/constants.php
 			- wp-graphql-gravity-forms.php
@@ -38,4 +35,5 @@ parameters:
 			- ../wp-gatsby/
 			- ../wp-jamstack-deployments/
 		ignoreErrors:
+			- identifier: missingType.iterableValue
 			- '#^Function gf_apply_filters(_ref_array)? invoked with ([1-9]|1[0-2]) parameters, 2 required\.$#'

phpstan/class-app-context.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace WPGraphQL;
+/**
+ * @property ?\WPGraphQL\GF\Model\Form $gfForm
+ * @property \WPGraphQL\GF\Model\SubmittedEntry|\WPGraphQL\GF\Model\SubmittedEntry|null $gfEntry
+ * @property ?\WPGraphQL\GF\Model\FormField $gfField
+ */
+class AppContext {}

src/Data/Connection/FormFieldsConnectionResolver.php

@@ -41,8 +41,14 @@ class FormFieldsConnectionResolver extends AbstractConnectionResolver {
 
 	/**
 	 * {@inheritDoc}
+	 *
+	 * @throws \Exception If the Form model is not set on the AppContext.
 	 */
 	public function __construct( $source, array $args, AppContext $context, ResolveInfo $info ) {
+		if ( ! isset( $context->gfForm ) ) {
+			throw new \Exception( 'The FormFieldsConnectionResolver requires a Form to be set on the AppContext.' );
+		}
+
 		$this->form        = $context->gfForm;
 		$this->form_fields = ! empty( $source->formFields ) ? $source->formFields : [];
 
@@ -176,7 +182,7 @@ protected function is_valid_model( $model ) {
 	 */
 	public function get_node_by_id( $id ) {
 		// The id needs to include the form.
-		$id_for_loader = (string) $this->form->databaseId . ':' . (string) $id;
+		$id_for_loader = FormFieldsLoader::prepare_loader_id( $this->form->databaseId, (int) $id );
 
 		return parent::get_node_by_id( $id_for_loader );
 	}