Ignore location rules when adding fields to the schema. Fixes #52.

.travis.yml

@@ -29,12 +29,6 @@ matrix:
       env: WP_VERSION=latest
     - php: 7.0
       env: WP_VERSION=trunk
-    - php: 5.6
-      env: WP_VERSION=4.9
-    - php: 5.6
-      env: WP_VERSION=latest
-    - php: 5.6
-      env: WP_TRAVISCI=phpcs
 
 install:
   - |

src/class-acf.php

@@ -131,7 +131,12 @@ private function actions() {
 	 * Setup filters
 	 */
 	private function filters() {
-
+		add_filter( 'acf/location/rule_match', function( $query ) {
+			if ( defined( 'GRAPHQL_HTTP_REQUEST' ) ) {
+				return true;
+			}
+			return $query;
+		});
 	}
 
 	/**

src/class-config.php

@@ -14,7 +14,6 @@
 use WPGraphQL\Model\Post;
 use WPGraphQL\Model\Term;
 use WPGraphQL\Model\User;
-use WPGraphQL\Types;
 
 /**
  * Config class.
@@ -367,7 +366,6 @@ protected function register_graphql_field( $type_name, $field_name, $config ) {
 			case 'button_group':
 			case 'color_picker':
 			case 'email':
-			case 'textarea':
 			case 'text':
 			case 'message':
 			case 'oembed':
@@ -379,6 +377,24 @@ protected function register_graphql_field( $type_name, $field_name, $config ) {
 				// GraphQL we can't return different types
 				$field_config['type'] = 'String';
 				break;
+			case 'textarea':
+				$field_config['type'] = 'String';
+				$field_config['resolve'] = function( $root ) use ( $acf_field ) {
+					$value = $this->get_acf_field_value( $root, $acf_field );
+
+					if ( ! empty( $acf_field['new_lines'] ) ) {
+						if ( 'wpautop' === $acf_field['new_lines'] ) {
+							$value = wpautop( $value );
+						}
+						if ( 'br' === $acf_field['new_lines'] ) {
+							$value = nl2br( $value );
+						}
+					}
+					return $value;
+
+
+				};
+				break;
 			case 'select':
 
 				/**
@@ -499,7 +515,7 @@ protected function register_graphql_field( $type_name, $field_name, $config ) {
 					} else {
 						$type_names = [];
 						foreach ( $acf_field['post_type'] as $post_type ) {
-							if ( in_array( $post_type, \WPGraphQL::$allowed_post_types, true ) ) {
+							if ( in_array( $post_type, \get_post_types( [ 'show_in_graphql' => true ]), true ) ) {
 								$type_names[ $post_type ] = get_post_type_object( $post_type )->graphql_single_name;
 							}
 						}
@@ -531,7 +547,22 @@ protected function register_graphql_field( $type_name, $field_name, $config ) {
 							return new Post( $value );
 						}
 
-						return absint( $value ) ? DataSource::resolve_post_object( (int) $value, $context ) : null;
+						/**
+						 * This hooks allows for filtering of the post object source. In case an non-core defined
+						 * post-type is being targeted.
+						 * 
+						 * @param mixed|null  $source  GraphQL Type source.
+						 * @param mixed|null  $value   Root ACF field value.
+						 * @param AppContext  $context AppContext instance.
+						 * @param ResolveInfo $info    ResolveInfo instance.
+						 */
+						return apply_filters(
+							'graphql_acf_post_object_source',
+							absint( $value ) ? DataSource::resolve_post_object( (int) $value, $context ) : null,
+							$value,
+							$context,
+							$info
+						);
 
 					},
 				];
@@ -672,34 +703,113 @@ protected function register_graphql_field( $type_name, $field_name, $config ) {
 					$field_config['type'] = $field_type_name;
 					break;
 				}
