Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 62 additions & 62 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function makeProvider(): AIProvider {
return {
extractDependencies: vi.fn(),
analyzeDrift: vi.fn(),
} as unknown as AIProvider;
};
}

const SAMPLE_C4 = `specification {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function makeProvider(patchResult?: string): AIProvider {
extractDependencies: vi.fn(),
analyzeDrift: vi.fn(),
patchModel: patchResult !== undefined ? vi.fn().mockResolvedValue(patchResult) : undefined,
} as unknown as AIProvider;
};
}

const SAMPLE_C4 = `specification {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function makeProvider(patchResult?: string): AIProvider {
extractDependencies: vi.fn(),
analyzeDrift: vi.fn(),
patchModel: patchResult !== undefined ? vi.fn().mockResolvedValue(patchResult) : undefined,
} as unknown as AIProvider;
};
}

const SAMPLE_DSL = `workspace {
Expand Down
16 changes: 8 additions & 8 deletions packages/core/src/adapters/structurizr/adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -358,10 +358,12 @@ export class StructurizrAdapter implements ArchitectureModelAdapter {
const resolvedId = this.resolveElementId(element, localId, parentPath);
callback(element, parentPath);

const sys = element as StructurizrSoftwareSystem;
if (sys.containers) walk(sys.containers, resolvedId);
const container = element as StructurizrContainer;
if (container.components) walk(container.components, resolvedId);
if ('containers' in element && Array.isArray(element.containers)) {
walk(element.containers as StructurizrElement[], resolvedId);
}
if ('components' in element && Array.isArray(element.components)) {
walk(element.components as StructurizrElement[], resolvedId);
}
}
};

Expand Down Expand Up @@ -411,10 +413,8 @@ export class StructurizrAdapter implements ArchitectureModelAdapter {

private getElementType(element: StructurizrElement, parentPath: string): string {
// Infer from position in hierarchy or explicit type from parser
const sys = element as StructurizrSoftwareSystem;
if (sys.containers) return 'softwareSystem';
const container = element as StructurizrContainer;
if (container.components) return 'container';
if ('containers' in element && element.containers) return 'softwareSystem';
if ('components' in element && element.components) return 'container';

if (
this.workspace?.model?.people?.some((p) => p.id === element.id && p.name === element.name)
Expand Down
51 changes: 33 additions & 18 deletions packages/core/src/providers/__tests__/provider-factory.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,41 @@ const {
MockAnthropicProvider,
mockConfig,
} = vi.hoisted(() => {
type ProviderName = 'gemini' | 'anthropic' | 'openai';
interface ProviderConfig {
apiKey: string | undefined;
fastModel: string;
advancedModel: string;
}
interface MockConfig {
ai: { provider: ProviderName };
gemini: ProviderConfig;
openai: ProviderConfig;
anthropic: ProviderConfig;
}

const geminiInstance = { type: 'gemini' };
const openaiInstance = { type: 'openai' };
const anthropicInstance = { type: 'anthropic' };
const mockConfig: MockConfig = {
ai: { provider: 'gemini' },
gemini: {
apiKey: 'test-gemini-key',
fastModel: 'gemini-flash',
advancedModel: 'gemini-pro',
},
openai: {
apiKey: 'test-openai-key',
fastModel: 'gpt-4.1-mini',
advancedModel: 'gpt-4.1',
},
anthropic: {
apiKey: 'test-anthropic-key',
fastModel: 'claude-haiku',
advancedModel: 'claude-sonnet',
},
};

return {
mockGeminiInstance: geminiInstance,
mockOpenAIInstance: openaiInstance,
Expand All @@ -26,24 +58,7 @@ const {
MockAnthropicProvider: vi.fn(function () {
return anthropicInstance;
}),
mockConfig: {
ai: { provider: 'gemini' as 'gemini' | 'openai' | 'anthropic' },
gemini: {
apiKey: 'test-gemini-key' as string | undefined,
fastModel: 'gemini-flash',
advancedModel: 'gemini-pro',
},
openai: {
apiKey: 'test-openai-key' as string | undefined,
fastModel: 'gpt-4.1-mini',
advancedModel: 'gpt-4.1',
},
anthropic: {
apiKey: 'test-anthropic-key' as string | undefined,
fastModel: 'claude-haiku',
advancedModel: 'claude-sonnet',
},
},
mockConfig,
};
});

Expand Down
Loading
Loading