Release v0.3.0

.phpcs.ruleset.xml

@@ -33,7 +33,7 @@
 	<rule ref="WordPress.NamingConventions.PrefixAllGlobals">
 		<properties>
 			<!-- Value: replace the function, class, and variable prefixes used. Separate multiple prefixes with a comma. -->
-			<property name="prefixes" type="array" value="WPGraphQL\Extensions\WooCommerce"/>
+			<property name="prefixes" type="array" value="WPGraphQL\WooCommerce"/>
 		</properties>
 	</rule>
 	<rule ref="WordPress.WP.I18n">

.travis.yml

@@ -15,14 +15,13 @@ branches:
   only:
     - develop
     - master
-    - release-v0.2.0
-    - release-v0.2.1
+    - release-v0.1.2
     - release-v0.2.2
+    - release-v0.3.0
 
 cache:
   apt: true
   directories:
-    - vendor
     - $HOME/.composer/cache
 
 matrix:

README.txt

@@ -4,7 +4,7 @@ Tags: GraphQL, WooCommerce, WPGraphQL
 Requires at least: 4.9
 Tested up to: 5.2
 Requires PHP: 5.6
-Stable tag: 0.2.2
+Stable tag: 0.3.0
 License: GPL-3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 Maintained at: https://github.com/wp-graphql/wp-graphql-woocommerce

access-functions.php

@@ -2,29 +2,10 @@
 /**
  * This file contains access functions for various class methods
  *
- * @package WPGraphQL\Extensions\WooCommerce
+ * @package WPGraphQL\WooCommerce
  * @since 0.0.1
  */
 
-/**
- * Adds an ObjectType to the TypeRegistry and node resolvers to Relay node definitions.
- *
- * @param string $type_name The name of the Type to register.
- * @param array  $config    The Type config.
- */
-function wc_register_graphql_object_type( $type_name, $config ) {
-	$config['kind'] = 'object';
-	if ( ! empty( $config['resolve_node'] ) ) {
-		add_filter( 'graphql_resolve_node', $config['resolve_node'], 10, 4 );
-		unset( $config['resolve_node'] );
-	}
-	if ( ! empty( $config['resolve_node_type'] ) ) {
-		add_filter( 'graphql_resolve_node_type', $config['resolve_node_type'], 10, 2 );
-		unset( $config['resolve_node_type'] );
-	}
-	register_graphql_type( $type_name, $config );
-}
-
 /**
  * Checks if source string starts with the target string
  *

class-inflect.php

@@ -7,7 +7,7 @@
  *
  * @author @tbrianjones
  * @link https://gist.github.com/tbrianjones/ba0460cc1d55f357e00b
- * @package WPGraphQL\Extensions\WooCommerce
+ * @package WPGraphQL\WooCommerce
  * @since 0.0.4
  */
 

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "wp-graphql/wp-graphql-woocommerce",
     "description": "WooCommerce bindings for wp-graphql",
