@bleedingdev/modern-js-create 3.4.0-ultramodern.9 → 3.5.0-ultramodern.1

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

@@ -1,38 +1,38 @@
 import "node:module";
-import { appHasEffectApi, effectApiPrefix, effectApiStem, verticalEffectApps } from "./descriptors.js";
+import { appHasApi, resolveApiPrefix, resolveApiStem, verticalApiApps } from "./descriptors.js";
 import { packageName, toCamelCase, toPascalCase } from "./naming.js";
-function verticalEffectApiExport(service) {
-    return `${toCamelCase(effectApiStem(service))}EffectApi`;
+function verticalApiExport(service) {
+    return `${toCamelCase(resolveApiStem(service))}Api`;
 }
-function verticalEffectGroupName(service) {
-    return toCamelCase(effectApiStem(service));
+function verticalApiGroupName(service) {
+    return toCamelCase(resolveApiStem(service));
 }
-function verticalEffectApiName(service) {
-    return `${toPascalCase(effectApiStem(service))}EffectApi`;
+function verticalApiName(service) {
+    return `${toPascalCase(resolveApiStem(service))}Api`;
 }
-function verticalEffectSchemaExport(service) {
-    return `${toCamelCase(effectApiStem(service))}ItemSchema`;
+function verticalApiSchemaExport(service) {
+    return `${toCamelCase(resolveApiStem(service))}ItemSchema`;
 }
-function verticalEffectMarkerSchemaExport(service) {
-    return `${toCamelCase(effectApiStem(service))}MarkerSchema`;
+function verticalApiMarkerSchemaExport(service) {
+    return `${toCamelCase(resolveApiStem(service))}MarkerSchema`;
 }
-function verticalEffectReadinessSchemaExport(service) {
-    return `${toCamelCase(effectApiStem(service))}ReadinessSchema`;
+function verticalApiReadinessSchemaExport(service) {
+    return `${toCamelCase(resolveApiStem(service))}ReadinessSchema`;
 }
-function verticalEffectErrorStem(service) {
-    return effectApiStem(service);
+function verticalApiErrorStem(service) {
+    return resolveApiStem(service);
 }
-function verticalEffectCreatePayloadSchemaExport(service) {
-    return `${toCamelCase(effectApiStem(service))}CreatePayloadSchema`;
+function verticalApiCreatePayloadSchemaExport(service) {
+    return `${toCamelCase(resolveApiStem(service))}CreatePayloadSchema`;
 }
-function verticalEffectNotFoundErrorExport(service) {
-    return `${toPascalCase(verticalEffectErrorStem(service))}NotFound`;
+function verticalApiNotFoundErrorExport(service) {
+    return `${toPascalCase(verticalApiErrorStem(service))}NotFound`;
 }
-function verticalEffectNotFoundSchemaExport(service) {
-    return `${toCamelCase(verticalEffectErrorStem(service))}NotFoundSchema`;
+function verticalApiNotFoundSchemaExport(service) {
+    return `${toCamelCase(verticalApiErrorStem(service))}NotFoundSchema`;
 }
 function serviceHasCheckoutCartState(service) {
-    return 'checkout' === effectApiStem(service);
+    return 'checkout' === resolveApiStem(service);
 }
 function createCheckoutCartSharedSchemas(service) {
     if (!serviceHasCheckoutCartState(service)) return '';
@@ -90,61 +90,61 @@ 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,
       }),
     )`;
 }
 function createCheckoutCartOperationContexts(service) {
-    const apiName = verticalEffectApiName(service);
-    const groupName = verticalEffectGroupName(service);
+    const apiName = verticalApiName(service);
+    const groupName = verticalApiGroupName(service);
     if (!serviceHasCheckoutCartState(service)) return '';
     return `
   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: '${resolveApiPrefix(service)}/checkout/cart',
 `;
 }
 function createCheckoutCartServerState(service) {
@@ -175,12 +175,12 @@ const createCheckoutCartSnapshot = () => {
 `;
 }
 function createCheckoutCartServerHandlers(service) {
-    const groupName = verticalEffectGroupName(service);
+    const groupName = verticalApiGroupName(service);
     if (!serviceHasCheckoutCartState(service)) return '';
     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',
           }),
@@ -198,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',
           }),
@@ -209,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',
           }),
@@ -220,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',
           }),
