@sap/cds-lsp - npm Package Compare versions

Comparing version 6.2.2 to 6.3.0

CHANGELOG.md

@@ -9,3 +9,19 @@ # Changelog
 
+## 6.3.0 - 2022-11-01
+
+### Added
+
+- formatting of artifact and type extensions
+- syntax highlighting of element extensions
+- syntax highlighting of numbers and some known types
+
+### Fixed
+- formatting of extensions with selectItems
+- format-cds script didn't find .cdsprettier.json
+
+### Also see
+- `@sap/cds-compiler` 3.4.0
+
 ## 6.2.2 - 2022-10-17
+
 ### Added
@@ -35,4 +51,5 @@ - cds-lsp bin script for easier integration into custom editors/IDEs
 ### Fixed
-- fixed syntax highlighting for `extend`, attribute names, type structs, and some keywords
+- fixed syntax highlighting for `extend`, attribute names, type structs, new integer types, and some keywords
 - fixed formatting of bracketed expressions and annotations standing in their own lines
+- fixed formatting of actions and functions inside aspects
 - fixed alignment of multiple annotations per line
@@ -39,0 +56,0 @@

dist/contributions.d.ts

@@ -124,3 +124,5 @@ import * as LSP from 'vscode-languageserver-protocol';
 	expression: keyof RelevantRuleNames;
+	extendArtifact: keyof RelevantRuleNames;
 	extendContext: keyof RelevantRuleNames;
+	extendProjection: keyof RelevantRuleNames;
 	flattenedValue: keyof RelevantRuleNames;
@@ -147,2 +149,5 @@ innerUsing: keyof RelevantRuleNames;
 	typeDef: keyof RelevantRuleNames;
+	typeNamedArg: keyof RelevantRuleNames;
+	typeNamedArgList: keyof RelevantRuleNames;
+	typeRefArgs: keyof RelevantRuleNames;
 	typeRefOptArgs: keyof RelevantRuleNames;
@@ -149,0 +154,0 @@ typeSpecSemi: keyof RelevantRuleNames;

dist/index.d.ts

@@ -746,3 +746,5 @@ import { BigIntStats, Dirent, PathLike, StatOptions, Stats, WriteFileOptions } from 'fs';
 	expression: keyof RelevantRuleNames;
+	extendArtifact: keyof RelevantRuleNames;
 	extendContext: keyof RelevantRuleNames;
+	extendProjection: keyof RelevantRuleNames;
 	flattenedValue: keyof RelevantRuleNames;
@@ -769,2 +771,5 @@ innerUsing: keyof RelevantRuleNames;
 	typeDef: keyof RelevantRuleNames;
+	typeNamedArg: keyof RelevantRuleNames;
+	typeNamedArgList: keyof RelevantRuleNames;
+	typeRefArgs: keyof RelevantRuleNames;
 	typeRefOptArgs: keyof RelevantRuleNames;
@@ -771,0 +776,0 @@ typeSpecSemi: keyof RelevantRuleNames;

