@orpc/nest 2.0.0-beta.25 → 2.0.0-beta.26

package/dist/index.mjs

@@ -6,7 +6,7 @@ import { getOpenAPIMeta, DEFAULT_OPENAPI_METHOD, getDynamicPathParams } from '@o
 import { OpenAPIHandlerCodecCore } from '@orpc/openapi/standard';
 import { unlazy, Procedure, DEFAULT_SUCCESS_STATUS, getRouter } from '@orpc/server';
 import { StandardHandler } from '@orpc/server/standard';
-import { value, isAsyncIteratorObject, stringifyJSON, mergeHttpPath } from '@orpc/shared';
+import { value, isAsyncIteratorObject, stringifyJSON, mergeHttpPath, NullProtoObj } from '@orpc/shared';
 import { flattenStandardHeader, generateContentDisposition } from '@standardserver/core';
 import { toStandardLazyRequest, toEventStream } from '@standardserver/node';
 import { mergeMap } from 'rxjs';
@@ -260,21 +260,26 @@ function flattenParamValue(value2) {
 }
 function toORPCOpenAPIParams(contract, params) {
   const meta = getOpenAPIMeta(contract);
-  if (!params || meta?.path === void 0) {
+  if (!params || meta?.path === void 0 || Object.keys(params).length === 0) {
     return void 0;
   }
-  const dynamicParams = getDynamicPathParams(meta.prefix ? mergeHttpPath(meta.prefix, meta.path) : meta.path);
-  if (!dynamicParams) {
-    return void 0;
-  }
-  return dynamicParams.reduce((acc, config) => {
-    const value2 = config.allowsSlash ? flattenParamValue(params?.["*"] ?? params?.path) : flattenParamValue(params?.[config.parameterName]);
-    if (value2 === void 0) {
-      return acc;
+  const orpcParams = new NullProtoObj();
+  const restKey = Object.hasOwn(params, "*") ? "*" : "path";
+  for (const [key, value2] of Object.entries(params)) {
+    if (key === restKey) {
+      const restParams = getDynamicPathParams(
+        meta.prefix ? mergeHttpPath(meta.prefix, meta.path) : meta.path
+      )?.filter((c) => c.allowsSlash);
+      if (restParams?.length) {
+        for (const c of restParams) {
+          orpcParams[c.parameterName] = flattenParamValue(value2);
+        }
+        continue;
+      }
     }
-    acc[config.parameterName] = value2;
-    return acc;
-  }, {});
+    orpcParams[key] = flattenParamValue(value2);
+  }
+  return orpcParams;
 }
 function toNestPattern(path) {
   const params = getDynamicPathParams(path);

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@orpc/nest",
   "type": "module",
-  "version": "2.0.0-beta.25",
+  "version": "2.0.0-beta.26",
   "license": "MIT",
+  "funding": "https://github.com/sponsors/dinwwwh",
   "homepage": "https://orpc.dev",
   "repository": {
     "type": "git",
@@ -39,11 +40,11 @@
   "dependencies": {
     "@standardserver/core": "^0.7.1",
     "@standardserver/node": "^0.7.1",
-    "@orpc/client": "2.0.0-beta.25",
-    "@orpc/contract": "2.0.0-beta.25",
-    "@orpc/openapi": "2.0.0-beta.25",
-    "@orpc/server": "2.0.0-beta.25",
-    "@orpc/shared": "2.0.0-beta.25"
+    "@orpc/client": "2.0.0-beta.26",
+    "@orpc/contract": "2.0.0-beta.26",
+    "@orpc/openapi": "2.0.0-beta.26",
+    "@orpc/server": "2.0.0-beta.26",
+    "@orpc/shared": "2.0.0-beta.26"
   },
   "devDependencies": {
     "@fastify/cookie": "^11.0.2",