dev: cleanup and rename to groupLocation

justlevine · justlevine · commit bd1627b9c512 · 2024-08-24T18:41:20.000Z
diff --git a/src/Type/Enum/ScriptLoadingGroupEnum.php b/src/Type/Enum/ScriptLoadingGroupEnum.php
@@ -22,15 +22,15 @@ public static function register_type() {
 		register_graphql_enum_type(
 			'ScriptLoadingGroupEnum',
 			[
-				'description' => __( 'Locations for script to be loaded', 'wp-graphql' ),
+				'description' => __( 'Location in the document where the script to be loaded', 'wp-graphql' ),
 				'values'      => [
 					'HEADER' => [
 						'value'       => 0,
-						'description' => __( 'Script to be loaded in document `<head>` tags', 'wp-graphql' ),
+						'description' => __( 'A script to be loaded in document `<head>` tag', 'wp-graphql' ),
 					],
 					'FOOTER' => [
 						'value'       => 1,
-						'description' => __( 'Script to be loaded in document at right before the closing `<body>` tag', 'wp-graphql' ),
+						'description' => __( 'A script to be loaded in document at right before the closing `<body>` tag', 'wp-graphql' ),
 					],
 				],
 			]
diff --git a/src/Type/InterfaceType/EnqueuedAsset.php b/src/Type/InterfaceType/EnqueuedAsset.php
@@ -125,14 +125,10 @@ static function ( $before ) {
 						},
 					],
 					'group'        => [
-						'type'        => 'Integer',
+						'type'        => 'Int',
 						'description' => __( 'The loading group to which this asset belongs.', 'wp-graphql' ),
 						'resolve'     => static function ( $asset ) {
-							if ( ! isset( $asset->extra['group'] ) ) {
-								return 0;
-							}
-
-							return absint( $asset->extra['group'] );
+							return isset( $asset->extra['group'] ) ? (int) $asset->extra['group'] : null;
 						},
 					],
 				],
diff --git a/src/Type/ObjectType/EnqueuedScript.php b/src/Type/ObjectType/EnqueuedScript.php
@@ -23,18 +23,18 @@ public static function register_type() {
 				'description' => __( 'Script enqueued by the CMS', 'wp-graphql' ),
 				'interfaces'  => [ 'Node', 'EnqueuedAsset' ],
 				'fields'      => [
-					'id'           => [
+					'id'            => [
 						'type'        => [ 'non_null' => 'ID' ],
 						'description' => __( 'The global ID of the enqueued script', 'wp-graphql' ),
 						'resolve'     => static function ( $asset ) {
 							return isset( $asset->handle ) ? Relay::toGlobalId( 'enqueued_script', $asset->handle ) : null;
 						},
 					],
-					'dependencies' => [
+					'dependencies'  => [
 						'type'        => [ 'list_of' => 'EnqueuedScript' ],
 						'description' => __( 'Dependencies needed to use this asset', 'wp-graphql' ),
 					],
-					'extraData'    => [
+					'extraData'     => [
 						'type'        => 'String',
 						'description' => __( 'Extra data supplied to the enqueued script', 'wp-graphql' ),
 						'resolve'     => static function ( \_WP_Dependency $script ) {
@@ -45,7 +45,7 @@ public static function register_type() {
 							return $script->extra['data'];
 						},
 					],
-					'strategy'     => [
+					'strategy'      => [
 						'type'        => 'ScriptLoadingStrategyEnum',
 						'description' => __( 'The loading strategy to use on the script tag', 'wp-graphql' ),
 						'resolve'     => static function ( \_WP_Dependency $script ) {
@@ -56,18 +56,14 @@ public static function register_type() {
 							return $script->extra['strategy'];
 						},
 					],
-					'location'     => [
+					'groupLocation' => [
 						'type'        => 'ScriptLoadingGroupEnum',
 						'description' => __( 'The location where this script should be loaded', 'wp-graphql' ),
 						'resolve'     => static function ( \_WP_Dependency $script ) {
-							if ( ! isset( $script->extra['group'] ) ) {
-								return 0;
-							}
-
-							return absint( $script->extra['group'] );
+							return isset( $script->extra['group'] ) ? (int) $script->extra['group'] : 0;
 						},
 					],
-					'version'      => [
+					'version'       => [
 						'description' => __( 'The version of the enqueued script', 'wp-graphql' ),
 						'resolve'     => static function ( \_WP_Dependency $script ) {
 							/** @var \WP_Scripts $wp_scripts */