@@ -229,8 +229,8 @@ function createCheckoutCartServerHandlers(service) {
 }
 function createCheckoutCartClientExports(service) {
     if (!serviceHasCheckoutCartState(service)) return '';
-    const stem = effectApiStem(service);
-    const groupName = verticalEffectGroupName(service);
+    const stem = resolveApiStem(service);
+    const groupName = verticalApiGroupName(service);
     const pascalStem = toPascalCase(stem);
     const clientOptionsName = `${pascalStem}ClientOptions`;
     const createClientName = `create${pascalStem}Client`;
@@ -307,7 +307,7 @@ export const clearCheckoutCart = (
   );
 `;
 }
-function createEffectSharedApiImports() {
+function createSharedApiImports() {
     return `import {
   HttpApi,
   HttpApiEndpoint,
@@ -317,17 +317,17 @@ function createEffectSharedApiImports() {
 } from '@modern-js/plugin-bff/effect-client';
 `;
 }
-function createEffectSharedApiContract(service) {
-    const schemaExport = verticalEffectSchemaExport(service);
-    const markerSchemaExport = verticalEffectMarkerSchemaExport(service);
-    const readinessSchemaExport = verticalEffectReadinessSchemaExport(service);
-    const createPayloadSchemaExport = verticalEffectCreatePayloadSchemaExport(service);
-    const notFoundErrorExport = verticalEffectNotFoundErrorExport(service);
-    const notFoundSchemaExport = verticalEffectNotFoundSchemaExport(service);
-    const apiExport = verticalEffectApiExport(service);
-    const apiName = verticalEffectApiName(service);
-    const groupName = verticalEffectGroupName(service);
-    const stem = effectApiStem(service);
+function createSharedApiContract(service) {
+    const schemaExport = verticalApiSchemaExport(service);
+    const markerSchemaExport = verticalApiMarkerSchemaExport(service);
+    const readinessSchemaExport = verticalApiReadinessSchemaExport(service);
+    const createPayloadSchemaExport = verticalApiCreatePayloadSchemaExport(service);
+    const notFoundErrorExport = verticalApiNotFoundErrorExport(service);
+    const notFoundSchemaExport = verticalApiNotFoundSchemaExport(service);
+    const apiExport = verticalApiExport(service);
+    const apiName = verticalApiName(service);
+    const groupName = verticalApiGroupName(service);
+    const stem = resolveApiStem(service);
     const pascalStem = toPascalCase(stem);
     const markerType = `${pascalStem}Marker`;
     const itemType = `${pascalStem}Item`;
@@ -335,7 +335,7 @@ function createEffectSharedApiContract(service) {
     const createPayloadType = `${pascalStem}CreatePayload`;
     const createResponseType = `${pascalStem}CreateResponse`;
     const listResponseType = `${pascalStem}ListResponse`;
-    const apiPrefix = effectApiPrefix(service);
+    const apiPrefix = resolveApiPrefix(service);
     const checkoutCartSharedSchemas = createCheckoutCartSharedSchemas(service);
     const checkoutCartSharedSchemaSection = '' === checkoutCartSharedSchemas ? '' : `${checkoutCartSharedSchemas}\n`;
     const checkoutCartOperationContexts = createCheckoutCartOperationContexts(service).trimStart();
@@ -357,7 +357,7 @@ export interface ${itemType} {
 
 export interface ${readinessType} {
   readonly checks: {
-    readonly effectBff: 'ready';
+    readonly api: 'ready';
     readonly moduleFederation: 'ready';
     readonly ssr: 'ready';
     readonly translations: 'ready';
@@ -401,7 +401,7 @@ export const ${schemaExport}: Schema.Codec<${itemType}> = 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'),
@@ -438,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),
         },
@@ -448,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,
@@ -462,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},
@@ -475,46 +475,46 @@ 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;
 `;
 }
-function createEffectSharedApi(service) {
-    return `${createEffectSharedApiImports()}
-${createEffectSharedApiContract(service)}`;
+function createSharedApi(service) {
+    return `${createSharedApiImports()}
+${createSharedApiContract(service)}`;
 }
-function createEffectServiceEntry(service, contractImportPath) {
-    const apiExport = verticalEffectApiExport(service);
-    const groupName = verticalEffectGroupName(service);
-    const notFoundErrorExport = verticalEffectNotFoundErrorExport(service);
-    const stem = effectApiStem(service);
+function createApiServiceEntry(service, contractImportPath) {
+    const apiExport = verticalApiExport(service);
+    const groupName = verticalApiGroupName(service);
+    const notFoundErrorExport = verticalApiNotFoundErrorExport(service);
+    const stem = resolveApiStem(service);
     return `import {
   defineEffectBff,
   Effect,
@@ -526,7 +526,7 @@ import type {
   EffectBffRuntime,
   EffectRuntimeLayer,
 } from '@modern-js/plugin-bff/effect-edge';
-import { ultramodernApiMarker } from '../../shared/ultramodern-build.ts';
+import { ultramodernApiMarker } from '../shared/ultramodern-build.ts';
 import {
   ${apiExport},
   ${groupName}OperationContexts,
@@ -567,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',
           }),
@@ -576,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,
@@ -585,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',
           }),
@@ -605,7 +605,7 @@ const ${groupName}Layer = HttpApiBuilder.group(
             : 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',
             }),
@@ -622,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',
           }),
@@ -634,21 +634,21 @@ const layer = HttpApiBuilder.layer(${apiExport}).pipe(
   Layer.provide(${groupName}Layer),
 ) satisfies EffectRuntimeLayer;
 
-const effectBff: EffectBffDefinition<typeof ${apiExport}, EffectRuntimeLayer> &
+const apiRuntime: EffectBffDefinition<typeof ${apiExport}, EffectRuntimeLayer> &
   EffectBffRuntime<typeof ${apiExport}, EffectRuntimeLayer> = defineEffectBff({
   api: ${apiExport},
   layer,
 });
 
-export default effectBff;
+export default apiRuntime;
 `;
 }
-function createEffectClient(service, contractImportPath) {
-    const apiExport = verticalEffectApiExport(service);
-    const contractExport = verticalEffectGroupName(service);
-    const stem = effectApiStem(service);
-    const groupName = verticalEffectGroupName(service);
-    const singular = verticalEffectErrorStem(service);
+function createApiClient(service, contractImportPath) {
+    const apiExport = verticalApiExport(service);
+    const contractExport = verticalApiGroupName(service);
+    const stem = resolveApiStem(service);
+    const groupName = verticalApiGroupName(service);
+    const singular = verticalApiErrorStem(service);
     const clientOptionsName = `${toPascalCase(stem)}ClientOptions`;
     const createClientName = `create${toPascalCase(stem)}Client`;
     const clientTypeName = `${toPascalCase(stem)}Client`;
@@ -657,7 +657,7 @@ function createEffectClient(service, contractImportPath) {
     const readinessName = `get${toPascalCase(stem)}Readiness`;
     const getName = `get${toPascalCase(singular)}`;
     const createName = `create${toPascalCase(singular)}`;
-    const notFoundErrorExport = verticalEffectNotFoundErrorExport(service);
+    const notFoundErrorExport = verticalApiNotFoundErrorExport(service);
     const pascalStem = toPascalCase(stem);
     const itemType = `${pascalStem}Item`;
     const readinessType = `${pascalStem}Readiness`;
@@ -692,7 +692,7 @@ import type {
 
 export { Effect, runEffectRequest };
 
-type ${pascalStem}EffectGroups = typeof ${apiExport} extends HttpApi.HttpApi<
+type ${pascalStem}ApiGroups = typeof ${apiExport} extends HttpApi.HttpApi<
   infer _ApiId,
   infer Groups
 >
@@ -700,7 +700,7 @@ type ${pascalStem}EffectGroups = typeof ${apiExport} extends HttpApi.HttpApi<
   : never;
 
 export type ${clientTypeName} = HttpApiClient.Client<
-  Extract<${pascalStem}EffectGroups, HttpApiGroup.Any>,
+  Extract<${pascalStem}ApiGroups, HttpApiGroup.Any>,
   never,
   never
 >;
@@ -790,11 +790,11 @@ export const ${createName} = (
   );${checkoutCartClientExports}
 `;
 }
-function createShellEffectClient(scope, remotes = []) {
-    const exports = verticalEffectApps(remotes).map((remote)=>{
-        const stem = effectApiStem(remote);
+function createShellApiClient(scope, remotes = []) {
+    const exports = verticalApiApps(remotes).map((remote)=>{
+        const stem = resolveApiStem(remote);
         const pascalStem = toPascalCase(stem);
-        const pascalSingular = toPascalCase(verticalEffectErrorStem(remote));
+        const pascalSingular = toPascalCase(verticalApiErrorStem(remote));
         const checkoutCartExports = serviceHasCheckoutCartState(remote) ? `  addCheckoutCartItem,
   clearCheckoutCart,
   getCheckoutCart,
@@ -810,15 +810,15 @@ ${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;
 `;
 }
-function createEffectReadinessContract(app) {
-    const stem = effectApiStem(app);
+function createApiReadinessContract(app) {
+    const stem = resolveApiStem(app);
     return {
-        endpoint: `/effect/${stem}/readiness`,
+        endpoint: `/${stem}/readiness`,
         marker: {
             ui: 'ultramodernUiMarker',
             api: 'ultramodernApiMarker',
@@ -828,11 +828,11 @@ function createEffectReadinessContract(app) {
             'moduleFederation',
             'ssr',
             'translations',
-            'effectBff'
+            'api'
         ]
     };
 }
-function createEffectRequestContextContract() {
+function createApiRequestContextContract() {
     return {
         propagatedHeaders: [
             'accept-language',
@@ -843,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}`;
+function createApiDomainOperations(app) {
+    const stem = resolveApiStem(app);
+    const group = verticalApiGroupName(app);
+    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
         }
@@ -890,14 +890,14 @@ function createEffectDomainOperations(app) {
             owner: app.id
         },
         workspaceDetail: {
-            client: `get${toPascalCase(verticalEffectErrorStem(app))}`,
+            client: `get${toPascalCase(verticalApiErrorStem(app))}`,
             method: 'GET',
             path: `${basePath}/:id`,
             resource: 'workspace-item',
             owner: app.id
         },
         workspaceCreate: {
-            client: `create${toPascalCase(verticalEffectErrorStem(app))}`,
+            client: `create${toPascalCase(verticalApiErrorStem(app))}`,
             method: 'POST',
             path: basePath,
             resource: group,
@@ -905,82 +905,81 @@ function createEffectDomainOperations(app) {
         }
     };
 }
-function effectApiTopologyMetadata(app) {
-    if (!appHasEffectApi(app)) return;
+function apiTopologyMetadata(app) {
+    if (!appHasApi(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.api.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.api.stem}-client.ts`
+        },
+        serverEntry: `${app.directory}/api/index.ts`,
+        basePath: `${app.api.prefix}/${app.api.stem}`,
+        consumedBy: app.api.consumedBy,
+        readiness: createApiReadinessContract(app),
+        requestContext: createApiRequestContextContract(),
+        domainOperations: createApiDomainOperations(app)
     };
 }
-function createEffectOperationContract(target) {
-    const stem = effectApiStem(target);
+function createApiOperationContract(target) {
+    const stem = resolveApiStem(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'
         }
     } : {};
     return {
-        group: verticalEffectGroupName(target),
-        notFound: verticalEffectNotFoundErrorExport(target),
+        group: verticalApiGroupName(target),
+        notFound: verticalApiNotFoundErrorExport(target),
         operations: {
             ...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'
             }
         }
     };
 }
-export { createEffectClient, createEffectDomainOperations, createEffectOperationContract, createEffectReadinessContract, createEffectRequestContextContract, createEffectServiceEntry, createEffectSharedApi, createEffectSharedApiContract, createEffectSharedApiImports, createShellEffectClient, effectApiTopologyMetadata, verticalEffectApiExport, verticalEffectApiName, verticalEffectCreatePayloadSchemaExport, verticalEffectErrorStem, verticalEffectGroupName, verticalEffectMarkerSchemaExport, verticalEffectNotFoundErrorExport, verticalEffectNotFoundSchemaExport, verticalEffectReadinessSchemaExport, verticalEffectSchemaExport };
+export { apiTopologyMetadata, createApiClient, createApiDomainOperations, createApiOperationContract, createApiReadinessContract, createApiRequestContextContract, createApiServiceEntry, createSharedApi, createSharedApiContract, createSharedApiImports, createShellApiClient, verticalApiCreatePayloadSchemaExport, verticalApiErrorStem, verticalApiExport, verticalApiGroupName, verticalApiMarkerSchemaExport, verticalApiName, verticalApiNotFoundErrorExport, verticalApiNotFoundSchemaExport, verticalApiReadinessSchemaExport, verticalApiSchemaExport };