@codecks/fetch 0.1.4 → 0.1.5

package/dist/_exploration/store.js

@@ -98,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) {
@@ -136,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/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@codecks/fetch",
-  "version": "0.1.4",
+  "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": [