@signalium/query 1.0.17 → 1.1.0

package/dist/esm/mutation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutation.d.ts","sourceRoot":"","sources":["../../src/mutation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mutation.d.ts","sourceRoot":"","sources":["../../src/mutation.ts"],"names":[],"mappings":"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"}

package/dist/esm/pathInterpolator.d.ts

@@ -8,6 +8,10 @@
  * keys, then uses simple string concatenation at runtime for optimal performance.
  */
 export type PathInterpolator = (params: Record<string, any>) => string;
+export interface PathInterpolatorResult {
+    interpolate: PathInterpolator;
+    pathParamNames: Set<string>;
+}
 /**
  * Creates an optimized path interpolation function from a URL template.
  *
@@ -16,14 +20,14 @@ export type PathInterpolator = (params: Record<string, any>) => string;
  * found in the path template are appended as query string parameters.
  *
  * @param pathTemplate - URL template with {paramName} placeholders
- * @returns Function that interpolates parameters into the path with search params
+ * @returns Object with interpolate function and set of path param names
  *
  * @example
  * ```ts
- * const interpolate = createPathInterpolator('/users/{userId}/posts/{postId}');
+ * const { interpolate } = createPathInterpolator('/users/{userId}/posts/{postId}');
  * const url = interpolate({ userId: '123', postId: '456', page: 2, limit: 10 });
  * // Returns: "/users/123/posts/456?page=2&limit=10"
  * ```
  */
-export declare function createPathInterpolator(pathTemplate: string): PathInterpolator;
+export declare function createPathInterpolator(pathTemplate: string): PathInterpolatorResult;
 //# sourceMappingURL=pathInterpolator.d.ts.map

package/dist/esm/pathInterpolator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pathInterpolator.d.ts","sourceRoot":"","sources":["../../src/pathInterpolator.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,MAAM,CAAC;AAEvE;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,gBAAgB,CA4C7E"}
+{"version":3,"file":"pathInterpolator.d.ts","sourceRoot":"","sources":["../../src/pathInterpolator.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,MAAM,CAAC;AAEvE,MAAM,WAAW,sBAAsB;IACrC,WAAW,EAAE,gBAAgB,CAAC;IAC9B,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC7B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,sBAAsB,CAAC,YAAY,EAAE,MAAM,GAAG,sBAAsB,CA8CnF"}

package/dist/esm/production/index.js

@@ -1137,7 +1137,8 @@ class EntityStore {
       });
     }
     const warn = this.queryClient.getContext().log?.warn;
