@orpc/contract 0.0.0-next.57a6344 → 0.0.0-next.5d3da98

package/dist/index.js

@@ -7,7 +7,10 @@ var ContractProcedure = class {
   }
 };
 function isContractProcedure(item) {
-  return item instanceof ContractProcedure;
+  if (item instanceof ContractProcedure) {
+    return true;
+  }
+  return (typeof item === "object" || typeof item === "function") && item !== null && "~type" in item && item["~type"] === "ContractProcedure" && "~orpc" in item && typeof item["~orpc"] === "object" && item["~orpc"] !== null && "InputSchema" in item["~orpc"] && "OutputSchema" in item["~orpc"];
 }
 
 // src/procedure-decorated.ts
@@ -35,12 +38,15 @@ var DecoratedContractProcedure = class _DecoratedContractProcedure extends Contr
       } : void 0
     });
   }
-  pushTag(...tags) {
+  unshiftTag(...tags) {
     return new _DecoratedContractProcedure({
       ...this["~orpc"],
       route: {
         ...this["~orpc"].route,
-        tags: [...this["~orpc"].route?.tags ?? [], ...tags]
+        tags: [
+          ...tags,
+          ...this["~orpc"].route?.tags?.filter((tag) => !tags.includes(tag)) ?? []
+        ]
       }
     });
   }
@@ -80,21 +86,19 @@ var ContractRouterBuilder = class _ContractRouterBuilder {
     });
   }
   router(router) {
+    if (isContractProcedure(router)) {
+      let decorated = DecoratedContractProcedure.decorate(router);
+      if (this["~orpc"].tags) {
+        decorated = decorated.unshiftTag(...this["~orpc"].tags);
+      }
+      if (this["~orpc"].prefix) {
+        decorated = decorated.prefix(this["~orpc"].prefix);
+      }
+      return decorated;
+    }
     const adapted = {};
     for (const key in router) {
-      const item = router[key];
-      if (isContractProcedure(item)) {
-        let decorated = DecoratedContractProcedure.decorate(item);
-        if (this["~orpc"].tags) {
-          decorated = decorated.pushTag(...this["~orpc"].tags);
-        }
-        if (this["~orpc"].prefix) {
-          decorated = decorated.prefix(this["~orpc"].prefix);
-        }
-        adapted[key] = decorated;
-      } else {
-        adapted[key] = this.router(item);
-      }
+      adapted[key] = this.router(router[key]);
     }
     return adapted;
   }

package/dist/src/builder.d.ts

@@ -7,8 +7,8 @@ export declare class ContractBuilder {
     prefix(prefix: HTTPPath): ContractRouterBuilder;
     tag(...tags: string[]): ContractRouterBuilder;
     route(route: RouteOptions): DecoratedContractProcedure<undefined, undefined>;
-    input<U extends Schema>(schema: U, example?: SchemaInput<U>): DecoratedContractProcedure<U, undefined>;
-    output<U extends Schema>(schema: U, example?: SchemaOutput<U>): DecoratedContractProcedure<undefined, U>;
+    input<U extends Schema = undefined>(schema: U, example?: SchemaInput<U>): DecoratedContractProcedure<U, undefined>;
+    output<U extends Schema = undefined>(schema: U, example?: SchemaOutput<U>): DecoratedContractProcedure<undefined, U>;
     router<T extends ContractRouter>(router: T): T;
 }
 //# sourceMappingURL=builder.d.ts.map

package/dist/src/procedure-decorated.d.ts

@@ -5,7 +5,7 @@ export declare class DecoratedContractProcedure<TInputSchema extends Schema, TOu
     static decorate<UInputSchema extends Schema = undefined, UOutputSchema extends Schema = undefined>(procedure: ContractProcedure<UInputSchema, UOutputSchema>): DecoratedContractProcedure<UInputSchema, UOutputSchema>;
     route(route: RouteOptions): DecoratedContractProcedure<TInputSchema, TOutputSchema>;
     prefix(prefix: HTTPPath): DecoratedContractProcedure<TInputSchema, TOutputSchema>;
-    pushTag(...tags: string[]): DecoratedContractProcedure<TInputSchema, TOutputSchema>;
+    unshiftTag(...tags: string[]): DecoratedContractProcedure<TInputSchema, TOutputSchema>;
     input<U extends Schema = undefined>(schema: U, example?: SchemaInput<U>): DecoratedContractProcedure<U, TOutputSchema>;
     output<U extends Schema = undefined>(schema: U, example?: SchemaOutput<U>): DecoratedContractProcedure<TInputSchema, U>;
 }

package/dist/src/procedure.d.ts

@@ -5,7 +5,7 @@ export interface RouteOptions {
     summary?: string;
     description?: string;
     deprecated?: boolean;
-    tags?: string[];
+    tags?: readonly string[];
 }
 export interface ContractProcedureDef<TInputSchema extends Schema, TOutputSchema extends Schema> {
     route?: RouteOptions;

package/dist/src/router.d.ts

@@ -1,12 +1,12 @@
 import type { ANY_CONTRACT_PROCEDURE, ContractProcedure } from './procedure';
 import type { SchemaInput, SchemaOutput } from './types';
-export interface ContractRouter {
-    [k: string]: ANY_CONTRACT_PROCEDURE | ContractRouter;
-}
-export type InferContractRouterInputs<T extends ContractRouter> = {
-    [K in keyof T]: T[K] extends ContractProcedure<infer UInputSchema, any> ? SchemaInput<UInputSchema> : T[K] extends ContractRouter ? InferContractRouterInputs<T[K]> : never;
+export type ContractRouter = ANY_CONTRACT_PROCEDURE | {
+    [k: string]: ContractRouter;
 };
-export type InferContractRouterOutputs<T extends ContractRouter> = {
-    [K in keyof T]: T[K] extends ContractProcedure<any, infer UOutputSchema> ? SchemaOutput<UOutputSchema> : T[K] extends ContractRouter ? InferContractRouterOutputs<T[K]> : never;
+export type InferContractRouterInputs<T extends ContractRouter> = T extends ContractProcedure<infer UInputSchema, any> ? SchemaInput<UInputSchema> : {
+    [K in keyof T]: T[K] extends ContractRouter ? InferContractRouterInputs<T[K]> : never;
+};
+export type InferContractRouterOutputs<T extends ContractRouter> = T extends ContractProcedure<any, infer UOutputSchema> ? SchemaOutput<UOutputSchema> : {
+    [K in keyof T]: T[K] extends ContractRouter ? InferContractRouterOutputs<T[K]> : never;
 };
 //# sourceMappingURL=router.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/contract",
   "type": "module",
-  "version": "0.0.0-next.57a6344",
+  "version": "0.0.0-next.5d3da98",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -30,7 +30,7 @@
   ],
   "dependencies": {
     "@standard-schema/spec": "1.0.0-beta.4",
-    "@orpc/shared": "0.0.0-next.57a6344"
+    "@orpc/shared": "0.0.0-next.5d3da98"
   },
   "devDependencies": {
     "arktype": "2.0.0-rc.26",