package.json

 {
   "name": "@sap/cds-lsp",
   "description": "Language server for CDS",
-  "version": "6.2.2",
+  "version": "6.3.0",
   "homepage": "https://cap.cloud.sap/",
@@ -26,3 +26,2 @@ "author": "SAP SE (https://www.sap.com)",
     "README.md",
-    "INSTALLATION.md",
     "npm-shrinkwrap.json",
@@ -41,3 +40,3 @@ "LICENSE"
   "dependencies": {
-    "@sap/cds-compiler": "3.3.2",
+    "@sap/cds-compiler": "3.4.0",
     "ignore": "5.2.0",
@@ -44,0 +43,0 @@ "json-source-map": "0.6.1",

README.md

@@ -84,5 +84,5 @@ # CDS Language Server
 
-Refer to the [installation details](./INSTALLATION.md).
+Refer to the [installation details](doc/INSTALLATION.md).
 
 ## License
 This package is provided under the terms of the [SAP Developer License Agreement](https://tools.hana.ondemand.com/developer-license-3_1.txt).

syntaxes/cds.tmLanguage.json

@@ -63,3 +63,3 @@ {
         "1": {
-          "name": "keyword.cds"
+          "name": "keyword.strong.cds"
         },
@@ -567,3 +567,3 @@ "3": {
           "comment": "Types (exact casing)",
-          "match": "(?<!\\.|\\$)\\b(Association\\s*(?:\\[[0-9.eE+, *-]*\\]\\s*)?to\\s*(?:(many|one)\\s*)?|Composition\\s*(?:\\[[0-9.eE+, *-]*\\]\\s*)?of\\s*(?:(many|one)\\s*)?|(Boolean|Date|Time|DateTime|Timestamp|Number|Integer|Decimal|String)\\s*(\\([^()]*\\))?)(?!\\$|\\s*:)",
+          "match": "(?<!\\.|\\$)\\b(Association\\s*(?:\\[[0-9.eE+, *-]*\\]\\s*)?to\\s*(?:(many|one)\\s*)?|Composition\\s*(?:\\[[0-9.eE+, *-]*\\]\\s*)?of\\s*(?:(many|one)\\s*)?|(Binary|Boolean|Date|DateTime|Decimal|DecimalFloat|Double|Int(16|32|64)|Integer|Integer64|LargeBinary|LargeString|Number|String|Time|Timestamp|UInt8|UUID)\\s*(\\([^()]*\\))?)(?!\\$|\\s*:)",
           "name": "support.class.cds"
@@ -691,3 +691,3 @@ },
         {
-          "match":"(?<!\\w|\\$)\t\t\t\t\t\t\t[+-]?(?>;((0|[1-9][0-9]*)(\\.[0-9]*)?\t|\\.[0-9]+\t\t\t\t\t\t)([eE][+-]?[0-9]+)?\t\t\t\t\t)(?!\\w)\t\t\t\t\t\t\t\t\t",
+          "match":"(?<!\\w|\\$)[+-]?[0-9]+('.'[0-9]+)?([eE][+-]?[0-9]+)?(?!\\w)",
           "name": "constant.numeric.cds"
@@ -845,3 +845,3 @@ }
     "elementDef": {
-      "begin": "(?=\\b(virtual)?(key)?(masked)?(element)?)",
+      "begin": "\\b(virtual(?:\\s+))?(key(?:\\s+))?(masked(?:\\s+))?(element(?:\\s+))?",
       "beginCaptures": {
@@ -914,3 +914,3 @@ "1": {
     "bracedElementDef": {
-      "comment": "Braces enclosing all elementDefs; also typeStructs",
+      "comment": "Braces enclosing all elementDefs and extendElements; also typeStructs",
       "begin": "{",
@@ -933,5 +933,91 @@ "beginCaptures": {
         {
+          "include": "#extendElement"
+        },
+        {
           "include": "#elementDef"
         }
       ]
+    },
+    "extendElement": {
+      "begin": "\\b(?=extend\\b.*\\bwith\\b)",
+      "end": "(?<=})(;)?|(;)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.terminator.statement.cds"
+        },
+        "2": {
+          "name": "punctuation.terminator.statement.cds"
+        }
+      },
+      "patterns": [
+        {
+          "begin": "\\bextend\\b",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.strong.cds"
+            }
+          },
+          "end": "\\bwith\\b",
+          "endCaptures": {
+            "0": {
+              "name": "keyword.cds"
+            }
+          },
+          "patterns": [
+            {
+              "match": "element(?!(?:\\s*/\\*.*\\*/\\s*|\\s+)?with\\b)",
+              "name": "keyword.cds"
+            },
+            {
+              "match": "[$_a-zA-Z][$_a-zA-Z0-9]*|\"[^\"]*(\"\"[^\"]*)*\"|!\\[[^\\]]*(\\]\\][^\\]]*)*\\]",
+              "name": "entity.name.type.attribute-name.cds"
+            },
+            {
+              "include": "#comments"
+            }
+          ]
+        },
+        {
+          "begin": "{",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.section.scope.begin.cds"
+            }
+          },
+          "end": "}",
+          "endCaptures": {
+            "0": {
+              "name": "punctuation.section.scope.end.cds"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#extendElement"
+            }
+          ]
+        },
+        {
+          "include": "#comments"
+        },
+        {
+          "include": "#keywords"
+        },
+        {
+          "include": "#identifiers"
+        },
+        {
+          "include": "#operators"
+        },
+        {
+          "match": "\\(",
+          "name": "punctuation.section.scope.begin.cds"
+        },
+        {
+          "match": "\\)",
+          "name": "punctuation.section.scope.end.cds"
+        },
+        {
+          "include": "#numbers"
+        }
+      ]
     }
@@ -938,0 +1024,0 @@ },

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

NPM Shrinkwrap

Supply chain risk

Package contains a shrinkwrap file. This may allow the package to bypass normal install procedures.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

2011580

increased by2.98%

Number of package files

27

increased by8%

Lines of code

7916

increased by19.13%

Worsened metrics

Number of high supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Added@sap/cds-compiler@3.4.0(transitive)

• + Added@types/mdast@3.0.10(transitive)

• + Added@types/unist@2.0.6(transitive)

• + Addeddebug@4.3.4(transitive)

• + Addedms@2.1.2(transitive)

• - Removed@sap/cds-compiler@3.3.2(transitive)

• - Removed@types/mdast@3.0.15(transitive)

• - Removed@types/unist@2.0.11(transitive)

• - Removeddebug@4.4.0(transitive)

• - Removedms@2.1.3(transitive)

• Updated@sap/cds-compiler@3.4.0