@codecks/fetch 0.1.2 → 0.1.4

package/dist/_exploration/create-hooks.js

@@ -2,28 +2,32 @@ import { queryToKey } from "../query-helpers-DsMMOtSO.js";
 import { use, useSyncExternalStore } from "react";
 
 //#region src/_exploration/user-query-manager.ts
-const diffResults = (prevResult, prevParts, nextResult) => {
-	const nextParts = [];
+const diffResults = (prevTrackedData, nextStorePayload) => {
+	const nextPartKeys = nextStorePayload.partKeys;
+	const prevSet = new Set(prevTrackedData.partKeys);
+	const nextSet = new Set(nextPartKeys);
+	const added = nextPartKeys.filter((key) => !prevSet.has(key));
+	const removed = prevTrackedData.partKeys.filter((key) => !nextSet.has(key));
 	return {
-		added: nextParts,
-		removed: prevParts,
-		reconciledResult: {
-			parts: nextParts,
-			data: nextResult
+		added,
+		removed,
+		nextTrackedData: {
+			partKeys: nextPartKeys,
+			value: nextStorePayload.value
 		}
 	};
 };
 const createStoreQuery = (opts) => {
 	const { onDispose, updateDataListener, store, q, ids, model } = opts;
 	const queryListeners = new Set();
-	let lastData = {
-		parts: [],
-		data: null
+	let trackedData = {
+		partKeys: [],
+		value: null
 	};
-	const reconcileNextResult = (nextData) => {
-		const { added, removed, reconciledResult } = diffResults(lastData.data, lastData.parts, nextData);
-		if (!added.length && !removed.length) {
-			lastData = reconciledResult;
+	const reconcileNextResult = (storePayload) => {
+		const { added, removed, nextTrackedData } = diffResults(trackedData, storePayload);
+		if (added.length || removed.length) {
+			trackedData = nextTrackedData;
 			updateDataListener({
 				added,
 				removed
@@ -34,13 +38,26 @@ const createStoreQuery = (opts) => {
 	const notify = () => {
 		loadData();
 	};
+	let userQueryResult;
 	const loadData = () => {
-		const res = store.loadData(model, ids, q);
-		if (res.state === "pending") res.promise.then(reconcileNextResult);
-		else reconcileNextResult(res.value);
-		return res;
+		const storeResult = store.loadData(model, ids, q);
+		if (storeResult.state === "pending") userQueryResult = {
+			state: "pending",
+			promise: storeResult.promise.then((storePayload) => {
+				reconcileNextResult(storePayload);
+				return storePayload.value;
+			})
+		};
+		else {
+			const storePayload = storeResult.payload;
+			reconcileNextResult(storePayload);
+			userQueryResult = {
+				state: "resolved",
+				value: storePayload.value
+			};
+		}
 	};
-	let data = loadData();
+	loadData();
 	const subscribe = (listener) => {
 		queryListeners.add(listener);
 		return () => {
@@ -48,12 +65,12 @@ const createStoreQuery = (opts) => {
 			if (queryListeners.size === 0) onDispose();
 			updateDataListener({
 				added: [],
-				removed: lastData.parts
+				removed: trackedData.partKeys
 			}, notify);
 		};
 	};
 	const get = () => {
-		return data;
+		return userQueryResult;
 	};
 	return {
 		subscribe,
@@ -122,10 +139,12 @@ const createHooks = (store) => {
 		return val.value;
 	};
 	const useFetch = (model, id, q) => {
-		return useQueryManager(model, [id], q);
+		const res = useQueryManager(model, [id], q);
+		return res[id];
 	};
 	const useFetchFromRoot = (q) => {
-		return useQueryManager("_root", [""], { relations: q });
+		const res = useQueryManager("_root", [""], { relations: q });
+		return res[""];
 	};
 	return {
 		useFetch,

package/dist/_exploration/loader.d.ts

@@ -1,5 +1,5 @@
-import "../query-type-MH8IxqbW.js";
-import { BaseLoader, BaseRequester, MissingDataRequest, OnLoadedFn } from "../loader-types-DJdGWL4B.js";
+import "../query-type-Dx5ZCv5N.js";
+import { BaseLoader, BaseRequester, MissingDataRequest, OnLoadedFn } from "../loader-types-Dp0CSVTf.js";
 
 //#region src/_exploration/loader.d.ts
 type DataRequestWithKey = {

package/dist/_exploration/store.d.ts

@@ -1,4 +1,5 @@
-import "../query-type-MH8IxqbW.js";
-import "../loader-types-DJdGWL4B.js";
-import { Store } from "../store-mAj3G67A.js";
+import "../query-type-Dx5ZCv5N.js";
+import "../index-DUBsesYl.js";
+import "../loader-types-Dp0CSVTf.js";
+import { Store } from "../store-B6JWZnAO.js";
 export { Store };

package/dist/_exploration/store.js

@@ -71,14 +71,15 @@ var Store = class {
 			if (missingRequests.length > 0) this.loader.loadBatch(missingRequests);
 			return {
 				state: "resolved",
-				value: {
+				payload: {
 					value: resultObj,
 					partKeys: allPartKeys
 				}
 			};
 		}
 		const promise = this.loader.loadBatch(missingRequests).then(() => {
-			return this.loadData(model, ids, q, acceptDirty, iteration + 1);
+			const res = this.loadData(model, ids, q, acceptDirty, iteration + 1);
+			return res.state === "pending" ? res.promise : res.payload;
 		});
 		return {
 			state: "pending",

package/dist/{_root-BG9fhc-C.d.ts → _root-D1Faf8cg.d.ts}

@@ -1,4 +1,4 @@
-import { ModelDesc, RelationEntry } from "./query-type-MH8IxqbW.js";
+import { ModelDesc, RelationEntry } from "./query-type-Dx5ZCv5N.js";
 
 //#region src/models/_root.d.ts
 declare const _rootDesc: ModelDesc<"_root", {}, {

package/dist/{loader-utils-CjrkQskt.d.ts → index-DUBsesYl.d.ts}

@@ -1,4 +1,4 @@
-import { InferModelQuery, ModelDesc, ModelQuery, Nominal, RelationEntry, TypedField } from "./query-type-MH8IxqbW.js";
+import { ModelDesc, Nominal, RelationEntry, TypedField } from "./query-type-Dx5ZCv5N.js";
 
 //#region src/models/AccountOnboardingStep.d.ts
 type AccountOnboardingStepId = Nominal<string, "accountOnboardingStep">;
@@ -2670,19 +2670,4 @@ declare const modelMap: {
   }, ["itemId"]>;
 };
 //#endregion
-//#region src/loaders/loader-utils.d.ts
-type ModelMap = typeof modelMap;
-type DataLoader = {
-  fetchModel: <K extends keyof ModelMap, Id extends string, const Q extends ModelQuery<ModelMap[K], ModelMap>>(model: K, id: Id[], q: Q) => Promise<Record<Id, InferModelQuery<ModelMap[K], Q, ModelMap>>>;
-};
-type FetchFunction = (url: string, init?: RequestInit) => Promise<Response>;
-type FetchOptions = {
-  fetch?: FetchFunction;
-  accessToken?: string;
-  subdomain?: string;
-  baseUrl?: string;
-  headers?: Record<string, string>;
-  timeout?: number;
-};
-//#endregion
-export { DataLoader, FetchOptions, modelMap as modelMap$1 };
+export { AccountId, AccountOnboardingStepId, ActiveTimeTrackerId, ActivityId, AffiliateCodeId, AppId, AppInstallationId, AttachmentId, CardId, CardPresetId, CardSubscriptionId, CardUpvoteId, DeckId, DeckSubscriptionId, DiscordGuildId, DiscordMemberId, DiscordProjectNotificationId, DiscordSlashCommandId, FileId, IntegrationId, InvoiceId, MilestoneId, PinnedMilestoneId, ProjectId, ProjectSelectionId, ProjectTagId, QueueEntryId, QueueSelectionId, ReleaseId, ResolvableEntryId, ResolvableEntryReactionId, ResolvableId, SavedSearchId, SprintConfigId, SprintId, TimeTrackingSegmentId, UserEmailId, UserId, UserInvitationId, UserInviteCodeId, UserReportEmailId, UserReportSettingId, UserReportTokenId, UserTagId, VisionBoardId, VisionBoardQueryId, WizardId, WorkflowItemId, modelMap as modelMap$1 };

package/dist/index.d.ts

@@ -1,6 +1,7 @@
-import { InferModelQuery, InferRelQuery, Instance, ModelQuery, RelQuery } from "./query-type-MH8IxqbW.js";
-import { DataLoader, FetchOptions, modelMap$1 as modelMap } from "./loader-utils-CjrkQskt.js";
-import { _rootDesc$1 as _rootDesc } from "./_root-BG9fhc-C.js";
+import { InferModelQuery, InferRelQuery, Instance, ModelQuery, RelQuery } from "./query-type-Dx5ZCv5N.js";
+import { modelMap$1 as modelMap } from "./index-DUBsesYl.js";
+import { DataLoader, FetchOptions } from "./loader-utils-Du-CTKH-.js";
+import { _rootDesc$1 as _rootDesc } from "./_root-D1Faf8cg.js";
 
 //#region src/loaders/simple-loader.d.ts
 type SimpleLoaderOptions = FetchOptions;

package/dist/{loader-types-DJdGWL4B.d.ts → loader-types-Dp0CSVTf.d.ts}

@@ -1,4 +1,4 @@
-import { SerializableRelationQuery } from "./query-type-MH8IxqbW.js";
+import { SerializableRelationQuery } from "./query-type-Dx5ZCv5N.js";
 
 //#region src/_exploration/loader-types.d.ts
 type OnLoadedFn = (model: string, key: string, partialInstance: Record<string, unknown>) => void;
@@ -12,10 +12,10 @@ type LoaderPayload = {
 };
 type LoaderResult = {
   state: "resolved";
-  value: LoaderPayload;
+  payload: LoaderPayload;
 } | {
   state: "pending";
-  promise: Promise<LoaderResult>;
+  promise: Promise<LoaderPayload>;
 };
 type MissingDataRequest = {
   type: "field";

package/dist/loader-utils-Du-CTKH-.d.ts

@@ -0,0 +1,19 @@
+import { InferModelQuery, ModelQuery } from "./query-type-Dx5ZCv5N.js";
+import { modelMap$1 as modelMap } from "./index-DUBsesYl.js";
+
+//#region src/loaders/loader-utils.d.ts
+type ModelMap = typeof modelMap;
+type DataLoader = {
+  fetchModel: <K extends keyof ModelMap, Id extends string, const Q extends ModelQuery<ModelMap[K], ModelMap>>(model: K, id: Id[], q: Q) => Promise<Record<Id, InferModelQuery<ModelMap[K], Q, ModelMap>>>;
+};
+type FetchFunction = (url: string, init?: RequestInit) => Promise<Response>;
+type FetchOptions = {
+  fetch?: FetchFunction;
+  accessToken?: string;
+  subdomain?: string;
+  baseUrl?: string;
+  headers?: Record<string, string>;
+  timeout?: number;
+};
+//#endregion
+export { DataLoader, FetchOptions };

package/dist/{query-type-MH8IxqbW.d.ts → query-type-Dx5ZCv5N.d.ts}

@@ -179,4 +179,4 @@ type Instance<M extends keyof ModelMap> = {
   "~key": string;
 };
 //#endregion
-export { AnyDesc, InferModelQuery, InferRelQuery, Instance, ModelDesc, ModelQuery, Nominal, RelQuery, RelationEntry, SerializableRelationQuery, TypedField };
+export { InferModelQuery, InferRelQuery, Instance, ModelDesc, ModelQuery, Nominal, RelQuery, RelationEntry, SerializableRelationQuery, TypedField };