@codecks/fetch 0.0.4 → 0.1.0

package/dist/index.d.ts

@@ -2755,7 +2755,7 @@ type Filter<T extends AnyDesc, TMap extends ModelMap$3> = SimpleFilter<T, TMap>
 //#region src/query-type.d.ts
 type ModelMap$2 = Record<string, AnyDesc>;
 interface ModelQuery<T extends AnyDesc, TMap extends ModelMap$2> {
-  fields?: (keyof T["fields"])[];
+  fields?: (keyof T["fields"] & string)[];
   relations?: RelQuery<T, TMap>;
 }
 interface SimpleHasManyQuery<T extends AnyDesc, TMap extends ModelMap$2> extends ModelQuery<T, TMap> {
@@ -2873,7 +2873,7 @@ declare const _rootDesc: ModelDesc<"_root", {}, {
   }>;
 }, []>;
 //#endregion
-//#region src/loader-utils.d.ts
+//#region src/loaders/loader-utils.d.ts
 type ModelMap$1 = typeof modelMap;
 type DataLoader = {
   fetchModel: <K extends keyof ModelMap$1, Id extends string, const Q extends ModelQuery<ModelMap$1[K], ModelMap$1>>(model: K, id: Id[], q: Q) => Promise<Record<Id, InferModelQuery<ModelMap$1[K], Q, ModelMap$1>>>;
@@ -2888,7 +2888,7 @@ type FetchOptions = {
   timeout?: number;
 };
 //#endregion
-//#region src/simple-loader.d.ts
+//#region src/loaders/simple-loader.d.ts
 type SimpleLoaderOptions = FetchOptions;
 //#endregion
 //#region src/index.d.ts

package/dist/index.js

@@ -2952,7 +2952,7 @@ const modelMap = {
 };
 
 //#endregion
-//#region src/loader-utils.ts
+//#region src/loaders/loader-utils.ts
 const configuredFetch = async (opts, url, init = {}) => {
 	const fetchImpl = opts.fetch || globalThis.fetch;
 	const headers = new Headers(init.headers);
@@ -2965,6 +2965,10 @@ const configuredFetch = async (opts, url, init = {}) => {
 	return fetchImpl(fullUrl, {
 		...init,
 		headers
+	}).then(async (r) => {
+		const content = await r.json();
+		if (r.status !== 200) throw new Error(`[${r.status}] ${JSON.stringify(content)}`);
+		return content;
 	});
 };
 
@@ -3031,7 +3035,16 @@ var ModelPool = class {
 
 //#endregion
 //#region src/query-helpers.ts
+const normalizeQuery = (q) => {
+	return JSON.stringify(q);
+};
 const getRelKey = (r, k) => {
+	const getSuffix = () => {
+		if (r.type === "exists") return `exists:`;
+		if (r.type === "count") return `count:`;
+		return "";
+	};
+	const suffix = getSuffix();
 	const isPlainKey = () => {
 		if (r.type === "first") return false;
 		if (r.filter && Object.keys(r.filter).length > 0) return false;
@@ -3040,7 +3053,7 @@ const getRelKey = (r, k) => {
 		}
 		return true;
 	};
-	if (isPlainKey()) return k;
+	if (isPlainKey()) return `${suffix}${k}`;
 	const q = { ...r.filter };
 	if (r.type === "first") {
 		q.$first = true;
@@ -3051,41 +3064,53 @@ const getRelKey = (r, k) => {
 		if (r.offset) q.$offset = r.offset;
 		if (r.orderBy) q.$order = r.orderBy;
 	}
-	return `${k}(${JSON.stringify(q)})`;
+	return `${suffix}${k}(${normalizeQuery(q)})`;
+};
+const processRelations = (rels) => {
+	const result = {};
+	for (const [key, relq] of Object.entries(rels)) {
+		const asArray = Array.isArray(relq) ? relq : [relq];
+		for (const rel of asArray) {
+			if (!rel) continue;
+			result[getRelKey(rel, key)] = makeRelQuerySerializable(rel);
+		}
+	}
+	return result;
 };
-const serializeModel = (q, modelDesc) => {
+const makeModelQuerySerializable = (q) => {
+	if (!q.relations) return q;
+	return {
+		...q,
+		relations: processRelations(q.relations)
+	};
+};
+const makeRelQuerySerializable = (r) => {
+	if (r.type === "exists" || r.type === "count") return { asField: true };
+	return {
+		asField: false,
+		fields: r.fields,
+		relations: r.relations ? processRelations(r.relations) : void 0
+	};
+};
+const serializeModel = (q) => {
 	const list = q.fields ? [...q.fields] : [];
 	if (!q.relations) return list;
 	const relObj = {};
-	Object.entries(q.relations).forEach(([k, _v]) => {
-		const rels = Array.isArray(_v) ? _v : [_v];
-		rels.forEach((r) => {
-			switch (r?.type) {
-				case "count": {
-					list.push(`count:${getRelKey(r, k)}`);
-					break;
-				}
-				case "exists": {
-					list.push(`exists:${getRelKey(r, k)}`);
-					break;
-				}
-				default:
-					relObj[getRelKey(r, k)] = serializeModel(r, modelDesc);
-					break;
-			}
-		});
+	Object.entries(q.relations).forEach(([k, r]) => {
+		if (r.asField) list.push(k);
+		else relObj[k] = serializeModel(r);
 	});
 	if (Object.keys(relObj).length) list.push(relObj);
 	return list;
 };
-const serializeInstanceQuery = (q, instances, modelMap$1) => {
+const serializeInstanceQuery = (q, instances) => {
 	return Object.fromEntries(instances.map((instance) => {
 		const name = instance["~model"];
 		const getKey = () => {
 			if (name === "_root") return "_root";
 			return `${name}(${instance["~key"]})`;
 		};
-		return [getKey(), serializeModel(q, modelMap$1[name])];
+		return [getKey(), serializeModel(q)];
 	}));
 };
 
@@ -3124,12 +3149,9 @@ const reconcileInstanceQuery = (query, response, instanceModel, key, store) => {
 					const relKey = getRelKey(relEntry, relName);
 					const val = instance[relKey];
 					switch (relEntry.type) {
-						case "count": {
-							result[asName] = instance[`count:${relKey}`];
-							break;
-						}
+						case "count":
 						case "exists": {
-							result[asName] = instance[`exists:${relKey}`];
+							result[asName] = instance[relKey];
 							break;
 						}
 						case "first":
@@ -3149,19 +3171,14 @@ const reconcileInstanceQuery = (query, response, instanceModel, key, store) => {
 };
 
 //#endregion
-//#region src/simple-loader.ts
+//#region src/loaders/simple-loader.ts
 const createSimpleLoader = (opts = {}) => {
 	const fetchWithQuery = async (query) => {
-		const response = await configuredFetch(opts, "", {
+		return configuredFetch(opts, "", {
 			method: "POST",
 			headers: { "Content-Type": "application/json" },
 			body: JSON.stringify({ query })
-		}).then(async (r) => {
-			const content = await r.json();
-			if (r.status !== 200) throw new Error(`[${r.status}] ${JSON.stringify(content)}`);
-			return content;
 		});
-		return response;
 	};
 	return { fetchModel: async (model, ids, q) => {
 		const modelDesc = modelMap[model];
@@ -3169,7 +3186,7 @@ const createSimpleLoader = (opts = {}) => {
 			"~model": model,
 			"~key": id$1
 		}));
-		const response = await fetchWithQuery(serializeInstanceQuery(q, instances, modelMap));
+		const response = await fetchWithQuery(serializeInstanceQuery(makeModelQuerySerializable(q), instances));
 		const pool = new ModelPool(modelMap);
 		pool.add(response);
 		return Object.fromEntries(ids.map((id$1) => [id$1, reconcileInstanceQuery(q, response, modelDesc, id$1, pool)]));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codecks/fetch",
-  "version": "0.0.4",
+  "version": "0.1.0",
   "description": "Quickly create deeply nested queries for the Codecks API with advanced TypeScript support",
   "type": "module",
   "license": "MIT",
@@ -21,6 +21,10 @@
   "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js",
+    "./_exploration/store": "./dist/_exploration/store.js",
+    "./_exploration/loader": "./dist/_exploration/loader.js",
+    "./_exploration/api-requester": "./dist/_exploration/api-requester.js",
+    "./_exploration/react": "./dist/_exploration/create-hooks.js",
     "./package.json": "./package.json"
   },
   "publishConfig": {
@@ -41,11 +45,15 @@
   "devDependencies": {
     "@changesets/cli": "^2.29.7",
     "@types/node": "^22.15.17",
+    "@types/react": "^19.2.2",
     "msw": "^2.10.4",
     "prettier": "^3.6.2",
     "tsdown": "^0.11.9",
     "typescript": "^5.9.2",
     "vite-node": "^3.2.4",
     "vitest": "^3.1.3"
+  },
+  "peerDependencies": {
+    "react": "^19.0.0"
   }
 }