@codecks/fetch 0.0.2 → 0.0.3

package/dist/index.js

@@ -85,8 +85,7 @@ var ModelPool = class {
 	}
 	get(model, id$1) {
 		const instances = this.data.get(model);
-		if (!instances) return null;
-		return instances.get(id$1) ?? null;
+		return instances?.get(id$1) ?? null;
 	}
 };
 
@@ -3046,11 +3045,11 @@ const serializeModel = (q, modelDesc) => {
 		rels.forEach((r) => {
 			switch (r?.type) {
 				case "count": {
-					list.push(`count(${getRelKey(r, k)})`);
+					list.push(`count:${getRelKey(r, k)}`);
 					break;
 				}
 				case "exists": {
-					list.push(`exists(${getRelKey(r, k)})`);
+					list.push(`exists:${getRelKey(r, k)}`);
 					break;
 				}
 				default:
@@ -3062,11 +3061,8 @@ const serializeModel = (q, modelDesc) => {
 	if (Object.keys(relObj).length) list.push(relObj);
 	return list;
 };
-const serializeRelations = (q, modelDesc) => {
-	return Object.fromEntries(Object.entries(q).map(([k, v]) => [k, serializeModel(v, modelDesc.relations[k])]));
-};
 const serializeRootQuery = (q) => {
-	return { _root: [serializeRelations(q, _rootDesc)] };
+	return { _root: serializeModel({ relations: q }, _rootDesc) };
 };
 const serializeInstanceQuery = (q, instances, modelMap$1) => {
 	return Object.fromEntries(instances.map((instance) => {
@@ -3077,26 +3073,13 @@ const serializeInstanceQuery = (q, instances, modelMap$1) => {
 
 //#endregion
 //#region src/reconcile-query.ts
-const reconcileRootQuery = (query, response, pool) => {
-	const result = {};
-	const responsePart = response._root;
-	for (const [relName, modelFields] of Object.entries(query)) {
-		const relDesc = _rootDesc.relations[relName];
-		const id$1 = responsePart[relName];
-		if (!id$1) {
-			result[relName] = null;
-			continue;
-		} else result[relName] = reconcileInstanceQuery(modelFields, response, modelMap[relDesc.relName], `${id$1}`, pool);
-	}
-	return result;
-};
-const reconcileInstanceQuery = (query, response, instanceModel, key, pool) => {
-	const instance = pool.get(instanceModel.name, key);
+const reconcileInstanceQuery = (query, response, instanceModel, key, store, skipMeta = false) => {
+	const instance = store.get(instanceModel.name, key);
 	if (!instance) {
 		console.warn(`no instance found in pool: [${instanceModel.name}, ${key}]`);
 		return null;
 	}
-	const result = {
+	const result = skipMeta ? {} : {
 		"~model": instanceModel.name,
 		"~key": key
 	};
@@ -3112,11 +3095,11 @@ const reconcileInstanceQuery = (query, response, instanceModel, key, pool) => {
 			switch (opts.type) {
 				case "belongsTo":
 					result[opts.fk] = instance[relName];
-					result[relName] = opts.fk ? reconcileInstanceQuery(relEntry, response, relModel, `${instance[relName]}`, pool) : null;
+					result[relName] = opts.fk ? reconcileInstanceQuery(relEntry, response, relModel, `${instance[relName]}`, store) : null;
 					break;
 				case "hasOne":
 					result[`~${relName}`] = instance[relName];
-					result[relName] = reconcileInstanceQuery(relEntry, response, relModel, `${instance[relName]}`, pool);
+					result[relName] = reconcileInstanceQuery(relEntry, response, relModel, `${instance[relName]}`, store);
 					break;
 				case "hasMany":
 					const asName = relEntry.as ?? relName;
@@ -3124,20 +3107,20 @@ const reconcileInstanceQuery = (query, response, instanceModel, key, pool) => {
 					const val = instance[relKey];
 					switch (relEntry.type) {
 						case "count": {
-							result[asName] = instance[`count(${relKey})`];
+							result[asName] = instance[`count:${relKey}`];
 							break;
 						}
 						case "exists": {
-							result[asName] = instance[`exists(${relKey})`];
+							result[asName] = instance[`exists:${relKey}`];
 							break;
 						}
 						case "first":
 							result[`~${asName}`] = val;
-							result[asName] = reconcileInstanceQuery(relEntry, response, relModel, `${val}`, pool);
+							result[asName] = reconcileInstanceQuery(relEntry, response, relModel, `${val}`, store);
 							break;
 						default: {
 							result[`~${asName}`] = val;
-							result[asName] = val.map((id$1) => reconcileInstanceQuery(relEntry, response, relModel, `${id$1}`, pool));
+							result[asName] = val.map((id$1) => reconcileInstanceQuery(relEntry, response, relModel, `${id$1}`, store));
 						}
 					}
 					break;
@@ -3187,20 +3170,19 @@ const buildFetchers = (opts = {}) => {
 			const response = await fetchWithQuery(serializeRootQuery(q));
 			const pool = new ModelPool(modelMap);
 			pool.add(response);
-			return reconcileRootQuery(q, response, pool);
+			return reconcileInstanceQuery({ relations: q }, response, _rootDesc, "", pool, true);
 		},
 		fetchFromInstance: _fetchSingleInstance,
-		fetchInstance: async (key, id$1, q) => {
-			const instance = {
-				"~model": key,
+		fetchInstance: async (model, id$1, q) => {
+			return _fetchSingleInstance({
+				"~model": model,
 				"~key": id$1
-			};
-			return _fetchSingleInstance(instance, q);
+			}, q);
 		},
-		fetchInstances: async (key, ids, q) => {
-			const modelDesc = modelMap[key];
+		fetchInstances: async (model, ids, q) => {
+			const modelDesc = modelMap[model];
 			const instances = ids.map((id$1) => ({
-				"~model": key,
+				"~model": model,
 				"~key": id$1
 			}));
 			const response = await fetchWithQuery(serializeInstanceQuery(q, instances, modelMap));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codecks/fetch",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Quickly create deeply nested queries for the Codecks API with advanced TypeScript support",
   "type": "module",
   "license": "MIT",