Core Data: Fixes necessary for converting to TypeScript

packages/core-data/src/batch/create-batch.js → packages/core-data/src/batch/create-batch.ts

@@ -106,7 +106,7 @@ export default function createBatch( processor = defaultProcessor ) {
 		 */
 		async run() {
 			if ( pending.size ) {
-				await new Promise( ( resolve ) => {
+				await new Promise< void >( ( resolve ) => {
 					const unsubscribe = pending.subscribe( () => {
 						if ( ! pending.size ) {
 							unsubscribe();
@@ -160,7 +160,10 @@ export default function createBatch( processor = defaultProcessor ) {
 	};
 }
 
-class ObservableSet {
+class ObservableSet< T > {
+	private set: Set< T >;
+	private subscribers: Set< () => void >;
+
 	constructor( ...args ) {
 		this.set = new Set( ...args );
 		this.subscribers = new Set();

packages/core-data/src/batch/default-processor.js

@@ -36,7 +36,7 @@ export default async function defaultProcessor( requests ) {
 
 	const results = [];
 
-	for ( const batchRequests of chunk( requests, maxItems ) ) {
+	for ( const batchRequests of chunk( requests, maxItems ?? undefined ) ) {
 		const batchResponse = await apiFetch( {
 			path: '/batch/v1',
 			method: 'POST',

packages/core-data/src/entities.js

@@ -275,7 +275,7 @@ export const getMethodName = (
 	const nameSuffix =
 		upperFirst( camelCase( name ) ) + ( usePlural ? 's' : '' );
 	const suffix =
-		usePlural && entity.plural
+		usePlural && entity?.plural
 			? upperFirst( camelCase( entity.plural ) )
 			: nameSuffix;
 	return `${ prefix }${ kindPrefix }${ suffix }`;
@@ -286,7 +286,7 @@ export const getMethodName = (
  *
  * @param {string} kind Kind
  *
- * @return {Array} Entities
+ * @return {( thunkArgs: any ) => Promise<any[]>} Entities
  */
 export const getKindEntities = ( kind ) => async ( { select, dispatch } ) => {
 	let entities = select.getEntitiesByKind( kind );

packages/core-data/src/entity-provider.js

@@ -27,7 +27,9 @@ const entities = {
 		if ( ! acc[ entity.kind ] ) {
 			acc[ entity.kind ] = {};
 		}
-		acc[ entity.kind ][ entity.name ] = { context: createContext() };
+		acc[ entity.kind ][ entity.name ] = {
+			context: createContext( undefined ),
+		};
 		return acc;
 	}, {} ),
 	...kinds.reduce( ( acc, kind ) => {
@@ -41,7 +43,7 @@ const getEntity = ( kind, type ) => {
 	}
 
 	if ( ! entities[ kind ][ type ] ) {
-		entities[ kind ][ type ] = { context: createContext() };
+		entities[ kind ][ type ] = { context: createContext( undefined ) };
 	}
 
 	return entities[ kind ][ type ];
@@ -126,6 +128,10 @@ export function useEntityProp( kind, type, prop, _id ) {
 	return [ value, setValue, fullValue ];
 }
 
+/** @typedef {Object} WPBlock A loaded block in memory
+ *  @property {string} name Block name
+ */
+
 /**
  * Hook that returns block content getters and setters for
  * the nearest provided entity of the specified type.

packages/core-data/src/types/attachment.ts → packages/core-data/src/entity-types/attachment.ts

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import {
+import type {
 	Context,
 	ContextualField,
 	MediaType,
@@ -12,7 +12,7 @@ import {
 	PingStatus,
 } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/comment.ts → packages/core-data/src/entity-types/comment.ts

@@ -1,14 +1,14 @@
 /**
  * Internal dependencies
  */
-import {
+import type {
 	AvatarUrls,
 	Context,
 	ContextualField,
 	OmitNevers,
 	RenderedText,
 } from './helpers';
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 export type CommentStatus = 'hold' | 'approve' | 'spam' | 'trash' | '1' | '0';
 

packages/core-data/src/types/helpers.ts → packages/core-data/src/entity-types/helpers.ts

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { EntityRecord } from './index';
+import type { EntityRecord } from './index';
 
 export interface AvatarUrls {
 	/**

packages/core-data/src/types/menu-location.ts → packages/core-data/src/entity-types/menu-location.ts

@@ -1,9 +1,9 @@
 /**
  * Internal dependencies
  */
-import { Context, OmitNevers } from './helpers';
+import type { Context, OmitNevers } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/nav-menu-item.ts → packages/core-data/src/entity-types/nav-menu-item.ts

@@ -1,9 +1,14 @@
 /**
  * Internal dependencies
  */
-import { RenderedText, Context, ContextualField, OmitNevers } from './helpers';
+import type {
+	RenderedText,
+	Context,
+	ContextualField,
+	OmitNevers,
+} from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 export type NavMenuItemType =
 	| 'taxonomy'

packages/core-data/src/types/nav-menu.ts → packages/core-data/src/entity-types/nav-menu.ts

@@ -1,9 +1,9 @@
 /**
  * Internal dependencies
  */
-import { Context, ContextualField, OmitNevers } from './helpers';
+import type { Context, ContextualField, OmitNevers } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/navigation-area.ts → packages/core-data/src/entity-types/navigation-area.ts

@@ -1,9 +1,9 @@
 /**
  * Internal dependencies
  */
-import { Context, OmitNevers } from './helpers';
+import type { Context, OmitNevers } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/page.ts → packages/core-data/src/entity-types/page.ts

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import {
+import type {
 	CommentingStatus,
 	Context,
 	ContextualField,
@@ -11,7 +11,7 @@ import {
 	OmitNevers,
 } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/plugin.ts → packages/core-data/src/entity-types/plugin.ts

@@ -1,9 +1,14 @@
 /**
  * Internal dependencies
  */
-import { Context, ContextualField, RenderedText, OmitNevers } from './helpers';
+import type {
+	Context,
+	ContextualField,
+	RenderedText,
+	OmitNevers,
+} from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/post.ts → packages/core-data/src/entity-types/post.ts

@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import {
+import type {
 	CommentingStatus,
 	Context,
 	ContextualField,
@@ -12,7 +12,7 @@ import {
 	OmitNevers,
 } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/settings.ts → packages/core-data/src/entity-types/settings.ts

@@ -1,9 +1,14 @@
 /**
  * Internal dependencies
  */
-import { CommentingStatus, Context, OmitNevers, PingStatus } from './helpers';
+import type {
+	CommentingStatus,
+	Context,
+	OmitNevers,
+	PingStatus,
+} from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/sidebar.ts → packages/core-data/src/entity-types/sidebar.ts

@@ -1,10 +1,9 @@
 /**
  * Internal dependencies
  */
-import { Widget } from './widget';
-import { Context, OmitNevers } from './helpers';
+import type { Context, OmitNevers } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/taxonomy.ts → packages/core-data/src/entity-types/taxonomy.ts

@@ -1,9 +1,9 @@
 /**
  * Internal dependencies
  */
-import { Context, ContextualField, OmitNevers } from './helpers';
+import type { Context, ContextualField, OmitNevers } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/theme.ts → packages/core-data/src/entity-types/theme.ts

@@ -1,9 +1,9 @@
 /**
  * Internal dependencies
  */
-import { Context, PostFormat, RenderedText, OmitNevers } from './helpers';
+import type { Context, PostFormat, RenderedText, OmitNevers } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/type.ts → packages/core-data/src/entity-types/type.ts

@@ -1,9 +1,9 @@
 /**
  * Internal dependencies
  */
-import { Context, ContextualField, OmitNevers } from './helpers';
+import type { Context, ContextualField, OmitNevers } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/user.ts → packages/core-data/src/entity-types/user.ts

@@ -1,9 +1,14 @@
 /**
  * Internal dependencies
  */
-import { AvatarUrls, Context, ContextualField, OmitNevers } from './helpers';
+import type {
+	AvatarUrls,
+	Context,
+	ContextualField,
+	OmitNevers,
+} from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/widget-type.ts → packages/core-data/src/entity-types/widget-type.ts

@@ -1,9 +1,9 @@
 /**
  * Internal dependencies
  */
-import { Context, OmitNevers } from './helpers';
+import type { Context, OmitNevers } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/widget.ts → packages/core-data/src/entity-types/widget.ts

@@ -1,9 +1,9 @@
 /**
  * Internal dependencies
  */
-import { Context, ContextualField, OmitNevers } from './helpers';
+import type { Context, ContextualField, OmitNevers } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/wp-template-part.ts → packages/core-data/src/entity-types/wp-template-part.ts

@@ -1,15 +1,15 @@
 /**
  * Internal dependencies
  */
-import {
+import type {
 	Context,
 	PostStatus,
 	RenderedText,
 	OmitNevers,
 	ContextualField,
 } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/types/wp-template.ts → packages/core-data/src/entity-types/wp-template.ts

@@ -1,15 +1,15 @@
 /**
  * Internal dependencies
  */
-import {
+import type {
 	Context,
 	PostStatus,
 	RenderedText,
 	OmitNevers,
 	ContextualField,
 } from './helpers';
 
-import { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
+import type { BaseEntityTypes as _BaseEntityTypes } from './base-entity-types';
 
 declare module './base-entity-types' {
 	export namespace BaseEntityTypes {

packages/core-data/src/fetch/__experimental-fetch-link-suggestions.js

@@ -170,7 +170,7 @@ const fetchLinkSuggestions = async (
 			.slice( 0, perPage )
 			.map(
 				/**
-				 * @param {{ id: number, url:string, title?:string, subtype?: string, type?: string }} result
+				 * @param {{ id: number, meta?: object, url:string, title?:string, subtype?: string, type?: string }} result
 				 */
 				( result ) => {
 					return {

packages/core-data/src/fetch/__experimental-fetch-url-data.js

@@ -60,6 +60,7 @@ const fetchUrlData = async ( url, options = {} ) => {
 	const protocol = getProtocol( url );
 
 	if (
+		! protocol ||
 		! isValidProtocol( protocol ) ||
 		! protocol.startsWith( 'http' ) ||
 		! /^https?:\/\/[^\/\s]/i.test( url )

packages/core-data/src/hooks/use-entity-record.ts

@@ -3,7 +3,7 @@
  */
 import useQuerySelect from './use-query-select';
 import { store as coreStore } from '../';
-import { Status } from './constants';
+import type { Status } from './constants';
 
 interface EntityRecordResolution< RecordType > {
 	/** The requested entity record */