@sap/eslint-plugin-cds 2.6.1 → 2.6.3

package/CHANGELOG.md

@@ -6,6 +6,18 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [2.6.3] - 2023-02-13
+
+### Changed
+
+- Filter rule reports using *inferred* models on $location.
+
+## [2.6.2] - 2023-02-13
+
+### Changed
+
+- Fixed rule reports using *inferred* models to always receive valid _file_ $locations.
+
 ## [2.6.1] - 2023-01-26
 
 ### Changed

package/README.md

@@ -1,6 +1,5 @@
 # @sap/eslint-plugin-cds
-[![JavaScript Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://standardjs.com)
-[![Sync Files Workflow](https://github.tools.sap/cap/eslint-plugin-cds/actions/workflows/sync.yml/badge.svg)](https://github.tools.sap/cap/eslint-plugin-cds/actions/workflows/sync.yml)
+
 
 The [ESLint](https://eslint.org) plugin includes a set of recommended [SAP Cloud Application Programming Model (CAP)](https://cap.cloud.sap) model and environment rules.	The aim of CDS linting is to catch issues with CDS models and with the environment early. To use this module we recommend to install [@sap/cds-dk](https://www.npmjs.com/package/@sap/cds-dk) globally.
 

package/lib/utils/createRule.js

@@ -144,8 +144,11 @@ function createReport (node, cdscontext, meta, create) {
 
         if (model) {
           model.forall((d) => {
+            d = (meta.model === 'inferred') ? sanitizeFileLocation(d) : d
+            const isValidLocation = (meta.model === 'parsed' && d.$location) ||
+              (meta.model === 'inferred' && d.$location?.file)
             Object.entries(handlers)
-              .filter(([type, lazy]) => d.is(type))
+              .filter(([type, lazy]) => d.is(type) && isValidLocation)
               .forEach(([lazy, handler]) => {
                 try {
                   handler(d)
@@ -161,6 +164,13 @@ function createReport (node, cdscontext, meta, create) {
   }
 }
 
+function sanitizeFileLocation (d) {
+  let parent = d
+  while (!parent.$location && parent.parent && !parent.parent.definitions) parent = d.parent
+  if (parent.$location) d.$location = parent.$location
+  return d
+}
+
 function extendContext (node, context, meta) {
   if (!Cache.has('test')) {
     const filePath = context.getFilename()

package/package.json

@@ -1,38 +1,38 @@
 {
-  "name": "@sap/eslint-plugin-cds",
-  "version": "2.6.1",
-  "description": "ESLint plugin including recommended SAP Cloud Application Programming model and environment rules",
-  "homepage": "https://cap.cloud.sap/",
-  "keywords": [
-    "eslint",
-    "eslint-plugin",
-    "cds",
-    "cds-lint",
-    "cds-lint-plugin"
-  ],
-  "author": "SAP SE (https://www.sap.com)",
-  "license": "See LICENSE file",
-  "main": "lib/index.js",
-  "files": [
-    "lib/",
-    "CHANGELOG.md",
-    "LICENSE",
-    "README.md"
-  ],
-  "dependencies": {
-    "@sap/cds": ">=5.6.0",
-    "semver": "^7.3.4"
-  },
-  "eslintConfig": {
-    "extends": [
-      "eslint:recommended",
-      "standard"
-    ]
-  },
-  "peerDependencies": {
-    "eslint": ">=7"
-  },
-  "engines": {
-    "node": ">=14"
-  }
+    "name": "@sap/eslint-plugin-cds",
+    "version": "2.6.3",
+    "description": "ESLint plugin including recommended SAP Cloud Application Programming model and environment rules",
+    "homepage": "https://cap.cloud.sap/",
+    "keywords": [
+        "eslint",
+        "eslint-plugin",
+        "cds",
+        "cds-lint",
+        "cds-lint-plugin"
+    ],
+    "author": "SAP SE (https://www.sap.com)",
+    "license": "See LICENSE file",
+    "main": "lib/index.js",
+    "files": [
+        "lib/",
+        "CHANGELOG.md",
+        "LICENSE",
+        "README.md"
+    ],
+    "dependencies": {
+        "@sap/cds": ">=5.6.0",
+        "semver": "^7.3.4"
+    },
+    "eslintConfig": {
+        "extends": [
+            "eslint:recommended",
+            "standard"
+        ]
+    },
+    "peerDependencies": {
+        "eslint": ">=7"
+    },
+    "engines": {
+        "node": ">=14"
+    }
 }