fix(cli): remove datasources from components push command (#236)

imranolas · web-flow · commit 25aea21787d6 · 2025-08-06T13:40:32.000+01:00
Components push command no longer attempts to manage datasources,
resolving failed datasource operations during component synchronisation.

- Remove datasources fetching and processing from components push
- Remove datasource stub creation and dependency resolution
- Add informational messaging directing users to dedicated datasources
command
- Components referencing datasources will work if datasources exist in
target space

Fixes: WDX-68
diff --git a/packages/cli/src/commands/components/push/graph-operations/__tests__/graph-integration.test.ts b/packages/cli/src/commands/components/push/graph-operations/__tests__/graph-integration.test.ts
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { buildDependencyGraph, collectWhitelistDependencies, determineProcessingOrder, validateGraph } from '../dependency-graph';
+import { buildDependencyGraph, determineProcessingOrder, validateGraph } from '../dependency-graph';
 import { processAllResources } from '../resource-processor';
 import type { SpaceComponentsDataState } from '../../../constants';
 
@@ -753,197 +753,4 @@ describe('graph Integration Tests', () => {
       expect(processingOrder.length).toBeGreaterThan(0);
     });
   });
-
-  describe('datasource Dependencies', () => {
-    it('should detect datasource dependencies in component schemas', () => {
-      const schema = {
-        option_field: {
-          type: 'option',
-          source: 'internal',
-          datasource_slug: 'colors',
-        },
-        options_field: {
-          type: 'options',
-          source: 'internal',
-          datasource_slug: 'categories',
-        },
-        external_option: {
-          type: 'option',
-          source: 'external',
-          url: 'https://api.example.com/data',
-        },
-      };
-
-      const dependencies = collectWhitelistDependencies(schema);
-
-      expect(dependencies.datasourceNames.has('colors')).toBe(true);
-      expect(dependencies.datasourceNames.has('categories')).toBe(true);
-      expect(dependencies.datasourceNames.size).toBe(2);
-    });
-
-    it('should build dependency graph with datasources from component references', () => {
-      const mockSpaceState: SpaceComponentsDataState = {
-        local: {
-          components: [
-            {
-              id: 1,
-              name: 'ProductCard',
-              display_name: 'Product Card',
-              schema: {
-                category: {
-                  type: 'option',
-                  source: 'internal',
-                  datasource_slug: 'categories',
-                },
-              },
-              created_at: new Date().toISOString(),
-              updated_at: new Date().toISOString(),
-              space_id: 123,
-            },
-          ],
-          groups: [],
-          presets: [],
-          internalTags: [],
-          datasources: [], // No local datasources - stubs created from component references
-        },
-        target: {
-          components: new Map(),
-          groups: new Map(),
-          tags: new Map(),
-          presets: new Map(),
-          datasources: new Map(),
-        },
-      };
-
-      const graph = buildDependencyGraph({ spaceState: mockSpaceState });
-
-      expect(graph.nodes.has('component:ProductCard')).toBe(true);
-      expect(graph.nodes.has('datasource:categories')).toBe(true);
-
-      const component = graph.nodes.get('component:ProductCard');
-      const datasource = graph.nodes.get('datasource:categories');
-
-      expect(component?.dependencies.has('datasource:categories')).toBe(true);
-      expect(datasource?.dependents.has('component:ProductCard')).toBe(true);
-    });
-
-    it('should create stub datasources for referenced datasources', () => {
-      const mockSpaceState: SpaceComponentsDataState = {
-        local: {
-          components: [
-            {
-              id: 1,
-              name: 'ProductCard',
-              display_name: 'Product Card',
-              schema: {
-                category: {
-                  type: 'option',
-                  source: 'internal',
-                  datasource_slug: 'referenced_datasource',
-                },
-              },
-              created_at: new Date().toISOString(),
-              updated_at: new Date().toISOString(),
-              space_id: 123,
-            },
-          ],
-          groups: [],
-          presets: [],
-          internalTags: [],
-          datasources: [], // No datasources in local workspace
-        },
-        target: {
-          components: new Map(),
-          groups: new Map(),
-          tags: new Map(),
-          presets: new Map(),
-          datasources: new Map(),
-        },
-      };
-
-      const graph = buildDependencyGraph({ spaceState: mockSpaceState });
-
-      expect(graph.nodes.has('component:ProductCard')).toBe(true);
-      expect(graph.nodes.has('datasource:referenced_datasource')).toBe(true);
-
-      const component = graph.nodes.get('component:ProductCard');
-      const datasource = graph.nodes.get('datasource:referenced_datasource');
-
-      expect(component?.dependencies.has('datasource:referenced_datasource')).toBe(true);
-      expect(datasource?.dependents.has('component:ProductCard')).toBe(true);
-
-      // Verify the stub datasource has correct structure
-      expect(datasource?.sourceData.name).toBe('referenced_datasource');
-      expect(datasource?.sourceData.slug).toBe('referenced_datasource');
-      expect(datasource?.sourceData.entries).toEqual([]);
-    });
-
-    it('should resolve datasource references in component schemas', () => {
-      const mockTargetDatasource = {
-        id: 42,
-        name: 'categories',
-        slug: 'target_categories',
-        dimensions: [],
-        entries: [],
-        created_at: new Date().toISOString(),
-        updated_at: new Date().toISOString(),
-      };
-
-      const mockSpaceState: SpaceComponentsDataState = {
-        local: {
-          components: [
-            {
-              id: 1,
-              name: 'ProductCard',
-              display_name: 'Product Card',
-              schema: {
-                category: {
-                  type: 'option',
-                  source: 'internal',
-                  datasource_slug: 'categories',
-                },
-              },
-              created_at: new Date().toISOString(),
-              updated_at: new Date().toISOString(),
-              space_id: 123,
-            },
-          ],
-          groups: [],
-          presets: [],
-          internalTags: [],
-          datasources: [
-            {
-              id: 1,
-              name: 'categories',
-              slug: 'categories',
-              dimensions: [],
-              entries: [],
-              created_at: new Date().toISOString(),
-              updated_at: new Date().toISOString(),
-            },
-          ],
-        },
-        target: {
-          components: new Map(),
-          groups: new Map(),
-          tags: new Map(),
-          presets: new Map(),
-          datasources: new Map([['categories', mockTargetDatasource]]),
-        },
-      };
-
-      const graph = buildDependencyGraph({ spaceState: mockSpaceState });
-
-      // Simulate that the datasource was successfully upserted
-      const datasourceNode = graph.nodes.get('datasource:categories');
-      datasourceNode?.updateTargetData(mockTargetDatasource);
-
-      const componentNode = graph.nodes.get('component:ProductCard') as ComponentNode;
-      componentNode.resolveReferences(graph);
-
-      // Check that the schema reference was resolved to the target datasource
-      const resolvedSchema = componentNode.sourceData.schema;
-      expect(resolvedSchema.category.datasource_slug).toBe('target_categories');
-    });
-  });
 });