+
+				$fields = [
+					'streetAddress' => [
+						'type'        => 'String',
+						'description' => __( 'The street address associated with the map', 'wp-graphql-acf' ),
+						'resolve'     => function( $root ) {
+							return isset( $root['address'] ) ? $root['address'] : null;
+						},
+					],
+					'latitude'      => [
+						'type'        => 'Float',
+						'description' => __( 'The latitude associated with the map', 'wp-graphql-acf' ),
+						'resolve'     => function( $root ) {
+							return isset( $root['lat'] ) ? $root['lat'] : null;
+						},
+					],
+					'longitude'     => [
+						'type'        => 'Float',
+						'description' => __( 'The longitude associated with the map', 'wp-graphql-acf' ),
+						'resolve'     => function( $root ) {
+							return isset( $root['lng'] ) ? $root['lng'] : null;
+						},
+					],
+				];
+
+				// ACF 5.8.6 added more data to Google Maps field value
+				// https://www.advancedcustomfields.com/changelog/
+				if (\acf_version_compare(acf_get_db_version(), '>=', '5.8.6')) {
+                    $fields += [
+                        'streetName' => [
+							'type'        => 'String',
+							'description' => __( 'The street name associated with the map', 'wp-graphql-acf' ),
+							'resolve'     => function( $root ) {
+								return isset( $root['street_name'] ) ? $root['street_name'] : null;
+							},
+                        ],
+                        'streetNumber' => [
+							'type'        => 'String',
+							'description' => __( 'The street number associated with the map', 'wp-graphql-acf' ),
+							'resolve'     => function( $root ) {
+								return isset( $root['street_number'] ) ? $root['street_number'] : null;
+							},
+                        ],
+                        'city' => [
+							'type'        => 'String',
+							'description' => __( 'The city associated with the map', 'wp-graphql-acf' ),
+							'resolve'     => function( $root ) {
+								return isset( $root['city'] ) ? $root['city'] : null;
+							},
+                        ],
+                        'state' => [
+							'type'        => 'String',
+							'description' => __( 'The state associated with the map', 'wp-graphql-acf' ),
+							'resolve'     => function( $root ) {
+								return isset( $root['state'] ) ? $root['state'] : null;
+							},
+                        ],
+                        'stateShort' => [
+							'type'        => 'String',
+							'description' => __( 'The state abbreviation associated with the map', 'wp-graphql-acf' ),
+							'resolve'     => function( $root ) {
+								return isset( $root['state_short'] ) ? $root['state_short'] : null;
+							},
+                        ],
+                        'postCode' => [
+							'type'        => 'String',
+							'description' => __( 'The post code associated with the map', 'wp-graphql-acf' ),
+							'resolve'     => function( $root ) {
+								return isset( $root['post_code'] ) ? $root['post_code'] : null;
+							},
+                        ],
+                        'country' => [
+							'type'        => 'String',
+							'description' => __( 'The country associated with the map', 'wp-graphql-acf' ),
+							'resolve'     => function( $root ) {
+								return isset( $root['country'] ) ? $root['country'] : null;
+							},
+                        ],
+                        'countryShort' => [
+							'type'        => 'String',
+							'description' => __( 'The country abbreviation associated with the map', 'wp-graphql-acf' ),
+							'resolve'     => function( $root ) {
+								return isset( $root['country_short'] ) ? $root['country_short'] : null;
+							},
+                        ],
+                        'placeId' => [
+							'type'        => 'String',
+							'description' => __( 'The country associated with the map', 'wp-graphql-acf' ),
+							'resolve'     => function( $root ) {
+								return isset( $root['place_id'] ) ? $root['place_id'] : null;
+							},
+                        ],
+                        'zoom' => [
+							'type'        => 'String',
+							'description' => __( 'The zoom defined with the map', 'wp-graphql-acf' ),
+							'resolve'     => function( $root ) {
+								return isset( $root['zoom'] ) ? $root['zoom'] : null;
+							},
+                        ],
+                    ];
+                }
 
 				register_graphql_object_type(
 					$field_type_name,
 					[
 						'description' => __( 'Google Map field', 'wp-graphql-acf' ),
-						'fields'      => [
-							'streetAddress' => [
-								'type'        => 'String',
-								'description' => __( 'The street address associated with the map', 'wp-graphql-acf' ),
-								'resolve'     => function( $root ) {
-									return isset( $root['address'] ) ? $root['address'] : null;
-								},
-							],
-							'latitude'      => [
-								'type'        => 'Float',
-								'description' => __( 'The latitude associated with the map', 'wp-graphql-acf' ),
-								'resolve'     => function( $root ) {
-									return isset( $root['lat'] ) ? $root['lat'] : null;
-								},
-							],
-							'longitude'     => [
-								'type'        => 'Float',
-								'description' => __( 'The longitude associated with the map', 'wp-graphql-acf' ),
-								'resolve'     => function( $root ) {
-									return isset( $root['lng'] ) ? $root['lng'] : null;
-								},
-							],
-						],
+						'fields'      => $fields,
 					]
 				);
 				$field_config['type'] = $field_type_name;
