@codecks/fetch 0.1.3 → 0.1.5

package/dist/_exploration/api-requester.d.ts

@@ -1,7 +1,7 @@
 import "../query-type-Dx5ZCv5N.js";
 import "../index-DUBsesYl.js";
 import { FetchOptions } from "../loader-utils-Du-CTKH-.js";
-import { BaseRequester, MissingDataRequest } from "../loader-types-CMF96Ae1.js";
+import { BaseRequester, MissingDataRequest } from "../loader-types-Dp0CSVTf.js";
 
 //#region src/_exploration/api-requester.d.ts
 declare class ApiRequester implements BaseRequester {

package/dist/_exploration/create-hooks.d.ts

@@ -1,8 +1,8 @@
 import { InferModelQuery, InferRelQuery, ModelDesc, ModelQuery, RelQuery, RelationEntry, TypedField } from "../query-type-Dx5ZCv5N.js";
 import { 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 } from "../index-DUBsesYl.js";
-import "../loader-types-CMF96Ae1.js";
+import "../loader-types-Dp0CSVTf.js";
 import { _rootDesc$1 as _rootDesc } from "../_root-D1Faf8cg.js";
-import { Store } from "../store-C_DXGjif.js";
+import { Store } from "../store-B6JWZnAO.js";
 
 //#region src/_exploration/create-hooks.d.ts
 declare const createHooks: (store: Store) => {

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-Dx5ZCv5N.js";
-import { BaseLoader, BaseRequester, MissingDataRequest, OnLoadedFn } from "../loader-types-CMF96Ae1.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,5 +1,5 @@
 import "../query-type-Dx5ZCv5N.js";
 import "../index-DUBsesYl.js";
-import "../loader-types-CMF96Ae1.js";
-import { Store } from "../store-C_DXGjif.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",
@@ -97,7 +98,10 @@ var Store = class {
 	* Accumulates missing requests in the missingRequests array
 	*/
 	checkQueryRecursive(desc, model, id, query, missingRequests, acceptDirty) {
-		const data = {};
+		const data = model === "_root" ? {} : {
+			"~model": model,
+			"~key": id
+		};
 		const partKeys = [];
 		let allPresent = true;
 		if (query.fields) for (const field of query.fields) {
@@ -135,13 +139,18 @@ var Store = class {
 				if (acceptsData) {
 					if (!relatedModelDesc) throw new Error(`Model ${relatedModel} not found`);
 					const fieldName = relQuery.as || relationName;
-					if (Array.isArray(cachedValue.value)) {
-						const relationResults = cachedValue.value.map((key) => this.checkQueryRecursive(relatedModelDesc, relatedModel, key, relQuery, missingRequests, acceptDirty));
+					if (relQuery.type === "count" || relQuery.type === "exists") {
+						data[fieldName] = cachedValue.value;
+						partKeys.push(...cachedValue.partKeys);
+					} else if (Array.isArray(cachedValue.value)) {
+						const relationResults = cachedValue.value.map((key) => this.checkQueryRecursive(relatedModelDesc, relatedModel, `${key}`, relQuery, missingRequests, acceptDirty));
+						data[`~${fieldName}`] = cachedValue.value.map((v) => `${v}`);
 						data[fieldName] = relationResults.map((result) => result.data);
 						partKeys.push(...relationResults.flatMap((result) => result.partKeys));
 						if (relationResults.some((result) => !result.allPresent)) allPresent = false;
 					} else {
-						const relationResult = this.checkQueryRecursive(relatedModelDesc, relatedModel, cachedValue.value, relQuery, missingRequests, acceptDirty);
+						const relationResult = this.checkQueryRecursive(relatedModelDesc, relatedModel, `${cachedValue.value}`, relQuery, missingRequests, acceptDirty);
+						data[`~${fieldName}`] = cachedValue.value != null ? `${cachedValue.value}` : null;
 						data[fieldName] = relationResult.data;
 						partKeys.push(...relationResult.partKeys);
 						if (!relationResult.allPresent) allPresent = false;

package/dist/index.js

@@ -75,10 +75,11 @@ const reconcileInstanceQuery = (query, response, instanceModel, key, store) => {
 			switch (opts.type) {
 				case "belongsTo":
 					result[opts.fk] = instance[relName];
+					result[`~${relName}`] = instance[relName] != null ? `${instance[relName]}` : null;
 					result[relName] = opts.fk ? reconcileInstanceQuery(relEntry, response, relModel, `${instance[relName]}`, store) : null;
 					break;
 				case "hasOne":
-					result[`~${relName}`] = instance[relName];
+					result[`~${relName}`] = instance[relName] != null ? `${instance[relName]}` : null;
 					result[relName] = reconcileInstanceQuery(relEntry, response, relModel, `${instance[relName]}`, store);
 					break;
 				case "hasMany":
@@ -92,11 +93,11 @@ const reconcileInstanceQuery = (query, response, instanceModel, key, store) => {
 							break;
 						}
 						case "first":
-							result[`~${asName}`] = val;
+							result[`~${asName}`] = val != null ? `${val}` : null;
 							result[asName] = reconcileInstanceQuery(relEntry, response, relModel, `${val}`, store);
 							break;
 						default: {
-							result[`~${asName}`] = val;
+							result[`~${asName}`] = val.map((v) => `${v}`);
 							result[asName] = val.map((id) => reconcileInstanceQuery(relEntry, response, relModel, `${id}`, store));
 						}
 					}

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

@@ -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/{store-C_DXGjif.d.ts → store-B6JWZnAO.d.ts}

@@ -1,6 +1,6 @@
 import { ModelDesc, ModelQuery, RelationEntry, TypedField } from "./query-type-Dx5ZCv5N.js";
 import { 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$1 as modelMap } from "./index-DUBsesYl.js";
-import { BaseLoader, LoaderResult } from "./loader-types-CMF96Ae1.js";
+import { BaseLoader, LoaderResult } from "./loader-types-Dp0CSVTf.js";
 
 //#region src/_exploration/immediate-cache.d.ts
 type FieldMeta = {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@codecks/fetch",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Quickly create deeply nested queries for the Codecks API with advanced TypeScript support",
   "type": "module",
   "license": "MIT",
-  "homepage": "https://github.com/codecks-io/cdx-fetch#readme",
+  "homepage": "https://github.com/codecks-io/fetch#readme",
   "bugs": {
-    "url": "https://github.com/codecks-io/cdx-fetch/issues"
+    "url": "https://github.com/codecks-io/fetch/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/codecks-io/cdx-fetch.git"
+    "url": "git+https://github.com/codecks-io/fetch.git"
   },
   "author": "Daniel Berndt <daniel@codecks.io>",
   "files": [
@@ -44,8 +44,13 @@
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.7",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.0",
+    "@testing-library/user-event": "^14.6.1",
     "@types/node": "^22.15.17",
     "@types/react": "^19.2.2",
+    "happy-dom": "^20.0.10",
     "msw": "^2.10.4",
     "prettier": "^3.6.2",
     "tsdown": "^0.11.9",