diff --git a/packages/cli/src/commands/components/push/graph-operations/dependency-graph.ts b/packages/cli/src/commands/components/push/graph-operations/dependency-graph.ts
@@ -4,30 +4,13 @@ import type {
   SpaceComponentInternalTag,
   SpaceComponentPreset,
 } from '../../constants';
-import type { SpaceDatasource } from '../../../datasources/constants';
 import type { DependencyGraph, GraphBuildingContext, NodeData, NodeType, ProcessingLevel, SchemaDependencies, TargetResourceInfo, UnifiedNode } from './types';
 import { upsertComponent, upsertComponentGroup, upsertComponentInternalTag, upsertComponentPreset } from '../actions';
-import { upsertDatasource } from '../../../datasources/push/actions';
 
 // =============================================================================
 // HELPER FUNCTIONS
 // =============================================================================
 
-/**
- * Creates a minimal stub datasource with only required fields.
- */
-function createStubDatasource(name: string): SpaceDatasource {
-  return {
-    id: 0, // Will be set by API
-    name,
-    slug: name,
-    dimensions: [],
-    entries: [], // Empty entries for stub
-    created_at: new Date().toISOString(),
-    updated_at: new Date().toISOString(),
-  };
-}
-
 // =============================================================================
 // GRAPH BUILDING
 // =============================================================================
@@ -53,27 +36,8 @@ export function buildDependencyGraph(context: GraphBuildingContext): DependencyG
     }
   }
 
-  // Collect all datasource names referenced by components
-  const referencedDatasources = new Set<string>();
-  spaceState.local.components.forEach((component) => {
-    if (component.schema) {
-      const dependencies = collectWhitelistDependencies(component.schema);
-      dependencies.datasourceNames.forEach((datasourceName) => {
-        referencedDatasources.add(datasourceName);
-      });
-    }
-  });
-
-  // Create stub datasource nodes for all referenced datasources
-  referencedDatasources.forEach((datasourceName) => {
-    const nodeId = `datasource:${datasourceName}`;
-    const targetDatasource = spaceState.target.datasources?.get(datasourceName);
-
-    // Create minimal stub datasource
-    const stubDatasource = createStubDatasource(datasourceName);
-    const node = new DatasourceNode(nodeId, stubDatasource, targetDatasource);
-    graph.nodes.set(nodeId, node);
-  });
+  // Note: Datasource dependencies are not processed by the components push command.
+  // Datasources should be managed using the dedicated 'storyblok datasources push' command.
 
   // Create nodes for all tags with colocated target data
   spaceState.local.internalTags.forEach((tag) => {
@@ -185,13 +149,6 @@ export function buildDependencyGraph(context: GraphBuildingContext): DependencyG
         const dependencyId = `component:${componentName}`;
         addDependency(componentId, dependencyId);
       });
