Skip to content

Commit bed0bb0

Browse files
martin-fleck-atmartin-fleck-at
authored
Generate and use only single index per repository convention (#135)
1 parent a58ea45 commit bed0bb0

39 files changed

Lines changed: 193 additions & 295 deletions

‎examples/workflow-server/src/common/index.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ export * from './handler/grid-snapper';
3232
export * from './labeledit/workflow-label-edit-validator';
3333
export * from './layout/workflow-layout-configurator';
3434
export * from './marker/workflow-model-validator';
35+
export * from './mcp/workflow-element-types-provider';
36+
export * from './mcp/workflow-mcp-label-provider';
37+
export * from './mcp/workflow-mcp-model-serializer';
38+
export * from './mcp/workflow-mcp-module';
3539
export * from './model/workflow-navigation-target-resolver';
3640
export * from './provider/abstract-next-or-previous-navigation-target-provider';
3741
export * from './provider/next-node-navigation-target-provider';

‎packages/server-mcp/src/index.ts‎

Lines changed: 50 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,53 @@
1313
*
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
********************************************************************************/
16-
export * from './prompts';
17-
export * from './resources';
18-
export * from './server';
19-
export * from './tools';
20-
export * from './util';
21-
// Module classes — exported here (not from `./server`) to avoid circular imports through
22-
// the handler barrels which the modules consume.
23-
export * from './server/mcp-diagram-module';
24-
export * from './server/mcp-server-module';
16+
export * from './modules/mcp-diagram-module';
17+
export * from './modules/mcp-server-module';
18+
export * from './prompts/handlers/describe-diagram-mcp-prompt-handler';
19+
export * from './prompts/handlers/suggest-improvements-mcp-prompt-handler';
20+
export * from './resources/handlers/diagram-png-mcp-resource-handler';
21+
export * from './resources/handlers/diagram-svg-mcp-resource-handler';
22+
export * from './resources/services/element-types-provider';
23+
export * from './resources/services/mcp-model-serializer';
24+
export * from './server/glsp-mcp-server';
25+
export * from './server/lru-event-store';
26+
export * from './server/mcp-diagram-handler-dispatcher';
27+
export * from './server/mcp-diagram-prompt-handler-registry';
28+
export * from './server/mcp-diagram-resource-handler-registry';
29+
export * from './server/mcp-diagram-tool-handler-registry';
30+
export * from './server/mcp-handler-shared';
31+
export * from './server/mcp-http-transport';
32+
export * from './server/mcp-id-alias-service';
33+
export * from './server/mcp-input-schemas';
34+
export * from './server/mcp-label-provider';
35+
export * from './server/mcp-log-level-registry';
36+
export * from './server/mcp-logger';
37+
export * from './server/mcp-mime-types';
38+
export * from './server/mcp-options';
39+
export * from './server/mcp-progress-reporter';
40+
export * from './server/mcp-prompt-handler';
41+
export * from './server/mcp-request-context';
42+
export * from './server/mcp-resource-handler';
43+
export * from './server/mcp-server-launcher';
44+
export * from './server/mcp-session';
45+
export * from './server/mcp-tool-handler';
46+
export * from './tools/handlers/count-elements-mcp-tool-handler';
47+
export * from './tools/handlers/create-edges-mcp-tool-handler';
48+
export * from './tools/handlers/create-nodes-mcp-tool-handler';
49+
export * from './tools/handlers/delete-elements-mcp-tool-handler';
50+
export * from './tools/handlers/diagram-model-mcp-tool-handler';
51+
export * from './tools/handlers/element-types-mcp-tool-handler';
52+
export * from './tools/handlers/get-selection-mcp-tool-handler';
53+
export * from './tools/handlers/layout-mcp-tool-handler';
54+
export * from './tools/handlers/modify-edges-mcp-tool-handler';
55+
export * from './tools/handlers/modify-nodes-mcp-tool-handler';
56+
export * from './tools/handlers/query-elements-mcp-tool-handler';
57+
export * from './tools/handlers/redo-mcp-tool-handler';
58+
export * from './tools/handlers/save-model-mcp-tool-handler';
59+
export * from './tools/handlers/session-info-mcp-tool-handler';
60+
export * from './tools/handlers/set-selection-mcp-tool-handler';
61+
export * from './tools/handlers/set-view-mcp-tool-handler';
62+
export * from './tools/handlers/undo-mcp-tool-handler';
63+
export * from './tools/handlers/validate-diagram-mcp-tool-handler';
64+
export * from './util/markdown-util';
65+
export * from './util/mcp-util';

packages/server-mcp/src/server/mcp-diagram-module.ts renamed to packages/server-mcp/src/modules/mcp-diagram-module.ts

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,48 +16,47 @@
1616

1717
import { applyBindingTarget, BindingTarget, ClientSessionInitializer, GLSPModule, InstanceMultiBinding } from '@eclipse-glsp/server';
1818
import { interfaces } from 'inversify';
19-
import { DiagramPngMcpResourceHandler, DiagramSvgMcpResourceHandler } from '../resources';
19+
import { DiagramPngMcpResourceHandler } from '../resources/handlers/diagram-png-mcp-resource-handler';
20+
import { DiagramSvgMcpResourceHandler } from '../resources/handlers/diagram-svg-mcp-resource-handler';
2021
import { DefaultElementTypesProvider, ElementTypesProvider } from '../resources/services/element-types-provider';
2122
import { MarkdownMcpModelSerializer, McpModelSerializer } from '../resources/services/mcp-model-serializer';
22-
import {
23-
CountElementsMcpToolHandler,
24-
CreateEdgesMcpToolHandler,
25-
CreateNodesMcpToolHandler,
26-
DeleteElementsMcpToolHandler,
27-
DiagramModelMcpToolHandler,
28-
GetSelectionMcpToolHandler,
29-
LayoutMcpToolHandler,
30-
ModifyEdgesMcpToolHandler,
31-
ModifyNodesMcpToolHandler,
32-
QueryElementsMcpToolHandler,
33-
RedoMcpToolHandler,
34-
SaveModelMcpToolHandler,
35-
SetSelectionMcpToolHandler,
36-
SetViewMcpToolHandler,
37-
UndoMcpToolHandler,
38-
ValidateDiagramMcpToolHandler
39-
} from '../tools';
23+
import { CountElementsMcpToolHandler } from '../tools/handlers/count-elements-mcp-tool-handler';
24+
import { CreateEdgesMcpToolHandler } from '../tools/handlers/create-edges-mcp-tool-handler';
25+
import { CreateNodesMcpToolHandler } from '../tools/handlers/create-nodes-mcp-tool-handler';
26+
import { DeleteElementsMcpToolHandler } from '../tools/handlers/delete-elements-mcp-tool-handler';
27+
import { DiagramModelMcpToolHandler } from '../tools/handlers/diagram-model-mcp-tool-handler';
28+
import { GetSelectionMcpToolHandler } from '../tools/handlers/get-selection-mcp-tool-handler';
29+
import { LayoutMcpToolHandler } from '../tools/handlers/layout-mcp-tool-handler';
30+
import { ModifyEdgesMcpToolHandler } from '../tools/handlers/modify-edges-mcp-tool-handler';
31+
import { ModifyNodesMcpToolHandler } from '../tools/handlers/modify-nodes-mcp-tool-handler';
32+
import { QueryElementsMcpToolHandler } from '../tools/handlers/query-elements-mcp-tool-handler';
33+
import { RedoMcpToolHandler } from '../tools/handlers/redo-mcp-tool-handler';
34+
import { SaveModelMcpToolHandler } from '../tools/handlers/save-model-mcp-tool-handler';
35+
import { SetSelectionMcpToolHandler } from '../tools/handlers/set-selection-mcp-tool-handler';
36+
import { SetViewMcpToolHandler } from '../tools/handlers/set-view-mcp-tool-handler';
37+
import { UndoMcpToolHandler } from '../tools/handlers/undo-mcp-tool-handler';
38+
import { ValidateDiagramMcpToolHandler } from '../tools/handlers/validate-diagram-mcp-tool-handler';
4039
import {
4140
McpDiagramPromptHandlerFactory,
4241
McpDiagramPromptHandlerRegistry,
4342
McpDiagramPromptHandlerRegistryInitializer
44-
} from './mcp-diagram-prompt-handler-registry';
43+
} from '../server/mcp-diagram-prompt-handler-registry';
4544
import {
4645
McpDiagramResourceHandlerFactory,
4746
McpDiagramResourceHandlerRegistry,
4847
McpDiagramResourceHandlerRegistryInitializer
49-
} from './mcp-diagram-resource-handler-registry';
48+
} from '../server/mcp-diagram-resource-handler-registry';
5049
import {
5150
McpDiagramToolHandlerFactory,
5251
McpDiagramToolHandlerRegistry,
5352
McpDiagramToolHandlerRegistryInitializer
54-
} from './mcp-diagram-tool-handler-registry';
55-
import { DefaultMcpIdAliasService, McpIdAliasService } from './mcp-id-alias-service';
56-
import { McpDiagramScopedInput } from './mcp-input-schemas';
57-
import { DefaultMcpLabelProvider, McpLabelProvider } from './mcp-label-provider';
58-
import { AbstractMcpDiagramPromptHandler, McpDiagramPromptHandlerConstructor } from './mcp-prompt-handler';
59-
import { AbstractMcpDiagramResourceHandler, McpDiagramResourceHandlerConstructor } from './mcp-resource-handler';
60-
import { BaseMcpDiagramToolHandler, McpDiagramToolHandlerConstructor } from './mcp-tool-handler';
53+
} from '../server/mcp-diagram-tool-handler-registry';
54+
import { DefaultMcpIdAliasService, McpIdAliasService } from '../server/mcp-id-alias-service';
55+
import { McpDiagramScopedInput } from '../server/mcp-input-schemas';
56+
import { DefaultMcpLabelProvider, McpLabelProvider } from '../server/mcp-label-provider';
57+
import { AbstractMcpDiagramPromptHandler, McpDiagramPromptHandlerConstructor } from '../server/mcp-prompt-handler';
58+
import { AbstractMcpDiagramResourceHandler, McpDiagramResourceHandlerConstructor } from '../server/mcp-resource-handler';
59+
import { BaseMcpDiagramToolHandler, McpDiagramToolHandlerConstructor } from '../server/mcp-tool-handler';
6160