-    return createEntityProxy(record.key, record, shape, entityRelay, this.queryClient, warn);
+    const desc = `${shape.typenameValue}:${id}`;
+    return createEntityProxy(record.key, record, shape, entityRelay, this.queryClient, warn, desc);
   }
 }
 class NetworkManager {
@@ -1329,7 +1330,7 @@ function parseObjectEntities(obj, objectShape, queryClient, entityRefs) {
       throw new Error(`Entity id is required: ${typename}`);
     }
     const desc = `${typename}:${id}`;
-    const key = hashValue(desc);
+    const key = hashValue([desc, entityDef.shapeKey]);
     if (entityRefs !== void 0) {
       entityRefs.add(key);
     }
@@ -2348,7 +2349,7 @@ class MutationResultImpl {
       const entityId = obj[idField];
       if (entityId !== void 0) {
         const typename = entityDef.typenameValue;
-        const entityKey = hashValue(`${typename}:${entityId}`);
+        const entityKey = hashValue([`${typename}:${entityId}`, entityDef.shapeKey]);
         this.queryClient.registerOptimisticUpdate(entityKey, obj);
         this._pendingOptimisticKeys.add(entityKey);
       }
@@ -2559,7 +2560,7 @@ var QueryType = /* @__PURE__ */ ((QueryType2) => {
   return QueryType2;
 })(QueryType || {});
 function isSignal(value) {
-  return typeof value === "object" && value !== null;
+  return typeof value === "object" && value !== null && !Array.isArray(value) && "value" in value && "_id" in value;
 }
 function extractParamsForKey(params) {
   if (params === void 0) {
@@ -2703,7 +2704,7 @@ function createPathInterpolator(pathTemplate) {
     lastIndex = paramRegex.lastIndex;
   }
   segments.push(pathTemplate.slice(lastIndex));
-  return (params) => {
+  const interpolate = (params) => {
     let result = segments[0];
     for (let i = 0; i < paramKeys.length; i++) {
       result += encodeURIComponent(String(params[paramKeys[i]])) + segments[i + 1];
@@ -2722,6 +2723,7 @@ function createPathInterpolator(pathTemplate) {
     }
     return result;
   };
+  return { interpolate, pathParamNames: paramKeysSet };
 }
 const QUERY_DEFINITION_MAP = /* @__PURE__ */ new Map();
 function buildQueryFn(queryDefinitionBuilder) {
@@ -2731,6 +2733,8 @@ function buildQueryFn(queryDefinitionBuilder) {
       const {
         path,
         method = "GET",
+        searchParams,
+        body,
         response,
         requestOptions,
         cache,
@@ -2757,14 +2761,53 @@ function buildQueryFn(queryDefinitionBuilder) {
         shape = response;
         shapeKey = hashValue(shape);
       }
-      const interpolatePath = createPathInterpolator(path);
+      const { interpolate: interpolatePath, pathParamNames } = createPathInterpolator(path);
+      const bodyParamNames = /* @__PURE__ */ new Set();
+      const hasBody = body !== void 0 && typeof body === "object" && !(body instanceof ValidatorDef) && !(body instanceof Set);
+      if (hasBody) {
+        for (const key of Object.keys(body)) {
+          bodyParamNames.add(key);
+        }
+      }
+      const searchParamNames = new Set(
+        searchParams && typeof searchParams === "object" && !(searchParams instanceof ValidatorDef) && !(searchParams instanceof Set) ? Object.keys(searchParams) : []
+      );
+      const checkConflicts = (sourceNames, targetNames, sourceLabel, targetLabel) => {
+        const conflicts = [...sourceNames].filter((name) => targetNames.has(name));
+        if (conflicts.length > 0) {
+          throw new Error(
+            `Query definition error: ${sourceLabel} [${conflicts.join(", ")}] conflict with ${targetLabel}. Please rename to avoid this conflict.`
+          );
+        }
+      };
+      checkConflicts(searchParamNames, pathParamNames, "Search param(s)", `path parameter(s) in "${path}"`);
+      checkConflicts(bodyParamNames, pathParamNames, "Body field(s)", `path parameter(s) in "${path}"`);
+      checkConflicts(bodyParamNames, searchParamNames, "Body field(s)", "search param(s)");
       const fetchFn = async (context2, params) => {
-        const interpolatedPath = interpolatePath(params);
+        let bodyData;
+        let urlParams = params;
+        if (hasBody) {
+          bodyData = {};
+          urlParams = params !== void 0 ? {} : void 0;
+          if (params !== void 0) {
+            for (const key in params) {
+              if (bodyParamNames.has(key)) {
+                bodyData[key] = params[key];
+              } else {
+                urlParams[key] = params[key];
+              }
+            }
+          }
+        }
+        const interpolatedPath = interpolatePath(urlParams ?? {});
         const baseUrl = resolveBaseUrl(requestOptions?.baseUrl) ?? resolveBaseUrl(context2.baseUrl);
         const fullUrl = baseUrl ? `${baseUrl}${interpolatedPath}` : interpolatedPath;
-        const { baseUrl: _baseUrl, ...fetchOptions } = requestOptions ?? {};
+        const { baseUrl: _baseUrl, headers: userHeaders, ...fetchOptions } = requestOptions ?? {};
+        const headers = bodyData ? { "Content-Type": "application/json", ...userHeaders } : userHeaders;
         const response2 = await context2.fetch(fullUrl, {
           method,
+          headers,
+          body: bodyData ? JSON.stringify(bodyData) : void 0,
           ...fetchOptions
         });
         return response2.json();
@@ -2925,13 +2968,7 @@ function buildMutationFn(mutationDefinitionBuilder) {
       const id = `mutation:${method}:${path}`;
       const { shape: requestShape, shapeKey: requestShapeKey } = processTypeDef(request);
       const { shape: responseShape, shapeKey: responseShapeKey } = processTypeDef(response);
-      const interpolatePath = createPathInterpolator(path);
-      const pathParamNames = /* @__PURE__ */ new Set();
-      const paramRegex = /\[([^\]]+)\]/g;
-      let match;
-      while ((match = paramRegex.exec(path)) !== null) {
-        pathParamNames.add(match[1]);
-      }
+      const { interpolate: interpolatePath, pathParamNames } = createPathInterpolator(path);
       const mutateFn = async (context2, requestData) => {
         const pathParams = {};
         for (const paramName of pathParamNames) {