@likec4/language-server 1.42.1 → 1.44.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/browser/package.json +1 -1
- package/browser-worker/package.json +1 -1
- package/dist/LikeC4LanguageServices.d.ts +12 -19
- package/dist/LikeC4LanguageServices.js +182 -0
- package/dist/Rpc.js +245 -0
- package/dist/ast.d.ts +10 -6
- package/dist/ast.js +253 -0
- package/dist/browser-worker.js +4 -0
- package/dist/browser.js +35 -0
- package/dist/bundled.js +42 -0
- package/dist/bundled.mjs +3830 -4172
- package/dist/documentation/documentation-provider.js +51 -0
- package/dist/documentation/index.js +1 -0
- package/dist/empty.js +2 -0
- package/dist/filesystem/ChokidarWatcher.js +97 -0
- package/dist/filesystem/FileSystemWatcher.js +14 -0
- package/dist/filesystem/LikeC4FileSystem.d.ts +1 -2
- package/dist/filesystem/LikeC4FileSystem.js +126 -0
- package/dist/filesystem/index.d.ts +26 -0
- package/dist/filesystem/index.js +29 -0
- package/dist/formatting/LikeC4Formatter.js +637 -0
- package/dist/formatting/utils.js +18 -0
- package/dist/generated/ast.d.ts +19 -3
- package/dist/generated/ast.js +2155 -0
- package/dist/generated/grammar.js +7 -0
- package/dist/generated/module.d.ts +6 -1
- package/dist/generated/module.js +27 -0
- package/dist/generated-lib/{icons.mjs → icons.js} +11 -7
- package/dist/index.d.ts +7 -0
- package/dist/index.js +53 -0
- package/dist/{likec4lib.mjs → likec4lib.js} +3 -3
- package/dist/logger.js +81 -0
- package/dist/lsp/CodeActionProvider.d.ts +14 -0
- package/dist/lsp/CodeActionProvider.js +33 -0
- package/dist/lsp/CodeLensProvider.js +44 -0
- package/dist/lsp/CompletionProvider.d.ts +3 -1
- package/dist/lsp/CompletionProvider.js +200 -0
- package/dist/lsp/DocumentHighlightProvider.js +10 -0
- package/dist/lsp/DocumentLinkProvider.js +58 -0
- package/dist/lsp/DocumentSymbolProvider.js +306 -0
- package/dist/lsp/HoverProvider.js +106 -0
- package/dist/lsp/RenameProvider.js +6 -0
- package/dist/lsp/SemanticTokenProvider.d.ts +5 -0
- package/dist/lsp/SemanticTokenProvider.js +257 -0
- package/dist/lsp/index.d.ts +1 -0
- package/dist/lsp/index.js +9 -0
- package/dist/mcp/MCPServerFactory.js +73 -0
- package/dist/mcp/NoopLikeC4MCPServer.js +17 -0
- package/dist/mcp/interfaces.js +5 -0
- package/dist/mcp/server/StdioLikeC4MCPServer.js +47 -0
- package/dist/mcp/server/StreamableLikeC4MCPServer.js +145 -0
- package/dist/mcp/server/WithMCPServer.js +56 -0
- package/dist/mcp/tools/_common.d.ts +8 -7
- package/dist/mcp/tools/_common.js +49 -0
- package/dist/mcp/tools/find-relationships.d.ts +7 -8
- package/dist/mcp/tools/find-relationships.js +150 -0
- package/dist/mcp/tools/list-projects.d.ts +3 -3
- package/dist/mcp/tools/list-projects.js +62 -0
- package/dist/mcp/tools/open-view.d.ts +6 -7
- package/dist/mcp/tools/open-view.js +52 -0
- package/dist/mcp/tools/read-deployment.d.ts +6 -7
- package/dist/mcp/tools/read-deployment.js +132 -0
- package/dist/mcp/tools/read-element.d.ts +6 -7
- package/dist/mcp/tools/read-element.js +194 -0
- package/dist/mcp/tools/read-project-summary.d.ts +5 -6
- package/dist/mcp/tools/read-project-summary.js +176 -0
- package/dist/mcp/tools/read-view.d.ts +6 -7
- package/dist/mcp/tools/read-view.js +203 -0
- package/dist/mcp/tools/search-element.d.ts +3 -3
- package/dist/mcp/tools/search-element.js +177 -0
- package/dist/mcp/utils.d.ts +2 -2
- package/dist/mcp/utils.js +48 -0
- package/dist/model/builder/MergedExtends.d.ts +2 -1
- package/dist/model/builder/MergedExtends.js +74 -0
- package/dist/model/builder/MergedSpecification.js +175 -0
- package/dist/model/builder/buildModel.js +176 -0
- package/dist/model/deployments-index.js +102 -0
- package/dist/model/fqn-index.js +250 -0
- package/dist/model/index.js +6 -0
- package/dist/model/model-builder.d.ts +13 -11
- package/dist/model/model-builder.js +234 -0
- package/dist/model/model-locator.d.ts +6 -5
- package/dist/model/model-locator.js +240 -0
- package/dist/model/model-parser-where.js +81 -0
- package/dist/model/model-parser.d.ts +318 -313
- package/dist/model/model-parser.js +119 -0
- package/dist/model/parser/Base.d.ts +3 -3
- package/dist/model/parser/Base.js +367 -0
- package/dist/model/parser/DeploymentModelParser.d.ts +3 -3
- package/dist/model/parser/DeploymentModelParser.js +176 -0
- package/dist/model/parser/DeploymentViewParser.d.ts +4 -4
- package/dist/model/parser/DeploymentViewParser.js +86 -0
- package/dist/model/parser/FqnRefParser.d.ts +3 -3
- package/dist/model/parser/FqnRefParser.js +382 -0
- package/dist/model/parser/GlobalsParser.d.ts +7 -7
- package/dist/model/parser/GlobalsParser.js +84 -0
- package/dist/model/parser/ImportsParser.d.ts +12 -13
- package/dist/model/parser/ImportsParser.js +24 -0
- package/dist/model/parser/ModelParser.d.ts +3 -3
- package/dist/model/parser/ModelParser.js +165 -0
- package/dist/model/parser/PredicatesParser.d.ts +3 -3
- package/dist/model/parser/PredicatesParser.js +45 -0
- package/dist/model/parser/SpecificationParser.d.ts +3 -3
- package/dist/model/parser/SpecificationParser.js +109 -0
- package/dist/model/parser/ValueConverter.js +12 -0
- package/dist/model/parser/ViewsParser.d.ts +4 -4
- package/dist/model/parser/ViewsParser.js +477 -0
- package/dist/model-change/ModelChanges.d.ts +6 -3
- package/dist/model-change/ModelChanges.js +102 -0
- package/dist/model-change/changeElementStyle.js +134 -0
- package/dist/model-change/changeViewLayout.d.ts +2 -2
- package/dist/model-change/changeViewLayout.js +28 -0
- package/dist/model-change/removeManualLayoutV1.d.ts +7 -0
- package/dist/model-change/removeManualLayoutV1.js +27 -0
- package/dist/module.d.ts +10 -5
- package/dist/module.js +143 -0
- package/dist/protocol.d.ts +1 -17
- package/dist/protocol.js +114 -0
- package/dist/references/index.js +3 -0
- package/dist/references/name-provider.js +37 -0
- package/dist/references/scope-computation.js +288 -0
- package/dist/references/scope-provider.d.ts +3 -3
- package/dist/references/scope-provider.js +242 -0
- package/dist/shared/NodeKindProvider.js +57 -0
- package/dist/shared/{WorkspaceSymbolProvider.mjs → WorkspaceSymbolProvider.js} +1 -1
- package/dist/shared/index.js +2 -0
- package/dist/test/index.js +1 -0
- package/dist/test/testServices.d.ts +16 -16
- package/dist/test/testServices.js +210 -0
- package/dist/utils/disposable.js +26 -0
- package/dist/utils/elementRef.d.ts +1 -1
- package/dist/utils/elementRef.js +27 -0
- package/dist/utils/fqnRef.js +63 -0
- package/dist/utils/index.js +35 -0
- package/dist/utils/printDocs.js +1 -0
- package/dist/utils/projectId.js +16 -0
- package/dist/utils/stringHash.js +5 -0
- package/dist/validation/DocumentValidator.js +17 -0
- package/dist/validation/_shared.js +26 -0
- package/dist/validation/deployment-checks.js +140 -0
- package/dist/validation/dynamic-view.js +67 -0
- package/dist/validation/element-ref.js +12 -0
- package/dist/validation/element.js +49 -0
- package/dist/validation/imports.js +46 -0
- package/dist/validation/index.d.ts +1 -1
- package/dist/validation/index.js +157 -0
- package/dist/validation/property-checks.js +108 -0
- package/dist/validation/relation.js +55 -0
- package/dist/validation/specification.js +190 -0
- package/dist/validation/view-predicates/fqn-expr-with.js +43 -0
- package/dist/validation/view-predicates/fqn-ref-expr.js +51 -0
- package/dist/validation/view-predicates/incoming.js +16 -0
- package/dist/validation/view-predicates/index.js +6 -0
- package/dist/validation/view-predicates/outgoing.js +20 -0
- package/dist/validation/view-predicates/relation-expr.js +46 -0
- package/dist/validation/view-predicates/relation-with.js +16 -0
- package/dist/validation/view.d.ts +1 -1
- package/dist/validation/view.js +42 -0
- package/dist/view-utils/assignNavigateTo.js +27 -0
- package/dist/view-utils/index.d.ts +1 -0
- package/dist/view-utils/index.js +2 -0
- package/dist/view-utils/manual-layout.d.ts +6 -0
- package/dist/view-utils/manual-layout.js +151 -0
- package/dist/views/ConfigurableLayouter.js +51 -0
- package/dist/views/LikeC4ManualLayouts.d.ts +28 -0
- package/dist/views/LikeC4ManualLayouts.js +132 -0
- package/dist/views/{likec4-views.d.ts → LikeC4Views.d.ts} +9 -8
- package/dist/views/LikeC4Views.js +200 -0
- package/dist/views/index.d.ts +4 -1
- package/dist/views/index.js +11 -0
- package/dist/workspace/AstNodeDescriptionProvider.js +15 -0
- package/dist/workspace/IndexManager.js +21 -0
- package/dist/workspace/LangiumDocuments.d.ts +1 -1
- package/dist/workspace/LangiumDocuments.js +58 -0
- package/dist/workspace/ProjectsManager.d.ts +8 -3
- package/dist/workspace/ProjectsManager.js +373 -0
- package/dist/workspace/WorkspaceManager.d.ts +3 -2
- package/dist/workspace/WorkspaceManager.js +93 -0
- package/dist/workspace/index.js +5 -0
- package/likec4lib/package.json +1 -1
- package/package.json +32 -31
- package/protocol/package.json +1 -1
- package/dist/LikeC4LanguageServices.mjs +0 -197
- package/dist/Rpc.mjs +0 -296
- package/dist/ast.mjs +0 -221
- package/dist/browser-worker.mjs +0 -2
- package/dist/browser.mjs +0 -32
- package/dist/documentation/documentation-provider.mjs +0 -48
- package/dist/documentation/index.mjs +0 -1
- package/dist/empty.mjs +0 -1
- package/dist/filesystem/ChokidarWatcher.mjs +0 -68
- package/dist/filesystem/FileSystemWatcher.mjs +0 -11
- package/dist/filesystem/LikeC4FileSystem.mjs +0 -64
- package/dist/filesystem/index.mjs +0 -19
- package/dist/formatting/LikeC4Formatter.mjs +0 -511
- package/dist/formatting/utils.mjs +0 -15
- package/dist/generated/ast.mjs +0 -2118
- package/dist/generated/grammar.mjs +0 -3
- package/dist/generated/module.mjs +0 -23
- package/dist/index.mjs +0 -50
- package/dist/logger.mjs +0 -82
- package/dist/lsp/CodeLensProvider.mjs +0 -42
- package/dist/lsp/CompletionProvider.mjs +0 -208
- package/dist/lsp/DocumentHighlightProvider.mjs +0 -10
- package/dist/lsp/DocumentLinkProvider.mjs +0 -53
- package/dist/lsp/DocumentSymbolProvider.mjs +0 -287
- package/dist/lsp/HoverProvider.mjs +0 -104
- package/dist/lsp/RenameProvider.mjs +0 -6
- package/dist/lsp/SemanticTokenProvider.mjs +0 -350
- package/dist/lsp/index.mjs +0 -7
- package/dist/mcp/MCPServerFactory.mjs +0 -70
- package/dist/mcp/NoopLikeC4MCPServer.mjs +0 -17
- package/dist/mcp/interfaces.mjs +0 -4
- package/dist/mcp/server/StdioLikeC4MCPServer.mjs +0 -46
- package/dist/mcp/server/StreamableLikeC4MCPServer.mjs +0 -153
- package/dist/mcp/server/WithMCPServer.mjs +0 -58
- package/dist/mcp/tools/_common.mjs +0 -42
- package/dist/mcp/tools/find-relationships.mjs +0 -151
- package/dist/mcp/tools/list-projects.mjs +0 -62
- package/dist/mcp/tools/open-view.mjs +0 -52
- package/dist/mcp/tools/read-deployment.mjs +0 -130
- package/dist/mcp/tools/read-element.mjs +0 -198
- package/dist/mcp/tools/read-project-summary.mjs +0 -178
- package/dist/mcp/tools/read-view.mjs +0 -205
- package/dist/mcp/tools/search-element.mjs +0 -171
- package/dist/mcp/utils.mjs +0 -47
- package/dist/model/builder/MergedExtends.mjs +0 -67
- package/dist/model/builder/MergedSpecification.mjs +0 -205
- package/dist/model/builder/assignTagColors.d.ts +0 -7
- package/dist/model/builder/assignTagColors.mjs +0 -51
- package/dist/model/builder/buildModel.mjs +0 -226
- package/dist/model/deployments-index.mjs +0 -100
- package/dist/model/fqn-index.mjs +0 -243
- package/dist/model/index.mjs +0 -6
- package/dist/model/model-builder.mjs +0 -285
- package/dist/model/model-locator.mjs +0 -239
- package/dist/model/model-parser-where.mjs +0 -81
- package/dist/model/model-parser.mjs +0 -127
- package/dist/model/parser/Base.mjs +0 -342
- package/dist/model/parser/DeploymentModelParser.mjs +0 -212
- package/dist/model/parser/DeploymentViewParser.mjs +0 -95
- package/dist/model/parser/FqnRefParser.mjs +0 -398
- package/dist/model/parser/GlobalsParser.mjs +0 -82
- package/dist/model/parser/ImportsParser.mjs +0 -28
- package/dist/model/parser/ModelParser.mjs +0 -190
- package/dist/model/parser/PredicatesParser.mjs +0 -45
- package/dist/model/parser/SpecificationParser.mjs +0 -120
- package/dist/model/parser/ValueConverter.mjs +0 -12
- package/dist/model/parser/ViewsParser.mjs +0 -490
- package/dist/model-change/ModelChanges.mjs +0 -89
- package/dist/model-change/changeElementStyle.mjs +0 -143
- package/dist/model-change/changeViewLayout.mjs +0 -32
- package/dist/model-change/saveManualLayout.d.ts +0 -11
- package/dist/model-change/saveManualLayout.mjs +0 -27
- package/dist/module.mjs +0 -180
- package/dist/protocol.mjs +0 -65
- package/dist/references/index.mjs +0 -3
- package/dist/references/name-provider.mjs +0 -39
- package/dist/references/scope-computation.mjs +0 -312
- package/dist/references/scope-provider.mjs +0 -239
- package/dist/shared/NodeKindProvider.mjs +0 -110
- package/dist/shared/index.mjs +0 -2
- package/dist/test/index.mjs +0 -1
- package/dist/test/testServices.mjs +0 -200
- package/dist/utils/disposable.mjs +0 -25
- package/dist/utils/elementRef.mjs +0 -20
- package/dist/utils/fqnRef.mjs +0 -57
- package/dist/utils/index.mjs +0 -33
- package/dist/utils/printDocs.mjs +0 -1
- package/dist/utils/projectId.mjs +0 -16
- package/dist/utils/stringHash.mjs +0 -5
- package/dist/validation/DocumentValidator.mjs +0 -16
- package/dist/validation/_shared.mjs +0 -25
- package/dist/validation/deployment-checks.mjs +0 -146
- package/dist/validation/dynamic-view.mjs +0 -67
- package/dist/validation/element-ref.mjs +0 -12
- package/dist/validation/element.mjs +0 -50
- package/dist/validation/imports.mjs +0 -25
- package/dist/validation/index.mjs +0 -180
- package/dist/validation/property-checks.mjs +0 -107
- package/dist/validation/relation.mjs +0 -53
- package/dist/validation/specification.mjs +0 -173
- package/dist/validation/view-predicates/fqn-expr-with.mjs +0 -43
- package/dist/validation/view-predicates/fqn-ref-expr.mjs +0 -53
- package/dist/validation/view-predicates/incoming.mjs +0 -16
- package/dist/validation/view-predicates/index.mjs +0 -6
- package/dist/validation/view-predicates/outgoing.mjs +0 -20
- package/dist/validation/view-predicates/relation-expr.mjs +0 -39
- package/dist/validation/view-predicates/relation-with.mjs +0 -16
- package/dist/validation/view.mjs +0 -25
- package/dist/view-utils/assignNavigateTo.mjs +0 -25
- package/dist/view-utils/index.mjs +0 -1
- package/dist/view-utils/manual-layout.mjs +0 -99
- package/dist/views/configurable-layouter.mjs +0 -51
- package/dist/views/index.mjs +0 -1
- package/dist/views/likec4-views.mjs +0 -166
- package/dist/workspace/AstNodeDescriptionProvider.mjs +0 -17
- package/dist/workspace/IndexManager.mjs +0 -17
- package/dist/workspace/LangiumDocuments.mjs +0 -53
- package/dist/workspace/ProjectsManager.mjs +0 -360
- package/dist/workspace/WorkspaceManager.mjs +0 -83
- package/dist/workspace/index.mjs +0 -5
- /package/dist/views/{configurable-layouter.d.ts → ConfigurableLayouter.d.ts} +0 -0
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
import { FqnExpr, RelationExpr } from "@likec4/core";
|
|
2
|
-
import { AstUtils } from "langium";
|
|
3
|
-
import { ast } from "../../ast.mjs";
|
|
4
|
-
import { tryOrLog } from "../_shared.mjs";
|
|
5
|
-
export const checkRelationExpr = (services) => {
|
|
6
|
-
const ModelParser = services.likec4.ModelParser;
|
|
7
|
-
return tryOrLog((node, accept) => {
|
|
8
|
-
const predicate = AstUtils.getContainerOfType(node, ast.isDeploymentViewRulePredicate);
|
|
9
|
-
if (!predicate || predicate.isInclude !== true) {
|
|
10
|
-
return;
|
|
11
|
-
}
|
|
12
|
-
const doc = AstUtils.getDocument(node);
|
|
13
|
-
const parser = ModelParser.forDocument(doc);
|
|
14
|
-
let relationExpr = RelationExpr.unwrap(parser.parseRelationExpr(node));
|
|
15
|
-
const ModelRefOnlyExclude = "Model reference is allowed in exclude predicate only";
|
|
16
|
-
if (RelationExpr.isDirect(relationExpr)) {
|
|
17
|
-
if (FqnExpr.isModelRef(relationExpr.source) || FqnExpr.isModelRef(relationExpr.target)) {
|
|
18
|
-
accept("error", ModelRefOnlyExclude, {
|
|
19
|
-
node
|
|
20
|
-
});
|
|
21
|
-
}
|
|
22
|
-
return;
|
|
23
|
-
}
|
|
24
|
-
let expr;
|
|
25
|
-
if (RelationExpr.isIncoming(relationExpr)) {
|
|
26
|
-
expr = relationExpr.incoming;
|
|
27
|
-
} else if (RelationExpr.isOutgoing(relationExpr)) {
|
|
28
|
-
expr = relationExpr.outgoing;
|
|
29
|
-
} else {
|
|
30
|
-
expr = relationExpr.inout;
|
|
31
|
-
}
|
|
32
|
-
if (FqnExpr.isModelRef(expr)) {
|
|
33
|
-
accept("error", ModelRefOnlyExclude, {
|
|
34
|
-
node
|
|
35
|
-
});
|
|
36
|
-
return;
|
|
37
|
-
}
|
|
38
|
-
});
|
|
39
|
-
};
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
import { getViewRulePredicateContainer } from "../../ast.mjs";
|
|
2
|
-
import { tryOrLog } from "../_shared.mjs";
|
|
3
|
-
export const checkRelationExprWith = (_services) => {
|
|
4
|
-
return tryOrLog((el, accept) => {
|
|
5
|
-
const container = getViewRulePredicateContainer(el);
|
|
6
|
-
if (!container || container.$type == "DynamicViewIncludePredicate") {
|
|
7
|
-
return;
|
|
8
|
-
}
|
|
9
|
-
if (!container.isInclude) {
|
|
10
|
-
accept("error", 'Invalid usage inside "exclude"', {
|
|
11
|
-
node: el
|
|
12
|
-
});
|
|
13
|
-
return;
|
|
14
|
-
}
|
|
15
|
-
});
|
|
16
|
-
};
|
package/dist/validation/view.mjs
DELETED
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
import { ast } from "../ast.mjs";
|
|
2
|
-
import { projectIdFrom } from "../utils/index.mjs";
|
|
3
|
-
import { RESERVED_WORDS, tryOrLog } from "./_shared.mjs";
|
|
4
|
-
export const viewChecks = (services) => {
|
|
5
|
-
const index = services.shared.workspace.IndexManager;
|
|
6
|
-
return tryOrLog((node, accept) => {
|
|
7
|
-
if (!node.name) {
|
|
8
|
-
return;
|
|
9
|
-
}
|
|
10
|
-
if (RESERVED_WORDS.includes(node.name)) {
|
|
11
|
-
accept("error", `Reserved word: ${node.name}`, {
|
|
12
|
-
node,
|
|
13
|
-
property: "name"
|
|
14
|
-
});
|
|
15
|
-
}
|
|
16
|
-
const projectId = projectIdFrom(node);
|
|
17
|
-
const anotherViews = index.projectElements(projectId, ast.LikeC4View).filter((n) => n.name === node.name).limit(2).count();
|
|
18
|
-
if (anotherViews > 1) {
|
|
19
|
-
accept("error", `Duplicate view '${node.name}'`, {
|
|
20
|
-
node,
|
|
21
|
-
property: "name"
|
|
22
|
-
});
|
|
23
|
-
}
|
|
24
|
-
});
|
|
25
|
-
};
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
import { isElementView } from "@likec4/core";
|
|
2
|
-
import { find, isNullish } from "remeda";
|
|
3
|
-
export function assignNavigateTo(views) {
|
|
4
|
-
const allElementViews = /* @__PURE__ */ new Map();
|
|
5
|
-
for (const v of views) {
|
|
6
|
-
if (isElementView(v) && v.viewOf && isNullish(v.extends)) {
|
|
7
|
-
const viewsOf = allElementViews.get(v.viewOf) ?? [];
|
|
8
|
-
viewsOf.push(v.id);
|
|
9
|
-
allElementViews.set(v.viewOf, viewsOf);
|
|
10
|
-
}
|
|
11
|
-
}
|
|
12
|
-
for (const { id, nodes } of views) {
|
|
13
|
-
for (const node of nodes) {
|
|
14
|
-
const modelRef = node.modelRef;
|
|
15
|
-
if (node.navigateTo || !modelRef) {
|
|
16
|
-
continue;
|
|
17
|
-
}
|
|
18
|
-
const navigateTo = find(allElementViews.get(modelRef) ?? [], (v) => v !== id);
|
|
19
|
-
if (navigateTo) {
|
|
20
|
-
node.navigateTo = navigateTo;
|
|
21
|
-
}
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
return views;
|
|
25
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export * from "./assignNavigateTo.mjs";
|
|
@@ -1,99 +0,0 @@
|
|
|
1
|
-
import { isAutoLayoutDirection } from "@likec4/core";
|
|
2
|
-
import { decode, encode } from "@msgpack/msgpack";
|
|
3
|
-
import { fromBase64, toBase64 } from "@smithy/util-base64";
|
|
4
|
-
import { AstUtils, CstUtils } from "langium";
|
|
5
|
-
import { mapValues } from "remeda";
|
|
6
|
-
import { logger, logWarnError } from "../logger.mjs";
|
|
7
|
-
const { getDocument } = AstUtils;
|
|
8
|
-
function pack({
|
|
9
|
-
nodes,
|
|
10
|
-
edges,
|
|
11
|
-
...rest
|
|
12
|
-
}) {
|
|
13
|
-
return {
|
|
14
|
-
...rest,
|
|
15
|
-
nodes: mapValues(nodes, ({ x, y, width, height, isCompound, ...n }) => ({
|
|
16
|
-
...n,
|
|
17
|
-
b: [x, y, width, height],
|
|
18
|
-
c: isCompound
|
|
19
|
-
})),
|
|
20
|
-
edges: mapValues(edges, ({ points, controlPoints, labelBBox, dotpos, ...e }) => ({
|
|
21
|
-
...!!controlPoints && { cp: controlPoints },
|
|
22
|
-
...!!labelBBox && { l: labelBBox },
|
|
23
|
-
...!!dotpos && { dp: dotpos },
|
|
24
|
-
...e,
|
|
25
|
-
p: points
|
|
26
|
-
}))
|
|
27
|
-
};
|
|
28
|
-
}
|
|
29
|
-
function unpack({
|
|
30
|
-
nodes,
|
|
31
|
-
edges,
|
|
32
|
-
autoLayout,
|
|
33
|
-
...rest
|
|
34
|
-
}) {
|
|
35
|
-
return {
|
|
36
|
-
...rest,
|
|
37
|
-
/// Try to parse the old format for backward compatibility
|
|
38
|
-
autoLayout: isAutoLayoutDirection(autoLayout) ? { direction: autoLayout } : autoLayout,
|
|
39
|
-
nodes: mapValues(nodes, ({ b, c, ...n }) => ({
|
|
40
|
-
x: b[0],
|
|
41
|
-
y: b[1],
|
|
42
|
-
width: b[2],
|
|
43
|
-
height: b[3],
|
|
44
|
-
isCompound: c,
|
|
45
|
-
...n
|
|
46
|
-
})),
|
|
47
|
-
edges: mapValues(edges, ({ p, cp, l, dp, ...e }) => ({
|
|
48
|
-
...!!cp && { controlPoints: cp },
|
|
49
|
-
...!!l && { labelBBox: l },
|
|
50
|
-
...!!dp && { dotpos: dp },
|
|
51
|
-
...e,
|
|
52
|
-
points: p
|
|
53
|
-
}))
|
|
54
|
-
};
|
|
55
|
-
}
|
|
56
|
-
const MAX_LINE_LENGTH = 500;
|
|
57
|
-
export function serializeToComment(layout) {
|
|
58
|
-
const bytes = encode(pack(layout));
|
|
59
|
-
const base64 = toBase64(bytes);
|
|
60
|
-
const lines = [];
|
|
61
|
-
let offset = 0;
|
|
62
|
-
while (offset < base64.length) {
|
|
63
|
-
lines.push(" * " + base64.slice(offset, Math.min(offset + MAX_LINE_LENGTH, base64.length)));
|
|
64
|
-
offset += MAX_LINE_LENGTH;
|
|
65
|
-
}
|
|
66
|
-
lines.unshift(
|
|
67
|
-
"/**",
|
|
68
|
-
" * @likec4-generated(v1)"
|
|
69
|
-
);
|
|
70
|
-
lines.push(" */");
|
|
71
|
-
return lines.join("\n");
|
|
72
|
-
}
|
|
73
|
-
export function hasManualLayout(comment) {
|
|
74
|
-
return comment.includes("@likec4-generated");
|
|
75
|
-
}
|
|
76
|
-
export function deserializeFromComment(comment) {
|
|
77
|
-
if (!hasManualLayout(comment)) {
|
|
78
|
-
throw new Error(`Not a likec4-generated comment: ${comment}`);
|
|
79
|
-
}
|
|
80
|
-
const b64 = comment.trim().split("\n").filter((l) => !l.includes("**") && !l.includes("@likec4-") && !l.includes("*/")).map((l) => l.replaceAll("*", "").trim()).join("");
|
|
81
|
-
const decodedb64 = fromBase64(b64);
|
|
82
|
-
return unpack(decode(decodedb64));
|
|
83
|
-
}
|
|
84
|
-
export function parseViewManualLayout(node) {
|
|
85
|
-
const commentNode = CstUtils.findCommentNode(node.$cstNode, ["BLOCK_COMMENT"]);
|
|
86
|
-
if (!commentNode || !hasManualLayout(commentNode.text)) {
|
|
87
|
-
return void 0;
|
|
88
|
-
}
|
|
89
|
-
try {
|
|
90
|
-
return deserializeFromComment(commentNode.text);
|
|
91
|
-
} catch (e) {
|
|
92
|
-
const doc = getDocument(node);
|
|
93
|
-
logWarnError(e);
|
|
94
|
-
logger.warn(
|
|
95
|
-
`Ignoring manual layout of "${node.name ?? "unnamed"}" at ${doc.uri.fsPath}:${1 + (commentNode.range.start.line || 0)}`
|
|
96
|
-
);
|
|
97
|
-
return void 0;
|
|
98
|
-
}
|
|
99
|
-
}
|
|
@@ -1,51 +0,0 @@
|
|
|
1
|
-
import { GraphvizWasmAdapter, QueueGraphvizLayoter } from "@likec4/layouts";
|
|
2
|
-
import { GraphvizBinaryAdapter } from "@likec4/layouts/graphviz/binary";
|
|
3
|
-
import { isEmpty } from "remeda";
|
|
4
|
-
import which from "which";
|
|
5
|
-
import { logger } from "../logger.mjs";
|
|
6
|
-
function graphvizBinPath() {
|
|
7
|
-
try {
|
|
8
|
-
return which.sync("dot");
|
|
9
|
-
} catch (error) {
|
|
10
|
-
logger.error("Error checking for native Graphviz:", { error });
|
|
11
|
-
return null;
|
|
12
|
-
}
|
|
13
|
-
}
|
|
14
|
-
export const ConfigurableLayouter = {
|
|
15
|
-
likec4: {
|
|
16
|
-
Layouter(services) {
|
|
17
|
-
logger.debug("Creating ConfigurableLayouter");
|
|
18
|
-
const layouter = new QueueGraphvizLayoter();
|
|
19
|
-
services.shared.workspace.ConfigurationProvider.onConfigurationSectionUpdate((update) => {
|
|
20
|
-
logger.debug("Configuration update: {update}", { update });
|
|
21
|
-
if (update.section !== services.LanguageMetaData.languageId) {
|
|
22
|
-
logger.debug(`Ignoring configuration update as it is not for ${services.LanguageMetaData.languageId}`);
|
|
23
|
-
return;
|
|
24
|
-
}
|
|
25
|
-
try {
|
|
26
|
-
const { mode, path } = update.configuration.graphviz ?? {
|
|
27
|
-
mode: "wasm",
|
|
28
|
-
path: ""
|
|
29
|
-
};
|
|
30
|
-
if (mode !== "wasm") {
|
|
31
|
-
let binaryPath = isEmpty(path) ? graphvizBinPath() : path;
|
|
32
|
-
if (!isEmpty(binaryPath)) {
|
|
33
|
-
layouter.changePort(new GraphvizBinaryAdapter(binaryPath));
|
|
34
|
-
logger.info`use graphviz binary: ${binaryPath}`;
|
|
35
|
-
return;
|
|
36
|
-
}
|
|
37
|
-
logger.warn(`No Graphviz binaries found on PATH, use graphviz wasm`);
|
|
38
|
-
services.shared.lsp.Connection?.window.showWarningMessage(
|
|
39
|
-
"No Graphviz binaries found on PATH, set path to binaries in settings."
|
|
40
|
-
);
|
|
41
|
-
}
|
|
42
|
-
layouter.changePort(new GraphvizWasmAdapter());
|
|
43
|
-
logger.info("use graphviz wasm");
|
|
44
|
-
} catch (error) {
|
|
45
|
-
logger.error("Failed to update configuration", { error });
|
|
46
|
-
}
|
|
47
|
-
});
|
|
48
|
-
return layouter;
|
|
49
|
-
}
|
|
50
|
-
}
|
|
51
|
-
};
|
package/dist/views/index.mjs
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export { DefaultLikeC4Views } from "./likec4-views.mjs";
|
|
@@ -1,166 +0,0 @@
|
|
|
1
|
-
import { loggable } from "@likec4/log";
|
|
2
|
-
import { values } from "remeda";
|
|
3
|
-
import { logger as rootLogger, logWarnError } from "../logger.mjs";
|
|
4
|
-
import { performanceMark } from "../utils/index.mjs";
|
|
5
|
-
const viewsLogger = rootLogger.getChild("views");
|
|
6
|
-
export class DefaultLikeC4Views {
|
|
7
|
-
constructor(services) {
|
|
8
|
-
this.services = services;
|
|
9
|
-
this.ModelBuilder = services.likec4.ModelBuilder;
|
|
10
|
-
}
|
|
11
|
-
cache = /* @__PURE__ */ new WeakMap();
|
|
12
|
-
/**
|
|
13
|
-
* Set of viewIds with reported errors
|
|
14
|
-
* value is `${projectId}-${viewId}`
|
|
15
|
-
*/
|
|
16
|
-
viewsWithReportedErrors = /* @__PURE__ */ new Set();
|
|
17
|
-
ModelBuilder;
|
|
18
|
-
get layouter() {
|
|
19
|
-
return this.services.likec4.Layouter;
|
|
20
|
-
}
|
|
21
|
-
async computedViews(projectId, cancelToken) {
|
|
22
|
-
const likeC4Model = await this.ModelBuilder.buildLikeC4Model(projectId, cancelToken);
|
|
23
|
-
return values(likeC4Model.$data.views);
|
|
24
|
-
}
|
|
25
|
-
async layoutAllViews(projectId, cancelToken) {
|
|
26
|
-
const likeC4Model = await this.ModelBuilder.buildLikeC4Model(projectId, cancelToken);
|
|
27
|
-
const views = values(likeC4Model.$data.views);
|
|
28
|
-
if (views.length === 0) {
|
|
29
|
-
return [];
|
|
30
|
-
}
|
|
31
|
-
const m0 = performanceMark();
|
|
32
|
-
projectId ??= likeC4Model.project.id;
|
|
33
|
-
const logger = viewsLogger.getChild(projectId);
|
|
34
|
-
logger.debug`layoutAll: ${views.length} views`;
|
|
35
|
-
const tasks = [];
|
|
36
|
-
const styles = likeC4Model.$styles;
|
|
37
|
-
const results = [];
|
|
38
|
-
for (const view of views) {
|
|
39
|
-
let cached = this.cache.get(view);
|
|
40
|
-
if (cached) {
|
|
41
|
-
logger.debug`layout ${view.id} from cache`;
|
|
42
|
-
results.push(cached);
|
|
43
|
-
continue;
|
|
44
|
-
}
|
|
45
|
-
tasks.push({
|
|
46
|
-
view,
|
|
47
|
-
styles
|
|
48
|
-
});
|
|
49
|
-
}
|
|
50
|
-
if (tasks.length > 0) {
|
|
51
|
-
await this.layouter.batchLayout({
|
|
52
|
-
batch: tasks,
|
|
53
|
-
onSuccess: (task, result) => {
|
|
54
|
-
this.viewSucceed(task.view, projectId, result);
|
|
55
|
-
results.push(result);
|
|
56
|
-
},
|
|
57
|
-
onError: (task, error) => {
|
|
58
|
-
logger.warn(`Fail layout view ${task.view.id}`, { error });
|
|
59
|
-
}
|
|
60
|
-
});
|
|
61
|
-
}
|
|
62
|
-
if (results.length !== views.length) {
|
|
63
|
-
logger.warn`layouted ${results.length} of ${views.length} views in ${m0.pretty}`;
|
|
64
|
-
} else if (results.length > 0) {
|
|
65
|
-
logger.debug`layouted all ${results.length} views in ${m0.pretty}`;
|
|
66
|
-
}
|
|
67
|
-
return results;
|
|
68
|
-
}
|
|
69
|
-
async layoutView(viewId, projectId, cancelToken) {
|
|
70
|
-
const model = await this.ModelBuilder.buildLikeC4Model(projectId, cancelToken);
|
|
71
|
-
const view = model.findView(viewId)?.$view;
|
|
72
|
-
projectId ??= model.project.id;
|
|
73
|
-
const logger = viewsLogger.getChild(projectId);
|
|
74
|
-
if (!view) {
|
|
75
|
-
logger.warn`layoutView ${viewId} not found`;
|
|
76
|
-
return null;
|
|
77
|
-
}
|
|
78
|
-
let cached = this.cache.get(view);
|
|
79
|
-
if (cached) {
|
|
80
|
-
logger.debug`layout ${viewId} from cache`;
|
|
81
|
-
return await Promise.resolve().then(() => cached);
|
|
82
|
-
}
|
|
83
|
-
try {
|
|
84
|
-
const m0 = performanceMark();
|
|
85
|
-
const result = await this.layouter.layout({
|
|
86
|
-
view,
|
|
87
|
-
styles: model.$styles
|
|
88
|
-
});
|
|
89
|
-
this.viewSucceed(view, projectId, result);
|
|
90
|
-
logger.debug(`layout {viewId} ready in ${m0.pretty}`, { viewId });
|
|
91
|
-
return result;
|
|
92
|
-
} catch (e) {
|
|
93
|
-
const errMessage = loggable(e);
|
|
94
|
-
logger.warn(errMessage);
|
|
95
|
-
this.reportViewError(view, projectId, errMessage);
|
|
96
|
-
return Promise.reject(e);
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
async diagrams(projectId, cancelToken) {
|
|
100
|
-
const layouted = await this.layoutAllViews(projectId, cancelToken);
|
|
101
|
-
return layouted.map((l) => l.diagram);
|
|
102
|
-
}
|
|
103
|
-
async viewsAsGraphvizOut(projectId, cancelToken) {
|
|
104
|
-
const KEY = "All-LayoutedViews-DotWithSvg";
|
|
105
|
-
const cache = this.services.ValidatedWorkspaceCache;
|
|
106
|
-
if (cache.has(KEY)) {
|
|
107
|
-
return await Promise.resolve(cache.get(KEY));
|
|
108
|
-
}
|
|
109
|
-
const likeC4Model = await this.ModelBuilder.buildLikeC4Model(projectId, cancelToken);
|
|
110
|
-
const views = values(likeC4Model.$data.views);
|
|
111
|
-
if (views.length === 0) {
|
|
112
|
-
return [];
|
|
113
|
-
}
|
|
114
|
-
const tasks = views.map(async (view) => {
|
|
115
|
-
const { dot, svg } = await this.layouter.svg({
|
|
116
|
-
view,
|
|
117
|
-
styles: likeC4Model.$styles
|
|
118
|
-
});
|
|
119
|
-
return {
|
|
120
|
-
id: view.id,
|
|
121
|
-
dot,
|
|
122
|
-
svg
|
|
123
|
-
};
|
|
124
|
-
});
|
|
125
|
-
const succeed = [];
|
|
126
|
-
const settledResult = await Promise.allSettled(tasks);
|
|
127
|
-
for (const result of settledResult) {
|
|
128
|
-
if (result.status === "fulfilled") {
|
|
129
|
-
succeed.push(result.value);
|
|
130
|
-
} else {
|
|
131
|
-
logWarnError(result.reason);
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
cache.set(KEY, succeed);
|
|
135
|
-
return succeed;
|
|
136
|
-
}
|
|
137
|
-
/**
|
|
138
|
-
* Open a view in the preview panel.
|
|
139
|
-
*/
|
|
140
|
-
async openView(viewId, projectId) {
|
|
141
|
-
await this.services.Rpc.openView({ viewId, projectId });
|
|
142
|
-
}
|
|
143
|
-
reportViewError(view, projectId, error) {
|
|
144
|
-
const key = `${projectId}-${view.id}`;
|
|
145
|
-
if (!this.viewsWithReportedErrors.has(key)) {
|
|
146
|
-
this.services.shared.lsp.Connection?.window.showErrorMessage(`LikeC4: ${error}`);
|
|
147
|
-
this.viewsWithReportedErrors.add(key);
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
viewSucceed(view, projectId, result) {
|
|
151
|
-
const key = `${projectId}-${view.id}`;
|
|
152
|
-
this.viewsWithReportedErrors.delete(key);
|
|
153
|
-
this.cache.set(view, result);
|
|
154
|
-
}
|
|
155
|
-
// async overviewGraph(): Promise<OverviewGraph> {
|
|
156
|
-
// const KEY = 'OverviewGraph'
|
|
157
|
-
// const cache = this.services.ValidatedWorkspaceCache as WorkspaceCache<string, OverviewGraph>
|
|
158
|
-
// if (cache.has(KEY)) {
|
|
159
|
-
// return await Promise.resolve(cache.get(KEY)!)
|
|
160
|
-
// }
|
|
161
|
-
// const views = await this.computedViews()
|
|
162
|
-
// const overviewGraph = await this.layouter.layoutOverviewGraph(views)
|
|
163
|
-
// cache.set(KEY, overviewGraph)
|
|
164
|
-
// return overviewGraph
|
|
165
|
-
// }
|
|
166
|
-
}
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
AstUtils,
|
|
3
|
-
DefaultAstNodeDescriptionProvider
|
|
4
|
-
} from "langium";
|
|
5
|
-
export class AstNodeDescriptionProvider extends DefaultAstNodeDescriptionProvider {
|
|
6
|
-
constructor(services) {
|
|
7
|
-
super(services);
|
|
8
|
-
this.services = services;
|
|
9
|
-
}
|
|
10
|
-
createDescription(node, name, document) {
|
|
11
|
-
const doc = document ?? AstUtils.getDocument(node);
|
|
12
|
-
const description = super.createDescription(node, name, document);
|
|
13
|
-
doc.likec4ProjectId ??= this.services.shared.workspace.ProjectsManager.belongsTo(doc.uri);
|
|
14
|
-
description.likec4ProjectId = doc.likec4ProjectId;
|
|
15
|
-
return description;
|
|
16
|
-
}
|
|
17
|
-
}
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
import { DefaultIndexManager, stream } from "langium";
|
|
2
|
-
export class IndexManager extends DefaultIndexManager {
|
|
3
|
-
constructor(services) {
|
|
4
|
-
super(services);
|
|
5
|
-
this.services = services;
|
|
6
|
-
}
|
|
7
|
-
async updateContent(document, cancelToken) {
|
|
8
|
-
const projects = this.services.workspace.ProjectsManager;
|
|
9
|
-
document.likec4ProjectId = projects.belongsTo(document.uri);
|
|
10
|
-
await super.updateContent(document, cancelToken);
|
|
11
|
-
}
|
|
12
|
-
projectElements(projectId, nodeType, uris) {
|
|
13
|
-
const projects = this.services.workspace.ProjectsManager;
|
|
14
|
-
let documentUris = stream(this.symbolIndex.keys());
|
|
15
|
-
return documentUris.filter((uri) => projects.belongsTo(uri) === projectId && (!uris || uris.has(uri))).flatMap((uri) => this.getFileDescriptions(uri, nodeType));
|
|
16
|
-
}
|
|
17
|
-
}
|
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
import { compareNaturalHierarchically } from "@likec4/core/utils";
|
|
2
|
-
import { DefaultLangiumDocuments } from "langium";
|
|
3
|
-
import { groupBy, prop } from "remeda";
|
|
4
|
-
import { isLikeC4LangiumDocument } from "../ast.mjs";
|
|
5
|
-
import { isLikeC4Builtin } from "../likec4lib.mjs";
|
|
6
|
-
const compare = compareNaturalHierarchically("/", true);
|
|
7
|
-
const ensureOrder = (a, b) => compare(a.uri.path, b.uri.path);
|
|
8
|
-
export class LangiumDocuments extends DefaultLangiumDocuments {
|
|
9
|
-
constructor(services) {
|
|
10
|
-
super(services);
|
|
11
|
-
this.services = services;
|
|
12
|
-
}
|
|
13
|
-
compare = compareNaturalHierarchically("/", true);
|
|
14
|
-
addDocument(document) {
|
|
15
|
-
const uriString = document.uri.toString();
|
|
16
|
-
if (this.documentMap.has(uriString)) {
|
|
17
|
-
throw new Error(`A document with the URI '${uriString}' is already present.`);
|
|
18
|
-
}
|
|
19
|
-
const docs = [...this.documentMap.values(), document].sort(ensureOrder);
|
|
20
|
-
this.documentMap.clear();
|
|
21
|
-
for (const doc of docs) {
|
|
22
|
-
this.documentMap.set(doc.uri.toString(), doc);
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
/**
|
|
26
|
-
* Returns all user documents, excluding built-in documents.
|
|
27
|
-
*/
|
|
28
|
-
get allExcludingBuiltin() {
|
|
29
|
-
const projects = this.services.workspace.ProjectsManager;
|
|
30
|
-
return super.all.filter((doc) => {
|
|
31
|
-
if (!isLikeC4LangiumDocument(doc) || isLikeC4Builtin(doc.uri) || projects.checkIfExcluded(doc)) {
|
|
32
|
-
return false;
|
|
33
|
-
}
|
|
34
|
-
doc.likec4ProjectId = projects.belongsTo(doc.uri);
|
|
35
|
-
return true;
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
projectDocuments(projectId) {
|
|
39
|
-
return this.allExcludingBuiltin.filter((doc) => doc.likec4ProjectId === projectId);
|
|
40
|
-
}
|
|
41
|
-
groupedByProject() {
|
|
42
|
-
return groupBy(this.allExcludingBuiltin.toArray(), prop("likec4ProjectId"));
|
|
43
|
-
}
|
|
44
|
-
resetProjectIds() {
|
|
45
|
-
const projects = this.services.workspace.ProjectsManager;
|
|
46
|
-
this.all.forEach((doc) => {
|
|
47
|
-
if (!isLikeC4LangiumDocument(doc) || isLikeC4Builtin(doc.uri)) {
|
|
48
|
-
return;
|
|
49
|
-
}
|
|
50
|
-
doc.likec4ProjectId = projects.belongsTo(doc);
|
|
51
|
-
});
|
|
52
|
-
}
|
|
53
|
-
}
|