Throw, rather than returning null, on getGlobalData() error.

Author: techanvil

assets/js/googlesitekit/data/utils.js

@@ -441,14 +441,12 @@ export function createValidatedAction( validate, actionCreator ) {
  *
  * @param {string} propertyName        Property of the global data object.
  * @param {string} [childPropertyName] Optional. Property of the object matched by `propertyName`.
- * @return {*} The global data object, or the child property value if provided. Returns `null` if the property is not found.
+ * @return {*} The global data object, or the child property value if provided.
+ * @throws {Error} If the global data property is not found.
  */
 export function getGlobalData( propertyName, childPropertyName = undefined ) {
 	if ( ! global[ propertyName ] ) {
-		global.console.error(
-			`Global data property ${ propertyName } not found.`
-		);
-		return null;
+		throw new Error( `Global data property ${ propertyName } not found.` );
 	}
 
 	if ( childPropertyName ) {

assets/js/googlesitekit/data/utils.test.js

@@ -979,10 +979,8 @@ describe( 'data utils', () => {
 	describe( 'getGlobalData', () => {
 		const propertyName = '_googlesitekitTestData';
 
-		it( 'should return null when the global data property name is not found', () => {
-			expect( getGlobalData( 'invalidKey' ) ).toBeNull();
-
-			expect( console ).toHaveErroredWith(
+		it( 'should throw an error when the global data property name is not found', () => {
+			expect( () => getGlobalData( 'invalidKey' ) ).toThrow(
 				'Global data property invalidKey not found.'
 			);
 		} );

assets/js/googlesitekit/datastore/site/info.js

@@ -286,10 +286,13 @@ export const resolvers = {
 			return;
 		}
 
-		const baseData = getGlobalData( '_googlesitekitBaseData' );
-		const entityData = getGlobalData( '_googlesitekitEntityData' );
+		let baseData;
+		let entityData;
 
-		if ( baseData === null || entityData === null ) {
+		try {
+			baseData = getGlobalData( '_googlesitekitBaseData' );
+			entityData = getGlobalData( '_googlesitekitEntityData' );
+		} catch ( error ) {
 			global.console.error( 'Could not load core/site info.' );
 			return;
 		}

assets/js/googlesitekit/datastore/user/permissions.js

@@ -164,10 +164,17 @@ const baseResolvers = {
 		// has already expired.
 		// We'll still fetch it in case something has changed,
 		// but receive the preloaded right away.
-		const preloadedPermissions = getGlobalData(
-			'_googlesitekitAPIFetchData',
-			'preloadedData'
-		)?.[ '/google-site-kit/v1/core/user/data/permissions' ]?.body;
+		let preloadedPermissions;
+
+		try {
+			preloadedPermissions = getGlobalData(
+				'_googlesitekitAPIFetchData',
+				'preloadedData'
+			)?.[ '/google-site-kit/v1/core/user/data/permissions' ]?.body;
+		} catch ( error ) {
+			global.console.error( 'Could not load core/user permissions.' );
+			return;
+		}
 
 		if ( preloadedPermissions ) {
 			yield fetchGetCapabilitiesStore.actions.receiveGetCapabilities( {

assets/js/googlesitekit/datastore/user/user-info.js

@@ -208,9 +208,10 @@ export const resolvers = {
 			return;
 		}
 
-		const userData = getGlobalData( '_googlesitekitUserData' );
-
-		if ( userData === null ) {
+		let userData;
+		try {
+			userData = getGlobalData( '_googlesitekitUserData' );
+		} catch ( error ) {
 			global.console.error( 'Could not load core/user info.' );
 			return;
 		}

assets/js/googlesitekit/modules/datastore/modules.js

@@ -834,11 +834,12 @@ const baseResolvers = {
 			return;
 		}
 
-		const dashboardSharingData = getGlobalData(
-			'_googlesitekitDashboardSharingData'
-		);
-
-		if ( dashboardSharingData === null ) {
+		let dashboardSharingData;
+		try {
+			dashboardSharingData = getGlobalData(
+				'_googlesitekitDashboardSharingData'
+			);
+		} catch ( error ) {
 			global.console.error(
 				'Could not load core/modules dashboard sharing.'
 			);
@@ -857,8 +858,10 @@ const baseResolvers = {
 			return;
 		}
 
-		const inlineModulesData = getGlobalData( '_googlesitekitModulesData' );
-		if ( inlineModulesData === null ) {
+		let inlineModulesData;
+		try {
+			inlineModulesData = getGlobalData( '_googlesitekitModulesData' );
+		} catch ( error ) {
 			return;
 		}
 

assets/js/googlesitekit/modules/datastore/sharing-settings.js

@@ -410,11 +410,12 @@ const baseResolvers = {
 			return;
 		}
 
-		const dashboardSharingData = getGlobalData(
-			'_googlesitekitDashboardSharingData'
-		);
-
-		if ( dashboardSharingData === null ) {
+		let dashboardSharingData;
+		try {
+			dashboardSharingData = getGlobalData(
+				'_googlesitekitDashboardSharingData'
+			);
+		} catch ( error ) {
 			global.console.error(
 				'Could not load core/modules dashboard sharing settings.'
 			);
@@ -433,11 +434,12 @@ const baseResolvers = {
 			return;
 		}
 
-		const dashboardSharingData = getGlobalData(
-			'_googlesitekitDashboardSharingData'
-		);
-
-		if ( dashboardSharingData === null ) {
+		let dashboardSharingData;
+		try {
+			dashboardSharingData = getGlobalData(
+				'_googlesitekitDashboardSharingData'
+			);
+		} catch ( error ) {
 			global.console.error(
 				'Could not load core/modules dashboard sharing roles.'
 			);
@@ -458,10 +460,12 @@ const baseResolvers = {
 			return;
 		}
 
-		const dashboardSharingData = getGlobalData(
-			'_googlesitekitDashboardSharingData'
-		);
-		if ( dashboardSharingData === null ) {
+		let dashboardSharingData;
+		try {
+			dashboardSharingData = getGlobalData(
+				'_googlesitekitDashboardSharingData'
+			);
+		} catch ( error ) {
 			global.console.error(
 				'Could not load core/modules dashboard sharing.'
 			);