-
-      // Add dependencies on datasources (from schema fields with internal source)
-      dependencies.datasourceNames.forEach((datasourceName) => {
-        const datasourceId = `datasource:${datasourceName}`;
-        // Always add dependency since we create stubs for all referenced datasources
-        addDependency(componentId, datasourceId);
-      });
     }
   });
 
@@ -755,17 +712,9 @@ export class ComponentNode extends GraphNode<SpaceComponent> {
         // Component whitelist doesn't need ID resolution as it uses names
       }
 
-      // Resolve datasource references in option/options fields with internal source
-      if ((resolvedField.type === 'option' || resolvedField.type === 'options') && resolvedField.source === 'internal') {
-        if (resolvedField.datasource_slug && typeof resolvedField.datasource_slug === 'string') {
-          const datasourceNodeId = `datasource:${resolvedField.datasource_slug}`;
-          const datasourceNode = graph.nodes.get(datasourceNodeId) as DatasourceNode;
-          if (datasourceNode?.targetData) {
-            // Update the datasource_slug to the target datasource slug
-            resolvedField.datasource_slug = datasourceNode.targetData.resource.slug;
-          }
-        }
-      }
+      // Note: Datasource references are not resolved by the components push command.
+      // Components that reference datasources will work correctly if the datasources
+      // already exist in the target space with the same slug names.
 
       // Recursively resolve nested fields
       Object.keys(resolvedField).forEach((key) => {
@@ -857,28 +806,5 @@ class PresetNode implements UnifiedNode<SpaceComponentPreset> {
   }
 }
 
-export class DatasourceNode extends GraphNode<SpaceDatasource> {
-  constructor(id: string, data: SpaceDatasource, targetDatasource?: SpaceDatasource) {
-    super(id, 'datasource', data.name, data, targetDatasource);
-  }
-
-  resolveReferences(_graph: DependencyGraph): void {
-    // Datasources don't have references to resolve
-  }
-
-  async upsert(space: string): Promise<SpaceDatasource> {
-    const existingDatasource = this.targetData?.resource as SpaceDatasource | undefined;
-    const existingId = existingDatasource?.id;
-
-    // For components push, we only create the datasource stub without entries.
-    // Pushing entries is handled by the datasources push command.
-    const { entries, ...datasourceDefinition } = this.sourceData;
-
-    const result = await upsertDatasource(space, datasourceDefinition, existingId);
-    if (!result) {
-      throw new Error(`Failed to upsert datasource ${this.name}`);
-    }
-
-    return result;
-  }
-}
+// Note: DatasourceNode class removed as datasources are not managed
+// by the components push command. Use 'storyblok datasources push' instead.
diff --git a/packages/cli/src/commands/components/push/graph-operations/types.ts b/packages/cli/src/commands/components/push/graph-operations/types.ts
@@ -6,17 +6,16 @@ import type {
   SpaceComponentPreset,
   SpaceComponentsDataState,
 } from '../../constants';
-import type { SpaceDatasource } from '../../../datasources/constants';
 
 // =============================================================================
 // CORE TYPES
 // =============================================================================
 
 /** Types of nodes in our dependency graph */
-export type NodeType = 'component' | 'group' | 'tag' | 'preset' | 'datasource';
+export type NodeType = 'component' | 'group' | 'tag' | 'preset';
 
 /** Data that can be stored in a graph node */
-export type NodeData = SpaceComponent | SpaceComponentGroup | SpaceComponentInternalTag | SpaceComponentPreset | SpaceDatasource;
+export type NodeData = SpaceComponent | SpaceComponentGroup | SpaceComponentInternalTag | SpaceComponentPreset;
 
 /** Target resource information colocated with graph nodes */
 export interface TargetResourceInfo<T extends NodeData> {
@@ -57,7 +56,7 @@ export interface SchemaDependencies {
   groupUuids: Set<string>;
   tagIds: Set<number>;
   componentNames: Set<string>;
-  datasourceNames: Set<string>;
+  datasourceNames: Set<string>; // Note: Not processed by components push, kept for compatibility
 }
 
 // =============================================================================
diff --git a/packages/cli/src/commands/components/push/index.ts b/packages/cli/src/commands/components/push/index.ts
