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

package/dist/esm/ultramodern-workspace/add-vertical.js

@@ -2,12 +2,12 @@ import node_fs from "node:fs";
 import node_os from "node:os";
 import node_path from "node:path";
 import { WORKSPACE_PACKAGE_VERSION } from "../ultramodern-package-source.js";
+import { readUltramodernConfig } from "../ultramodern-tooling/config.js";
+import { apiTopologyMetadata, createShellApiClient } from "./api.js";
 import { createAppEnvDts, createAppRuntimeConfig, createShellFrameComponent } from "./app-files.js";
-import { createGeneratedContract } from "./contracts.js";
 import { createShellPage, createShellRemoteComponents } from "./demo-components.js";
-import { GENERATED_CONTRACT_PATH, appHasEffectApi, appI18nNamespace, createModuleFederationRemoteContracts, createNeutralOwnership, createRemoteManifestEnv, createShellHost, createVerticalDescriptor, effectApiPrefix, remoteDependencyAlias, shellApp, zephyrRemoteDependency } from "./descriptors.js";
-import { createShellEffectClient, effectApiTopologyMetadata } from "./effect-api.js";
-import { readJsonFile, writeFileReplacing, writeJsonFile } from "./fs-io.js";
+import { ULTRAMODERN_CONFIG_PATH, appHasApi, appI18nNamespace, createModuleFederationRemoteContracts, createNeutralOwnership, createRemoteManifestEnv, createShellHost, createVerticalDescriptor, remoteDependencyAlias, resolveApiPrefix, shellApp, zephyrRemoteDependency } from "./descriptors.js";
+import { formatGeneratedWorkspaceFiles, readJsonFile, writeFileReplacing, writeJsonFile } from "./fs-io.js";
 import { createFileSnapshot, createGenerationResult, diffFileSnapshots } from "./generation-result.js";
 import { createAppPublicLocaleMessages } from "./locales.js";
 import { createShellModuleFederationConfig } from "./module-federation.js";
@@ -19,12 +19,11 @@ import { createCloudflareDeployContract } from "./policy.js";
 import { createPublicWebAppArtifacts, rewriteWorkspaceAssetsForApp } from "./public-surface.js";
 import { isRecord } from "./types.js";
 import { writeGeneratedWorkspaceScripts } from "./workspace-scripts.js";
-import { writeApp } from "./write-workspace.js";
+import { createCompactUltramodernConfig, writeApp } from "./write-workspace.js";
 const FIRST_VERTICAL_PORT = 4101;
 const TOPOLOGY_PATH = 'topology/reference-topology.json';
 const OWNERSHIP_PATH = 'topology/ownership.json';
 const DEVELOPMENT_OVERLAY_PATH = 'topology/local-overlays/development.json';
