@likec4/language-server 1.9.0 → 1.10.0

package/src/validation/property-checks.ts

@@ -1,4 +1,4 @@
-import type { ValidationCheck } from 'langium'
+import { AstUtils, type ValidationCheck } from 'langium'
 import { ast } from '../ast'
 import type { LikeC4Services } from '../module'
 
@@ -37,3 +37,15 @@ export const iconPropertyRuleChecks = (
     }
   }
 }
+
+export const notesPropertyRuleChecks = (
+  _: LikeC4Services
+): ValidationCheck<ast.NotesProperty> => {
+  return (node, accept) => {
+    if (!AstUtils.hasContainerOfType(node, ast.isDynamicViewStep)) {
+      accept('error', `Notes can be defined only inside dynamic view`, {
+        node
+      })
+    }
+  }
+}

package/src/validation/specification.ts

@@ -8,7 +8,7 @@ export const specificationRuleChecks = (
 ): ValidationCheck<ast.SpecificationRule> => {
   return (node, accept) => {
     if (node.$containerIndex && node.$containerIndex > 0) {
-      accept('error', `Only one specification per document is allowed`, {
+      accept('warning', `Prefer one specification per document`, {
         node: node,
         property: 'name'
       })
@@ -19,7 +19,7 @@ export const specificationRuleChecks = (
 export const modelRuleChecks = (_: LikeC4Services): ValidationCheck<ast.Model> => {
   return (node, accept) => {
     if (node.$containerIndex && node.$containerIndex > 0) {
-      accept('error', `Only one model per document is allowed`, {
+      accept('warning', `Prefer one model per document`, {
         node: node,
         property: 'name'
       })
@@ -30,7 +30,7 @@ export const modelRuleChecks = (_: LikeC4Services): ValidationCheck<ast.Model> =
 export const modelViewsChecks = (_: LikeC4Services): ValidationCheck<ast.ModelViews> => {
   return (node, accept) => {
     if (node.$containerIndex && node.$containerIndex > 0) {
-      accept('error', `Only one views block per document is allowed`, {
+      accept('warning', `Prefer one views block per document`, {
         node: node,
         property: 'name'
       })

package/src/view-utils/resolve-relative-paths.ts

@@ -1,6 +1,6 @@
 import type { LikeC4View } from '@likec4/core'
-import { invariant } from '@likec4/core'
-import { filter, hasAtLeast, isTruthy, map, pipe, unique, zip } from 'remeda'
+import { compareNatural, invariant } from '@likec4/core'
+import { filter, hasAtLeast, isTruthy, map, pipe, unique } from 'remeda'
 import { parsePath } from 'ufo'
 
 function commonAncestorPath(views: LikeC4View[], sep = '/') {
@@ -11,7 +11,7 @@ function commonAncestorPath(views: LikeC4View[], sep = '/') {
     unique()
   )
   if (uniqURIs.length === 0) return ''
-  if (hasAtLeast(uniqURIs, 1) && uniqURIs.length === 1) {
+  if (uniqURIs.length === 1) {
     const parts = parsePath(uniqURIs[0]).pathname.split(sep)
     if (parts.length <= 1) return sep
     parts.pop() // remove filename
@@ -47,7 +47,7 @@ export function resolveRelativePaths(views: LikeC4View[]): LikeC4View[] {
       .map(view => {
         if (!view.docUri) {
           return {
-            ...view,
+            view,
             parts: []
           }
         }
@@ -62,28 +62,25 @@ export function resolveRelativePaths(views: LikeC4View[]): LikeC4View[] {
           path = path.includes(sep) ? path.slice(path.lastIndexOf(sep) + 1) : path
         }
         return {
-          ...view,
+          view,
           parts: path.split(sep)
         }
       })
       // Sort views by path segments
       .sort((a, b) => {
-        if (a.parts.length === b.parts.length) {
-          if (a.parts.length === 0) {
-            return 0
-          }
-          for (const [_a, _b] of zip(a.parts, b.parts)) {
-            const compare = _a.localeCompare(_b)
-            if (compare !== 0) {
-              return compare
-            }
+        if (a.parts.length !== b.parts.length) {
+          return a.parts.length - b.parts.length
+        }
+        for (let i = 0; i < a.parts.length; i++) {
+          const compare = compareNatural(a.parts[i], b.parts[i])
+          if (compare !== 0) {
+            return compare
           }
-          return 0
         }
-        return a.parts.length - b.parts.length
+        return compareNatural(a.view.title ?? a.view.id, b.view.title ?? b.view.id)
       })
       // Build relativePath from path segments
-      .map(({ parts, ...view }) => {
+      .map(({ parts, view }) => {
         return {
           ...view,
           relativePath: parts.join(sep)