vovk 3.0.0-draft.153 → 3.0.0-draft.154

package/cjs/client/createRPC.d.ts

@@ -1,3 +1,3 @@
 import type { KnownAny, VovkSchema } from '../types.js';
 import type { VovkClientOptions, VovkClient, VovkDefaultFetcherOptions } from './types.js';
-export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions<Record<string, never>>>(schema: VovkSchema, segmentName: string, rpcModuleName: string, options?: VovkClientOptions<OPTS>) => VovkClient<T, OPTS>;
+export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions<Record<string, never>>>(schema: VovkSchema, givenSegmentName: string, rpcModuleName: string, options?: VovkClientOptions<OPTS>) => VovkClient<T, OPTS>;

package/cjs/client/createRPC.js

@@ -17,7 +17,8 @@ const getHandlerPath = (endpoint, params, query) => {
     }
     return `${result}${queryStr ? '?' : ''}${queryStr}`;
 };
-const createRPC = (schema, segmentName, rpcModuleName, options) => {
+const createRPC = (schema, givenSegmentName, rpcModuleName, options) => {
+    const segmentName = options?.segmentNameOverride ?? givenSegmentName;
     const segmentSchema = schema.segments[segmentName];
     if (!segmentSchema)
         throw new Error(`Unable to create RPC object. Segment schema is missing. Check client template.`);
@@ -30,9 +31,13 @@ const createRPC = (schema, segmentName, rpcModuleName, options) => {
     for (const [staticMethodName, handlerSchema] of Object.entries(controllerSchema.handlers)) {
         const { path, httpMethod, validation } = handlerSchema;
         const getEndpoint = ({ apiRoot, params, query, }) => {
-            const mainPrefix = (apiRoot.startsWith('http://') || apiRoot.startsWith('https://') || apiRoot.startsWith('/') ? '' : '/') +
-                (apiRoot.endsWith('/') ? apiRoot : `${apiRoot}/`) +
-                (segmentName ? `${segmentName}/` : '');
+            const mainPrefix = [
+                apiRoot.startsWith('http://') || apiRoot.startsWith('https://') || apiRoot.startsWith('/') ? '' : '/',
+                apiRoot,
+                segmentName,
+            ]
+                .filter(Boolean)
+                .join('/');
             return mainPrefix + getHandlerPath([controllerPrefix, path].filter(Boolean).join('/'), params, query);
         };
         const handler = (input = {}) => {

package/cjs/client/types.d.ts

@@ -109,6 +109,7 @@ export type VovkValidateOnClient = (input: {
 export type VovkClientOptions<OPTS extends Record<string, KnownAny> = Record<string, never>> = {
     fetcher?: VovkClientFetcher<OPTS>;
     validateOnClient?: VovkValidateOnClient;
+    segmentNameOverride?: string;
     defaultOptions?: Partial<OPTS>;
 };
 export {};

package/cjs/types.d.ts

@@ -215,16 +215,18 @@ type BundleConfig = {
     excludeSegments?: string[];
     includeSegments?: never;
 });
+type SegmentConfig = Record<string, {
+    origin?: string;
+    rootEntry?: string;
+    segmentNameOverride?: string;
+}>;
 export type ClientTemplateDef = {
     extends?: string;
     templatePath?: string | null;
     origin?: string | null;
     composedClient?: Omit<ClientConfigFull, 'fromTemplates' | 'enabled'>;
     segmentedClient?: Omit<ClientConfigSegmented, 'fromTemplates' | 'enabled'>;
-    segmentConfig?: false | Record<string, {
-        origin?: string;
-        rootEntry?: string;
-    }>;
+    segmentConfig?: false | SegmentConfig;
     requires?: Record<string, string>;
 };
 type VovkUserConfig = {
@@ -253,11 +255,7 @@ type VovkUserConfig = {
         [key: string]: string | undefined;
     };
     libs?: Record<string, KnownAny>;
-    /** @todo this is an experimental feature */
-    segmentConfig?: false | Record<string, {
-        origin?: string;
-        rootEntry?: string;
-    }>;
+    segmentConfig?: false | SegmentConfig;
 };
 export type VovkConfig = VovkUserConfig & {
     [key: string]: KnownAny;

package/mjs/client/createRPC.d.ts

@@ -1,3 +1,3 @@
 import type { KnownAny, VovkSchema } from '../types.js';
 import type { VovkClientOptions, VovkClient, VovkDefaultFetcherOptions } from './types.js';
-export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions<Record<string, never>>>(schema: VovkSchema, segmentName: string, rpcModuleName: string, options?: VovkClientOptions<OPTS>) => VovkClient<T, OPTS>;
+export declare const createRPC: <T, OPTS extends Record<string, KnownAny> = VovkDefaultFetcherOptions<Record<string, never>>>(schema: VovkSchema, givenSegmentName: string, rpcModuleName: string, options?: VovkClientOptions<OPTS>) => VovkClient<T, OPTS>;

package/mjs/client/createRPC.js

@@ -17,7 +17,8 @@ const getHandlerPath = (endpoint, params, query) => {
     }
     return `${result}${queryStr ? '?' : ''}${queryStr}`;
 };
-const createRPC = (schema, segmentName, rpcModuleName, options) => {
+const createRPC = (schema, givenSegmentName, rpcModuleName, options) => {
+    const segmentName = options?.segmentNameOverride ?? givenSegmentName;
     const segmentSchema = schema.segments[segmentName];
     if (!segmentSchema)
         throw new Error(`Unable to create RPC object. Segment schema is missing. Check client template.`);
@@ -30,9 +31,13 @@ const createRPC = (schema, segmentName, rpcModuleName, options) => {
     for (const [staticMethodName, handlerSchema] of Object.entries(controllerSchema.handlers)) {
         const { path, httpMethod, validation } = handlerSchema;
         const getEndpoint = ({ apiRoot, params, query, }) => {
-            const mainPrefix = (apiRoot.startsWith('http://') || apiRoot.startsWith('https://') || apiRoot.startsWith('/') ? '' : '/') +
-                (apiRoot.endsWith('/') ? apiRoot : `${apiRoot}/`) +
-                (segmentName ? `${segmentName}/` : '');
+            const mainPrefix = [
+                apiRoot.startsWith('http://') || apiRoot.startsWith('https://') || apiRoot.startsWith('/') ? '' : '/',
+                apiRoot,
+                segmentName,
+            ]
+                .filter(Boolean)
+                .join('/');
             return mainPrefix + getHandlerPath([controllerPrefix, path].filter(Boolean).join('/'), params, query);
         };
         const handler = (input = {}) => {

package/mjs/client/types.d.ts

@@ -109,6 +109,7 @@ export type VovkValidateOnClient = (input: {
 export type VovkClientOptions<OPTS extends Record<string, KnownAny> = Record<string, never>> = {
     fetcher?: VovkClientFetcher<OPTS>;
     validateOnClient?: VovkValidateOnClient;
+    segmentNameOverride?: string;
     defaultOptions?: Partial<OPTS>;
 };
 export {};

package/mjs/types.d.ts

@@ -215,16 +215,18 @@ type BundleConfig = {
     excludeSegments?: string[];
     includeSegments?: never;
 });
+type SegmentConfig = Record<string, {
+    origin?: string;
+    rootEntry?: string;
+    segmentNameOverride?: string;
+}>;
 export type ClientTemplateDef = {
     extends?: string;
     templatePath?: string | null;
     origin?: string | null;
     composedClient?: Omit<ClientConfigFull, 'fromTemplates' | 'enabled'>;
     segmentedClient?: Omit<ClientConfigSegmented, 'fromTemplates' | 'enabled'>;
-    segmentConfig?: false | Record<string, {
-        origin?: string;
-        rootEntry?: string;
-    }>;
+    segmentConfig?: false | SegmentConfig;
     requires?: Record<string, string>;
 };
 type VovkUserConfig = {
@@ -253,11 +255,7 @@ type VovkUserConfig = {
         [key: string]: string | undefined;
     };
     libs?: Record<string, KnownAny>;
-    /** @todo this is an experimental feature */
-    segmentConfig?: false | Record<string, {
-        origin?: string;
-        rootEntry?: string;
-    }>;
+    segmentConfig?: false | SegmentConfig;
 };
 export type VovkConfig = VovkUserConfig & {
     [key: string]: KnownAny;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vovk",
-  "version": "3.0.0-draft.153",
+  "version": "3.0.0-draft.154",
   "main": "./cjs/index.js",
   "module": "./mjs/index.js",
   "types": "./mjs/index.d.ts",