@likec4/language-server 1.11.0 → 1.12.0

package/src/generated-lib/icons.ts

@@ -306,6 +306,595 @@ export const LibIcons: string = `likec4lib { icons {
   aws:work-mail
   aws:work-spaces-family
   aws:x-ray
+  azure:abs-member
+  azure:active-directory-connect-health
+  azure:activity-log
+  azure:administrative-units
+  azure:advisor
+  azure:ai-studio
+  azure:aks-automatic
+  azure:aks-istio
+  azure:alerts
+  azure:all-resources
+  azure:analysis-services
+  azure:anomaly-detector
+  azure:api-center
+  azure:api-connections
+  azure:api-management-services
+  azure:api-proxy
+  azure:app-compliance-automation
+  azure:app-configuration
+  azure:app-registrations
+  azure:app-service-certificates
+  azure:app-service-domains
+  azure:app-service-environments
+  azure:app-service-plans
+  azure:app-services
+  azure:app-space
+  azure:app-space-component
+  azure:applens
+  azure:application-gateway-containers
+  azure:application-gateways
+  azure:application-group
+  azure:application-insights
+  azure:application-security-groups
+  azure:aquila
+  azure:arc-data-services
+  azure:arc-kubernetes
+  azure:arc-machines
+  azure:arc-postgre-sql
+  azure:arc-sql-managed-instance
+  azure:arc-sql-server
+  azure:atm-multistack
+  azure:auto-scale
+  azure:automanaged-vm
+  azure:automation-accounts
+  azure:availability-sets
+  azure:avs-vm
+  azure:azure-a
+  azure:azure-ad-b2c
+  azure:azure-api-for-fhir
+  azure:azure-applied-ai-services
+  azure:azure-arc
+  azure:azure-attestation
+  azure:azure-backup-center
+  azure:azure-blockchain-service
+  azure:azure-center-for-sap
+  azure:azure-chaos-studio
+  azure:azure-cloud-shell
+  azure:azure-communication-services
+  azure:azure-communications-gateway
+  azure:azure-compute-galleries
+  azure:azure-cosmos-db
+  azure:azure-data-catalog
+  azure:azure-data-explorer-clusters
+  azure:azure-database-maria-db-server
+  azure:azure-database-migration-services
+  azure:azure-database-my-sql-server
+  azure:azure-database-postgre-sql-server
+  azure:azure-database-postgre-sql-server-group
+  azure:azure-databox-gateway
+  azure:azure-databricks
+  azure:azure-deployment-environments
+  azure:azure-dev-ops
+  azure:azure-dev-tunnels
+  azure:azure-edge-hardware-center
+  azure:azure-experimentation-studio
+  azure:azure-fileshares
+  azure:azure-firewall-manager
+  azure:azure-firewall-policy
+  azure:azure-hcp-cache
+  azure:azure-hpc-workbenches
+  azure:azure-hybrid-center
+  azure:azure-information-protection
+  azure:azure-io-t-operations
+  azure:azure-lighthouse
+  azure:azure-load-testing
+  azure:azure-managed-grafana
+  azure:azure-maps-accounts
+  azure:azure-media-service
+  azure:azure-migrate
+  azure:azure-monitor-dashboard
+  azure:azure-monitor-pipeline
+  azure:azure-monitors-for-sap-solutions
+  azure:azure-net-app-files
+  azure:azure-network-function-manager
+  azure:azure-network-function-manager-functions
+  azure:azure-object-understanding
+  azure:azure-open-ai
+  azure:azure-operator-5g-core
+  azure:azure-operator-insights
+  azure:azure-operator-nexus
+  azure:azure-operator-service-manager
+  azure:azure-orbital
+  azure:azure-programmable-connectivity
+  azure:azure-purview-accounts
+  azure:azure-quotas
+  azure:azure-red-hat-open-shift
+  azure:azure-sentinel
+  azure:azure-service-bus
+  azure:azure-sphere
+  azure:azure-spring-apps
+  azure:azure-sql
+  azure:azure-sql-edge
+  azure:azure-sql-server-stretch-databases
+  azure:azure-sql-vm
+  azure:azure-stack
+  azure:azure-stack-edge
+  azure:azure-stack-hci-sizer
+  azure:azure-storage-mover
+  azure:azure-support-center-blue
+  azure:azure-sustainability
+  azure:azure-synapse-analytics
+  azure:azure-token-service
+  azure:azure-video-indexer
+  azure:azure-virtual-desktop
+  azure:azure-vmware-solution
+  azure:azure-workbooks
+  azure:azurite
+  azure:backlog
+  azure:backup-vault
+  azure:bare-metal-infrastructure
+  azure:bastions
+  azure:batch-accounts
+  azure:batch-ai
+  azure:biz-talk
+  azure:blob-block
+  azure:blob-page
+  azure:blockchain-applications
+  azure:blueprints
+  azure:bonsai
+  azure:bot-services
+  azure:branch
+  azure:browser
+  azure:bug
+  azure:builds
+  azure:business-process-tracking
+  azure:cache
+  azure:cache-redis
+  azure:capacity
+  azure:capacity-reservation-groups
+  azure:cdn-profiles
+  azure:central-service-instance-for-sap
+  azure:ceres
+  azure:change-analysis
+  azure:client-apps
+  azure:cloud-services-classic
+  azure:cloud-services-extended-support
+  azure:cloud-test
+  azure:code
+  azure:code-optimization
+  azure:cognitive-search
+  azure:cognitive-services
+  azure:cognitive-services-decisions
+  azure:collaborative-service
+  azure:commit
+  azure:community-images
+  azure:compliance
+  azure:compliance-center
+  azure:compute-fleet
+  azure:computer-vision
+  azure:conditional-access
+  azure:confidential-ledgers
+  azure:connected-cache
+  azure:connected-vehicle-platform
+  azure:connections
+  azure:consortium
+  azure:container-apps-environments
+  azure:container-instances
+  azure:container-registries
+  azure:container-services-deprecated
+  azure:content-moderators
+  azure:content-safety
+  azure:controls
+  azure:controls-horizontal
+  azure:cost-alerts
+  azure:cost-analysis
+  azure:cost-budgets
+  azure:cost-export
+  azure:cost-management
+  azure:cost-management-and-billing
+  azure:counter
+  azure:cubes
+  azure:custom-ip-prefix
+  azure:custom-vision
+  azure:customer-lockbox-for-microsoft-azure
+  azure:dashboard
+  azure:dashboard-hub
+  azure:data-box
+  azure:data-collection-rules
+  azure:data-factories
+  azure:data-lake-analytics
+  azure:data-lake-storage-gen1
+  azure:data-lake-store-gen1
+  azure:data-share-invitations
+  azure:data-shares
+  azure:database-instance-for-sap
+  azure:ddo-s-protection-plans
+  azure:dedicated-hsm
+  azure:defender-cm-local-manager
+  azure:defender-dcs-controller
+  azure:defender-distributer-control-system
+  azure:defender-engineering-station
+  azure:defender-external-management
+  azure:defender-freezer-monitor
+  azure:defender-historian
+  azure:defender-hmi
+  azure:defender-industrial-packaging-system
+  azure:defender-industrial-printer
+  azure:defender-industrial-robot
+  azure:defender-industrial-scale-system
+  azure:defender-marquee
+  azure:defender-meter
+  azure:defender-plc
+  azure:defender-pneumatic-device
+  azure:defender-programable-board
+  azure:defender-relay
+  azure:defender-robot-controller
+  azure:defender-rtu
+  azure:defender-sensor
+  azure:defender-slot
+  azure:defender-web-guiding-system
+  azure:detonation
+  azure:dev-console
+  azure:dev-ops-starter
+  azure:dev-test-labs
+  azure:device-compliance
+  azure:device-configuration
+  azure:device-enrollment
+  azure:device-provisioning-services
+  azure:device-security-apple
+  azure:device-security-google
+  azure:device-security-windows
+  azure:device-update-io-t-hub
+  azure:devices
+  azure:diagnostics-settings
+  azure:digital-twins
+  azure:disk-encryption-sets
+  azure:disk-pool
+  azure:disks
+  azure:disks-classic
+  azure:disks-snapshots
+  azure:dns-multistack
+  azure:dns-private-resolver
+  azure:dns-security-policy
+  azure:dns-zones
+  azure:download
+  azure:e-books
+  azure:edge-management
+  azure:education
+  azure:elastic-job-agents
+  azure:elastic-san
+  azure:endpoint-analytics
+  azure:enterprise-applications
+  azure:entra-connect
+  azure:entra-connect-health
+  azure:entra-connect-sync
+  azure:entra-domain-services
+  azure:entra-global-secure-access
+  azure:entra-id-protection
+  azure:entra-identity-custom-roles
+  azure:entra-identity-licenses
+  azure:entra-identity-risky-signins
+  azure:entra-identity-risky-users
+  azure:entra-identity-roles-and-administrators
+  azure:entra-internet-access
+  azure:entra-managed-identities
+  azure:entra-private-access
+  azure:entra-privleged-identity-management
+  azure:entra-verified-id
+  azure:error
+  azure:event-grid-domains
+  azure:event-grid-subscriptions
+  azure:event-grid-topics
+  azure:event-hub-clusters
+  azure:event-hubs
+  azure:exchange-access
+  azure:exchange-on-premises-access
+  azure:express-route-circuits
+  azure:express-route-direct
+  azure:express-route-traffic-collector
+  azure:extended-security-updates
+  azure:extensions
+  azure:external-identities
+  azure:face-apis
+  azure:feature-previews
+  azure:fhir-service
+  azure:fiji
+  azure:file
+  azure:files
+  azure:firewalls
+  azure:folder-blank
+  azure:folder-website
+  azure:form-recognizers
+  azure:free-services
+  azure:front-door-and-cdn-profiles
+  azure:ftp
+  azure:function-apps
+  azure:gear
+  azure:genomics
+  azure:genomics-accounts
+  azure:globe-error
+  azure:globe-success
+  azure:globe-warning
+  azure:groups
+  azure:guide
+  azure:hd-insight-clusters
+  azure:hdi-aks-cluster
+  azure:heart
+  azure:help-and-support
+  azure:host-groups
+  azure:host-pools
+  azure:hosts
+  azure:ic-m-troubleshooting
+  azure:identity-governance
+  azure:identity-multi-factor-authentication
+  azure:identity-secure-score
+  azure:image
+  azure:image-definitions
+  azure:image-templates
+  azure:image-versions
+  azure:images
+  azure:immersive-readers
+  azure:import-export-jobs
+  azure:industrial-io-t
+  azure:information
+  azure:infrastructure-backup
+  azure:input-output
+  azure:instance-pools
+  azure:integration-accounts
+  azure:integration-environments
+  azure:integration-service-environments
+  azure:internet-analyzer-profiles
+  azure:intune
+  azure:intune-app-protection
+  azure:intune-for-education
+  azure:intune-trends
+  azure:io-t-central-applications
+  azure:io-t-edge
+  azure:io-t-hub
+  azure:ip-address-manager
+  azure:ip-groups
+  azure:journey-hub
+  azure:key-vaults
+  azure:keys
+  azure:kubernetes-fleet-manager
+  azure:kubernetes-services
+  azure:lab-accounts
+  azure:lab-services
+  azure:language
+  azure:language-understanding
+  azure:launch-portal
+  azure:learn
+  azure:load-balancer-hub
+  azure:load-balancers
+  azure:load-test
+  azure:load-testing
+  azure:local-network-gateways
+  azure:location
+  azure:log-analytics-query-pack
+  azure:log-analytics-workspaces
+  azure:log-streaming
+  azure:logic-apps
+  azure:logic-apps-custom-connector
+  azure:machine-learning
+  azure:machine-learning-studio-classic-web-services
+  azure:machine-learning-studio-web-service-plans
+  azure:machine-learning-studio-workspaces
+  azure:machines-azure-arc
+  azure:maintenance-configuration
+  azure:managed-applications-center
+  azure:managed-database
+  azure:managed-desktop
+  azure:managed-dev-ops-pools
+  azure:managed-file-shares
+  azure:managed-identities
+  azure:managed-instance-apache-cassandra
+  azure:managed-service-fabric
+  azure:management-groups
+  azure:management-portal
+  azure:marketplace
+  azure:marketplace-management
+  azure:med-tech-service
+  azure:media
+  azure:media-file
+  azure:mesh-applications
+  azure:metrics
+  azure:metrics-advisor
+  azure:microsoft-defender-easm
+  azure:microsoft-defender-for-cloud
+  azure:microsoft-defender-for-io-t
+  azure:microsoft-dev-box
+  azure:mindaro
+  azure:mission-landing-zone
+  azure:mobile
+  azure:mobile-engagement
+  azure:mobile-networks
+  azure:modular-data-center
+  azure:module
+  azure:monitor
+  azure:monitor-health-models
+  azure:multi-tenancy
+  azure:multifactor-authentication
+  azure:my-customers
+  azure:nat
+  azure:network-interfaces
+  azure:network-managers
+  azure:network-security-groups
+  azure:network-security-perimeters
+  azure:network-watcher
+  azure:notification-hub-namespaces
+  azure:notification-hubs
+  azure:offers
+  azure:on-premises-data-gateways
+  azure:open-supply-chain-platform
+  azure:operation-log-classic
+  azure:oracle-database
+  azure:os-images-classic
+  azure:osconfig
+  azure:outbound-connection
+  azure:partner-namespace
+  azure:partner-registration
+  azure:partner-topic
+  azure:peering-service
+  azure:peerings
+  azure:personalizers
+  azure:plans
+  azure:policy
+  azure:power
+  azure:power-bi-embedded
+  azure:power-platform
+  azure:power-up
+  azure:powershell
+  azure:preview-features
+  azure:private-endpoints
+  azure:private-link
+  azure:private-link-service
+  azure:private-link-services
+  azure:process-explorer
+  azure:production-ready-database
+  azure:proximity-placement-groups
+  azure:public-ip-addresses
+  azure:public-ip-addresses-classic
+  azure:public-ip-prefixes
+  azure:qn-a-makers
+  azure:quickstart-center
+  azure:recent
+  azure:recovery-services-vaults
+  azure:region-management
+  azure:relays
+  azure:remote-rendering
+  azure:reservations
+  azure:reserved-capacity
+  azure:reserved-ip-addresses-classic
+  azure:resource-explorer
+  azure:resource-graph-explorer
+  azure:resource-group-list
+  azure:resource-groups
+  azure:resource-guard
+  azure:resource-linked
+  azure:resource-management-private-link
+  azure:resource-mover
+  azure:resources-provider
+  azure:restore-points
+  azure:restore-points-collections
+  azure:route-filters
+  azure:route-tables
+  azure:rtos
+  azure:savings-plans
+  azure:scheduler
+  azure:scheduler-job-collections
+  azure:scvmm-management-servers
+  azure:search
+  azure:search-grid
+  azure:security
+  azure:security-baselines
+  azure:send-grid-accounts
+  azure:server-farm
+  azure:serverless-search
+  azure:service-catalog-mad
+  azure:service-endpoint-policies
+  azure:service-fabric-clusters
+  azure:service-health
+  azure:service-providers
+  azure:shared-image-galleries
+  azure:signal-r
+  azure:software-as-a-service
+  azure:software-updates
+  azure:solutions
+  azure:sonic-dash
+  azure:spatial-anchor-accounts
+  azure:speech-services
+  azure:spot-vm
+  azure:spot-vmss
+  azure:sql-data-warehouses
+  azure:sql-database
+  azure:sql-elastic-pools
+  azure:sql-managed-instance
+  azure:sql-server
+  azure:sql-server-registries
+  azure:ssd
+  azure:ssh-keys
+  azure:ssis-lift-and-shift-ir
+  azure:stack-hci-premium
+  azure:static-apps
+  azure:stor-simple-data-managers
+  azure:stor-simple-device-managers
+  azure:storage-accounts
+  azure:storage-accounts-classic
+  azure:storage-actions
+  azure:storage-azure-files
+  azure:storage-container
+  azure:storage-explorer
+  azure:storage-functions
+  azure:storage-queue
+  azure:storage-sync-services
+  azure:stream-analytics-jobs
+  azure:subnet
+  azure:subscriptions
+  azure:system-topic
+  azure:table
+  azure:tag
+  azure:tags
+  azure:targets-management
+  azure:template-specs
+  azure:templates
+  azure:tenant-properties
+  azure:tenant-status
+  azure:test-base
+  azure:tfs-vc-repository
+  azure:time-series-data-sets
+  azure:time-series-insights-access-policies
+  azure:time-series-insights-environments
+  azure:time-series-insights-event-sources
+  azure:toolbox
+  azure:traffic-manager-profiles
+  azure:translator-text
+  azure:troubleshoot
+  azure:universal-print
+  azure:update-management-center
+  azure:updates
+  azure:user-privacy
+  azure:user-settings
+  azure:user-subscriptions
+  azure:users
+  azure:verifiable-credentials
+  azure:verification-as-a-service
+  azure:versions
+  azure:video-analyzers
+  azure:virtual-clusters
+  azure:virtual-enclaves
+  azure:virtual-instance-for-sap
+  azure:virtual-machine
+  azure:virtual-machines-classic
+  azure:virtual-network-gateways
+  azure:virtual-networks
+  azure:virtual-networks-classic
+  azure:virtual-router
+  azure:virtual-visits-builder
+  azure:virtual-wan-hub
+  azure:virtual-wans
+  azure:vm-app-definitions
+  azure:vm-app-versions
+  azure:vm-image-version
+  azure:vm-images-classic
+  azure:vm-scale-sets
+  azure:wac
+  azure:wac-installer
+  azure:web-app-database
+  azure:web-application-firewall-policies-waf
+  azure:web-jobs
+  azure:web-slots
+  azure:web-test
+  azure:website-power
+  azure:website-staging
+  azure:windows-notification-services
+  azure:windows10-core-services
+  azure:workbooks
+  azure:worker-container-app
+  azure:workflow
+  azure:workspace-gateway
+  azure:workspaces
   gcp:access-context-manager
   gcp:administration
   gcp:advanced-agent-modeling

package/src/like-c4.langium

@@ -439,7 +439,10 @@ ViewRuleStyle:
   '}';
 
 ViewRuleAutoLayout:
-  'autoLayout' direction=ViewLayoutDirection;
+  'autoLayout' direction=ViewLayoutDirection (
+    rankSep=Number (
+      nodeSep=Number)?
+    )?;
 
 NotationProperty:
   key='notation' ':'? value=String ';'?
@@ -547,7 +550,7 @@ ElementShape returns string:
   'rectangle' | 'person' | 'browser' | 'mobile' | 'cylinder' | 'storage' | 'queue';
 
 CustomColorValue returns string:
-  Hash (Id | Hex);
+  Hash (Id | Hex | Number);
 
 IconId returns string:
   LIB_ICON;
@@ -599,7 +602,7 @@ hidden terminal NL: /[\r\n]+/;
 //terminal LineStartWithDash: /(?<=([\r?\n][^\S\r\n]*))-/;
 
 // LibIcons
-terminal LIB_ICON: /(aws|gcp|tech):[-\w]*/;
+terminal LIB_ICON: /(aws|azure|gcp|tech):[-\w]*/;
 
 terminal URI_WITH_SCHEMA: /\w+:\/\/\S+/;
 terminal URI_RELATIVE: /\.{0,2}\/[^\/]\S+/;
@@ -620,4 +623,5 @@ terminal String: /"[^"]*"|'[^']*'/;
 // terminal  TagId: HASH LETTER (LETTER | DIGIT | UNDERSCORE | DASH)*;
 // terminal IdTerminal: (LETTER | UNDERSCORE+ (LETTER | DIGIT)) (LETTER | DIGIT | UNDERSCORE | DASH)*;
 terminal IdTerminal:  /[_]*[a-zA-Z][-\w]*/;
-terminal Hex: /[a-zA-Z0-9]+/;
+terminal Number returns number: /\b\d+\b/;
+terminal Hex: /\b[a-zA-Z0-9]+\b/;

package/src/lsp/CompletionProvider.ts

@@ -1,7 +1,54 @@
-import { type CompletionProviderOptions, DefaultCompletionProvider } from 'langium/lsp'
+import { type GrammarAST, type MaybePromise } from 'langium'
+import {
+  type CompletionAcceptor,
+  type CompletionContext,
+  type CompletionProviderOptions,
+  DefaultCompletionProvider
+} from 'langium/lsp'
+import { CompletionItemKind, InsertTextFormat } from 'vscode-languageserver-types'
 
 export class LikeC4CompletionProvider extends DefaultCompletionProvider {
   override readonly completionOptions = {
     triggerCharacters: ['.']
   } satisfies CompletionProviderOptions
+
+  protected override completionForKeyword(
+    context: CompletionContext,
+    keyword: GrammarAST.Keyword,
+    acceptor: CompletionAcceptor
+  ): MaybePromise<void> {
+    if (!this.filterKeyword(context, keyword)) {
+      return
+    }
+    if (['views', 'specification', 'model'].includes(keyword.value)) {
+      return acceptor(context, {
+        label: keyword.value,
+        detail: `Insert ${keyword} block`,
+        kind: CompletionItemKind.Module,
+        insertTextFormat: InsertTextFormat.Snippet,
+        insertText: `${keyword} {\n\t$0\n}`
+      })
+    }
+    if (keyword.value === 'dynamic') {
+      return acceptor(context, {
+        label: keyword.value,
+        detail: `Insert dynamic view`,
+        kind: CompletionItemKind.Class,
+        insertTextFormat: InsertTextFormat.Snippet,
+        insertText: [
+          'dynamic view ${1:view_${TM_FILENAME_BASE}_${CURRENT_SECOND}} {',
+          '\ttitle \'${2:Untitled}\'',
+          '\t',
+          '\t$0',
+          '}'
+        ].join('\n')
+      })
+    }
+    acceptor(context, {
+      label: keyword.value,
+      kind: this.getKeywordCompletionItemKind(keyword),
+      detail: 'Keyword',
+      sortText: '1'
+    })
+  }
 }

package/src/model/model-parser.ts

@@ -608,9 +608,7 @@ export class LikeC4ModelParser {
       }
     }
     if (ast.isViewRuleAutoLayout(astRule)) {
-      return {
-        autoLayout: toAutoLayout(astRule.direction)
-      }
+      return toAutoLayout(astRule)
     }
     nonexhaustive(astRule)
   }
@@ -849,9 +847,7 @@ export class LikeC4ModelParser {
             return acc
           }
           if (ast.isViewRuleAutoLayout(n)) {
-            acc.push({
-              autoLayout: toAutoLayout(n.direction)
-            })
+            acc.push(toAutoLayout(n))
             return acc
           }
           nonexhaustive(n)

package/src/model-graph/compute-view/compute.ts

@@ -175,7 +175,11 @@ export class ComputeCtx {
 
     return calcViewLayoutHash({
       ...view,
-      autoLayout: autoLayoutRule?.autoLayout ?? 'TB',
+      autoLayout: {
+        direction: autoLayoutRule?.direction ?? 'TB',
+        ...(autoLayoutRule?.nodeSep && { nodeSep: autoLayoutRule.nodeSep }),
+        ...(autoLayoutRule?.rankSep && { rankSep: autoLayoutRule.rankSep }),
+      },
       nodes: map(nodes, omit(['notation'])),
       edges: applyCustomRelationProperties(rules, nodes, sortedEdges),
       ...(elementNotations.length > 0 && {