-    "version": "0.2.2",
+    "version": "0.3.0",
     "type": "wordpress-plugin",
     "keywords": [
         "wordpress",
@@ -35,7 +35,7 @@
             "includes/connection/common-post-type-args.php"
         ],
         "psr-4": {
-            "WPGraphQL\\Extensions\\WooCommerce\\": "includes/"
+            "WPGraphQL\\WooCommerce\\": "includes/"
         },
         "classmap": [
             "includes/"

includes/class-acf-schema-filters.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Adds filters that modify WPGraphQL ACF schema.
+ *
+ * @package \WPGraphQL\WooCommerce
+ * @since   0.3.0
+ */
+
+namespace WPGraphQL\WooCommerce;
+
+/**
+ * Class ACF_Schema_Filters
+ */
+class ACF_Schema_Filters {
+
+	/**
+	 * Register filters
+	 */
+	public static function add_filters() {
+		// Registers WooCommerce CPTs && taxonomies.
+		add_filter( 'graphql_acf_get_root_id', array( __CLASS__, 'resolve_crud_root_id' ), 10, 2 );
+	}
+
+	/**
+	 * Resolve post object ID from CRUD object Model.
+	 *
+	 * @param integer|null $id    Post object database ID.
+	 * @param mixed        $root  Root resolver.
+	 *
+	 * @return integer|null
+	 */
+	public static function resolve_crud_root_id( $id, $root ) {
+		switch ( true ) {
+			case $root instanceof \WPGraphQL\WooCommerce\Model\CRUD_CPT:
+				$id = absint( $root->ID );
+				break;
+		}
+
+		return $id;
+	}
+}

includes/class-core-schema-filters.php

@@ -2,14 +2,14 @@
 /**
  * Adds filters that modify core schema.
  *
- * @package \WPGraphQL\Extensions\WooCommerce
+ * @package \WPGraphQL\WooCommerce
  * @since   0.0.1
  */
 
-namespace WPGraphQL\Extensions\WooCommerce;
+namespace WPGraphQL\WooCommerce;
 
-use WPGraphQL\Extensions\WooCommerce\Data\Loader\WC_Customer_Loader;
-use WPGraphQL\Extensions\WooCommerce\Data\Loader\WC_Post_Crud_Loader;
+use WPGraphQL\WooCommerce\Data\Loader\WC_Customer_Loader;
+use WPGraphQL\WooCommerce\Data\Loader\WC_Post_Crud_Loader;
 
 /**
  * Class Core_Schema_Filters
@@ -33,6 +33,11 @@ class Core_Schema_Filters {
 	 * Register filters
 	 */
 	public static function add_filters() {
+		// Registers WooCommerce CPTs.
+		add_filter( 'register_post_type_args', array( __CLASS__, 'register_post_types' ), 10, 2 );
+		add_filter( 'graphql_post_entities_allowed_post_types', array( __CLASS__, 'skip_type_registry' ), 10 );
+		add_filter( 'graphql_union_resolve_type', array( __CLASS__, 'graphql_union_resolve_type' ), 10, 3 );
+
 		// Registers WooCommerce taxonomies.
 		add_filter( 'register_taxonomy_args', array( __CLASS__, 'register_taxonomy_args' ), 10, 2 );
 
@@ -43,7 +48,7 @@ public static function add_filters() {
 		add_filter(
 			'graphql_post_object_connection_query_args',
 			array(
-				'\WPGraphQL\Extensions\WooCommerce\Data\Connection\Post_Connection_Resolver',
+				'\WPGraphQL\WooCommerce\Data\Connection\Post_Connection_Resolver',
 				'get_query_args',
 			),
 			10,
@@ -52,12 +57,26 @@ public static function add_filters() {
 		add_filter(
 			'graphql_term_object_connection_query_args',
 			array(
-				'\WPGraphQL\Extensions\WooCommerce\Data\Connection\WC_Terms_Connection_Resolver',
+				'\WPGraphQL\WooCommerce\Data\Connection\WC_Terms_Connection_Resolver',
 				'get_query_args',
 			),
 			10,
 			5
 		);
+
+		// Add node resolvers.
+		add_filter(
+			'graphql_resolve_node',
+			array( '\WPGraphQL\WooCommerce\Data\Factory', 'resolve_node' ),
+			10,
+			4
+		);
+		add_filter(
+			'graphql_resolve_node_type',
+			array( '\WPGraphQL\WooCommerce\Data\Factory', 'resolve_node_type' ),
+			10,
+			2
+		);
 	}
 
 	/**
@@ -88,10 +107,72 @@ public static function customer_loader( $context ) {
 		return self::$customer_loader;
 	}
 
+	/**
+	 * Registers WooCommerce post-types to be used in GraphQL schema
+	 *
+	 * @param array  $args      - allowed post-types.
+	 * @param string $post_type - name of taxonomy being checked.
+	 *
+	 * @return array
+	 */
+	public static function register_post_types( $args, $post_type ) {
+		if ( 'product' === $post_type ) {
+			$args['show_in_graphql']            = true;
+			$args['graphql_single_name']        = 'Product';
+			$args['graphql_plural_name']        = 'Products';
+			$args['skip_graphql_type_registry'] = true;
+		}
+		if ( 'product_variation' === $post_type ) {
+			$args['show_in_graphql']            = true;
+			$args['graphql_single_name']        = 'ProductVariation';
+			$args['graphql_plural_name']        = 'ProductVariations';
+			$args['skip_graphql_type_registry'] = true;
+		}
+		if ( 'shop_coupon' === $post_type ) {
+			$args['show_in_graphql']            = true;
+			$args['graphql_single_name']        = 'Coupon';
+			$args['graphql_plural_name']        = 'Coupons';
+			$args['skip_graphql_type_registry'] = true;
+		}
+		if ( 'shop_order' === $post_type ) {
+			$args['show_in_graphql']            = true;
+			$args['graphql_single_name']        = 'Order';
+			$args['graphql_plural_name']        = 'Orders';
+			$args['skip_graphql_type_registry'] = true;
+		}
+		if ( 'shop_order_refund' === $post_type ) {
+			$args['show_in_graphql']            = true;
+			$args['graphql_single_name']        = 'Refund';
+			$args['graphql_plural_name']        = 'Refunds';
+			$args['skip_graphql_type_registry'] = true;
+		}
+
+		return $args;
+	}
+
+	/**
+	 * Filters "allowed_post_types" and removed Woocommerce CPTs.
+	 *
+	 * @param array $post_types  Post types registered in GraphQL schema.
+	 *
+	 * @return array
+	 */
+	public static function skip_type_registry( $post_types ) {
+		return array_diff(
+			$post_types,
+			get_post_types(
+				[
+					'show_in_graphql'            => true,
+					'skip_graphql_type_registry' => true,
+				]
+			)
+		);
+	}
+
 	/**
 	 * Registers WooCommerce taxonomies to be used in GraphQL schema
 	 *
-	 * @param array  $args     - allowed post-types.
+	 * @param array  $args     - allowed taxonomies.
 	 * @param string $taxonomy - name of taxonomy being checked.
 	 *
 	 * @return array

includes/class-jwt-auth-schema-filters.php

@@ -3,11 +3,11 @@
  * Adds filters that modify the WooGraphQL schema to include WPGraphQL JWT Authentication
  * fields in Customer type and mutations.
  *
- * @package \WPGraphQL\Extensions\WooCommerce
+ * @package \WPGraphQL\WooCommerce
  * @since   0.2.2
  */
 
-namespace WPGraphQL\Extensions\WooCommerce;
+namespace WPGraphQL\WooCommerce;
 
 use GraphQL\Error\UserError;
 use GraphQL\Type\Definition\ResolveInfo;