@likec4/language-server 0.26.0 → 0.27.0

package/contrib/likec4.monarch.ts

@@ -1,7 +1,7 @@
 // Monarch syntax highlighting for the likec4 language.
 export default {
     keywords: [
-        'BottomTop','LeftRight','RightLeft','TopBottom','amber','autoLayout','blue','browser','color','cylinder','description','element','exclude','extend','gray','green','include','indigo','it','kind','mobile','model','muted','of','person','primary','queue','rectangle','red','secondary','shape','sky','slate','specification','storage','style','tag','technology','this','title','view','views'
+        'BottomTop','LeftRight','RightLeft','TopBottom','amber','autoLayout','blue','browser','color','cylinder','description','element','exclude','extend','gray','green','include','indigo','it','kind','link','mobile','model','muted','of','person','primary','queue','rectangle','red','secondary','shape','sky','slate','specification','storage','style','tag','technology','this','title','view','views'
     ],
     operators: [
         '*','.*'
@@ -10,6 +10,8 @@ export default {
 
     tokenizer: {
         initial: [
+            { regex: /(\w+:\/\/)[^\s]+/, action: {"token":"URI_WITH_SCHEMA"} },
+            { regex: /\/[^\s\/][^\s]*/, action: {"token":"URI_RELATIVE"} },
             { regex: /"[^"]*"|'[^']*'/, action: {"token":"string"} },
             { regex: /[^\W\d_]/, action: { cases: { '@keywords': {"token":"keyword"}, '@default': {"token":"LETTER"} }} },
             { regex: /[0-9]/, action: {"token":"DIGIT"} },

package/contrib/likec4.tmLanguage.json

@@ -12,7 +12,7 @@
     },
     {
       "name": "keyword.control.likec4",
-      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|autoLayout|blue|browser|color|cylinder|description|element|exclude|extend|gray|green|include|indigo|it|kind|mobile|model|muted|of|person|primary|queue|rectangle|red|secondary|shape|sky|slate|specification|storage|style|tag|technology|this|title|view|views)\\b"
+      "match": "\\b(BottomTop|LeftRight|RightLeft|TopBottom|amber|autoLayout|blue|browser|color|cylinder|description|element|exclude|extend|gray|green|include|indigo|it|kind|link|mobile|model|muted|of|person|primary|queue|rectangle|red|secondary|shape|sky|slate|specification|storage|style|tag|technology|this|title|view|views)\\b"
     },
     {
       "name": "string.quoted.double.likec4",

package/dist/ast.d.ts

@@ -61,7 +61,7 @@ export declare function cleanParsedModel(doc: LikeC4LangiumDocument): {
 export declare function isLikeC4LangiumDocument(doc: LangiumDocument): doc is LikeC4LangiumDocument;
 export declare function isParsedLikeC4LangiumDocument(doc: LangiumDocument): doc is LikeC4LangiumDocument;
 export declare const isValidLikeC4LangiumDocument: (doc: LangiumDocument) => doc is LikeC4LangiumDocument;
-export declare function streamModel(doc: LikeC4LangiumDocument): Generator<ast.Element | ast.Relation, void, unknown>;
+export declare function streamModel(doc: LikeC4LangiumDocument): Generator<ast.Relation | ast.Element, void, unknown>;
 export declare function resolveRelationPoints(node: ast.Relation): {
     source: ast.Element;
     target: ast.Element;

package/dist/generated/ast.d.ts

@@ -4,7 +4,7 @@
  ******************************************************************************/
 import type { AstNode, Reference, ReferenceInfo, TypeMetaData } from 'langium';
 import { AbstractAstReflection } from 'langium';
-export type AnyStringProperty = ElementStringProperty | RelationStringProperty | ViewProperty;
+export type AnyStringProperty = ElementStringProperty | LinkProperty | RelationStringProperty | ViewProperty;
 export declare const AnyStringProperty = "AnyStringProperty";
 export declare function isAnyStringProperty(item: unknown): item is AnyStringProperty;
 export type AStyleProperty = ColorProperty | ShapeProperty;
@@ -27,6 +27,8 @@ export type RArrow = string;
 export declare function isRArrow(item: unknown): item is RArrow;
 export type ThemeColor = 'amber' | 'blue' | 'gray' | 'green' | 'indigo' | 'muted' | 'primary' | 'red' | 'secondary' | 'sky' | 'slate';
 export declare function isThemeColor(item: unknown): item is ThemeColor;
+export type Uri = string;
+export declare function isUri(item: unknown): item is Uri;
 export type View = ElementView;
 export declare const View = "View";
 export declare function isView(item: unknown): item is View;
@@ -57,7 +59,7 @@ export interface ElementBody extends AstNode {
     readonly $container: Element;
     readonly $type: 'ElementBody';
     elements: Array<Element | Relation>;
-    props: Array<ElementProperty>;
+    props: Array<ElementProperty | LinkProperty>;
     tags?: Tags;
 }
 export declare const ElementBody = "ElementBody";
@@ -166,6 +168,14 @@ export interface LikeC4Document extends AstNode {
 }
 export declare const LikeC4Document = "LikeC4Document";
 export declare function isLikeC4Document(item: unknown): item is LikeC4Document;
+export interface LinkProperty extends AstNode {
+    readonly $container: ElementBody | ElementView | RelationBody;
+    readonly $type: 'LinkProperty';
+    key: 'link';
+    value: Uri;
+}
+export declare const LinkProperty = "LinkProperty";
+export declare function isLinkProperty(item: unknown): item is LinkProperty;
 export interface Model extends AstNode {
     readonly $container: LikeC4Document;
     readonly $type: 'Model';
@@ -251,9 +261,8 @@ export declare function isSpecificationElementKindStyle(item: unknown): item is
 export interface SpecificationRule extends AstNode {
     readonly $container: LikeC4Document;
     readonly $type: 'SpecificationRule';
-    elementKinds: Array<SpecificationElementKind>;
     name: 'specification';
-    tags: Array<SpecificationTag>;
+    specs: Array<SpecificationElementKind | SpecificationTag>;
 }
 export declare const SpecificationRule = "SpecificationRule";
 export declare function isSpecificationRule(item: unknown): item is SpecificationRule;
@@ -365,6 +374,7 @@ export type LikeC4AstType = {
     InOutExpression: InOutExpression;
     IncomingExpression: IncomingExpression;
     LikeC4Document: LikeC4Document;
+    LinkProperty: LinkProperty;
     Model: Model;
     ModelViews: ModelViews;
     OutgoingExpression: OutgoingExpression;

package/dist/generated/ast.js

@@ -35,6 +35,9 @@ export function isRArrow(item) {
 export function isThemeColor(item) {
     return item === 'primary' || item === 'secondary' || item === 'muted' || item === 'slate' || item === 'blue' || item === 'indigo' || item === 'sky' || item === 'red' || item === 'gray' || item === 'green' || item === 'amber';
 }
+export function isUri(item) {
+    return typeof item === 'string';
+}
 export const View = 'View';
 export function isView(item) {
     return reflection.isInstance(item, View);
@@ -110,6 +113,10 @@ export const LikeC4Document = 'LikeC4Document';
 export function isLikeC4Document(item) {
     return reflection.isInstance(item, LikeC4Document);
 }
+export const LinkProperty = 'LinkProperty';
+export function isLinkProperty(item) {
+    return reflection.isInstance(item, LinkProperty);
+}
 export const Model = 'Model';
 export function isModel(item) {
     return reflection.isInstance(item, Model);
@@ -200,7 +207,7 @@ export function isRelationWithSource(item) {
 }
 export class LikeC4AstReflection extends AbstractAstReflection {
     getAllTypes() {
-        return ['AStyleProperty', 'AnyStringProperty', 'ColorProperty', 'Element', 'ElementBody', 'ElementExpression', 'ElementKind', 'ElementKindExpression', 'ElementProperty', 'ElementRef', 'ElementRefExpression', 'ElementStringProperty', 'ElementStyleProperty', 'ElementTagExpression', 'ElementView', 'Expression', 'ExtendElement', 'ExtendElementBody', 'InOutExpression', 'IncomingExpression', 'LikeC4Document', 'Model', 'ModelViews', 'OutgoingExpression', 'Relation', 'RelationBody', 'RelationExpression', 'RelationStringProperty', 'RelationWithSource', 'ShapeProperty', 'SpecificationElementKind', 'SpecificationElementKindStyle', 'SpecificationRule', 'SpecificationTag', 'SpecificationTagStyle', 'StrictElementRef', 'Tag', 'Tags', 'View', 'ViewProperty', 'ViewRule', 'ViewRuleAutoLayout', 'ViewRuleExpression', 'ViewRuleStyle', 'WildcardExpression'];
+        return ['AStyleProperty', 'AnyStringProperty', 'ColorProperty', 'Element', 'ElementBody', 'ElementExpression', 'ElementKind', 'ElementKindExpression', 'ElementProperty', 'ElementRef', 'ElementRefExpression', 'ElementStringProperty', 'ElementStyleProperty', 'ElementTagExpression', 'ElementView', 'Expression', 'ExtendElement', 'ExtendElementBody', 'InOutExpression', 'IncomingExpression', 'LikeC4Document', 'LinkProperty', 'Model', 'ModelViews', 'OutgoingExpression', 'Relation', 'RelationBody', 'RelationExpression', 'RelationStringProperty', 'RelationWithSource', 'ShapeProperty', 'SpecificationElementKind', 'SpecificationElementKindStyle', 'SpecificationRule', 'SpecificationTag', 'SpecificationTagStyle', 'StrictElementRef', 'Tag', 'Tags', 'View', 'ViewProperty', 'ViewRule', 'ViewRuleAutoLayout', 'ViewRuleExpression', 'ViewRuleStyle', 'WildcardExpression'];
     }
     computeIsSubtype(subtype, supertype) {
         switch (subtype) {
@@ -230,6 +237,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
             case ElementView: {
                 return this.isSubtype(View, supertype);
             }
+            case LinkProperty:
             case RelationStringProperty:
             case ViewProperty: {
                 return this.isSubtype(AnyStringProperty, supertype);
@@ -371,8 +379,7 @@ export class LikeC4AstReflection extends AbstractAstReflection {
                 return {
                     name: 'SpecificationRule',
                     mandatory: [
-                        { name: 'elementKinds', type: 'array' },
-                        { name: 'tags', type: 'array' }
+                        { name: 'specs', type: 'array' }
                     ]
                 };
             }