@orpc/nest 2.0.0-beta.2 → 2.0.0-beta.4

package/README.md

@@ -134,7 +134,6 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
   </tr>
   <tr>
    <td align="center"><a href="https://github.com/piscis?ref=orpc" target="_blank" rel="noopener" title="Alex"><img src="https://avatars.githubusercontent.com/u/326163?u=b245f368bd940cf51d08c0b6bf55f8257f359437&amp;v=4" width="119" alt="Alex"/><br />Alex</a></td>
-   <td align="center"><a href="https://github.com/nattstack?ref=orpc" target="_blank" rel="noopener" title="nattstack"><img src="https://avatars.githubusercontent.com/u/31426677?u=fa9dbb8b3e66eb0ea3c88db5dc07f31c8c5418fe&amp;v=4" width="119" alt="nattstack"/><br />nattstack</a></td>
    <td align="center"><a href="https://github.com/finom?ref=orpc" target="_blank" rel="noopener" title="Andrey Gubanov"><img src="https://avatars.githubusercontent.com/u/1082083?u=29e91400dbd4a9c217048a8f59562c4f740498e6&amp;v=4" width="119" alt="Andrey Gubanov"/><br />Andrey Gubanov</a></td>
   </tr>
 </table>
@@ -151,7 +150,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
   <a href="https://github.com/theoludwig?ref=orpc" target="_blank" rel="noopener" title="Théo LUDWIG"><img src="https://avatars.githubusercontent.com/u/25207499?u=a6a9653725a2f574c07893748806668e0598cdbe&amp;v=4" width="32" height="32" alt="Théo LUDWIG" /></a>
   <a href="https://github.com/abhay-ramesh?ref=orpc" target="_blank" rel="noopener" title="Abhay Ramesh"><img src="https://avatars.githubusercontent.com/u/66196314?u=c5c2b0327b26606c2efcfaf17046ab18c3d25c57&amp;v=4" width="32" height="32" alt="Abhay Ramesh" /></a>
   <a href="https://github.com/shr-ink?ref=orpc" target="_blank" rel="noopener" title="shr.ink oü"><img src="https://avatars.githubusercontent.com/u/139700438?v=4" width="32" height="32" alt="shr.ink oü" /></a>
-  <a href="https://github.com/johngerome?ref=orpc" target="_blank" rel="noopener" title="0x4e32"><img src="https://avatars.githubusercontent.com/u/2002000?u=24e8dd943cfc862aa284d858a023532c75071ade&amp;v=4" width="32" height="32" alt="0x4e32" /></a>
+  <a href="https://github.com/johngerome?ref=orpc" target="_blank" rel="noopener" title="0x4e32"><img src="https://avatars.githubusercontent.com/u/2002000?u=505e54608466ab53754f702973687b04c6424c1f&amp;v=4" width="32" height="32" alt="0x4e32" /></a>
   <a href="https://github.com/yzuyr?ref=orpc" target="_blank" rel="noopener" title="Ryuz"><img src="https://avatars.githubusercontent.com/u/196539378?u=d38374588d219b6748b16406982f6559411466d4&amp;v=4" width="32" height="32" alt="Ryuz" /></a>
   <a href="https://github.com/happyboy2022?ref=orpc" target="_blank" rel="noopener" title="happyboy"><img src="https://avatars.githubusercontent.com/u/103669586?u=65b49c4b893ed3703909fbb3a7a22313f3f9c121&amp;v=4" width="32" height="32" alt="happyboy" /></a>
   <a href="https://github.com/YiCChi?ref=orpc" target="_blank" rel="noopener" title="yicchi"><img src="https://avatars.githubusercontent.com/u/86967274?u=6c2756f09fe15dd94d572f560e979cd157982852&amp;v=4" width="32" height="32" alt="yicchi" /></a>
@@ -173,6 +172,7 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
   <a href="https://github.com/illarionvk?ref=orpc" target="_blank" rel="noopener" title="Illarion Koperski"><img src="https://avatars.githubusercontent.com/u/5012724?u=7cfa13652f7ac5fb3c56d880e3eb3fbe40c3ea34&amp;v=4" width="32" height="32" alt="Illarion Koperski" /></a>
   <a href="https://github.com/steelbrain?ref=orpc" target="_blank" rel="noopener" title="Anees Iqbal"><img src="https://avatars.githubusercontent.com/u/4278113?u=22b80b5399eed68ac76cd58b02961b0481f1db11&amp;v=4" width="32" height="32" alt="Anees Iqbal" /></a>
   <a href="https://github.com/Scrumplex?ref=orpc" target="_blank" rel="noopener" title="Sefa Eyeoglu"><img src="https://avatars.githubusercontent.com/u/11587657?u=ab503582165c0bbff0cca47ce31c9450bb1553c9&amp;v=4" width="32" height="32" alt="Sefa Eyeoglu" /></a>
