Add RFC 6570 on types

Author: sij411

packages/fedify/src/federation/builder.ts

@@ -524,20 +524,23 @@ export class FederationBuilderImpl<TContextData>
   setObjectDispatcher<TObject extends Object, TParam extends string>(
     // deno-lint-ignore no-explicit-any
     cls: (new (...args: any[]) => TObject) & { typeId: URL },
-    path:
-      `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`,
+    path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<
+      TParam
+    >}${string}${Rfc6570Expression<TParam>}${string}`,
     dispatcher: ObjectDispatcher<TContextData, TObject, TParam>,
   ): ObjectCallbackSetters<TContextData, TObject, TParam>;
   setObjectDispatcher<TObject extends Object, TParam extends string>(
     // deno-lint-ignore no-explicit-any
     cls: (new (...args: any[]) => TObject) & { typeId: URL },
-    path: `${string}{${TParam}}${string}{${TParam}}${string}`,
+    path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<
+      TParam
+    >}${string}`,
     dispatcher: ObjectDispatcher<TContextData, TObject, TParam>,
   ): ObjectCallbackSetters<TContextData, TObject, TParam>;
   setObjectDispatcher<TObject extends Object, TParam extends string>(
     // deno-lint-ignore no-explicit-any
     cls: (new (...args: any[]) => TObject) & { typeId: URL },
-    path: `${string}{${TParam}}${string}`,
+    path: `${string}${Rfc6570Expression<TParam>}${string}`,
     dispatcher: ObjectDispatcher<TContextData, TObject, TParam>,
   ): ObjectCallbackSetters<TContextData, TObject, TParam>;
   setObjectDispatcher<TObject extends Object, TParam extends string>(

packages/fedify/src/federation/federation.ts

@@ -196,8 +196,9 @@ export interface Federatable<TContextData> {
   setObjectDispatcher<TObject extends Object, TParam extends string>(
     // deno-lint-ignore no-explicit-any
     cls: (new (...args: any[]) => TObject) & { typeId: URL },
-    path:
-      `${string}{${TParam}}${string}{${TParam}}${string}{${TParam}}${string}`,
+    path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<
+      TParam
+    >}${string}${Rfc6570Expression<TParam>}${string}`,
     dispatcher: ObjectDispatcher<TContextData, TObject, TParam>,
   ): ObjectCallbackSetters<TContextData, TObject, TParam>;
 
@@ -217,7 +218,9 @@ export interface Federatable<TContextData> {
   setObjectDispatcher<TObject extends Object, TParam extends string>(
     // deno-lint-ignore no-explicit-any
     cls: (new (...args: any[]) => TObject) & { typeId: URL },
-    path: `${string}{${TParam}}${string}{${TParam}}${string}`,
+    path: `${string}${Rfc6570Expression<TParam>}${string}${Rfc6570Expression<
+      TParam
+    >}${string}`,
     dispatcher: ObjectDispatcher<TContextData, TObject, TParam>,
   ): ObjectCallbackSetters<TContextData, TObject, TParam>;
 
@@ -237,7 +240,7 @@ export interface Federatable<TContextData> {
   setObjectDispatcher<TObject extends Object, TParam extends string>(
     // deno-lint-ignore no-explicit-any
     cls: (new (...args: any[]) => TObject) & { typeId: URL },
-    path: `${string}{${TParam}}${string}`,
+    path: `${string}${Rfc6570Expression<TParam>}${string}`,
     dispatcher: ObjectDispatcher<TContextData, TObject, TParam>,
   ): ObjectCallbackSetters<TContextData, TObject, TParam>;