@orpc/pinia-colada 2.0.0-beta.43 → 2.0.0-beta.44

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -17,7 +17,7 @@
17
17
  <img alt="Discord" src="https://img.shields.io/discord/1308966753044398161?color=7389D8&label&logo=discord&logoColor=ffffff" />
18
18
  </a>
19
19
  <a href="https://deepwiki.com/middleapi/orpc">
20
- <img src="https://deepwiki.com/badge.svg" alt="Ask DeepWiki">
20
+ <img alt="Ask DeepWiki" src="https://img.shields.io/badge/Ask-DeepWiki-blue" />
21
21
  </a>
22
22
  </div>
23
23
 
@@ -95,14 +95,6 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
95
95
  </tr>
96
96
  </table>
97
97
 
98
- ### Special Sponsors
99
-
100
- <table>
101
- <tr>
102
- <td align="center"><a href="http://twitter.com/rauchg?ref=middleapi&amp;utm_source=middleapi&amp;utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Guillermo Rauch"><img src="https://avatars.githubusercontent.com/u/13041?u=1ee8d111657cdd02ff6d253df00978d17ee6d722&amp;v=4" width="279" alt="Guillermo Rauch"/><br />Guillermo Rauch</a></td>
103
- </tr>
104
- </table>
105
-
106
98
  ### Premium Sponsors
107
99
 
108
100
  <table>
@@ -178,7 +170,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
178
170
  </tr>
179
171
  </table>
180
172
 
181
- With thanks to [38 past sponsors](https://orpc.dev/sponsors#past-sponsors) who helped get oRPC here.
173
+ With thanks to [39 past sponsors](https://orpc.dev/sponsors#past-sponsors) who helped get oRPC here.
182
174
 
183
175
  ## References
184
176
 
package/dist/index.d.mts CHANGED
@@ -253,9 +253,9 @@ declare function isProcedureUtilsOptions(value: unknown): value is ProcedureUtil
253
253
  /**
254
254
  * Merge two procedure utils options where `override` takes priority.
255
255
  * A key explicitly set to `undefined` in `override` resets the base value.
256
- * When both sides define a key: interceptors are concatenated (base ones run first),
257
- * modifiers are spread-merged when both are plain objects and composed (base applied
258
- * first) otherwise, with plain objects applied as regular spread merges.
256
+ * When both sides define a key, interceptors are concatenated (base ones run first) and
257
+ * modifiers are combined so that, for object values, per-call options beat `override`,
258
+ * which beats `base`. A function modifier receives the merged options and its result wins.
259
259
  */
260
260
  declare function mergeProcedureUtilsOptions<TClientContext extends ClientContext, TInput, TOutput, TError>(base: ProcedureUtilsOptions<TClientContext, TInput, TOutput, TError>, override: ProcedureUtilsOptions<TClientContext, TInput, TOutput, TError>): ProcedureUtilsOptions<TClientContext, TInput, TOutput, TError>;
261
261
  declare class ProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError> extends SharedUtils<TInput> {
package/dist/index.d.ts CHANGED
@@ -253,9 +253,9 @@ declare function isProcedureUtilsOptions(value: unknown): value is ProcedureUtil
253
253
  /**
254
254
  * Merge two procedure utils options where `override` takes priority.
255
255
  * A key explicitly set to `undefined` in `override` resets the base value.
256
- * When both sides define a key: interceptors are concatenated (base ones run first),
257
- * modifiers are spread-merged when both are plain objects and composed (base applied
258
- * first) otherwise, with plain objects applied as regular spread merges.
256
+ * When both sides define a key, interceptors are concatenated (base ones run first) and
257
+ * modifiers are combined so that, for object values, per-call options beat `override`,
258
+ * which beats `base`. A function modifier receives the merged options and its result wins.
259
259
  */
260
260
  declare function mergeProcedureUtilsOptions<TClientContext extends ClientContext, TInput, TOutput, TError>(base: ProcedureUtilsOptions<TClientContext, TInput, TOutput, TError>, override: ProcedureUtilsOptions<TClientContext, TInput, TOutput, TError>): ProcedureUtilsOptions<TClientContext, TInput, TOutput, TError>;
261
261
  declare class ProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError> extends SharedUtils<TInput> {
package/dist/index.mjs CHANGED
@@ -154,12 +154,14 @@ function isProcedureUtilsOptions(value) {
154
154
  return true;
155
155
  }
156
156
  function mergeProcedureUtilsModifier(base, override) {
157
- if (typeof base !== "function" && typeof override !== "function") {
158
- return { ...base, ...override };
157
+ if (typeof override !== "function") {
158
+ if (typeof base !== "function") {
159
+ return { ...base, ...override };
160
+ }
161
+ return (options) => base({ ...override, ...options });
159
162
  }
160
163
  const applyBase = typeof base === "function" ? base : (options) => ({ ...base, ...options });
161
- const applyOverride = typeof override === "function" ? override : (options) => ({ ...override, ...options });
162
- return (options) => applyOverride(applyBase(options));
164
+ return (options) => override(applyBase(options));
163
165
  }
164
166
  function mergeProcedureUtilsOptions(base, override) {
165
167
  const merged = { ...base, ...override };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@orpc/pinia-colada",
3
3
  "type": "module",
4
- "version": "2.0.0-beta.43",
4
+ "version": "2.0.0-beta.44",
5
5
  "description": "Pinia Colada integration for oRPC: typesafe queries and mutations for Vue",
6
6
  "license": "MIT",
7
7
  "funding": [
@@ -41,17 +41,17 @@
41
41
  "vue": ">=3.5.17"
42
42
  },
43
43
  "dependencies": {
44
- "@orpc/client": "2.0.0-beta.43",
45
- "@orpc/contract": "2.0.0-beta.43",
46
- "@orpc/openapi": "2.0.0-beta.43",
47
- "@orpc/shared": "2.0.0-beta.43"
44
+ "@orpc/client": "2.0.0-beta.44",
45
+ "@orpc/contract": "2.0.0-beta.44",
46
+ "@orpc/openapi": "2.0.0-beta.44",
47
+ "@orpc/shared": "2.0.0-beta.44"
48
48
  },
49
49
  "devDependencies": {
50
- "@pinia/colada": "^1.4.2",
51
- "@vue/test-utils": "^2.4.11",
50
+ "@pinia/colada": "^1.4.8",
51
+ "@vue/test-utils": "^2.5.1",
52
52
  "pinia": "^4.0.2",
53
- "vue": "^3.5.41",
54
- "zod": "^4.5.4"
53
+ "vue": "^3.5.43",
54
+ "zod": "^4.6.5"
55
55
  },
56
56
  "scripts": {
57
57
  "type:check": "tsc -b"