-const PACKAGE_SOURCE_METADATA_PATH = '.modernjs/ultramodern-package-source.json';
 function existingPackageSource(workspaceRoot, modernVersion, packageSource) {
     if (packageSource) return resolvePackageSource({
         targetDir: workspaceRoot,
@@ -32,35 +31,21 @@ function existingPackageSource(workspaceRoot, modernVersion, packageSource) {
         modernVersion,
         packageSource
     });
-    const metadataPath = node_path.join(workspaceRoot, '.modernjs/ultramodern-package-source.json');
-    if (!node_fs.existsSync(metadataPath)) return resolvePackageSource({
-        targetDir: workspaceRoot,
-        packageName: node_path.basename(workspaceRoot),
-        modernVersion
-    });
-    const metadata = readJsonFile(metadataPath);
-    const aliases = metadata.modernPackages?.aliases ?? {};
-    const firstAlias = Object.values(aliases).find((value)=>'string' == typeof value);
-    const firstPackage = Object.keys(aliases)[0];
-    const aliasScope = firstAlias?.match(/^@([^/]+)\//)?.[1];
-    const unscopedName = firstPackage?.split('/').at(-1) ?? '';
-    const aliasUnscopedName = firstAlias?.split('/').at(-1) ?? '';
-    const aliasPackageNamePrefix = aliasUnscopedName && unscopedName && aliasUnscopedName.endsWith(unscopedName) ? aliasUnscopedName.slice(0, -unscopedName.length) : void 0;
-    return {
-        strategy: 'install' === metadata.strategy ? 'install' : 'workspace',
-        modernPackageVersion: 'string' == typeof metadata.modernPackages?.specifier ? metadata.modernPackages.specifier : modernVersion,
-        registry: metadata.modernPackages?.registry,
-        aliasScope,
-        aliasPackageNamePrefix
-    };
+    const compactPath = node_path.join(workspaceRoot, ULTRAMODERN_CONFIG_PATH);
+    if (node_fs.existsSync(compactPath)) {
+        const compactConfig = readUltramodernConfig(workspaceRoot);
+        if (compactConfig.packageSource) return compactConfig.packageSource;
+    }
+    throw new Error(`Missing UltraModern workspace file: ${compactPath}`);
 }
 function existingTailwindEnabled(workspaceRoot) {
-    const contractPath = node_path.join(workspaceRoot, GENERATED_CONTRACT_PATH);
-    if (!node_fs.existsSync(contractPath)) return true;
-    const contract = readJsonFile(contractPath);
-    const apps = isRecord(contract) && Array.isArray(contract.apps) ? contract.apps : [];
-    const shell = apps.find((app)=>isRecord(app) && app.id === shellApp.id);
-    return shell?.styling && isRecord(shell.styling) ? false !== shell.styling.tailwind : true;
+    const compactPath = node_path.join(workspaceRoot, ULTRAMODERN_CONFIG_PATH);
+    if (node_fs.existsSync(compactPath)) return readUltramodernConfig(workspaceRoot).features.tailwind;
+    throw new Error(`Missing UltraModern workspace file: ${compactPath}`);
+}
+function existingBridgeConfig(workspaceRoot) {
+    const compactPath = node_path.join(workspaceRoot, ULTRAMODERN_CONFIG_PATH);
+    return node_fs.existsSync(compactPath) ? readUltramodernConfig(workspaceRoot).bridge : void 0;
 }
 function assertValidVerticalName(name) {
     const normalized = toKebabCase(name);
@@ -74,17 +59,17 @@ function nextAvailablePort(ports) {
 function assertCanCreate(workspaceRoot, relativePath) {
     if (node_fs.existsSync(node_path.join(workspaceRoot, relativePath))) throw new Error(`Refusing to overwrite existing path: ${relativePath}`);
 }
-function updateRootWorkspaceScripts(workspaceRoot, scope, packageSource, remotes) {
+function updateRootWorkspaceScripts(workspaceRoot, scope, packageSource, remotes, bridge) {
     const packagePath = node_path.join(workspaceRoot, 'package.json');
     const rootPackage = readJsonFile(packagePath);
-    const generatedRootPackage = createRootPackageJson(scope, packageSource, remotes);
+    const generatedRootPackage = createRootPackageJson(scope, packageSource, remotes, bridge);
     rootPackage.scripts = generatedRootPackage.scripts;
     writeJsonFile(packagePath, rootPackage);
 }
-function rewriteShellAppFiles(workspaceRoot, scope, packageSource, enableTailwind, remotes) {
+function rewriteShellAppFiles(workspaceRoot, scope, packageSource, enableTailwind, remotes, bridge) {
     const shellHost = createShellHost(remotes);
     const publicWeb = createPublicWebAppArtifacts(shellHost);
-    writeJsonFile(node_path.join(workspaceRoot, `${shellApp.directory}/package.json`), createAppPackage(scope, shellHost, packageSource, enableTailwind, remotes));
+    writeJsonFile(node_path.join(workspaceRoot, `${shellApp.directory}/package.json`), createAppPackage(scope, shellHost, packageSource, enableTailwind, remotes, bridge));
     writeJsonFile(node_path.join(workspaceRoot, `${shellApp.directory}/tsconfig.json`), createAppTsConfig(shellHost, remotes));
     writeJsonFile(node_path.join(workspaceRoot, `${shellApp.directory}/tsconfig.mf-types.json`), createAppMfTypesTsConfig(shellHost));
     writeFileReplacing(workspaceRoot, `${shellApp.directory}/src/modern-app-env.d.ts`, createAppEnvDts(shellHost, remotes));
@@ -102,7 +87,7 @@ function rewriteShellAppFiles(workspaceRoot, scope, packageSource, enableTailwin
     writeFileReplacing(workspaceRoot, `${shellApp.directory}/src/routes/[lang]/page.tsx`, createShellPage(remotes));
     writeFileReplacing(workspaceRoot, `${shellApp.directory}/src/routes/vertical-components.tsx`, createShellRemoteComponents(scope, remotes));
     writeFileReplacing(workspaceRoot, `${shellApp.directory}/src/routes/shell-frame.tsx`, createShellFrameComponent());
-    writeFileReplacing(workspaceRoot, `${shellApp.directory}/src/effect/vertical-clients.ts`, createShellEffectClient(scope, remotes));
+    writeFileReplacing(workspaceRoot, `${shellApp.directory}/src/api/vertical-clients.ts`, createShellApiClient(scope, remotes));
 }
 function addShellZephyrDependency(workspaceRoot, scope, remote) {
     const packagePath = node_path.join(workspaceRoot, shellApp.directory, 'package.json');
@@ -112,7 +97,7 @@ function addShellZephyrDependency(workspaceRoot, scope, remote) {
     writeJsonFile(packagePath, shellPackage);
 }
 function addShellWorkspaceDependency(workspaceRoot, scope, remote) {
-    if (!appHasEffectApi(remote)) return;
+    if (!appHasApi(remote)) return;
     const packagePath = node_path.join(workspaceRoot, shellApp.directory, 'package.json');
     const shellPackage = readJsonFile(packagePath);
     shellPackage.dependencies ??= {};
@@ -139,8 +124,8 @@ function verticalTopologyEntry(scope, vertical, remotes = []) {
             fallbackTelemetryEvent: 'modernjs:mv-runtime-parity',
             sharedContractVersion: 'mf-ssr-contract-v1'
         },
-        ...effectApiTopologyMetadata(vertical) ? {
-            api: effectApiTopologyMetadata(vertical)
+        ...apiTopologyMetadata(vertical) ? {
+            api: apiTopologyMetadata(vertical)
         } : {},
         cloudflare: createCloudflareDeployContract(scope, vertical),
         ownership: vertical.ownership
@@ -158,10 +143,11 @@ function verticalsFromTopology(topology, ports) {
     return (topology.verticals ?? []).map((vertical)=>{
         const domain = vertical.domain ?? String(vertical.id);
         const packageSuffix = vertical.package?.split('/').at(-1) ?? domain;
-        const effectApi = vertical.api?.effect ? {
-            stem: 'string' == typeof vertical.api.effect.basePath ? vertical.api.effect.basePath.split('/').filter(Boolean).at(-1) ?? domain : domain,
-            prefix: vertical.api.effect.bff?.prefix ?? `/${domain}-api`,
-            consumedBy: Array.isArray(vertical.api.effect.consumedBy) ? vertical.api.effect.consumedBy : [
+        const apiTopology = vertical.api;
+        const api = apiTopology?.runtime === 'effect' ? {
+            stem: 'string' == typeof apiTopology.basePath ? apiTopology.basePath.split('/').filter(Boolean).at(-1) ?? domain : domain,
+            prefix: apiTopology.bff?.prefix ?? `/${domain}-api`,
+            consumedBy: Array.isArray(apiTopology.consumedBy) ? apiTopology.consumedBy : [
                 shellApp.id,
                 vertical.id
             ]
@@ -187,8 +173,8 @@ function verticalsFromTopology(topology, ports) {
             } : Array.isArray(vertical.moduleFederation?.remotes) ? {
                 verticalRefs: vertical.moduleFederation.remotes.map((entry)=>entry.id).filter((id)=>'string' == typeof id)
             } : {},
-            ...effectApi ? {
-                effectApi
+            ...api ? {
+                api
             } : {},
             ownership: vertical.ownership ?? createNeutralOwnership(vertical.id)
         };
@@ -203,8 +189,7 @@ function prepareAddUltramodernVertical(options) {
     const topology = readRequiredJsonObject(topologyPath);
     const ownership = readRequiredJsonObject(ownershipPath);
     const overlay = readRequiredJsonObject(overlayPath);
-    readRequiredJsonObject(node_path.join(options.workspaceRoot, GENERATED_CONTRACT_PATH));
-    readRequiredJsonObject(node_path.join(options.workspaceRoot, PACKAGE_SOURCE_METADATA_PATH));
+    readRequiredWorkspaceConfig(options.workspaceRoot);
     assertOptionalJsonObject(topology.shell, 'topology.shell', topologyPath);
     assertOptionalJsonArray(topology.verticals, 'topology.verticals', topologyPath);
     assertOptionalJsonArray(ownership.owners, 'ownership.owners', ownershipPath);
@@ -215,6 +200,7 @@ function prepareAddUltramodernVertical(options) {
     const scope = toPackageScope(String(rootPackage.name ?? node_path.basename(options.workspaceRoot)));
     const packageSource = existingPackageSource(options.workspaceRoot, options.modernVersion, options.packageSource);
     const enableTailwind = options.enableTailwind ?? existingTailwindEnabled(options.workspaceRoot);
+    const bridge = existingBridgeConfig(options.workspaceRoot);
     const existingVerticals = verticalsFromTopology(topology, overlay.ports);
     const port = nextAvailablePort(overlay.ports);
     const vertical = createVerticalDescriptor(name, port);
@@ -242,6 +228,7 @@ function prepareAddUltramodernVertical(options) {
         overlay,
         packageSource,
         enableTailwind,
+        bridge,
         vertical,
         updatedVerticals
     };
@@ -252,6 +239,10 @@ function readRequiredJsonObject(filePath) {
     if (!isRecord(value)) throw new Error(`UltraModern workspace file must contain a JSON object: ${filePath}`);
     return value;
 }
+function readRequiredWorkspaceConfig(workspaceRoot) {
+    const compactPath = node_path.join(workspaceRoot, ULTRAMODERN_CONFIG_PATH);
+    readRequiredJsonObject(compactPath);
+}
 function assertOptionalJsonObject(value, label, filePath) {
     if (void 0 !== value && !isRecord(value)) throw new Error(`${label} in ${filePath} must be a JSON object`);
 }
@@ -270,9 +261,9 @@ function validateWorkspaceAppDescriptors(apps) {
         assertNonEmptyString(app.portEnv, `port env for ${appLabel}`);
         if ('number' != typeof app.port || !Number.isFinite(app.port) || app.port <= 0) throw new Error(`Invalid development port for ${appLabel}`);
         assertNonEmptyString(app.mfName, `Module Federation name for ${appLabel}`);
-        if (app.effectApi) {
-            assertNonEmptyString(app.effectApi.prefix, `Effect API prefix for ${appLabel}`);
-            if (!app.effectApi.prefix.startsWith('/')) throw new Error(`Effect API prefix for ${appLabel} must start with "/"`);
+        if (app.api) {
+            assertNonEmptyString(app.api.prefix, `API prefix for ${appLabel}`);
+            if (!app.api.prefix.startsWith('/')) throw new Error(`API prefix for ${appLabel} must start with "/"`);
         }
     }
 }
@@ -282,7 +273,7 @@ function validateUniqueWorkspaceAppDescriptors(apps) {
     assertUniqueAppField(apps, 'output path', (app)=>normalizePath(app.directory));
     assertUniqueAppField(apps, 'Module Federation name', (app)=>app.mfName);
     assertUniqueAppField(apps, 'development port', (app)=>String(app.port));
-    assertUniqueAppField(apps, 'Effect API prefix', (app)=>app.effectApi?.prefix);
+    assertUniqueAppField(apps, 'API prefix', (app)=>app.api?.prefix);
     assertUniqueAppField(apps, 'manifest environment name', (app)=>'vertical' === app.kind ? createRemoteManifestEnv(app) : void 0);
 }
 function assertUniqueAppField(apps, label, readValue) {
@@ -349,14 +340,14 @@ function createVerticalPlan(preflight, result) {
             name: vertical.mfName,
             manifestUrl
         },
-        ...vertical.effectApi ? {
-            effectApiPrefix: effectApiPrefix(vertical)
+        ...vertical.api ? {
+            apiPrefix: resolveApiPrefix(vertical)
         } : {},
         jsonMutations: createDryRunJsonMutations(preflight, manifestUrl),
         shellDependencyChanges: createShellDependencyChanges(scope, vertical),
         generatedContractChanges: [
             {
-                path: GENERATED_CONTRACT_PATH,
+                path: ULTRAMODERN_CONFIG_PATH,
                 addedAppIds: [
                     vertical.id
                 ],
@@ -367,12 +358,12 @@ function createVerticalPlan(preflight, result) {
 }
 function createDryRunJsonMutations(preflight, manifestUrl) {
     const { scope, vertical } = preflight;
-    const effectApiMutation = appHasEffectApi(vertical) ? [
+    const apiMutation = appHasApi(vertical) ? [
         {
             path: DEVELOPMENT_OVERLAY_PATH,
             pointer: `/apis/${vertical.id}`,
-            description: `Add local Effect API URL for ${vertical.id}`,
-            value: `http://localhost:${vertical.port}${effectApiPrefix(vertical)}`
+            description: `Add local API URL for ${vertical.id}`,
+            value: `http://localhost:${vertical.port}${resolveApiPrefix(vertical)}`
         }
     ] : [];
     return [
@@ -416,7 +407,7 @@ function createDryRunJsonMutations(preflight, manifestUrl) {
             description: `Add local Module Federation manifest URL for ${vertical.id}`,
             value: manifestUrl
         },
-        ...effectApiMutation,
+        ...apiMutation,
         {
             path: 'package.json',
             pointer: "/scripts",
@@ -443,9 +434,9 @@ function createDryRunJsonMutations(preflight, manifestUrl) {
             description: 'Keep shell Module Federation DTS compilation scoped'
         },
         {
-            path: GENERATED_CONTRACT_PATH,
-            pointer: '/apps',
-            description: `Regenerate contract with ${vertical.id}`
+            path: ULTRAMODERN_CONFIG_PATH,
+            pointer: '/topology/apps',
+            description: `Regenerate compact config with ${vertical.id}`
         }
     ];
 }
@@ -457,7 +448,7 @@ function createShellDependencyChanges(scope, vertical) {
             packageName: remoteDependencyAlias(vertical),
             version: zephyrRemoteDependency(scope, vertical)
         },
-        ...appHasEffectApi(vertical) ? [
+        ...appHasApi(vertical) ? [
             {
                 path: `${shellApp.directory}/package.json`,
                 section: 'dependencies',
@@ -469,8 +460,8 @@ function createShellDependencyChanges(scope, vertical) {
 }
 function addUltramodernVertical(options) {
     const beforeFiles = createFileSnapshot(options.workspaceRoot);
-    const { scope, topologyPath, ownershipPath, overlayPath, topology, ownership, overlay, packageSource, enableTailwind, vertical, updatedVerticals } = prepareAddUltramodernVertical(options);
-    writeApp(options.workspaceRoot, scope, vertical, packageSource, enableTailwind);
+    const { scope, topologyPath, ownershipPath, overlayPath, topology, ownership, overlay, packageSource, enableTailwind, bridge, vertical, updatedVerticals } = prepareAddUltramodernVertical(options);
+    writeApp(options.workspaceRoot, scope, vertical, packageSource, enableTailwind, updatedVerticals, bridge);
     topology.shell ??= {};
     topology.shell.verticalRefs ??= [];
     topology.shell.verticalRefs.push(vertical.id);
@@ -489,22 +480,22 @@ function addUltramodernVertical(options) {
     overlay.manifests ??= {};
     overlay.manifests[vertical.id] = `http://localhost:${vertical.port}/mf-manifest.json`;
     overlay.apis ??= {};
-    overlay.apis[vertical.id] = `http://localhost:${vertical.port}${effectApiPrefix(vertical)}`;
+    overlay.apis[vertical.id] = `http://localhost:${vertical.port}${resolveApiPrefix(vertical)}`;
     writeJsonFile(topologyPath, topology);
     writeJsonFile(ownershipPath, ownership);
     writeJsonFile(overlayPath, overlay);
-    writeJsonFile(node_path.join(options.workspaceRoot, GENERATED_CONTRACT_PATH), createGeneratedContract(scope, [
+    writeJsonFile(node_path.join(options.workspaceRoot, ULTRAMODERN_CONFIG_PATH), createCompactUltramodernConfig(scope, options.modernVersion, packageSource, [
         {
             ...shellApp,
             verticalRefs: updatedVerticals.map((vertical)=>vertical.id)
         },
         ...updatedVerticals
-    ], enableTailwind));
-    rewriteShellAppFiles(options.workspaceRoot, scope, packageSource, enableTailwind, updatedVerticals);
+    ], enableTailwind, bridge));
+    rewriteShellAppFiles(options.workspaceRoot, scope, packageSource, enableTailwind, updatedVerticals, bridge);
     writeGeneratedWorkspaceScripts(options.workspaceRoot, scope, enableTailwind, updatedVerticals);
     addShellZephyrDependency(options.workspaceRoot, scope, vertical);
     addShellWorkspaceDependency(options.workspaceRoot, scope, vertical);
-    updateRootWorkspaceScripts(options.workspaceRoot, scope, packageSource, updatedVerticals);
+    updateRootWorkspaceScripts(options.workspaceRoot, scope, packageSource, updatedVerticals, bridge);
     writeJsonFile(node_path.join(options.workspaceRoot, 'tsconfig.json'), createRootTsConfig([
         {
             ...shellApp,
@@ -512,9 +503,9 @@ function addUltramodernVertical(options) {
         },
         ...updatedVerticals
     ]));
-    const afterFiles = createFileSnapshot(options.workspaceRoot);
-    const { createdPaths, rewrittenPaths } = diffFileSnapshots(beforeFiles, afterFiles);
-    const result = createGenerationResult({
+    const preliminaryAfterFiles = createFileSnapshot(options.workspaceRoot);
+    const preliminaryDiff = diffFileSnapshots(beforeFiles, preliminaryAfterFiles);
+    const preliminaryResult = createGenerationResult({
         operation: 'vertical',
         workspaceRoot: options.workspaceRoot,
         packageScope: scope,
@@ -522,14 +513,32 @@ function addUltramodernVertical(options) {
         createdApps: [
             vertical
         ],
-        createdPaths,
-        rewrittenPaths
+        createdPaths: preliminaryDiff.createdPaths,
+        rewrittenPaths: preliminaryDiff.rewrittenPaths
     });
     runCodeSmithOverlays({
         workspaceRoot: options.workspaceRoot,
         overlays: options.overlays,
-        result
+        result: preliminaryResult
+    });
+    const afterOverlaysFiles = createFileSnapshot(options.workspaceRoot);
+    const changedPaths = diffFileSnapshots(beforeFiles, afterOverlaysFiles);
+    formatGeneratedWorkspaceFiles(options.workspaceRoot, [
+        ...changedPaths.createdPaths,
+        ...changedPaths.rewrittenPaths
+    ]);
+    const afterFiles = createFileSnapshot(options.workspaceRoot);
+    const { createdPaths, rewrittenPaths } = diffFileSnapshots(beforeFiles, afterFiles);
+    return createGenerationResult({
+        operation: 'vertical',
+        workspaceRoot: options.workspaceRoot,
+        packageScope: scope,
+        packageSource,
+        createdApps: [
+            vertical
+        ],
+        createdPaths,
+        rewrittenPaths
     });
-    return result;
 }
-export { addShellWorkspaceDependency, addShellZephyrDependency, addUltramodernVertical, assertCanCreate, assertValidVerticalName, existingPackageSource, existingTailwindEnabled, nextAvailablePort, ownershipEntry, planUltramodernVertical, prepareAddUltramodernVertical, rewriteShellAppFiles, updateRootWorkspaceScripts, verticalTopologyEntry, verticalsFromTopology };
+export { addShellWorkspaceDependency, addShellZephyrDependency, addUltramodernVertical, assertCanCreate, assertValidVerticalName, existingBridgeConfig, existingPackageSource, existingTailwindEnabled, nextAvailablePort, ownershipEntry, planUltramodernVertical, prepareAddUltramodernVertical, rewriteShellAppFiles, updateRootWorkspaceScripts, verticalTopologyEntry, verticalsFromTopology };