@@ -777,12 +887,21 @@ protected function register_graphql_field( $type_name, $field_name, $config ) {
 
 						$flex_field_layout_name = ! empty( $layout['name'] ) ? ucfirst( self::camel_case( $layout['name'] ) ) : null;
 						$flex_field_layout_name = ! empty( $flex_field_layout_name ) ? $field_type_name . '_' . $flex_field_layout_name : null;
+
+						/**
+						 * If there are no layouts defined for the Flex Field
+						 */
+						if ( empty( $flex_field_layout_name ) ) {
+							continue;
+						}
+
 						$layout_type            = $this->type_registry->get_type( $flex_field_layout_name );
 
 						if ( $layout_type ) {
 							$union_types[ $layout['name'] ] = $layout_type;
 						} else {
 
+
 							register_graphql_object_type( $flex_field_layout_name, [
 								'description' => __( 'Group within the flex field', 'wp-graphql-acf' ),
 								'fields'      => [
@@ -874,7 +993,8 @@ protected function add_field_group_fields( $field_group, $type_name ) {
 			/**
 			 * Setup data for register_graphql_field
 			 */
-			$name            = ! empty( $acf_field['name'] ) ? self::camel_case( $acf_field['name'] ) : null;
+			$explicit_name   = ! empty( $acf_field['graphql_field_name'] ) ? $acf_field['graphql_field_name'] : null;
+			$name            = empty( $explicit_name ) && ! empty( $acf_field['name'] ) ? self::camel_case( $acf_field['name'] ) : $explicit_name;
 			$show_in_graphql = isset( $acf_field['show_in_graphql'] ) ? (bool) $acf_field['show_in_graphql'] : true;
 			$description     = isset( $acf_field['instructions'] ) ? $acf_field['instructions'] : __( 'ACF Field added to the Schema by WPGraphQL ACF' );
 

tests/wpunit/PostObjectFieldsTest.php

@@ -1118,7 +1118,7 @@ public function testQueryMultipleSelectField() {
 		    id
 		    title
 		    postFields {
-		      selectFieldMultiple
+		      selectMultiple
 		    }
 		  }
 		}';
@@ -1135,7 +1135,7 @@ public function testQueryMultipleSelectField() {
 		codecept_debug( $actual );
 
 		$this->assertArrayNotHasKey( 'errors', $actual );
-		$this->assertSame( $expected_value, $actual['data']['postBy']['postFields']['selectFieldMultiple'] );
+		$this->assertSame( $expected_value, $actual['data']['postBy']['postFields']['selectMultiple'] );
 
 
 	}
@@ -1169,7 +1169,7 @@ public function testQueryMultipleSelectFieldWithNoValueSet() {
 		    id
 		    title
 		    postFields {
-		      selectFieldMultiple
+		      selectMultiple
 		    }
 		  }
 		}';
@@ -1185,7 +1185,7 @@ public function testQueryMultipleSelectFieldWithNoValueSet() {
 
 		codecept_debug( $actual );
 
-		$this->assertSame( [], $actual['data']['postBy']['postFields']['selectFieldMultiple'] );
+		$this->assertSame( [], $actual['data']['postBy']['postFields']['selectMultiple'] );
 
 	}
 

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit3fbb9843644ca7389b188c6353f475fc::getLoader();
+return ComposerAutoloaderInit2c922a3b1933e10e7ad3704a3cd98524::getLoader();