@bleedingdev/modern-js-ultramodern-create 3.9.0-ultramodern.12 → 3.9.0-ultramodern.13

package/dist/cjs/ultramodern-workspace/add-vertical/execute.cjs

@@ -40,6 +40,8 @@ __webpack_require__.d(__webpack_exports__, {
     addUltramodernVertical: ()=>addUltramodernVertical,
     executeAddUltramodernVertical: ()=>executeAddUltramodernVertical
 });
+const external_node_fs_namespaceObject = require("node:fs");
+var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
 const config_cjs_namespaceObject = require("../../ultramodern-tooling/config.cjs");
@@ -78,7 +80,8 @@ function executeAddUltramodernVertical(options, logicalWorkspaceRoot = options.w
                 verticalRefs: app.verticalRefs?.filter((id)=>existingIds.has(id))
             } : app);
     const previousApps = (0, config_cjs_namespaceObject.normalizeWorkspaceInputs)(options.workspaceRoot, {
-        config
+        topology,
+        overlay
     }).apps;
     const previousDevPorts = (0, external_workspace_artifact_ownership_cjs_namespaceObject.workspaceDevelopmentPorts)(previousApps);
     const { io: ownedIo } = (0, external_workspace_artifact_ownership_cjs_namespaceObject.preserveConsumerWorkspaceArtifacts)(options.workspaceRoot, (0, external_workspace_artifact_ownership_cjs_namespaceObject.workspaceArtifactCandidates)(scope, previousProjection(previousApps), previousTailwind, previousProjection([
@@ -101,6 +104,13 @@ function executeAddUltramodernVertical(options, logicalWorkspaceRoot = options.w
         ...nextAdditionalShells
     ], overlay.ports);
     (0, external_write_workspace_cjs_namespaceObject.writeApp)(options.workspaceRoot, scope, vertical, packageSource, enableTailwind, updatedVerticals, bridge, configuredDevPorts);
+    const newPackagePath = external_node_path_default().join(options.workspaceRoot, vertical.directory, 'package.json');
+    const newPackage = JSON.parse(external_node_fs_default().readFileSync(newPackagePath, 'utf-8'));
+    newPackage.dependencies = {
+        ...newPackage.dependencies,
+        ...config.inheritedWorkspaceDependencies
+    };
+    (0, external_fs_io_cjs_namespaceObject.writeJsonFile)(newPackagePath, newPackage);
     if (targetShell.id === primaryShell.id) {
         topology.shell ??= {};
         topology.shell.deliveryUnit = {
@@ -110,7 +120,10 @@ function executeAddUltramodernVertical(options, logicalWorkspaceRoot = options.w
         };
         topology.shell.verticalRefs = nextTargetShell.verticalRefs;
         topology.shell.moduleFederation ??= {};
-        topology.shell.moduleFederation.remotes = (0, external_descriptors_cjs_namespaceObject.createModuleFederationRemoteContracts)(nextPrimaryShell, updatedVerticals).map((remote)=>({
+        topology.shell.moduleFederation.remotes = preserveAuthoredRemoteUrls(topology.shell.moduleFederation.remotes, (0, external_descriptors_cjs_namespaceObject.createModuleFederationRemoteContracts)({
+            ...primaryShell,
+            verticalRefs: primaryShell.verticalRefs?.filter((id)=>existingIds.has(id))
+        }, existingVerticals), (0, external_descriptors_cjs_namespaceObject.createModuleFederationRemoteContracts)(nextPrimaryShell, updatedVerticals)).map((remote)=>({
                 id: remote.id,
                 name: remote.name,
                 manifestUrl: remote.manifestUrl
@@ -148,41 +161,19 @@ function executeAddUltramodernVertical(options, logicalWorkspaceRoot = options.w
     (0, external_fs_io_cjs_namespaceObject.writeJsonFile)(topologyPath, topology);
     (0, external_fs_io_cjs_namespaceObject.writeJsonFile)(ownershipPath, ownership);
     (0, external_fs_io_cjs_namespaceObject.writeJsonFile)(overlayPath, overlay);
-    const generatedConfig = (0, external_write_workspace_cjs_namespaceObject.createCompactUltramodernConfig)(scope, options.modernVersion, packageSource, [
-        nextPrimaryShell,
-        ...updatedVerticals
-    ], enableTailwind, bridge, nextAdditionalShells, nextPrimaryShell);
-    const newEntry = generatedConfig.topology.apps.find((app)=>app.id === vertical.id);
-    for (const key of [
-        'moduleFederation',
-        'backendFederation'
-    ])config[key] = {
-        ...config[key],
-        apps: [
-            ...(0, config_cjs_namespaceObject.preserveUnknownProjectionFields)(config[key]?.apps, generatedConfig[key].apps)
-        ]
-    };
-    config.features = {
-        ...config.features,
-        tailwind: enableTailwind
-    };
-    config.topology = {
-        ...config.topology,
-        apps: [
-            ...config.topology.apps.map((app)=>{
-                const generated = generatedConfig.topology.apps.find((entry)=>entry.id === app.id);
-                return app.id === primaryShell.id ? updateShellComposition(app, generated) : {
-                    ...app,
-                    ...generated?.backendFederation ? {
-                        backendFederation: (0, config_cjs_namespaceObject.preserveUnknownProjectionFields)(app.backendFederation, generated.backendFederation)
-                    } : {}
-                };
-            }),
-            newEntry
-        ]
-    };
-    if (Array.isArray(config.shells)) config.shells = config.shells.map((entry)=>entry?.id === nextTargetShell.id ? updateShellComposition(entry, generatedConfig.shells.find((shell)=>shell.id === entry.id)) : entry);
-    (0, external_fs_io_cjs_namespaceObject.writeJsonFile)(external_node_path_default().join(options.workspaceRoot, external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH), config);
+    if (targetShell.id !== primaryShell.id) {
+        topology.shells = (topology.shells ?? []).map((entry)=>entry.id === nextTargetShell.id ? updateShellComposition(entry, {
+                verticalRefs: nextTargetShell.verticalRefs,
+                moduleFederation: {
+                    verticalRefs: nextTargetShell.verticalRefs,
+                    remotes: preserveAuthoredRemoteUrls(entry.moduleFederation?.remotes, (0, external_descriptors_cjs_namespaceObject.createModuleFederationRemoteContracts)({
+                        ...targetShell,
+                        verticalRefs: targetShell.verticalRefs?.filter((id)=>existingIds.has(id))
+                    }, existingVerticals), (0, external_descriptors_cjs_namespaceObject.createModuleFederationRemoteContracts)(nextTargetShell, updatedVerticals))
+                }
+            }) : entry);
+        (0, external_fs_io_cjs_namespaceObject.writeJsonFile)(topologyPath, topology);
+    }
     ownedIo.write(external_node_path_default().join(options.workspaceRoot, 'zerops.yaml'), `${(0, external_zerops_cjs_namespaceObject.createZeropsYaml)(scope, [
         nextPrimaryShell,
         ...updatedVerticals,
@@ -192,12 +183,12 @@ function executeAddUltramodernVertical(options, logicalWorkspaceRoot = options.w
         nextPrimaryShell,
         ...nextAdditionalShells
     ])(0, external_shell_files_cjs_namespaceObject.rewriteShellAppFiles)(options.workspaceRoot, scope, packageSource, enableTailwind, updatedVerticals, bridge, shellToRefresh.id === nextTargetShell.id ? nextTargetShell : shellToRefresh, configuredDevPorts, {
-        shell: previousApps.find((app)=>app.id === shellToRefresh.id),
+        shell: previousProjection(previousApps).find((app)=>app.id === shellToRefresh.id),
         remotes: existingVerticals,
         devPorts: previousDevPorts,
         enableTailwind: previousTailwind
     });
-    (0, external_workspace_scripts_cjs_namespaceObject.writeGeneratedWorkspaceScripts)(options.workspaceRoot, updatedVerticals, {
+    (0, external_workspace_scripts_cjs_namespaceObject.writeGeneratedWorkspaceScripts)(options.workspaceRoot, {
         io: {
             writeGenerated: ownedIo.write
         }
@@ -270,6 +261,16 @@ function updateShellComposition(current, generated) {
         }
     };
 }
+function preserveAuthoredRemoteUrls(current, previousGenerated, nextGenerated) {
+    return nextGenerated.map((remote)=>{
+        const previous = Array.isArray(current) ? current.find((entry)=>entry.id === remote.id) : void 0;
+        const generated = previousGenerated.find((entry)=>entry.id === remote.id);
+        return previous?.manifestUrl && previous.manifestUrl !== generated?.manifestUrl ? {
+            ...remote,
+            manifestUrl: previous.manifestUrl
+        } : remote;
+    });
+}
 exports.addUltramodernVertical = __webpack_exports__.addUltramodernVertical;
 exports.executeAddUltramodernVertical = __webpack_exports__.executeAddUltramodernVertical;
 for(var __rspack_i in __webpack_exports__)if (-1 === [

package/dist/cjs/ultramodern-workspace/add-vertical/plan.cjs

@@ -71,7 +71,7 @@ function createVerticalPlan(preflight, result, jsonMutations) {
         shellDependencyChanges: createShellDependencyChanges(scope, vertical, targetShell),
         generatedContractChanges: [
             {
-                path: external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH,
+                path: 'topology/reference-topology.json',
                 addedAppIds: [
                     vertical.id
                 ],

package/dist/cjs/ultramodern-workspace/add-vertical/preflight.cjs

@@ -39,7 +39,6 @@ __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     UnknownUltramodernShellError: ()=>UnknownUltramodernShellError,
     assertNonEmptyString: ()=>assertNonEmptyString,
-    createPrimaryShellDescriptor: ()=>external_topology_cjs_namespaceObject.createPrimaryShellDescriptor,
     prepareAddUltramodernVertical: ()=>prepareAddUltramodernVertical,
     readRequiredJsonObject: ()=>readRequiredJsonObject
 });
@@ -54,7 +53,6 @@ const external_naming_cjs_namespaceObject = require("../naming.cjs");
 const external_types_cjs_namespaceObject = require("../types.cjs");
 const external_constants_cjs_namespaceObject = require("./constants.cjs");
 const external_workspace_state_cjs_namespaceObject = require("./workspace-state.cjs");
-const external_topology_cjs_namespaceObject = require("./topology.cjs");
 class UnknownUltramodernShellError extends Error {
     constructor(sourcePath, requestedShellId, available){
         const issue = {
@@ -77,7 +75,6 @@ function prepareAddUltramodernVertical(options) {
     const topology = readRequiredJsonObject(topologyPath);
     const ownership = readRequiredJsonObject(ownershipPath);
     const overlay = readRequiredJsonObject(overlayPath);
-    const config = readRequiredJsonObject(external_node_path_default().join(options.workspaceRoot, external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH));
     assertOptionalJsonObject(topology.shell, 'topology.shell', topologyPath);
     assertOptionalJsonArray(topology.verticals, 'topology.verticals', topologyPath);
     assertOptionalJsonArray(ownership.owners, 'ownership.owners', ownershipPath);
@@ -85,7 +82,6 @@ function prepareAddUltramodernVertical(options) {
     assertOptionalJsonObject(overlay.manifests, 'overlay.manifests', overlayPath);
     assertOptionalJsonObject(overlay.apis, 'overlay.apis', overlayPath);
     const workspace = (0, config_cjs_namespaceObject.normalizeWorkspaceInputs)(options.workspaceRoot, {
-        config,
         topology,
         overlay
     });
@@ -95,7 +91,7 @@ function prepareAddUltramodernVertical(options) {
     const existingVerticals = workspace.verticals;
     const additionalShells = workspace.additionalShells;
     const resolvedPrimaryShell = workspace.primaryShell;
-    const targetShell = resolveTargetShell(options.shell, resolvedPrimaryShell, additionalShells, external_node_path_default().join(options.workspaceRoot, external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH));
+    const targetShell = resolveTargetShell(options.shell, resolvedPrimaryShell, additionalShells, topologyPath);
     const portsWithPrimary = {
         ...overlay.ports,
         [resolvedPrimaryShell.id]: resolvedPrimaryShell.port
@@ -131,7 +127,7 @@ function prepareAddUltramodernVertical(options) {
         ownershipPath,
         overlayPath,
         rootPackage,
-        config,
+        config: workspace.config,
         topology,
         ownership,
         overlay,
@@ -215,13 +211,11 @@ function assertSafeOutputPath(relativePath, appId) {
 }
 exports.UnknownUltramodernShellError = __webpack_exports__.UnknownUltramodernShellError;
 exports.assertNonEmptyString = __webpack_exports__.assertNonEmptyString;
-exports.createPrimaryShellDescriptor = __webpack_exports__.createPrimaryShellDescriptor;
 exports.prepareAddUltramodernVertical = __webpack_exports__.prepareAddUltramodernVertical;
 exports.readRequiredJsonObject = __webpack_exports__.readRequiredJsonObject;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
     "UnknownUltramodernShellError",
     "assertNonEmptyString",
-    "createPrimaryShellDescriptor",
     "prepareAddUltramodernVertical",
     "readRequiredJsonObject"
 ].indexOf(__rspack_i)) exports[__rspack_i] = __webpack_exports__[__rspack_i];

package/dist/cjs/ultramodern-workspace/add-vertical/topology.cjs

@@ -28,7 +28,6 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    createPrimaryShellDescriptor: ()=>createPrimaryShellDescriptor,
     ownershipEntry: ()=>ownershipEntry,
     verticalTopologyEntry: ()=>verticalTopologyEntry,
     verticalsFromTopology: ()=>verticalsFromTopology
@@ -143,41 +142,10 @@ function verticalsFromTopology(topology, ports) {
         };
     });
 }
-function createPrimaryShellDescriptor(topology, config) {
-    const compactShell = config.topology?.apps?.find((app)=>app?.id === external_descriptors_cjs_namespaceObject.shellApp.id);
-    const verticalRefs = Array.isArray(topology.shell?.verticalRefs) ? topology.shell.verticalRefs.filter((id)=>'string' == typeof id) : Array.isArray(compactShell?.moduleFederation?.verticalRefs) ? compactShell.moduleFederation.verticalRefs.filter((id)=>'string' == typeof id) : [];
-    return {
-        ...external_descriptors_cjs_namespaceObject.shellApp,
-        ...compactShell?.deliveryUnit || topology.shell?.deliveryUnit ? {
-            deliveryUnit: compactShell?.deliveryUnit ?? topology.shell.deliveryUnit
-        } : {},
-        verticalRefs,
-        ...'string' == typeof compactShell?.packageSuffix ? {
-            packageSuffix: compactShell.packageSuffix
-        } : {},
-        ...'string' == typeof compactShell?.displayName ? {
-            displayName: compactShell.displayName
-        } : {},
-        ...'string' == typeof compactShell?.path ? {
-            directory: compactShell.path
-        } : {},
-        ...'number' == typeof compactShell?.port ? {
-            port: compactShell.port
-        } : {},
-        ...'string' == typeof compactShell?.portEnv ? {
-            portEnv: compactShell.portEnv
-        } : {},
-        ...'string' == typeof compactShell?.moduleFederation?.name ? {
-            mfName: compactShell.moduleFederation.name
-        } : {}
-    };
-}
-exports.createPrimaryShellDescriptor = __webpack_exports__.createPrimaryShellDescriptor;
 exports.ownershipEntry = __webpack_exports__.ownershipEntry;
 exports.verticalTopologyEntry = __webpack_exports__.verticalTopologyEntry;
 exports.verticalsFromTopology = __webpack_exports__.verticalsFromTopology;
 for(var __rspack_i in __webpack_exports__)if (-1 === [
-    "createPrimaryShellDescriptor",
     "ownershipEntry",
     "verticalTopologyEntry",
     "verticalsFromTopology"

package/dist/cjs/ultramodern-workspace/add-vertical/workspace-state.cjs

@@ -48,7 +48,6 @@ const external_node_fs_namespaceObject = require("node:fs");
 var external_node_fs_default = /*#__PURE__*/ __webpack_require__.n(external_node_fs_namespaceObject);
 const external_node_path_namespaceObject = require("node:path");
 var external_node_path_default = /*#__PURE__*/ __webpack_require__.n(external_node_path_namespaceObject);
-const external_descriptors_cjs_namespaceObject = require("../descriptors.cjs");
 const external_naming_cjs_namespaceObject = require("../naming.cjs");
 const external_package_source_cjs_namespaceObject = require("../package-source.cjs");
 const external_constants_cjs_namespaceObject = require("./constants.cjs");
@@ -59,11 +58,11 @@ function workspaceOperationSettings(options, config) {
         modernVersion: options.modernVersion,
         packageSource: options.packageSource
     }) : config.packageSource;
-    if (!packageSource) throw new Error(`Missing UltraModern package source: ${external_node_path_default().join(options.workspaceRoot, external_descriptors_cjs_namespaceObject.ULTRAMODERN_CONFIG_PATH)}`);
+    if (!packageSource) throw new Error(`Missing UltraModern package source in workspace manifests: ${options.workspaceRoot}`);
     return {
         packageSource,
         enableTailwind: options.enableTailwind ?? config.features.tailwind,
-        bridge: config.bridge
+        bridge: void 0
     };
 }
 function assertValidVerticalName(name) {
@@ -74,8 +73,7 @@ function assertValidVerticalName(name) {
 function configuredDevelopmentPorts(ports, additionalShells = []) {
     return [
         ...new Set([
-            ...Object.values(ports),
-            ...additionalShells.map((shell)=>shell.port)
+            ...Object.values(ports)
         ].filter((value)=>'number' == typeof value && Number.isFinite(value)))
     ];
 }
@@ -87,11 +85,6 @@ function assertGlobalPortUniqueness(ports, additionalShells = []) {
         if (previous) throw new Error(`Duplicate development port "${value}" for ${previous} and ${id}.`);
         owners.set(value, id);
     }
-    for (const shell of additionalShells){
-        const previous = owners.get(shell.port);
-        if (previous) throw new Error(`Duplicate development port "${shell.port}" for ${previous} and ${shell.id}.`);
-        owners.set(shell.port, shell.id);
-    }
 }
 function nextAvailablePort(ports, additionalShells = [], minimumPort = external_constants_cjs_namespaceObject.FIRST_VERTICAL_PORT) {
     const used = new Set(configuredDevelopmentPorts(ports, additionalShells));

package/dist/cjs/ultramodern-workspace/api/contracts.cjs

@@ -145,7 +145,7 @@ function apiTopologyMetadata(app) {
         },
         client: {
             export: './api/rpc-client',
-            path: `${app.directory}/src/api/${app.api.stem}-rpc-client.ts`
+            path: `${app.directory}/${'api-only' === app.surfaceProfile ? 'shared' : 'src/api'}/${app.api.stem}-rpc-client.ts`
         },
         serverEntry: `${app.directory}/api/index.ts`,
         rpcPath: (0, external_rpc_cjs_namespaceObject.rpcPath)(app),
@@ -168,7 +168,7 @@ function apiTopologyMetadata(app) {
         },
         client: {
             export: './api/client',
-            path: `${app.directory}/src/api/${app.api.stem}-client.ts`
+            path: `${app.directory}/${'api-only' === app.surfaceProfile ? 'shared' : 'src/api'}/${app.api.stem}-client.ts`
         },
         serverEntry: `${app.directory}/api/index.ts`,
         basePath: `${app.api.prefix}/${app.api.stem}`,

package/dist/cjs/ultramodern-workspace/api/rpc.cjs

@@ -74,7 +74,9 @@ export const ${itemSchema}: Schema.Codec<${pascalStem}RpcItem> = Schema.Struct({
   title: Schema.String,
 });
 
-export class ${notFound} extends Schema.TaggedError<${notFound}>()(
+const taggedErrorSchema = Schema.TaggedError;
+
+export class ${notFound} extends taggedErrorSchema<${notFound}>()(
   '${notFound}',
   {
   id: Schema.String,
@@ -85,13 +87,13 @@ export class ${notFound} extends Schema.TaggedError<${notFound}>()(
 // (mirrors the shapes Effect BFF's RpcServer/RpcClient runtime accepts).
 export const ${groupExport} = RpcGroup.make(
   Rpc.make('list', {
-    success: Schema.Struct({ items: Schema.Array(${itemSchema}) }),
     payload: { limit: Schema.optional(Schema.Number) },
+    success: Schema.Struct({ items: Schema.Array(${itemSchema}) }),
   }),
   Rpc.make('get', {
-    success: ${itemSchema},
     error: ${notFound},
     payload: { id: Schema.String },
+    success: ${itemSchema},
   }),
 );
 
@@ -117,6 +119,12 @@ function rpcServiceEntryWiring(service) {
     const layer = `
 const ${groupName}RpcLayer = ${groupExport}.toLayer(
   ${groupExport}.of({
+    get: ({ id }) => {
+      const matched = ${groupName}Items.find(candidate => candidate.id === id);
+      return matched === undefined
+        ? Effect.fail(new ${notFound}({ id }))
+        : Effect.succeed({ id: matched.id, title: matched.title });
+    },
     list: ({ limit }) =>
       Effect.succeed({
         items:
@@ -130,12 +138,6 @@ const ${groupName}RpcLayer = ${groupExport}.toLayer(
                 title: item.title,
               })),
       }),
-    get: ({ id }) => {
-      const matched = ${groupName}Items.find(candidate => candidate.id === id);
-      return matched === undefined
-        ? Effect.fail(new ${notFound}({ id }))
-        : Effect.succeed({ id: matched.id, title: matched.title });
-    },
   }),
 );
 `;
@@ -186,11 +188,11 @@ const apiRuntime = defineEffectBff({
 ${rpc.field}
 });
 
-export { ${groupExport} };
+export { ${groupExport} } from '../shared/rpc.ts';
 export default apiRuntime;
 `;
 }
-function createRpcClientFile(service) {
+function createRpcClientFile(service, contractImportPath = '../../shared/rpc.ts') {
     const groupExport = verticalRpcGroupExport(service);
     const contractExport = verticalRpcContractExport(service);
     const stem = (0, external_descriptors_cjs_namespaceObject.resolveApiStem)(service);
@@ -202,11 +204,11 @@ function createRpcClientFile(service) {
 import {
   ${contractExport},
   ${groupExport},
-} from '../../shared/rpc.ts';
+} from '${contractImportPath}';
 
 export { Effect } from '@modern-js/bff-effect/effect-client';
 
-export const ${pascalStem}RpcContract = ${contractExport};
+export { ${contractExport} as ${pascalStem}RpcContract } from '${contractImportPath}';
 
 export interface ${pascalStem}RpcClientOptions {
   url?: string | URL;
@@ -216,8 +218,8 @@ export const make${pascalStem}RpcClient = (
   options: ${pascalStem}RpcClientOptions = {},
 ) =>
   makeEffectRpcClient(${groupExport}, {
-    url: String(options.url ?? ${contractExport}.path),
     serialization: 'json',
+    url: String(options.url ?? ${contractExport}.path),
   });
 
 export const list${pascalStem}Rpc = (

package/dist/cjs/ultramodern-workspace/api/service.cjs

@@ -43,7 +43,7 @@ function createApiServiceEntry(service, contractImportPath, options) {
     const groupName = (0, external_names_cjs_namespaceObject.verticalApiGroupName)(service);
     const notFoundErrorExport = (0, external_names_cjs_namespaceObject.verticalApiNotFoundErrorExport)(service);
     const stem = (0, external_descriptors_cjs_namespaceObject.resolveApiStem)(service);
-    const assemblyImport = options ? `import { assembleEffectBffRuntime } from '${(0, external_naming_cjs_namespaceObject.packageName)(options.scope, 'shared-contracts')}/server/effect-bff-runtime';\n` : '';
+    const assemblyImport = options ? "import { assembleEffectBffRuntime } from '@modern-js/bff-effect/assembly';\n" : '';
     return `${assemblyImport}import {
   ${options ? '' : 'defineEffectBff,'}
   Effect,
@@ -202,12 +202,8 @@ export default apiRuntime;
 function createBackendEffectApiExpose(scope, service) {
     if ((service.api?.protocol ?? 'rest') === 'rpc') {
         const groupExport = (0, external_rpc_cjs_namespaceObject.verticalRpcGroupExport)(service);
-        const contractExport = (0, external_rpc_cjs_namespaceObject.verticalRpcContractExport)(service);
         return `import { ultramodernApiMarker } from '../shared/ultramodern-build.ts';
-import {
-  ${contractExport},
-  ${groupExport},
-} from '../shared/rpc.ts';
+import { ${groupExport} } from '../shared/rpc.ts';
 
 export const backendFederationContract = {
   compatibility: {
@@ -221,16 +217,16 @@ export const backendFederationContract = {
   executionSurfaces: ['node-mf-runtime'],
   exposes: ['./effect-api'],
   name: '${(0, external_descriptors_cjs_namespaceObject.createBackendFederationName)(service)}',
+  role: 'microvertical-server',
   rpcPath: '${(0, external_rpc_cjs_namespaceObject.rpcPath)(service)}',
   rpcSerialization: 'json',
-  role: 'microvertical-server',
   runtimeFramework: 'effect',
   strictEffectApproach: true,
 } as const;
 
 export { default, default as runtime } from './index.ts';
 export {
-  ${contractExport} as contract,
+  ${(0, external_rpc_cjs_namespaceObject.verticalRpcContractExport)(service)} as contract,
   ${groupExport} as rpc,
 } from '../shared/rpc.ts';
 export const api: unknown = ${groupExport};

package/dist/cjs/ultramodern-workspace/api/shared.cjs

@@ -197,7 +197,7 @@ ${shared ? 'export type OperationContext = MicroVerticalOperationContext;' : `ex
     | 'client'
     | 'server'
     | 'generated-client'
-    | 'effect-adapter'
+    | 'effect-server'
     | 'data-platform'
     | 'unknown';
   traceId?: string;

package/dist/cjs/ultramodern-workspace/backend-federation.cjs

@@ -66,14 +66,14 @@ function createEffectExpose(app) {
     if ('rpc' === (0, external_descriptors_cjs_namespaceObject.resolveApiProtocol)(app)) return {
         contract: `${app.directory}/shared/rpc.ts`,
         runtime: `${app.directory}/api/index.ts`,
-        client: `${app.directory}/src/api/${app.api.stem}-rpc-client.ts`,
+        client: `${app.directory}/${'api-only' === app.surfaceProfile ? 'shared' : 'src/api'}/${app.api.stem}-rpc-client.ts`,
         rpc: (0, rpc_cjs_namespaceObject.rpcPath)(app),
         serialization: 'json'
     };
     return {
         contract: `${app.directory}/shared/api.ts`,
         runtime: `${app.directory}/api/index.ts`,
-        client: `${app.directory}/src/api/${app.api.stem}-client.ts`,
+        client: `${app.directory}/${'api-only' === app.surfaceProfile ? 'shared' : 'src/api'}/${app.api.stem}-client.ts`,
         openapi: `${app.api.prefix}/openapi.json`,
         readiness: `${app.api.prefix}/${apiStem}/readiness`
     };
@@ -262,9 +262,9 @@ export const backendFederationContract = {
   exposes: ['${backend_federation_contracts_namespaceObject.BACKEND_FEDERATION_EFFECT_EXPOSE}'],
   name: '${(0, external_descriptors_cjs_namespaceObject.createBackendFederationName)(app)}',
   nodeAdapterVersion: '${backend_federation_contracts_namespaceObject.BACKEND_FEDERATION_NODE_ADAPTER_VERSION}',
+  role: 'microvertical-server',
   rpcPath: '${(0, rpc_cjs_namespaceObject.rpcPath)(app)}',
   rpcSerialization: 'json',
-  role: 'microvertical-server',
   runtimeFramework: 'effect',
   strictEffectApproach: true,
 } as const;