← All changes | build/scripts/data/index.js +67 -105 23.3.2 → 22.7.0 View file →

		@@ -417,9 +417,8 @@
417	417	createRegistryControl: () => createRegistryControl,
418	418	createRegistrySelector: () => createRegistrySelector,
419	419	createSelector: () => rememo_default,
420	420	dispatch: () => dispatch2,
421		- keyedReducer: () => keyedReducer,
422	421	plugins: () => plugins_exports,
423	422	register: () => register,
424	423	registerGenericStore: () => registerGenericStore,
425	424	registerStore: () => registerStore,
		@@ -721,15 +720,15 @@
721	720	// packages/data/build-module/controls.mjs
722	721	var SELECT = "@@data/SELECT";
723	722	var RESOLVE_SELECT = "@@data/RESOLVE_SELECT";
724	723	var DISPATCH = "@@data/DISPATCH";
725		- function isStoreDescriptor(object) {
	724	+ function isObject(object) {
726	725	return object !== null && typeof object === "object";
727	726	}
728	727	function select(storeNameOrDescriptor, selectorName, ...args) {
729	728	return {
730	729	type: SELECT,
731		- storeKey: isStoreDescriptor(storeNameOrDescriptor) ? storeNameOrDescriptor.name : storeNameOrDescriptor,
	730	+ storeKey: isObject(storeNameOrDescriptor) ? storeNameOrDescriptor.name : storeNameOrDescriptor,
732	731	selectorName,
733	732	args
734	733	};
735	734	}
		@@ -735,9 +734,9 @@
735	734	}
736	735	function resolveSelect(storeNameOrDescriptor, selectorName, ...args) {
737	736	return {
738	737	type: RESOLVE_SELECT,
739		- storeKey: isStoreDescriptor(storeNameOrDescriptor) ? storeNameOrDescriptor.name : storeNameOrDescriptor,
	738	+ storeKey: isObject(storeNameOrDescriptor) ? storeNameOrDescriptor.name : storeNameOrDescriptor,
740	739	selectorName,
741	740	args
742	741	};
743	742	}
		@@ -743,9 +742,9 @@
743	742	}
744	743	function dispatch(storeNameOrDescriptor, actionName, ...args) {
745	744	return {
746	745	type: DISPATCH,
747		- storeKey: isStoreDescriptor(storeNameOrDescriptor) ? storeNameOrDescriptor.name : storeNameOrDescriptor,
	746	+ storeKey: isObject(storeNameOrDescriptor) ? storeNameOrDescriptor.name : storeNameOrDescriptor,
748	747	actionName,
749	748	args
750	749	};
751	750	}
		@@ -755,10 +754,9 @@
755	754	(registry) => ({ storeKey, selectorName, args }) => registry.select(storeKey)[selectorName](...args)
756	755	),
757	756	[RESOLVE_SELECT]: createRegistryControl(
758	757	(registry) => ({ storeKey, selectorName, args }) => {
759		- const selector = registry.select(storeKey)[selectorName];
760		- const method = selector.hasResolver ? "resolveSelect" : "select";
	758	+ const method = registry.select(storeKey)[selectorName].hasResolver ? "resolveSelect" : "select";
761	759	return registry[method](storeKey)[selectorName](
762	760	...args
763	761	);
764	762	}
		@@ -786,9 +784,8 @@
786	784	return action.then((resolvedAction) => {
787	785	if (resolvedAction) {
788	786	return next(resolvedAction);
789	787	}
790		- return void 0;
791	788	});
792	789	}
793	790	return next(action);
794	791	};
		@@ -796,17 +793,14 @@
