@bleedingdev/modern-js-create 3.4.0-ultramodern.2 → 3.4.0-ultramodern.20

package/dist/esm-node/ultramodern-workspace/effect-api.js

@@ -2,13 +2,13 @@ import "node:module";
 import { appHasEffectApi, effectApiPrefix, effectApiStem, verticalEffectApps } from "./descriptors.js";
 import { packageName, toCamelCase, toPascalCase } from "./naming.js";
 function verticalEffectApiExport(service) {
-    return `${toCamelCase(effectApiStem(service))}EffectApi`;
+    return `${toCamelCase(effectApiStem(service))}Api`;
 }
 function verticalEffectGroupName(service) {
     return toCamelCase(effectApiStem(service));
 }
 function verticalEffectApiName(service) {
-    return `${toPascalCase(effectApiStem(service))}EffectApi`;
+    return `${toPascalCase(effectApiStem(service))}Api`;
 }
 function verticalEffectSchemaExport(service) {
     return `${toCamelCase(effectApiStem(service))}ItemSchema`;
@@ -37,27 +37,51 @@ function serviceHasCheckoutCartState(service) {
 function createCheckoutCartSharedSchemas(service) {
     if (!serviceHasCheckoutCartState(service)) return '';
     return `
-export const checkoutCartLineSchema = Schema.Struct({
+export interface CheckoutCartLine {
+  readonly sku: string;
+  readonly name: string;
+  readonly quantity: number;
+  readonly unitPriceCents: number;
+}
+
+export interface CheckoutCart {
+  readonly lines: readonly CheckoutCartLine[];
+  readonly subtotalCents: number;
+  readonly totalQuantity: number;
+}
+
+export interface CheckoutAddCartItemPayload {
+  readonly sku: string;
+  readonly name?: string;
+  readonly quantity: number;
+  readonly unitPriceCents?: number;
+}
+
+export interface CheckoutRemoveCartItemPayload {
+  readonly sku: string;
+}
+
+export const checkoutCartLineSchema: Schema.Codec<CheckoutCartLine> = Schema.Struct({
   sku: Schema.String,
   name: Schema.String,
   quantity: Schema.Finite,
   unitPriceCents: Schema.Finite,
 });
 
-export const checkoutCartSchema = Schema.Struct({
+export const checkoutCartSchema: Schema.Codec<CheckoutCart> = Schema.Struct({
   lines: Schema.Array(checkoutCartLineSchema),
   subtotalCents: Schema.Finite,
   totalQuantity: Schema.Finite,
 });
 
-export const checkoutAddCartItemPayloadSchema = Schema.Struct({
+export const checkoutAddCartItemPayloadSchema: Schema.Codec<CheckoutAddCartItemPayload> = Schema.Struct({
   sku: Schema.String,
   name: Schema.optional(Schema.String),
   quantity: Schema.Finite,
   unitPriceCents: Schema.optional(Schema.Finite),
 });
 
-export const checkoutRemoveCartItemPayloadSchema = Schema.Struct({
+export const checkoutRemoveCartItemPayloadSchema: Schema.Codec<CheckoutRemoveCartItemPayload> = Schema.Struct({
   sku: Schema.String,
 });
 `;
@@ -66,24 +90,24 @@ function createCheckoutCartEndpointDefinitions(service) {
     if (!serviceHasCheckoutCartState(service)) return '';
     return `
     .add(
-      HttpApiEndpoint.get('getCart', '/effect/checkout/cart', {
+      HttpApiEndpoint.get('getCart', '/checkout/cart', {
         success: checkoutCartSchema,
       }),
     )
     .add(
-      HttpApiEndpoint.post('addCartItem', '/effect/checkout/cart/items', {
+      HttpApiEndpoint.post('addCartItem', '/checkout/cart/items', {
         payload: checkoutAddCartItemPayloadSchema,
         success: checkoutCartSchema,
       }),
     )
     .add(
-      HttpApiEndpoint.post('removeCartItem', '/effect/checkout/cart/remove', {
+      HttpApiEndpoint.post('removeCartItem', '/checkout/cart/remove', {
         payload: checkoutRemoveCartItemPayloadSchema,
         success: checkoutCartSchema,
       }),
     )
     .add(
-      HttpApiEndpoint.post('clearCart', '/effect/checkout/cart/clear', {
+      HttpApiEndpoint.post('clearCart', '/checkout/cart/clear', {
         success: checkoutCartSchema,
       }),
     )`;
@@ -96,31 +120,31 @@ function createCheckoutCartOperationContexts(service) {
   addCartItem: {
     method: 'POST',
     operationId: '${apiName}:${groupName}:addCartItem',
-    routePath: '/effect/checkout/cart/items',
+    routePath: '/checkout/cart/items',
     source: 'generated-client',
   },
   clearCart: {
     method: 'POST',
     operationId: '${apiName}:${groupName}:clearCart',
-    routePath: '/effect/checkout/cart/clear',
+    routePath: '/checkout/cart/clear',
     source: 'generated-client',
   },
   getCart: {
     method: 'GET',
     operationId: '${apiName}:${groupName}:getCart',
-    routePath: '/effect/checkout/cart',
+    routePath: '/checkout/cart',
     source: 'generated-client',
   },
   removeCartItem: {
     method: 'POST',
     operationId: '${apiName}:${groupName}:removeCartItem',
-    routePath: '/effect/checkout/cart/remove',
+    routePath: '/checkout/cart/remove',
     source: 'generated-client',
   },`;
 }
 function createCheckoutCartApiContractFields(service) {
     if (!serviceHasCheckoutCartState(service)) return '';
-    return `  checkoutCartPath: '${effectApiPrefix(service)}/effect/checkout/cart',
+    return `  checkoutCartPath: '${effectApiPrefix(service)}/checkout/cart',
 `;
 }
 function createCheckoutCartServerState(service) {
@@ -156,7 +180,7 @@ function createCheckoutCartServerHandlers(service) {
     return `
       .handle('getCart', () =>
         Effect.sync(() => createCheckoutCartSnapshot()).pipe(
-          Effect.withSpan('ultramodern.effect.${groupName}.checkout.getCart', {
+          Effect.withSpan('ultramodern.api.${groupName}.checkout.getCart', {
             attributes: operationAttributes(${groupName}OperationContexts.getCart),
             kind: 'server',
           }),
@@ -174,7 +198,7 @@ function createCheckoutCartServerHandlers(service) {
           });
           return createCheckoutCartSnapshot();
         }).pipe(
-          Effect.withSpan('ultramodern.effect.${groupName}.checkout.addCartItem', {
+          Effect.withSpan('ultramodern.api.${groupName}.checkout.addCartItem', {
             attributes: operationAttributes(${groupName}OperationContexts.addCartItem),
             kind: 'server',
           }),
@@ -185,7 +209,7 @@ function createCheckoutCartServerHandlers(service) {
           checkoutCartLines.delete(payload.sku);
           return createCheckoutCartSnapshot();
         }).pipe(
-          Effect.withSpan('ultramodern.effect.${groupName}.checkout.removeCartItem', {
+          Effect.withSpan('ultramodern.api.${groupName}.checkout.removeCartItem', {
             attributes: operationAttributes(${groupName}OperationContexts.removeCartItem),
             kind: 'server',
           }),
@@ -196,7 +220,7 @@ function createCheckoutCartServerHandlers(service) {
           checkoutCartLines.clear();
           return createCheckoutCartSnapshot();
         }).pipe(
-          Effect.withSpan('ultramodern.effect.${groupName}.checkout.clearCart', {
+          Effect.withSpan('ultramodern.api.${groupName}.checkout.clearCart', {
             attributes: operationAttributes(${groupName}OperationContexts.clearCart),
             kind: 'server',
           }),
@@ -210,6 +234,7 @@ function createCheckoutCartClientExports(service) {
     const pascalStem = toPascalCase(stem);
     const clientOptionsName = `${pascalStem}ClientOptions`;
     const createClientName = `create${pascalStem}Client`;
+    const clientEffectTypeName = `${pascalStem}ClientEffect`;
     return `
 export interface CheckoutCartLine {
   sku: string;
@@ -233,7 +258,7 @@ export interface CheckoutAddCartItemInput {
 
 export const getCheckoutCart = (
   options: ${clientOptionsName} = {},
-) =>
+): ${clientEffectTypeName}<CheckoutCart> =>
   ${createClientName}({
     ...options,
     operationContext:
@@ -245,7 +270,7 @@ export const getCheckoutCart = (
 export const addCheckoutCartItem = (
   payload: CheckoutAddCartItemInput,
   options: ${clientOptionsName} = {},
-) =>
+): ${clientEffectTypeName}<CheckoutCart> =>
   ${createClientName}({
     ...options,
     operationContext:
@@ -259,7 +284,7 @@ export const addCheckoutCartItem = (
 export const removeCheckoutCartItem = (
   sku: string,
   options: ${clientOptionsName} = {},
-) =>
+): ${clientEffectTypeName}<CheckoutCart> =>
   ${createClientName}({
     ...options,
     operationContext:
@@ -272,7 +297,7 @@ export const removeCheckoutCartItem = (
 
 export const clearCheckoutCart = (
   options: ${clientOptionsName} = {},
-) =>
+): ${clientEffectTypeName}<CheckoutCart> =>
   ${createClientName}({
     ...options,
     operationContext:
@@ -303,12 +328,63 @@ function createEffectSharedApiContract(service) {
     const apiName = verticalEffectApiName(service);
     const groupName = verticalEffectGroupName(service);
     const stem = effectApiStem(service);
+    const pascalStem = toPascalCase(stem);
+    const markerType = `${pascalStem}Marker`;
+    const itemType = `${pascalStem}Item`;
+    const readinessType = `${pascalStem}Readiness`;
+    const createPayloadType = `${pascalStem}CreatePayload`;
+    const createResponseType = `${pascalStem}CreateResponse`;
+    const listResponseType = `${pascalStem}ListResponse`;
     const apiPrefix = effectApiPrefix(service);
     const checkoutCartSharedSchemas = createCheckoutCartSharedSchemas(service);
     const checkoutCartSharedSchemaSection = '' === checkoutCartSharedSchemas ? '' : `${checkoutCartSharedSchemas}\n`;
     const checkoutCartOperationContexts = createCheckoutCartOperationContexts(service).trimStart();
     const checkoutCartOperationContextEntries = '' === checkoutCartOperationContexts ? '' : `${checkoutCartOperationContexts}\n`;
-    return `export const ${markerSchemaExport} = Schema.Struct({
+    return `export interface ${markerType} {
+  readonly appId: string;
+  readonly build: string;
+  readonly deployProfile: string;
+  readonly packageName: string;
+  readonly surface: string;
+  readonly version: string;
+}
+
+export interface ${itemType} {
+  readonly id: string;
+  readonly marker: ${markerType};
+  readonly title: string;
+}
+
+export interface ${readinessType} {
+  readonly checks: {
+    readonly api: 'ready';
+    readonly moduleFederation: 'ready';
+    readonly ssr: 'ready';
+    readonly translations: 'ready';
+  };
+  readonly marker: ${markerType};
+  readonly status: 'ready';
+  readonly versionSkew: 'none';
+}
+
+export interface ${createPayloadType} {
+  readonly title: string;
+}
+
+export interface ${listResponseType} {
+  readonly items: readonly ${itemType}[];
+}
+
+export interface ${createResponseType} {
+  readonly item: ${itemType};
+}
+
+export interface ${notFoundErrorExport} {
+  readonly _tag: '${notFoundErrorExport}';
+  readonly id: string;
+}
+
+export const ${markerSchemaExport}: Schema.Codec<${markerType}> = Schema.Struct({
   appId: Schema.String,
   build: Schema.String,
   deployProfile: Schema.String,
@@ -317,15 +393,15 @@ function createEffectSharedApiContract(service) {
   version: Schema.String,
 });
 
-export const ${schemaExport} = Schema.Struct({
+export const ${schemaExport}: Schema.Codec<${itemType}> = Schema.Struct({
   id: Schema.String,
   marker: ${markerSchemaExport},
   title: Schema.String,
 });
 
-export const ${readinessSchemaExport} = Schema.Struct({
+export const ${readinessSchemaExport}: Schema.Codec<${readinessType}> = Schema.Struct({
   checks: Schema.Struct({
-    effectBff: Schema.Literal('ready'),
+    api: Schema.Literal('ready'),
     moduleFederation: Schema.Literal('ready'),
     ssr: Schema.Literal('ready'),
     translations: Schema.Literal('ready'),
@@ -335,18 +411,13 @@ export const ${readinessSchemaExport} = Schema.Struct({
   versionSkew: Schema.Literal('none'),
 });
 
-export const ${createPayloadSchemaExport} = Schema.Struct({
+export const ${createPayloadSchemaExport}: Schema.Codec<${createPayloadType}> = Schema.Struct({
   title: Schema.String,
 });
 
-${checkoutCartSharedSchemaSection}export class ${notFoundErrorExport} extends Schema.TaggedErrorClass<${notFoundErrorExport}>()(
-  '${notFoundErrorExport}',
-  {
-    id: Schema.String,
-  },
-) {}
-
-export const ${notFoundSchemaExport} = ${notFoundErrorExport}.pipe(
+${checkoutCartSharedSchemaSection}export const ${notFoundSchemaExport}: Schema.Codec<${notFoundErrorExport}> = Schema.TaggedStruct('${notFoundErrorExport}', {
+  id: Schema.String,
+}).pipe(
   HttpApiSchema.status(404),
 );
 
@@ -367,7 +438,7 @@ export interface OperationContext {
 export const ${apiExport} = HttpApi.make('${apiName}').add(
   HttpApiGroup.make('${groupName}')
     .add(
-      HttpApiEndpoint.get('list', '/effect/${stem}', {
+      HttpApiEndpoint.get('list', '/${stem}', {
         query: {
           limit: Schema.optional(Schema.FiniteFromString),
         },
@@ -377,12 +448,12 @@ export const ${apiExport} = HttpApi.make('${apiName}').add(
       }),
     )
     .add(
-      HttpApiEndpoint.get('readiness', '/effect/${stem}/readiness', {
+      HttpApiEndpoint.get('readiness', '/${stem}/readiness', {
         success: ${readinessSchemaExport},
       }),
     )
     .add(
-      HttpApiEndpoint.get('get', '/effect/${stem}/:id', {
+      HttpApiEndpoint.get('get', '/${stem}/:id', {
         error: ${notFoundSchemaExport},
         params: {
           id: Schema.String,
@@ -391,7 +462,7 @@ export const ${apiExport} = HttpApi.make('${apiName}').add(
       }),
     )
     .add(
-      HttpApiEndpoint.post('create', '/effect/${stem}', {
+      HttpApiEndpoint.post('create', '/${stem}', {
         payload: ${createPayloadSchemaExport},
         success: Schema.Struct({
           item: ${schemaExport},
@@ -404,34 +475,34 @@ export const ${groupName}OperationContexts = {
 ${checkoutCartOperationContextEntries}  create: {
     method: 'POST',
     operationId: '${apiName}:${groupName}:create',
-    routePath: '/effect/${stem}',
+    routePath: '/${stem}',
     source: 'generated-client',
   },
   get: {
     method: 'GET',
     operationId: '${apiName}:${groupName}:get',
-    routePath: '/effect/${stem}/:id',
+    routePath: '/${stem}/:id',
     source: 'generated-client',
   },
   list: {
     method: 'GET',
     operationId: '${apiName}:${groupName}:list',
-    routePath: '/effect/${stem}',
+    routePath: '/${stem}',
     source: 'generated-client',
   },
   readiness: {
     method: 'GET',
     operationId: '${apiName}:${groupName}:readiness',
-    routePath: '/effect/${stem}/readiness',
+    routePath: '/${stem}/readiness',
     source: 'generated-client',
   },
 } satisfies Record<string, OperationContext>;
 
 export const ${groupName}ApiContract = {
   apiPrefix: '${apiPrefix}',
-  basePath: '${apiPrefix}/effect/${stem}',
+  basePath: '${apiPrefix}/${stem}',
 ${createCheckoutCartApiContractFields(service)}  ownerId: '${service.id}',
-  readinessPath: '${apiPrefix}/effect/${stem}/readiness',
+  readinessPath: '${apiPrefix}/${stem}/readiness',
 } as const;
 `;
 }
@@ -450,13 +521,20 @@ function createEffectServiceEntry(service, contractImportPath) {
   HttpApiBuilder,
   Layer,
 } from '@modern-js/plugin-bff/effect-edge';
-import { ultramodernApiMarker } from '../../src/ultramodern-build.ts';
+import type {
+  EffectBffDefinition,
+  EffectBffRuntime,
+  EffectRuntimeLayer,
+} from '@modern-js/plugin-bff/effect-edge';
+import { ultramodernApiMarker } from '../shared/ultramodern-build.ts';
 import {
   ${apiExport},
   ${groupName}OperationContexts,
+} from '${contractImportPath}';
+import type {
   ${notFoundErrorExport},
+  OperationContext,
 } from '${contractImportPath}';
-import type { OperationContext } from '${contractImportPath}';
 
 const ${groupName}Items = [
   {
@@ -489,7 +567,7 @@ const ${groupName}Layer = HttpApiBuilder.group(
               ? ${groupName}Items.slice(0, query.limit)
               : ${groupName}Items,
         }).pipe(
-          Effect.withSpan('ultramodern.effect.${groupName}.list', {
+          Effect.withSpan('ultramodern.api.${groupName}.list', {
             attributes: operationAttributes(${groupName}OperationContexts.list),
             kind: 'server',
           }),
@@ -498,7 +576,7 @@ const ${groupName}Layer = HttpApiBuilder.group(
       .handle('readiness', () =>
         Effect.succeed({
           checks: {
-            effectBff: 'ready' as const,
+            api: 'ready' as const,
             moduleFederation: 'ready' as const,
             ssr: 'ready' as const,
             translations: 'ready' as const,
@@ -507,7 +585,7 @@ const ${groupName}Layer = HttpApiBuilder.group(
           status: 'ready' as const,
           versionSkew: 'none' as const,
         }).pipe(
-          Effect.withSpan('ultramodern.effect.${groupName}.readiness', {
+          Effect.withSpan('ultramodern.api.${groupName}.readiness', {
             attributes: operationAttributes(${groupName}OperationContexts.readiness),
             kind: 'server',
           }),
@@ -517,13 +595,17 @@ const ${groupName}Layer = HttpApiBuilder.group(
         const matchedItem = ${groupName}Items.find(
           candidate => candidate.id === params.id,
         );
+        const notFound: ${notFoundErrorExport} = {
+          _tag: '${notFoundErrorExport}',
+          id: params.id,
+        };
         const result =
           matchedItem === undefined
-            ? Effect.fail(new ${notFoundErrorExport}({ id: params.id }))
+            ? Effect.fail(notFound)
             : Effect.succeed(matchedItem);
 
         return result.pipe(
-            Effect.withSpan('ultramodern.effect.${groupName}.get', {
+            Effect.withSpan('ultramodern.api.${groupName}.get', {
               attributes: operationAttributes(${groupName}OperationContexts.get),
               kind: 'server',
             }),
@@ -540,7 +622,7 @@ const ${groupName}Layer = HttpApiBuilder.group(
             title: payload.title,
           },
         }).pipe(
-          Effect.withSpan('ultramodern.effect.${groupName}.create', {
+          Effect.withSpan('ultramodern.api.${groupName}.create', {
             attributes: operationAttributes(${groupName}OperationContexts.create),
             kind: 'server',
           }),
@@ -550,12 +632,15 @@ const ${groupName}Layer = HttpApiBuilder.group(
 
 const layer = HttpApiBuilder.layer(${apiExport}).pipe(
   Layer.provide(${groupName}Layer),
-);
+) satisfies EffectRuntimeLayer;
 
-export default defineEffectBff({
+const apiRuntime: EffectBffDefinition<typeof ${apiExport}, EffectRuntimeLayer> &
+  EffectBffRuntime<typeof ${apiExport}, EffectRuntimeLayer> = defineEffectBff({
   api: ${apiExport},
   layer,
 });
+
+export default apiRuntime;
 `;
 }
 function createEffectClient(service, contractImportPath) {
@@ -566,25 +651,71 @@ function createEffectClient(service, contractImportPath) {
     const singular = verticalEffectErrorStem(service);
     const clientOptionsName = `${toPascalCase(stem)}ClientOptions`;
     const createClientName = `create${toPascalCase(stem)}Client`;
+    const clientTypeName = `${toPascalCase(stem)}Client`;
+    const clientEffectTypeName = `${toPascalCase(stem)}ClientEffect`;
     const listName = `list${toPascalCase(stem)}`;
     const readinessName = `get${toPascalCase(stem)}Readiness`;
     const getName = `get${toPascalCase(singular)}`;
     const createName = `create${toPascalCase(singular)}`;
+    const notFoundErrorExport = verticalEffectNotFoundErrorExport(service);
+    const pascalStem = toPascalCase(stem);
+    const itemType = `${pascalStem}Item`;
+    const readinessType = `${pascalStem}Readiness`;
+    const createResponseType = `${pascalStem}CreateResponse`;
+    const listResponseType = `${pascalStem}ListResponse`;
     const checkoutCartClientExports = createCheckoutCartClientExports(service);
     return `import {
   Effect,
   makeEffectHttpApiClient,
   runEffectRequest,
 } from '@modern-js/plugin-bff/effect-client';
+import type {
+  HttpClientError,
+  HttpApi,
+  HttpApiClient,
+  HttpApiGroup,
+  Schema,
+} from '@modern-js/plugin-bff/effect-client';
 import {
   ${contractExport}ApiContract,
   ${apiExport},
   ${groupName}OperationContexts,
 } from '${contractImportPath}';
-import type { OperationContext } from '${contractImportPath}';
+import type {
+  ${createResponseType},
+  ${itemType},
+  ${listResponseType},
+  ${notFoundErrorExport},
+  OperationContext,
+  ${readinessType},
+} from '${contractImportPath}';
 
 export { Effect, runEffectRequest };
 
+type ${pascalStem}ApiGroups = typeof ${apiExport} extends HttpApi.HttpApi<
+  infer _ApiId,
+  infer Groups
+>
+  ? Groups
+  : never;
+
+export type ${clientTypeName} = HttpApiClient.Client<
+  Extract<${pascalStem}ApiGroups, HttpApiGroup.Any>,
+  never,
+  never
+>;
+
+export type ${pascalStem}ClientError =
+  | ${notFoundErrorExport}
+  | HttpClientError.HttpClientError
+  | Schema.SchemaError;
+
+export type ${clientEffectTypeName}<Success> = Effect.Effect<
+  Success,
+  ${pascalStem}ClientError,
+  never
+>;
+
 export interface ${clientOptionsName} {
   baseUrl?: string | URL;
   locale?: string;
@@ -594,7 +725,7 @@ export interface ${clientOptionsName} {
 
 export const ${createClientName} = (
   options: ${clientOptionsName} = {},
-) =>
+): ${clientEffectTypeName}<${clientTypeName}> =>
   makeEffectHttpApiClient(${apiExport}, {
     baseUrl: options.baseUrl ?? ${contractExport}ApiContract.apiPrefix,
     requestContext: {
@@ -610,7 +741,7 @@ export const ${createClientName} = (
 
 export const ${listName} = (
   options: ${clientOptionsName} & { limit?: number } = {},
-) =>
+): ${clientEffectTypeName}<${listResponseType}> =>
   ${createClientName}({
     ...options,
     operationContext:
@@ -623,7 +754,7 @@ export const ${listName} = (
 
 export const ${readinessName} = (
   options: ${clientOptionsName} = {},
-) =>
+): ${clientEffectTypeName}<${readinessType}> =>
   ${createClientName}({
     ...options,
     operationContext:
@@ -635,7 +766,7 @@ export const ${readinessName} = (
 export const ${getName} = (
   id: string,
   options: ${clientOptionsName} = {},
-) =>
+): ${clientEffectTypeName}<${itemType}> =>
   ${createClientName}({
     ...options,
     operationContext:
@@ -647,7 +778,7 @@ export const ${getName} = (
 export const ${createName} = (
   title: string,
   options: ${clientOptionsName} = {},
-) =>
+): ${clientEffectTypeName}<${createResponseType}> =>
   ${createClientName}({
     ...options,
     operationContext:
@@ -679,7 +810,7 @@ ${checkoutCartExports}  create${pascalSingular},
   get${pascalStem}Readiness,
   list${pascalStem},
   type ${pascalStem}ClientOptions,
-} from '${packageName(scope, remote.packageSuffix)}/effect/client';`;
+} from '${packageName(scope, remote.packageSuffix)}/api/client';`;
     }).join('\n\n');
     return exports ? `${exports}\n` : `export const ultramodernVerticalClients = [] as const;
 `;
@@ -687,7 +818,7 @@ ${checkoutCartExports}  create${pascalSingular},
 function createEffectReadinessContract(app) {
     const stem = effectApiStem(app);
     return {
-        endpoint: `/effect/${stem}/readiness`,
+        endpoint: `/${stem}/readiness`,
         marker: {
             ui: 'ultramodernUiMarker',
             api: 'ultramodernApiMarker',
@@ -697,7 +828,7 @@ function createEffectReadinessContract(app) {
             'moduleFederation',
             'ssr',
             'translations',
-            'effectBff'
+            'api'
         ]
     };
 }
@@ -712,39 +843,39 @@ function createEffectRequestContextContract() {
             'x-ultramodern-env',
             'x-vertical-version-id'
         ],
-        source: 'shell-to-vertical-effect-client'
+        source: 'shell-to-vertical-api-client'
     };
 }
 function createEffectDomainOperations(app) {
     const stem = effectApiStem(app);
     const group = verticalEffectGroupName(app);
-    const basePath = `/effect/${stem}`;
+    const basePath = `/${stem}`;
     const checkoutCartOperations = serviceHasCheckoutCartState(app) ? {
         checkoutCartAddItem: {
             client: 'addCheckoutCartItem',
             method: 'POST',
-            path: '/effect/checkout/cart/items',
+            path: '/checkout/cart/items',
             resource: 'checkout-cart',
             owner: app.id
         },
         checkoutCartClear: {
             client: 'clearCheckoutCart',
             method: 'POST',
-            path: '/effect/checkout/cart/clear',
+            path: '/checkout/cart/clear',
             resource: 'checkout-cart',
             owner: app.id
         },
         checkoutCartRead: {
             client: 'getCheckoutCart',
             method: 'GET',
-            path: '/effect/checkout/cart',
+            path: '/checkout/cart',
             resource: 'checkout-cart',
             owner: app.id
         },
         checkoutCartRemoveItem: {
             client: 'removeCheckoutCartItem',
             method: 'POST',
-            path: '/effect/checkout/cart/remove',
+            path: '/checkout/cart/remove',
             resource: 'checkout-cart',
             owner: app.id
         }
@@ -777,27 +908,26 @@ function createEffectDomainOperations(app) {
 function effectApiTopologyMetadata(app) {
     if (!appHasEffectApi(app)) return;
     return {
-        effect: {
-            runtime: 'effect',
-            bff: {
-                prefix: app.effectApi.prefix,
-                openapi: '/openapi.json'
-            },
-            contract: {
-                export: './shared/effect/api',
-                path: `${app.directory}/shared/effect/api.ts`
-            },
-            client: {
-                export: './effect/client',
-                path: `${app.directory}/src/effect/${app.effectApi.stem}-client.ts`
-            },
-            serverEntry: `${app.directory}/api/effect/index.ts`,
-            basePath: `${app.effectApi.prefix}/effect/${app.effectApi.stem}`,
-            consumedBy: app.effectApi.consumedBy,
-            readiness: createEffectReadinessContract(app),
-            requestContext: createEffectRequestContextContract(),
-            domainOperations: createEffectDomainOperations(app)
-        }
+        runtime: 'effect',
+        bff: {
+            prefix: app.effectApi.prefix,
+            openapi: '/openapi.json',
+            strictEffectApproach: true
+        },
+        contract: {
+            export: './api',
+            path: `${app.directory}/shared/api.ts`
+        },
+        client: {
+            export: './api/client',
+            path: `${app.directory}/src/api/${app.effectApi.stem}-client.ts`
+        },
+        serverEntry: `${app.directory}/api/index.ts`,
+        basePath: `${app.effectApi.prefix}/${app.effectApi.stem}`,
+        consumedBy: app.effectApi.consumedBy,
+        readiness: createEffectReadinessContract(app),
+        requestContext: createEffectRequestContextContract(),
+        domainOperations: createEffectDomainOperations(app)
     };
 }
 function createEffectOperationContract(target) {
@@ -805,22 +935,22 @@ function createEffectOperationContract(target) {
     const checkoutCartOperations = serviceHasCheckoutCartState(target) ? {
         addCartItem: {
             method: 'POST',
-            path: '/effect/checkout/cart/items',
+            path: '/checkout/cart/items',
             source: 'generated-client'
         },
         clearCart: {
             method: 'POST',
-            path: '/effect/checkout/cart/clear',
+            path: '/checkout/cart/clear',
             source: 'generated-client'
         },
         getCart: {
             method: 'GET',
-            path: '/effect/checkout/cart',
+            path: '/checkout/cart',
             source: 'generated-client'
         },
         removeCartItem: {
             method: 'POST',
-            path: '/effect/checkout/cart/remove',
+            path: '/checkout/cart/remove',
             source: 'generated-client'
         }
     } : {};
@@ -831,22 +961,22 @@ function createEffectOperationContract(target) {
             ...checkoutCartOperations,
             list: {
                 method: 'GET',
-                path: `/effect/${stem}`,
+                path: `/${stem}`,
                 source: 'generated-client'
             },
             readiness: {
                 method: 'GET',
-                path: `/effect/${stem}/readiness`,
+                path: `/${stem}/readiness`,
                 source: 'generated-client'
             },
             get: {
                 method: 'GET',
-                path: `/effect/${stem}/:id`,
+                path: `/${stem}/:id`,
                 source: 'generated-client'
             },
             create: {
                 method: 'POST',
-                path: `/effect/${stem}`,
+                path: `/${stem}`,
                 source: 'generated-client'
             }
         }