6261
/**
6362
* Per-GLSP-client-session DI module for the MCP server. Loaded inside `configureDiagramModule`

packages/server-mcp/src/server/mcp-server-module.ts renamed to packages/server-mcp/src/modules/mcp-server-module.ts

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,22 @@ import {
2727
} from '@eclipse-glsp/server';
2828
import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
2929
import { interfaces } from 'inversify';
30-
import { DescribeDiagramMcpPromptHandler, SuggestImprovementsMcpPromptHandler } from '../prompts';
31-
import { ElementTypesMcpToolHandler, SessionInfoMcpToolHandler } from '../tools';
32-
import { DefaultGLSPMcpServer, GLSPMcpServerFactory } from './glsp-mcp-server';
33-
import { DefaultMcpDiagramHandlerDispatcher, McpDiagramHandlerDispatcher } from './mcp-diagram-handler-dispatcher';
34-
import { DefaultMcpLogLevelRegistry, McpLogLevelRegistry } from './mcp-log-level-registry';
35-
import { LruEventStore } from './lru-event-store';
36-
import { McpHttpTransport } from './mcp-http-transport';
37-
import { McpLogger } from './mcp-logger';
38-
import { McpServerDefaults, McpServerOptions } from './mcp-options';
39-
import { McpProgressReporter } from './mcp-progress-reporter';
40-
import { McpPromptHandler } from './mcp-prompt-handler';
41-
import { McpResourceHandler } from './mcp-resource-handler';
42-
import { McpServerLauncher } from './mcp-server-launcher';
43-
import { McpToolHandler } from './mcp-tool-handler';
30+
import { DescribeDiagramMcpPromptHandler } from '../prompts/handlers/describe-diagram-mcp-prompt-handler';
31+
import { SuggestImprovementsMcpPromptHandler } from '../prompts/handlers/suggest-improvements-mcp-prompt-handler';
32+
import { ElementTypesMcpToolHandler } from '../tools/handlers/element-types-mcp-tool-handler';
33+
import { SessionInfoMcpToolHandler } from '../tools/handlers/session-info-mcp-tool-handler';
34+
import { DefaultGLSPMcpServer, GLSPMcpServerFactory } from '../server/glsp-mcp-server';
35+
import { DefaultMcpDiagramHandlerDispatcher, McpDiagramHandlerDispatcher } from '../server/mcp-diagram-handler-dispatcher';
36+
import { DefaultMcpLogLevelRegistry, McpLogLevelRegistry } from '../server/mcp-log-level-registry';
37+
import { LruEventStore } from '../server/lru-event-store';
38+
import { McpHttpTransport } from '../server/mcp-http-transport';
39+
import { McpLogger } from '../server/mcp-logger';
40+
import { McpServerDefaults, McpServerOptions } from '../server/mcp-options';
41+
import { McpProgressReporter } from '../server/mcp-progress-reporter';
42+
import { McpPromptHandler } from '../server/mcp-prompt-handler';
43+
import { McpResourceHandler } from '../server/mcp-resource-handler';
44+
import { McpServerLauncher } from '../server/mcp-server-launcher';
45+
import { McpToolHandler } from '../server/mcp-tool-handler';
4446

4547
/**
4648
* GLSP-generic default agent persona — adopters typically pass a product-specific persona to

‎packages/server-mcp/src/prompts/handlers/describe-diagram-mcp-prompt-handler.ts‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,14 @@
1717
import { ClientSessionManager } from '@eclipse-glsp/server';
1818
import { inject, injectable } from 'inversify';
1919
import * as z from 'zod/v4';
20-
import { AbstractMcpPromptHandler, McpPromptResult, resolveActiveSessionId } from '../../server';
21-
import {
22-
CountElementsMcpToolHandler,
23-
DiagramModelMcpToolHandler,
24-
ElementTypesMcpToolHandler,
25-
QueryElementsMcpToolHandler,
26-
SetSelectionMcpToolHandler,
27-
SetViewMcpToolHandler
28-
} from '../../tools';
20+
import { McpPromptResult, resolveActiveSessionId } from '../../server/mcp-handler-shared';
21+
import { AbstractMcpPromptHandler } from '../../server/mcp-prompt-handler';
22+
import { CountElementsMcpToolHandler } from '../../tools/handlers/count-elements-mcp-tool-handler';
23+
import { DiagramModelMcpToolHandler } from '../../tools/handlers/diagram-model-mcp-tool-handler';
24+
import { ElementTypesMcpToolHandler } from '../../tools/handlers/element-types-mcp-tool-handler';
25+
import { QueryElementsMcpToolHandler } from '../../tools/handlers/query-elements-mcp-tool-handler';
26+
import { SetSelectionMcpToolHandler } from '../../tools/handlers/set-selection-mcp-tool-handler';
27+
import { SetViewMcpToolHandler } from '../../tools/handlers/set-view-mcp-tool-handler';
2928

3029
export const DescribeDiagramArgsSchema = z.object({
3130
sessionId: z

‎packages/server-mcp/src/prompts/handlers/suggest-improvements-mcp-prompt-handler.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,12 @@
1717
import { ClientSessionManager } from '@eclipse-glsp/server';
1818
import { inject, injectable } from 'inversify';
1919
import * as z from 'zod/v4';
20-
import { AbstractMcpPromptHandler, McpPromptResult, resolveActiveSessionId } from '../../server';
21-
import {
22-
DiagramModelMcpToolHandler,
23-
QueryElementsMcpToolHandler,
24-
SetSelectionMcpToolHandler,
25-
ValidateDiagramMcpToolHandler
26-
} from '../../tools';
20+
import { McpPromptResult, resolveActiveSessionId } from '../../server/mcp-handler-shared';
21+
import { AbstractMcpPromptHandler } from '../../server/mcp-prompt-handler';
22+
import { DiagramModelMcpToolHandler } from '../../tools/handlers/diagram-model-mcp-tool-handler';
23+
import { QueryElementsMcpToolHandler } from '../../tools/handlers/query-elements-mcp-tool-handler';
24+
import { SetSelectionMcpToolHandler } from '../../tools/handlers/set-selection-mcp-tool-handler';
25+
import { ValidateDiagramMcpToolHandler } from '../../tools/handlers/validate-diagram-mcp-tool-handler';
2726

2827
export const SuggestImprovementsArgsSchema = z.object({
2928
sessionId: z

‎packages/server-mcp/src/prompts/index.ts‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎packages/server-mcp/src/resources/handlers/diagram-png-mcp-resource-handler.ts‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@ import { ClientActionKinds, isGBoundsAware, RequestExportAction } from '@eclipse
1818
import { Role } from '@modelcontextprotocol/sdk/types.js';
1919
import { inject, injectable } from 'inversify';
2020
import * as z from 'zod/v4';
21-
import {
22-
AbstractMcpDiagramResourceHandler,
23-
McpDiagramScopedInputSchema,
24-
McpMimeType,
25-
McpProgressReporter,
26-
McpResourceContent,
27-
McpResourceUri,
28-
McpToolError
29-
} from '../../server';
21+
import { McpResourceContent, McpToolError } from '../../server/mcp-handler-shared';
22+
import { McpDiagramScopedInputSchema } from '../../server/mcp-input-schemas';
23+
import { McpMimeType } from '../../server/mcp-mime-types';
24+
import { McpProgressReporter } from '../../server/mcp-progress-reporter';
25+
import { AbstractMcpDiagramResourceHandler, McpResourceUri } from '../../server/mcp-resource-handler';
3026

3127
export const DiagramPngInputSchema = McpDiagramScopedInputSchema.extend({
3228
scale: z

‎packages/server-mcp/src/resources/handlers/diagram-svg-mcp-resource-handler.ts‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@ import { ClientActionKinds, RequestExportAction } from '@eclipse-glsp/server';
1818
import { Role } from '@modelcontextprotocol/sdk/types.js';
1919
import { inject, injectable } from 'inversify';
2020
import * as z from 'zod/v4';
21-
import {
22-
AbstractMcpDiagramResourceHandler,
23-
McpDiagramScopedInputSchema,
24-
McpMimeType,
25-
McpProgressReporter,
26-
McpResourceContent,
27-
McpResourceUri,
28-
McpToolError
29-
} from '../../server';
21+
import { McpResourceContent, McpToolError } from '../../server/mcp-handler-shared';
22+
import { McpDiagramScopedInputSchema } from '../../server/mcp-input-schemas';
23+
import { McpMimeType } from '../../server/mcp-mime-types';
24+
import { McpProgressReporter } from '../../server/mcp-progress-reporter';
25+
import { AbstractMcpDiagramResourceHandler, McpResourceUri } from '../../server/mcp-resource-handler';
3026

3127
export const DiagramSvgInputSchema = McpDiagramScopedInputSchema.extend({
3228
timeoutMs: z

‎packages/server-mcp/src/resources/index.ts‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)