+  <a href="https://github.com/nattstack?ref=orpc" target="_blank" rel="noopener" title="nattstack"><img src="https://avatars.githubusercontent.com/u/31426677?u=fa9dbb8b3e66eb0ea3c88db5dc07f31c8c5418fe&amp;v=4" width="32" height="32" alt="nattstack" /></a>
   <a href="https://github.com/ChromeGG?ref=orpc" target="_blank" rel="noopener" title="Adam Tkaczyk"><img src="https://avatars.githubusercontent.com/u/39050595?u=a58ca6042a6950e94e6e92442db76ef584279bc0&amp;v=4" width="32" height="32" alt="Adam Tkaczyk" /></a>
   <a href="https://github.com/plancraft?ref=orpc" target="_blank" rel="noopener" title="plancraft"><img src="https://avatars.githubusercontent.com/u/46482287?v=4" width="32" height="32" alt="plancraft" /></a>
 </p>

package/dist/index.mjs

@@ -6,7 +6,7 @@ import { getOpenAPIMeta, DEFAULT_OPENAPI_METHOD, getDynamicPathParams } from '@o
 import { OpenAPIHandlerCodecCore } from '@orpc/openapi/standard';
 import { DEFAULT_SUCCESS_STATUS, getRouter, unlazy, Procedure } from '@orpc/server';
 import { StandardHandler } from '@orpc/server/standard';
-import { get, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
+import { mergeHttpPath, get, isAsyncIteratorObject, stringifyJSON } from '@orpc/shared';
 import { flattenStandardHeader, generateContentDisposition } from '@standardserver/core';
 import { toStandardLazyRequest, toEventStream } from '@standardserver/node';
 import { mergeMap } from 'rxjs';
@@ -77,19 +77,19 @@ const MethodDecoratorMap = {
 function Implement(contract) {
   if (contract instanceof ProcedureContract) {
     const meta = getOpenAPIMeta(contract);
-    const method = meta?.method ?? DEFAULT_OPENAPI_METHOD;
-    const path = meta?.path;
-    const successStatus = meta?.successStatus ?? DEFAULT_SUCCESS_STATUS;
-    if (path === void 0) {
+    if (meta?.path === void 0) {
       throw new TypeError(`
         @Implement decorator requires contract to have a 'openapi.path' meta.
         Please define one using '.meta(openapi({ path: '/example' }))'.
-        Or use "populateRouterContractPaths" from "@orpc/contract" utility to automatically fill in any missing paths.
+        Or use "populateRouterContractOpenAPIPaths" from "@orpc/openapi" utility to automatically fill in any missing paths.
       `);
     }
+    const method = meta.method ?? DEFAULT_OPENAPI_METHOD;
+    const path = toNestPattern(meta.prefix ? mergeHttpPath(meta.prefix, meta.path) : meta.path);
+    const successStatus = meta.successStatus ?? DEFAULT_SUCCESS_STATUS;
     return (target, propertyKey, descriptor) => {
       applyDecorators(
-        MethodDecoratorMap[method](toNestPattern(path)),
+        MethodDecoratorMap[method](path),
         HttpCode(successStatus),
         UseInterceptors(ImplementInterceptor)
       )(target, propertyKey, descriptor);
@@ -237,11 +237,11 @@ function flattenParamValue(value) {
   return Array.isArray(value) ? value.join("/") : value;
 }
 function toORPCOpenAPIParams(contract, params) {
-  const path = getOpenAPIMeta(contract)?.path;
-  if (!params || !path) {
+  const meta = getOpenAPIMeta(contract);
+  if (!params || meta?.path === void 0) {
     return void 0;
   }
-  const dynamicParams = getDynamicPathParams(path);
+  const dynamicParams = getDynamicPathParams(meta.prefix ? mergeHttpPath(meta.prefix, meta.path) : meta.path);
   if (!dynamicParams) {
     return void 0;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/nest",
   "type": "module",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.4",
   "license": "MIT",
   "homepage": "https://orpc.dev",
   "repository": {
@@ -37,11 +37,11 @@
     }
   },
   "dependencies": {
-    "@orpc/client": "2.0.0-beta.3",
-    "@orpc/contract": "2.0.0-beta.3",
-    "@orpc/openapi": "2.0.0-beta.3",
-    "@orpc/server": "2.0.0-beta.3",
-    "@orpc/shared": "2.0.0-beta.3",
+    "@orpc/client": "^2.0.0-beta.3",
+    "@orpc/contract": "^2.0.0-beta.3",
+    "@orpc/openapi": "^2.0.0-beta.3",
+    "@orpc/server": "^2.0.0-beta.3",
+    "@orpc/shared": "^2.0.0-beta.3",
     "@standardserver/core": "^0.0.25",
     "@standardserver/node": "^0.0.25"
   },