796	793
797	794	// packages/data/build-module/resolvers-cache-middleware.mjs
798	795	var createResolversCacheMiddleware = (registry, storeName) => () => (next) => (action) => {
799	796	const resolvers = registry.select(storeName).getCachedResolvers();
800		- const resolverEntries = Object.entries(
801		- resolvers
802		- );
	797	+ const resolverEntries = Object.entries(resolvers);
803	798	resolverEntries.forEach(([selectorName, resolversByArgs]) => {
804	799	const resolver = registry.stores[storeName]?.resolvers?.[selectorName];
805	800	if (!resolver || !resolver.shouldInvalidate) {
806	801	return;
807	802	}
808		- const { shouldInvalidate } = resolver;
809	803	resolversByArgs.forEach((value, args) => {
810	804	if (value === void 0) {
811	805	return;
812	806	}
		@@ -812,9 +806,9 @@
812	806	}
813	807	if (value.status !== "finished" && value.status !== "error") {
814	808	return;
815	809	}
816		- if (!shouldInvalidate(action, ...args)) {
	810	+ if (!resolver.shouldInvalidate(action, ...args)) {
817	811	return;
818	812	}
819	813	registry.dispatch(storeName).invalidateResolution(selectorName, args);
820	814	});
		@@ -835,10 +829,10 @@
835	829
836	830	// packages/data/build-module/redux-store/metadata/reducer.mjs
837	831	var import_equivalent_key_map = __toESM(require_equivalent_key_map(), 1);
838	832
839		- // packages/data/build-module/redux-store/keyed-reducer.mjs
840		- var keyedReducer = (actionProperty) => (reducer) => (state = {}, action) => {
	833	+ // packages/data/build-module/redux-store/metadata/utils.mjs
	834	+ var onSubKey = (actionProperty) => (reducer) => (state = {}, action) => {
841	835	const key = action[actionProperty];
842	836	if (key === void 0) {
843	837	return state;
844	838	}
		@@ -850,10 +844,8 @@
850	844	...state,
851	845	[key]: nextKeyState
852	846	};
853	847	};
854		-
855		- // packages/data/build-module/redux-store/metadata/utils.mjs
856	848	function selectorArgsToStateKey(args) {
857	849	if (args === void 0 || args === null) {
858	850	return [];
859	851	}
		@@ -865,9 +857,9 @@
865	857	return idx === len ? args : args.slice(0, idx);
866	858	}
867	859
868	860	// packages/data/build-module/redux-store/metadata/reducer.mjs
869		- var subKeysIsResolved = keyedReducer("selectorName")((state = new import_equivalent_key_map.default(), action) => {
	861	+ var subKeysIsResolved = onSubKey("selectorName")((state = new import_equivalent_key_map.default(), action) => {
870	862	switch (action.type) {
871	863	case "START_RESOLUTION": {
872	864	const nextState = new import_equivalent_key_map.default(state);
873	865	nextState.set(selectorArgsToStateKey(action.args), {
		@@ -1262,13 +1254,13 @@
1262	1254	key,
1263	1255	callback(value, key)
1264	1256	])
1265	1257	);
1266		- var devToolsReplacer = (_key, state) => {
	1258	+ var devToolsReplacer = (key, state) => {
1267	1259	if (state instanceof Map) {
1268	1260	return Object.fromEntries(state);
1269	1261	}
1270		- if (typeof window !== "undefined" && state instanceof window.HTMLElement) {
	1262	+ if (state instanceof window.HTMLElement) {
1271	1263	return null;
1272	1264	}
1273	1265	return state;
1274	1266	};
		@@ -1275,9 +1267,9 @@
1275	1267	function createResolversCache() {
1276	1268	const cache = {};
1277	1269	return {
1278	1270	isRunning(selectorName, args) {
1279		- return !!(cache[selectorName] && cache[selectorName].get(trimUndefinedValues(args)));
	1271	+ return cache[selectorName] && cache[selectorName].get(trimUndefinedValues(args));
1280	1272	},
1281	1273	clear(selectorName, args) {
1282	1274	if (cache[selectorName]) {
1283	1275	cache[selectorName].delete(trimUndefinedValues(args));
		@@ -1354,16 +1346,10 @@
1354	1346	function bindAction(action) {
1355	1347	return (...args) => Promise.resolve(store.dispatch(action(...args)));
1356	1348	}
1357	1349	const actions = {
1358		- ...mapValues(
1359		- actions_exports,
1360		- bindAction
1361		- ),
1362		- ...mapValues(
1363		- options.actions,
1364		- bindAction
1365		- )
	1350	+ ...mapValues(actions_exports, bindAction),
	1351	+ ...mapValues(options.actions, bindAction)
1366	1352	};
1367	1353	const allActions = createPrivateProxy(
1368	1354	actions,
1369	1355	createBindingCache(
		@@ -1372,17 +1358,12 @@
1372	1358	)
1373	1359	);
1374	1360	const thunkDispatch = new Proxy(
1375	1361	(action) => store.dispatch(action),
1376		- {
1377		- get: (_target, name) => allActions[name]
1378		- }
	1362	+ { get: (target, name) => allActions[name] }
1379	1363	);
1380	1364	lock(actions, allActions);
1381		- const resolvers = options.resolvers ? mapValues(
1382		- options.resolvers,
1383		- mapResolver
1384		- ) : {};
	1365	+ const resolvers = options.resolvers ? mapValues(options.resolvers, mapResolver) : {};
1385	1366	function bindSelector(selector, selectorName) {
1386	1367	if (selector.isRegistrySelector) {
1387	1368	selector.registry = registry;
1388	1369	}
		@@ -1434,12 +1415,9 @@
1434	1415	const boundMetadataSelectors = mapValues(
1435	1416	selectors_exports,
1436	1417	bindMetadataSelector
1437	1418	);
1438		- const boundSelectors = mapValues(
1439		- options.selectors,
1440		- bindSelector
1441		- );
	1419	+ const boundSelectors = mapValues(options.selectors, bindSelector);
1442	1420	const selectors = {
1443	1421	...boundMetadataSelectors,
1444	1422	...boundSelectors
1445	1423	};
		@@ -1455,16 +1433,13 @@
1455	1433	boundPrivateSelectors.get(selectorName);
1456	1434	}
1457	1435	const thunkSelect = new Proxy(
1458	1436	(selector) => selector(store.__unstableOriginalGetState()),
1459		- {
1460		- get: (_target, name) => allSelectors[name]
1461		- }
	1437	+ { get: (target, name) => allSelectors[name] }
1462	1438	);
1463	1439	lock(selectors, allSelectors);
1464	1440	const bindResolveSelector = mapResolveSelector(
1465	1441	store,
1466		- resolvers,
1467	1442	boundMetadataSelectors
1468	1443	);
1469	1444	const resolveSelectors = mapValues(
1470	1445	boundSelectors,
		@@ -1500,12 +1475,12 @@
1500	1475	const getResolveSelectors = () => resolveSelectors;
1501	1476	const getSuspendSelectors = () => suspendSelectors;
1502	1477	store.__unstableOriginalGetState = store.getState;
1503	1478	store.getState = () => store.__unstableOriginalGetState().root;
1504		- const subscribe2 = (listener) => {
	1479	+ const subscribe2 = store && ((listener) => {
1505	1480	listeners.add(listener);
1506	1481	return () => listeners.delete(listener);
1507		- };
	1482	+ });
1508	1483	let lastState = store.__unstableOriginalGetState();
1509	1484	store.subscribe(() => {
1510	1485	const state = store.__unstableOriginalGetState();
1511	1486	const hasChanged = state !== lastState;
		@@ -1567,23 +1542,22 @@
1567	1542	});
1568	1543	return createStore(
1569	1544	enhancedReducer,
1570	1545	{ root: initialState },
1571		- (0, import_compose.compose)(...enhancers)
	1546	+ (0, import_compose.compose)(enhancers)
1572	1547	);
1573	1548	}
1574		- function mapResolveSelector(store, resolvers, boundMetadataSelectors) {
	1549	+ function mapResolveSelector(store, boundMetadataSelectors) {
1575	1550	return (selector, selectorName) => {
1576	1551	if (!selector.hasResolver) {
1577		- return async (...args) => selector(...args);
	1552	+ return async (...args) => selector.apply(null, args);
1578	1553	}
1579	1554	return (...args) => new Promise((resolve, reject) => {
1580		- const resolver = resolvers[selectorName];
1581	1555	const hasFinished = () => {
1582	1556	return boundMetadataSelectors.hasFinishedResolution(
1583	1557	selectorName,
1584	1558	args
1585		- ) || typeof resolver.isFulfilled === "function" && resolver.isFulfilled(store.getState(), ...args);
	1559	+ );
1586	1560	};
1587	1561	const finalize = (result2) => {
1588	1562	const hasFailed = boundMetadataSelectors.hasResolutionFailed(
1589	1563	selectorName,
		@@ -1598,9 +1572,9 @@
1598	1572	} else {
1599	1573	resolve(result2);
1600	1574	}
1601	1575	};
1602		- const getResult = () => selector(...args);
	1576	+ const getResult = () => selector.apply(null, args);
1603	1577	const result = getResult();
1604	1578	if (hasFinished()) {
1605	1579	return finalize(result);
1606	1580	}
		@@ -1618,9 +1592,9 @@
1618	1592	if (!selector.hasResolver) {
1619	1593	return selector;
1620	1594	}
1621	1595	return (...args) => {
1622		- const result = selector(...args);
	1596	+ const result = selector.apply(null, args);
1623	1597	if (boundMetadataSelectors.hasFinishedResolution(
1624	1598	selectorName,
1625	1599	args
1626	1600	)) {
		@@ -1661,9 +1635,9 @@
1661	1635	};
1662	1636	}
1663	1637	function mapSelectorWithResolver(selector, selectorName, resolver, store, resolversCache, boundMetadataSelectors) {
1664	1638	function fulfillSelector(args) {
1665		- if (resolversCache.isRunning(selectorName, args) || boundMetadataSelectors.hasStartedResolution(selectorName, args) || typeof resolver.isFulfilled === "function" && resolver.isFulfilled(store.getState(), ...args)) {
	1639	+ if (resolversCache.isRunning(selectorName, args) || boundMetadataSelectors.hasStartedResolution(selectorName, args)) {
1666	1640	return;
1667	1641	}
1668	1642	resolversCache.markAsRunning(selectorName, args);
1669	1643	setTimeout(async () => {
		@@ -1671,11 +1645,14 @@
1671	1645	store.dispatch(
1672	1646	startResolution(selectorName, args)
1673	1647	);
1674	1648	try {
1675		- const action = resolver.fulfill(...args);
1676		- if (action) {
1677		- await store.dispatch(action);
	1649	+ const isFulfilled = typeof resolver.isFulfilled === "function" && resolver.isFulfilled(store.getState(), ...args);
	1650	+ if (!isFulfilled) {
	1651	+ const action = resolver.fulfill(...args);
	1652	+ if (action) {
	1653	+ await store.dispatch(action);
	1654	+ }
1678	1655	}
1679	1656	store.dispatch(
1680	1657	finishResolution(selectorName, args)
1681	1658	);
		@@ -1864,21 +1841,21 @@
1864	1841	return [key, attribute];
1865	1842	}
1866	1843	return [
1867	1844	key,
1868		- (...args) => {
1869		- return registry[key](...args);
	1845	+ function() {
	1846	+ return registry[key].apply(null, arguments);
1870	1847	}
1871	1848	];
1872	1849	})
1873	1850	);
1874	1851	}
1875		- function registerStoreInstance(name, createStoreFunc) {
	1852	+ function registerStoreInstance(name, createStore2) {
1876	1853	if (stores[name]) {
1877	1854	console.error('Store "' + name + '" is already registered.');
1878	1855	return stores[name];
1879	1856	}
1880		- const store = createStoreFunc();
	1857	+ const store = createStore2();
1881	1858	if (typeof store.getSelectors !== "function") {
1882	1859	throw new TypeError("store.getSelectors must be a function");
1883	1860	}
1884	1861	if (typeof store.getActions !== "function") {
		@@ -1912,9 +1889,9 @@
1912	1889	);
1913	1890	unlock(store.store).registerPrivateSelectors(
1914	1891	unlock(parent).privateSelectorsOf(name)
1915	1892	);
1916		- } catch {
	1893	+ } catch (e) {
1917	1894	}
1918	1895	}
1919	1896	return store;
1920	1897	}
		@@ -1936,11 +1913,9 @@
1936	1913	throw new TypeError("Must specify store reducer");
1937	1914	}
1938	1915	const store = registerStoreInstance(
1939	1916	storeName,
1940		- () => createReduxStore(storeName, options).instantiate(
1941		- registry
1942		- )
	1917	+ () => createReduxStore(storeName, options).instantiate(registry)
1943	1918	);
1944	1919	return store.store;
1945	1920	}
1946	1921	function batch(callback) {
		@@ -1991,16 +1966,14 @@
1991	1966	}
1992	1967	if (parent) {
1993	1968	parent.subscribe(globalListener);
1994	1969	}
1995		- const registryWithPlugins = withPlugins(
1996		- registry
1997		- );
	1970	+ const registryWithPlugins = withPlugins(registry);
1998	1971	lock(registryWithPlugins, {
1999	1972	privateActionsOf: (name) => {
2000	1973	try {
2001	1974	return unlock(stores[name].store).privateActions;
2002		- } catch {
	1975	+ } catch (e) {
2003	1976	return {};
2004	1977	}
2005	1978	},
2006	1979	privateSelectorsOf: (name) => {
		@@ -2005,9 +1978,9 @@
2005	1978	},
2006	1979	privateSelectorsOf: (name) => {
2007	1980	try {
2008	1981	return unlock(stores[name].store).privateSelectors;
2009		- } catch {
	1982	+ } catch (e) {
2010	1983	return {};
2011	1984	}
2012	1985	}
2013	1986	});
		@@ -2014,10 +1987,9 @@
2014	1987	return registryWithPlugins;
2015	1988	}
2016	1989
2017	1990	// packages/data/build-module/default-registry.mjs
2018		- var defaultRegistry = createRegistry();
2019		- var default_registry_default = defaultRegistry;
	1991	+ var default_registry_default = createRegistry();
2020	1992
2021	1993	// packages/data/build-module/plugins/index.mjs
2022	1994	var plugins_exports = {};
2023	1995	__export(plugins_exports, {
		@@ -2024,18 +1996,18 @@
2024	1996	persistence: () => persistence_default
2025	1997	});
2026	1998
2027	1999	// node_modules/is-plain-object/dist/is-plain-object.mjs
2028		- function isObject(o) {
	2000	+ function isObject2(o) {
2029	2001	return Object.prototype.toString.call(o) === "[object Object]";
2030	2002	}
2031	2003	function isPlainObject2(o) {
2032	2004	var ctor, prot;
2033		- if (isObject(o) === false) return false;
	2005	+ if (isObject2(o) === false) return false;
2034	2006	ctor = o.constructor;
2035	2007	if (ctor === void 0) return true;
2036	2008	prot = ctor.prototype;
2037		- if (isObject(prot) === false) return false;
	2009	+ if (isObject2(prot) === false) return false;
2038	2010	if (prot.hasOwnProperty("isPrototypeOf") === false) {
2039	2011	return false;
2040	2012	}
2041	2013	return true;
		@@ -2070,9 +2042,9 @@
2070	2042	try {
2071	2043	storage2 = window.localStorage;
2072	2044	storage2.setItem("__wpDataTestLocalStorage", "");
2073	2045	storage2.removeItem("__wpDataTestLocalStorage");
2074		- } catch {
	2046	+ } catch (error) {
2075	2047	storage2 = object_default;
2076	2048	}
2077	2049	var default_default = storage2;
2078	2050
		@@ -2095,9 +2067,9 @@
2095	2067	data = {};
2096	2068	} else {
2097	2069	try {
2098	2070	data = JSON.parse(persisted);
2099		- } catch {
	2071	+ } catch (error) {
2100	2072	data = {};
2101	2073	}
2102	2074	}
2103	2075	}
		@@ -2126,9 +2098,9 @@
2126	2098	getPersistedState = withLazySameState(
2127	2099	combineReducers2(reducers)
2128	2100	);
2129	2101	} else {
2130		- getPersistedState = (_state, action) => action.nextState;
	2102	+ getPersistedState = (state, action) => action.nextState;
2131	2103	}
2132	2104	let lastState = getPersistedState(void 0, {
2133	2105	nextState: getState()
2134	2106	});
		@@ -2152,15 +2124,11 @@
2152	2124	let initialState = options.reducer(options.initialState, {
2153	2125	type: "@@WP/PERSISTENCE_RESTORE"
2154	2126	});
2155	2127	if (isPlainObject2(initialState) && isPlainObject2(persistedState)) {
2156		- initialState = (0, import_deepmerge.default)(
2157		- initialState,
2158		- persistedState,
2159		- {
2160		- isMergeableObject: isPlainObject2
2161		- }
2162		- );
	2128	+ initialState = (0, import_deepmerge.default)(initialState, persistedState, {
	2129	+ isMergeableObject: isPlainObject2
	2130	+ });
2163	2131	} else {
2164	2132	initialState = persistedState;
2165	2133	}
2166	2134	options = {
		@@ -2179,12 +2147,11 @@
2179	2147	return store;
2180	2148	}
2181	2149	};
2182	2150	}
2183		- var persistence_default = Object.assign(persistencePlugin, {
2184		- __unstableMigrate: () => {
2185		- }
2186		- });
	2151	+ persistencePlugin.__unstableMigrate = () => {
	2152	+ };
	2153	+ var persistence_default = persistencePlugin;
2187	2154
2188	2155	// packages/data/build-module/components/with-select/index.mjs
2189	2156	var import_compose2 = __toESM(require_compose(), 1);
2190	2157
		@@ -2303,9 +2270,9 @@
2303	2270	};
2304	2271	return (mapSelect, isAsync) => {
2305	2272	function updateValue() {
2306	2273	if (lastMapResultValid && mapSelect === lastMapSelect) {
2307		- return;
	2274	+ return lastMapResult;
2308	2275	}
2309	2276	const listeningStores = { current: null };
2310	2277	const mapResult = registry.__unstableMarkListeningStores(
2311	2278	() => mapSelect(select3, registry),
		@@ -2456,33 +2423,28 @@
2456	2423	var with_registry_default = withRegistry;
2457	2424
2458	2425	// packages/data/build-module/dispatch.mjs
2459	2426	function dispatch2(storeNameOrDescriptor) {
2460		- return default_registry_default.dispatch(
2461		- storeNameOrDescriptor
2462		- );
	2427	+ return default_registry_default.dispatch(storeNameOrDescriptor);
2463	2428	}
2464	2429
2465	2430	// packages/data/build-module/select.mjs
2466	2431	function select2(storeNameOrDescriptor) {
2467		- return default_registry_default.select(
2468		- storeNameOrDescriptor
2469		- );
	2432	+ return default_registry_default.select(storeNameOrDescriptor);
2470	2433	}
2471	2434
2472	2435	// packages/data/build-module/index.mjs
	2436	+ var defaultRegistry = default_registry_default;
2473	2437	var combineReducers2 = combineReducers;
2474	2438	function resolveSelect2(storeNameOrDescriptor) {
2475		- return default_registry_default.resolveSelect(
2476		- storeNameOrDescriptor
2477		- );
	2439	+ return defaultRegistry.resolveSelect(storeNameOrDescriptor);
2478	2440	}
2479		- var suspendSelect = (storeNameOrDescriptor) => default_registry_default.suspendSelect(storeNameOrDescriptor);
2480		- var subscribe = (listener, storeNameOrDescriptor) => default_registry_default.subscribe(listener, storeNameOrDescriptor);
2481		- var registerGenericStore = default_registry_default.registerGenericStore;
2482		- var registerStore = default_registry_default.registerStore;
2483		- var use = default_registry_default.use;
2484		- var register = (store) => default_registry_default.register(store);
	2441	+ var suspendSelect = (storeNameOrDescriptor) => defaultRegistry.suspendSelect(storeNameOrDescriptor);
	2442	+ var subscribe = (listener, storeNameOrDescriptor) => defaultRegistry.subscribe(listener, storeNameOrDescriptor);
	2443	+ var registerGenericStore = defaultRegistry.registerGenericStore;
	2444	+ var registerStore = defaultRegistry.registerStore;
	2445	+ var use = defaultRegistry.use;
	2446	+ var register = (store) => defaultRegistry.register(store);
2485	2447	return __toCommonJS(index_exports);
2486	2448	})();
2487	2449	/*! Bundled license information:
2488	2450