flow type

alexanderkirtzel · alexanderkirtzel · commit 4690f2e38434 · 2025-11-26T09:38:34.000+01:00
diff --git a/packages/cli/examples/flow-order-complete.json b/packages/cli/examples/flow-order-complete.json
@@ -1,6 +1,6 @@
 {
   "flow": {
-    "platform": "web",
+    "web": {},
     "destinations": {
       "demo": {
         "code": "destinationDemo",
diff --git a/packages/cli/examples/flow-simple.json b/packages/cli/examples/flow-simple.json
@@ -1,6 +1,6 @@
 {
   "flow": {
-    "platform": "web",
+    "web": {},
     "destinations": {
       "demo": {
         "code": "destinationDemo",
diff --git a/packages/cli/examples/flow.json b/packages/cli/examples/flow.json
@@ -1,6 +1,6 @@
 {
   "flow": {
-    "platform": "web",
+    "web": {},
     "destinations": {
       "ga4": {
         "code": "destinationGtag",
diff --git a/packages/cli/examples/server-collect.json b/packages/cli/examples/server-collect.json
@@ -1,6 +1,6 @@
 {
   "flow": {
-    "platform": "server",
+    "server": {},
     "sources": {
       "http": {
         "code": "sourceExpress",
diff --git a/packages/cli/examples/web-serve.json b/packages/cli/examples/web-serve.json
@@ -1,6 +1,9 @@
 {
   "flow": {
-    "platform": "web",
+    "web": {
+      "windowCollector": "collector",
+      "windowElb": "elb"
+    },
     "sources": {
       "demo": {
         "code": "sourceDemo",
@@ -68,8 +71,6 @@
       }
     },
     "minify": true,
-    "output": "web-serve.js",
-    "windowCollector": "collector",
-    "windowElb": "elb"
+    "output": "web-serve.js"
   }
 }
diff --git a/packages/cli/src/__tests__/config-loader.test.ts b/packages/cli/src/__tests__/config-loader.test.ts
@@ -310,11 +310,12 @@ describe('Config Loader', () => {
         build: { packages: {}, code: 'export {};', output: '' },
       };
 
+      // Invalid platform value causes config to fail format detection
       expect(() =>
         loadBundleConfig(invalidConfig, {
           configPath: '/test/config.json',
         }),
-      ).toThrow('Invalid platform "invalid". Must be "web" or "server".');
+      ).toThrow('Invalid configuration format');
     });
 
     test('throws error for missing required fields', () => {
diff --git a/packages/cli/src/__tests__/push/fixtures/configs/server-basic.json b/packages/cli/src/__tests__/push/fixtures/configs/server-basic.json
@@ -1,6 +1,6 @@
 {
   "flow": {
-    "platform": "server",
+    "server": {},
     "destinations": {
       "demo": {
         "code": "destinationDemo"
diff --git a/packages/cli/src/__tests__/push/fixtures/configs/web-basic.json b/packages/cli/src/__tests__/push/fixtures/configs/web-basic.json
@@ -1,6 +1,6 @@
 {
   "flow": {
-    "platform": "web",
+    "web": {},
     "destinations": {
       "demo": {
         "code": "destinationDemo"
diff --git a/packages/cli/src/commands/push/index.ts b/packages/cli/src/commands/push/index.ts
@@ -2,7 +2,7 @@ import path from 'path';
 import os from 'os';
 import { JSDOM, VirtualConsole } from 'jsdom';
 import fs from 'fs-extra';
-import type { Elb } from '@walkeros/core';
+import { getPlatform, type Elb } from '@walkeros/core';
 import {
   createCommandLogger,
   createLogger,
@@ -71,7 +71,7 @@ export async function pushCommand(options: PushCommandOptions): Promise<void> {
             logger,
           });
 
-        const platform = flowConfig.platform;
+        const platform = getPlatform(flowConfig);
 
         // Step 3: Bundle to temp file
         logger.info('🔨 Bundling flow configuration...');
diff --git a/packages/cli/src/commands/run/__tests__/run.integration.test.ts b/packages/cli/src/commands/run/__tests__/run.integration.test.ts
@@ -42,7 +42,8 @@ describe('Run Command Integration', () => {
       const config = require(configPath);
       expect(config.flow).toBeDefined();
       expect(config.build).toBeDefined();
-      expect(config.flow.platform).toBe('server');
+      // New format uses server: {} key instead of platform property
+      expect(config.flow.server).toBeDefined();
     });
   });
 
diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
@@ -43,6 +43,7 @@ export type { LoadConfigResult, LoadConfigOptions } from './loader.js';
 export type {
   BuildOptions,
   MinifyOptions,
+  Flow,
   EnvironmentConfig,
   Setup,
 } from '../types/bundle.js';
diff --git a/packages/cli/src/config/parser.ts b/packages/cli/src/config/parser.ts
@@ -15,7 +15,8 @@ import {
   isObject,
   isSingleEnvConfig,
   isMultiEnvConfig,
-  validatePlatform,
+  detectPlatform,
+  hasValidPlatform,
 } from './validators.js';
 
 /**
@@ -160,18 +161,19 @@ export function normalizeAndValidate(
   buildOptions: unknown,
   configPath?: string,
 ): ParsedConfig {
-  // Extract and validate platform (ONCE - not in type guards)
-  if (!isObject(flowConfig) || !('platform' in flowConfig)) {
+  // Extract and validate platform (supports both web/server keys and legacy platform property)
+  if (!isObject(flowConfig)) {
     throw new Error(
-      `Invalid flow config: missing "platform" field. Expected "web" or "server".`,
+      `Invalid flow config: expected object, got ${typeof flowConfig}`,
     );
   }
 
-  const platform = (flowConfig as { platform: unknown }).platform;
+  const platform = detectPlatform(flowConfig);
 
-  if (!validatePlatform(platform)) {
+  if (!platform) {
     throw new Error(
-      `Invalid platform "${platform}". Must be "web" or "server".`,
+      `Invalid flow config: missing platform. ` +
+        `Expected either "web" or "server" key, or legacy "platform" property.`,
     );
   }
 
@@ -215,13 +217,18 @@ export function normalizeAndValidate(
     merged.template = platform === 'server' ? 'server.hbs' : 'web.hbs';
   }
 
-  // Apply window assignment defaults for browser IIFE
+  // Apply window assignment for browser IIFE
+  // Priority: flow.web config > build options > defaults
   if (merged.format === 'iife' && merged.platform === 'browser') {
+    const webConfig = flowConfig.web as Record<string, unknown> | undefined;
+
+    // Extract from flow.web first, then fall back to build options, then defaults
     if (merged.windowCollector === undefined) {
-      merged.windowCollector = 'collector';
+      merged.windowCollector =
+        (webConfig?.windowCollector as string | undefined) || 'collector';
     }
     if (merged.windowElb === undefined) {
-      merged.windowElb = 'elb';
+      merged.windowElb = (webConfig?.windowElb as string | undefined) || 'elb';
     }
   }
 
@@ -298,18 +305,18 @@ export function parseBundleConfig(data: unknown): ParsedConfig {
     throw new Error(`Invalid config: expected object, got ${typeof data}`);
   }
 
-  // Check for new format { flow, build }
+  // Check for { flow, build } format
   if (!('flow' in data) || !isObject(data.flow)) {
     throw new Error(
       `Invalid config: missing "flow" field. ` +
-        `Expected format: { flow: { platform: "web" | "server", ... }, build: { ... } }`,
+        `Expected format: { flow: { web: {...} | server: {...}, ... }, build: { ... } }`,
     );
   }
 
   if (!('build' in data) || !isObject(data.build)) {
     throw new Error(
       `Invalid config: missing "build" field. ` +
-        `Expected format: { flow: { platform: "web" | "server", ... }, build: { ... } }`,
+        `Expected format: { flow: { web: {...} | server: {...}, ... }, build: { ... } }`,
     );
   }
 
diff --git a/packages/cli/src/config/validators.ts b/packages/cli/src/config/validators.ts
@@ -27,6 +27,37 @@ export function validatePlatform(
   return platform === 'web' || platform === 'server';
 }
 
+/**
+ * Detect platform from flow config.
+ *
+ * @remarks
+ * Supports both legacy format (platform property) and new format (web/server keys).
+ * New format takes precedence.
+ */
+export function detectPlatform(
+  flowConfig: Record<string, unknown>,
+): 'web' | 'server' | undefined {
+  // New format: web/server keys
+  if ('web' in flowConfig && flowConfig.web !== undefined) {
+    return 'web';
+  }
+  if ('server' in flowConfig && flowConfig.server !== undefined) {
+    return 'server';
+  }
+  // Legacy format: platform property
+  if ('platform' in flowConfig && validatePlatform(flowConfig.platform)) {
+    return flowConfig.platform;
+  }
+  return undefined;
+}
+
+/**
+ * Check if flow config has valid platform (new or legacy format).
+ */
+export function hasValidPlatform(flowConfig: Record<string, unknown>): boolean {
+  return detectPlatform(flowConfig) !== undefined;
+}
+
 /**
  * Type guard: Check if config is multi-environment format.
  */
@@ -44,7 +75,7 @@ export function isMultiEnvConfig(data: unknown): data is Setup {
  * Type guard: Check if config is single-environment format.
  *
  * @remarks
- * Only checks structural shape. Platform validation happens later in normalization.
+ * Only checks structural shape. Supports both legacy (platform) and new (web/server) formats.
  */
 export function isSingleEnvConfig(data: unknown): data is EnvironmentConfig {
   return (
@@ -53,7 +84,7 @@ export function isSingleEnvConfig(data: unknown): data is EnvironmentConfig {
     'build' in data &&
     isObject(data.flow) &&
     isObject(data.build) &&
-    'platform' in data.flow
+    hasValidPlatform(data.flow as Record<string, unknown>)
   );
 }
 
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
@@ -28,7 +28,13 @@ export { run } from './commands/run/index.js';
 
 // === Types ===
 // Export types for programmatic usage
-export type { BuildOptions, EnvironmentConfig, Setup } from './types/bundle.js';
+// Config structure uses Flow.Setup and Flow.Config from @walkeros/core
+export type {
+  Flow,
+  CLIBuildOptions,
+  BuildOptions,
+  MinifyOptions,
+} from './types/bundle.js';
 export type { BundleStats } from './commands/bundle/bundler.js';
 export type { SimulationResult } from './commands/simulate/types.js';
 export type {
diff --git a/packages/cli/src/types/bundle.ts b/packages/cli/src/types/bundle.ts
diff --git a/packages/core/src/__tests__/flow.test.ts b/packages/core/src/__tests__/flow.test.ts
diff --git a/packages/core/src/flow.ts b/packages/core/src/flow.ts
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
diff --git a/packages/core/src/schemas/flow.ts b/packages/core/src/schemas/flow.ts
diff --git a/packages/core/src/types/flow.ts b/packages/core/src/types/flow.ts
diff --git a/packages/core/src/wrapInlineCode.ts b/packages/core/src/wrapInlineCode.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"flow": {`
`3`		`- "platform": "web",`
	`3`	`+ "web": {},`
`4`	`4`	`"destinations": {`
`5`	`5`	`"demo": {`
`6`	`6`	`"code": "destinationDemo",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"flow": {`
`3`		`- "platform": "server",`
	`3`	`+ "server": {},`
`4`	`4`	`"sources": {`
`5`	`5`	`"http": {`
`6`	`6`	`"code": "sourceExpress",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"flow": {`
`3`		`- "platform": "web",`
	`3`	`+ "web": {`
	`4`	`+ "windowCollector": "collector",`
	`5`	`+ "windowElb": "elb"`
	`6`	`+ },`
`4`	`7`	`"sources": {`
`5`	`8`	`"demo": {`
`6`	`9`	`"code": "sourceDemo",`
`@@ -68,8 +71,6 @@`
`68`	`71`	`}`
`69`	`72`	`},`
`70`	`73`	`"minify": true,`
`71`		`- "output": "web-serve.js",`
`72`		`- "windowCollector": "collector",`
`73`		`- "windowElb": "elb"`
	`74`	`+ "output": "web-serve.js"`
`74`	`75`	`}`
`75`	`76`	`}`