@sap/eslint-plugin-cds 2.3.3 → 2.3.4

package/CHANGELOG.md

@@ -6,6 +6,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [2.3.4] - 2022-03-31
+
+### Changed
+
+- Only deduplicate model error messages when working within VS Code Editor
+- Hide `no-dollar-prefixed-names` compiler warning message in VS Code Editor (already passed by lsp)
+
 ## [2.3.3] - 2022-03-24
 
 ### Added

package/lib/rules/no-dollar-prefixed-names.js

@@ -1,3 +1,5 @@
+const { isVSCodeEditor } = require("../utils/helpers");
+
 module.exports = {
   meta: {
     docs: {
@@ -20,7 +22,7 @@ module.exports = {
       const results = [];
       for (const m in context.cds.model.messages) {
         const msg = context.cds.model.messages[m];
-        if (msg.messageId === "syntax-dollar-ident") {
+        if (msg.messageId === "syntax-dollar-ident" && !isVSCodeEditor()) {
           results.push({
             message: msg.message,
             loc: {

package/lib/utils/helpers.js

@@ -7,15 +7,7 @@ module.exports = {
    * @returns boolean
    */
   isValidFile: function (filePath, fileType) {
-    function genRegex(key) {
-      return new RegExp(
-        `${key
-          .map((file) => {
-            return file.replace("*", "");
-          })
-          .join("$|")}$`
-      );
-    }
+    const genRegex = (key) => new RegExp(`${key.map((file) => file.replace("*", "")).join("$|")}$`);
     let isValid = false;
     switch(fileType) {
       case 'MODEL_FILES':

package/lib/utils/model.js

@@ -23,11 +23,7 @@ module.exports = {
       return cache.set(key, [value, Date.now()]);
     },
     get(key) {
-      if (cache.get(key)) {
-        return cache.get(key)[0];
-      } else {
-        return;
-      }
+      return cache.get(key) ? cache.get(key)[0] : undefined
     },
     dump() {
       const dump = {};
@@ -41,11 +37,9 @@ module.exports = {
       if (cache.has(key)) {
         cache.delete(key);
       }
-      return;
     },
     clear() {
       cache.clear();
-      return;
     },
   },
 
@@ -56,11 +50,8 @@ module.exports = {
    * @returns boolean
    */
   isNewConfigPath: function (configPath) {
-    if (!module.exports.Cache.has("configpath") &&
-      (configPath !== module.exports.Cache.get("configpath"))) {
-      return true;
-    }
-    return false;
+    return !module.exports.Cache.has("configpath") 
+            && (configPath !== module.exports.Cache.get("configpath"))
   },
 
   /**
@@ -115,25 +106,12 @@ module.exports = {
    * @returns ESLint range
    */
   getRange: function (code, line, column) {
-    let lines;
-    if (typeof code === "string") {
-      lines = SourceCode.splitLines(code);
-    } else {
-      lines = code;
-    }
+    const lines = typeof code === "string" ? SourceCode.splitLines(code) : code
     const ranges = [0];
     lines.forEach((line, i) => {
-      if (i === 0) {
-        ranges[i + 1] = line.length + 1;
-      } else {
-        ranges[i + 1] = ranges[i] + line.length + 1;
-      }
+      ranges[i + 1] = i === 0 ? line.length + 1 : ranges[i] + line.length + 1
     });
-    if (line > 1) {
-      return ranges[line - 1] + column;
-    } else {
-      return column;
-    }
+    return line > 1 ? ranges[line - 1] + column : column
   },
 
   /**
@@ -145,12 +123,7 @@ module.exports = {
    * @returns Last line index
    */
   getLastLine: function (code) {
-    let lines;
-    if (typeof code === "string") {
-      lines = SourceCode.splitLines(code);
-    } else {
-      lines = code;
-    }
+    const lines = typeof code === "string" ? SourceCode.splitLines(code) : code
     return lines.length - 1;
   },
 
@@ -181,10 +154,8 @@ module.exports = {
         loc.start.line = nameloc.line;
         loc.end.column = nameloc.col - 1 + name.length;
         loc.end.line = nameloc.line;
-      } else {
-        if (obj.parent) {
+      } else if (obj.parent) {
           this.getLocation(name, obj.parent, model);
-        }
       }
     }
     // Empty locations default to line 0, column 0
@@ -332,13 +303,8 @@ module.exports = {
     const configPath = path.dirname(filePath);
     module.exports.Cache.set('configpath', configPath);
     let files = fs.readdirSync(configPath);
-    const modelfiles = [];
-    files.forEach((file) => {
-      const filePath = path.join(configPath, file);
-      if (isValidFile(filePath, 'MODEL_FILES')) {
-        modelfiles.push(filePath);
-      }
-    });
+    const modelfiles = files.map(f => path.join(configPath, f))
+                            .filter(fp => isValidFile(fp, 'MODEL_FILES'))
     module.exports.Cache.set(`modelfiles:${configPath}`, modelfiles);
     const dictFiles = module.exports.getDictFiles(configPath, modelfiles);
     module.exports.Cache.set(`dictfiles:${configPath}`, dictFiles);
@@ -359,11 +325,9 @@ module.exports = {
       dictFiles = module.exports.Cache.get(`dictfiles:${input}`);
     } else {
       files.forEach((file) => {
-        if (module.exports.Cache.has(`file:${file}`)) {
-          dictFiles[file] = module.exports.Cache.get(`file:${file}`);
-        } else {
-          dictFiles[file] = fs.readFileSync(file, "utf8");
-        }
+        dictFiles[file] = module.exports.Cache.has(`file:${file}`)
+                          ? module.exports.Cache.get(`file:${file}`)
+                          : fs.readFileSync(file, "utf8")
       });
     }
     return dictFiles;
@@ -375,6 +339,7 @@ module.exports = {
    * @returns boolean
    */
   hasFileChanged: function (code, filePath, configPath) {
+    let result = false
     const files = module.exports.Cache.get(`modelfiles:${configPath}`);
     const dictFiles = module.exports.getDictFiles(configPath, files);
     const isFileInModel = module.exports.isFileInModel(filePath, configPath);
@@ -384,14 +349,12 @@ module.exports = {
       if (dictFiles[filePath] !== code) {
         dictFiles[filePath] = code;
         module.exports.Cache.set(`dictfiles:${configPath}`, dictFiles);
-        return true;
-      }
-    } else {
-      if (dictFiles[filePath] !== code) {
-        return true;
+        result = true
       }
+    } else if (dictFiles[filePath] !== code) {
+        result = true
     }
-    return false;
+    return result;
   },
 
   /**
@@ -401,14 +364,8 @@ module.exports = {
    * @returns boolean
    */
   isFileInModel(filePath, configPath) {
-    let files = module.exports.Cache.get(`modelfiles:${configPath}`);
-    if (!files) {
-      files = [];
-    }
-    if (files && files.length > 0 && files.includes(filePath)) {
-      return true;
-    }
-    return false;
+    let files = module.exports.Cache.get(`modelfiles:${configPath}`) || [];
+    return files && files.length > 0 && files.includes(filePath)
   },
 
   /**
@@ -419,10 +376,6 @@ module.exports = {
    */
   updateModel: function (code, filePath, configPath) {
     let reflectedModel;
-    let files = module.exports.Cache.get(`modelfiles:${configPath}`);
-    if (!files) {
-      files = [];
-    }
     const dictFiles = module.exports.Cache.get(`dictfiles:${configPath}`);
     dictFiles[filePath] = code;
     module.exports.Cache.set(`dictfiles:${configPath}`, dictFiles);

package/lib/utils/rules.js

@@ -39,31 +39,29 @@ const REGEX_COMMENT_START = "(/\\*|(.+)?//)(\\s?)+eslint-";
 const REGEX_COMMENTS = `${REGEX_COMMENT_START}(enable|disable)(-next)?(-line)?(.+)?`;
 
 function doReport(cdscontext, reportDescriptor, d) {
+  const retouchLocations = (descriptor) => {
+    if (d) {
+      descriptor.loc = descriptor.loc || cdscontext.cds.getLocation(d.name, d);
+      descriptor.file = descriptor.file || (d.$location ? d.$location.file : "unknown.cds");
+    }
+  };
+
   switch (typeof reportDescriptor) {
     case "string":
       reportDescriptor = { message: reportDescriptor };
-      if (d) {
-        if (!reportDescriptor.loc) reportDescriptor.loc = cdscontext.cds.getLocation(d.name, d);
-        if (!reportDescriptor.file) reportDescriptor.file = (d.$location && d.$location.file) || "unknown.cds";
-      }
+      retouchLocations(reportDescriptor);
       cdscontext.report(reportDescriptor);
       break;
     case "object":
       if (!Array.isArray(reportDescriptor)) {
-        if (d) {
-          if (!reportDescriptor.loc) reportDescriptor.loc = getLocation(d.name, d);
-          if (!reportDescriptor.file) reportDescriptor.file = (d.$location && d.$location.file) || "unknown.cds";
-        }
+        retouchLocations(reportDescriptor);
         cdscontext.report(reportDescriptor);
       } else {
         reportDescriptor.forEach((x) => {
           if (typeof x === "string") {
             x = { message: x };
           }
-          if (d) {
-            if (!x.loc) x.loc = getLocation(d.name, d);
-            if (!x.file) x.file = (d.$location && d.$location.file) || "unknown.cds";
-          }
+          retouchLocations(x);
           cdscontext.report(x);
         });
       }
@@ -116,10 +114,7 @@ function addCDSContext(context, node) {
   const filePath = (context.filePath = context.getPhysicalFilename());
   const configPath = !Cache.has("test") ? loadConfigPath(filePath) : path.dirname(filePath);
   let sourcecode = context.getSourceCode();
-  let code = sourcecode.getText(node);
-  if (!code) {
-    code = Cache.get(`file:${filePath}`);
-  }
+  const code = sourcecode.getText(node) || Cache.get(`file:${filePath}`);
   if (code) {
     sourcecode = new SourceCode(code, getAST(code));
   }
@@ -162,167 +157,151 @@ function createRule(spec) {
 
   return {
     meta,
-    create: function (context) {
-      return {
-        Program: function (node) {
-          const cdscontext = addCDSContext(context, node, meta);
-
-          try {
-            const { report, ...ruleDescriptors } = cdscontext;
-            const handlers = create({ ...ruleDescriptors, report: (r) => report(r) });
-
-            // Report descriptors with fake visitor 'all'
-            // Used for environment rules and rules which require another compiled model
-            // (i.e. sql or odata)
-            if (handlers.all) {
-              let reportDescriptor = handlers.all();
-              doReport(cdscontext, reportDescriptor);
-            } else {
-              // Report descriptors with visitors using using `any.is()`
-              // https://pages.github.tools.sap/cap/docs/node.js/cds-reflect
-              if (cdscontext.cds.model) {
-                cdscontext.cds.model.forall((d) => {
-                  for (let each in handlers) {
-                    if (d.is(each)) {
-                      let reportDescriptor = handlers[each](d);
-                      doReport(cdscontext, reportDescriptor, d);
-                    }
-                  }
-                });
-              }
-            }
-          } catch (err) {
-            // Report errors in ESLint style
-            if (err.messages) {
-              // Always show model compile errors
-              reportCompilationErr(meta, node, cdscontext, err);
-            } else {
-              // Thrown errors are only shown on console with --debug
-              reportErr(meta, node, cdscontext, err);
+    create: (context) => ({
+      Program: function (node) {
+        const cdscontext = addCDSContext(context, node, meta);
+
+        try {
+          const { report, ...ruleDescriptors } = cdscontext;
+          const handlers = create({ ...ruleDescriptors, report: (r) => report(r) });
+
+          // Report descriptors with fake visitor 'all'
+          // Used for environment rules and rules which require another compiled model
+          // (i.e. sql or odata)
+          if (handlers.all) {
+            let reportDescriptor = handlers.all();
+            doReport(cdscontext, reportDescriptor);
+          } else {
+            // TODO: Use external address
+            // Report descriptors with visitors using using `any.is()`
+            // https://pages.github.tools.sap/cap/docs/node.js/cds-reflect
+            if (cdscontext.cds.model) {
+              cdscontext.cds.model.forall((d) =>
+                Object.entries(handlers)
+                  .filter(([type, lazy]) => d.is(type))
+                  .forEach(([lazy, handler]) => doReport(cdscontext, handler(d), d))
+              );
             }
           }
-        },
-      };
-    },
+        } catch (err) {
+          // Report errors in ESLint style
+          if (err.messages) {
+            // Always show model compile errors
+            reportCompilationErr(meta, node, cdscontext, err);
+          } else {
+            // Thrown errors are only shown on console with --debug
+            reportErr(meta, node, cdscontext, err);
+          }
+        }
+      },
+    }),
   };
 }
 
-  /**
-   * Checks whether a lint rule has been disabled by eslint-disable
-   * comments at a given location
-   * @param entry lint report
-   * @param cdscontext cds context object
-   * @param rules all availabe rules
-   * @returns boolean
-   */
+/**
+ * Checks whether a lint rule has been disabled by eslint-disable
+ * comments at a given location
+ * @param entry lint report
+ * @param cdscontext cds context object
+ * @param rules all availabe rules
+ * @returns boolean
+ */
 
-   function isRuleDisabled(entry, cdscontext) {
-    let isDisabled = false;
-    if (entry.loc && entry.loc.start) {
-      const line = entry.loc.start.line;
-      if (cdscontext) {
-        const rulesDisabled = _getDisabled(cdscontext.code, cdscontext.sourcecode, line);
-        let id = cdscontext.id;
-        if (line && id in rulesDisabled && rulesDisabled[id] === "off") {
-          isDisabled = true;
-        }
-      }
+function isRuleDisabled(entry, cdscontext) {
+  let isDisabled = false;
+  if (entry.loc && entry.loc.start) {
+    const line = entry.loc.start.line;
+    if (cdscontext) {
+      const rulesDisabled = _getDisabled(cdscontext.code, cdscontext.sourcecode, line);
+      const id = cdscontext.id;
+      isDisabled = line && id in rulesDisabled && rulesDisabled[id] === "off";
     }
-    return isDisabled;
   }
+  return isDisabled;
+}
 
-
-    /**
-   * Turns rules "on" or "off" for given line according to eslint-disable
-   * comments:
-   * 1. Reads code string and extracts a list of comments (in order)
-   * 2. Initiates rulesDisabled array with all rules "on" by default
-   * 3. Switches rules "off" (or "on" again) based on disable comment
-   * @param code current code
-   * @param sourcecode source code object to get index from
-   * @param line current code line to analyze
-   * @returns rules dictionary with rules being either 'on' and 'off'
-   */
-     function _getDisabled(code, sourcecode, line) {
-      const listDisabled = [];
-      let { listEnvRules, listModelRules, listRules } = Cache.get("rulesInfo");
-      const rulesDisabled = listRules.reduce((o, key) => ({ ...o, [key]: "on" }), {});
-      let matches = [];
-      if (code) {
-        matches = [...code.matchAll(REGEX_COMMENTS)];
-        if (matches.length > 0) {
-          matches.forEach((match) => {
-            if (match) {
-              const index = match.index;
-              match = match[0];
-              if (match.includes("*/")) {
-                match = match.split("*/")[0].replace("/*", "");
-              } else if (match.includes("//")) {
-                match = match.split("//")[1];
-              }
-              if (match) {
-                match = match.trim();
-              }
-              ["disable", "enable"].forEach((keyword) => {
-                const loc = sourcecode.getLocFromIndex(index);
-                const disableType = match.split(" ")[0];
-                let disableRules = match.split(`${disableType} `)[1];
-                if (disableRules) {
-                  disableRules = disableRules.split(",").map((rule) => rule.trim());
-                } else {
-                  disableRules = listEnvRules.concat(listModelRules).map((rule) => `@sap/cds/${rule}`);
-                }
-                let comment = {};
-                if (
-                  [`eslint-${keyword}`, `eslint-${keyword}-line`, `eslint-${keyword}-next-line`].includes(disableType)
-                ) {
-                  if (disableType.includes("-next-line")) {
-                    comment = {
-                      lineComment: loc.line,
-                      lineDisabled: loc.line + 1,
-                      rules: disableRules,
-                      type: keyword,
-                    };
-                  } else {
-                    comment = {
-                      lineComment: loc.line,
-                      lineDisabled: loc.line,
-                      rules: disableRules,
-                      type: keyword,
-                    };
-                  }
-                  if (!disableType.includes("-line")) {
-                    comment.lineDisabled = "EOF";
+/**
+ * Turns rules "on" or "off" for given line according to eslint-disable
+ * comments:
+ * 1. Reads code string and extracts a list of comments (in order)
+ * 2. Initiates rulesDisabled array with all rules "on" by default
+ * 3. Switches rules "off" (or "on" again) based on disable comment
+ * @param code current code
+ * @param sourcecode source code object to get index from
+ * @param line current code line to analyze
+ * @returns rules dictionary with rules being either 'on' and 'off'
+ */
+function _getDisabled(code, sourcecode, line) {
+  const listDisabled = [];
+  let { listEnvRules, listModelRules, listRules } = Cache.get("rulesInfo");
+  const rulesDisabled = listRules.reduce((o, key) => ({ ...o, [key]: "on" }), {});
+  let matches = [];
+  if (code) {
+    matches = [...code.matchAll(REGEX_COMMENTS)];
+    if (matches.length > 0) {
+      matches.forEach((match) => {
+        if (match) {
+          const index = match.index;
+          match = match[0];
+          if (match.includes("*/")) {
+            match = match.split("*/")[0].replace("/*", "");
+          } else if (match.includes("//")) {
+            match = match.split("//")[1];
+          }
+          if (match) {
+            match = match.trim();
+          }
+          ["disable", "enable"].forEach((keyword) => {
+            const loc = sourcecode.getLocFromIndex(index);
+            const disableType = match.split(" ")[0];
+            let disableRules = match.split(`${disableType} `)[1];
+            disableRules = disableRules
+              ? disableRules.split(",").map((rule) => rule.trim())
+              : listEnvRules.concat(listModelRules).map((rule) => `@sap/cds/${rule}`);
+            let comment = {};
+            if ([`eslint-${keyword}`, `eslint-${keyword}-line`, `eslint-${keyword}-next-line`].includes(disableType)) {
+              comment = disableType.includes("-next-line")
+                ? {
+                    lineComment: loc.line,
+                    lineDisabled: loc.line + 1,
+                    rules: disableRules,
+                    type: keyword,
                   }
-                }
-                listDisabled.push(comment);
-              });
+                : {
+                    lineComment: loc.line,
+                    lineDisabled: loc.line,
+                    rules: disableRules,
+                    type: keyword,
+                  };
+              if (!disableType.includes("-line")) {
+                comment.lineDisabled = "EOF";
+              }
             }
+            listDisabled.push(comment);
           });
-          for (let i = 0; i <= listDisabled.length - 1; i++) {
-            if (listDisabled[i].lineComment > line) {
-              break;
-            }
-            if (listDisabled[i].lineDisabled === "EOF" || listDisabled[i].lineDisabled === line) {
-              if (listDisabled[i].lineDisabled === "EOF") {
-                listDisabled[i].lineDisabled = getLastLine(code);
-              }
-              if (listDisabled[i].rules) {
-                listDisabled[i].rules.forEach((rule) => {
-                  if (listDisabled[i].type === "disable") {
-                    rulesDisabled[rule] = "off";
-                  } else if (listDisabled[i].type === "enable") {
-                    rulesDisabled[rule] = "on";
-                  }
-                });
-              }
+        }
+      });
+      for (const el of listDisabled.filter(
+        (d) => d.lineComment > line && (d.lineDisabled === "EOF" || d.lineDisabled === line)
+      )) {
+        if (el.lineDisabled === "EOF") {
+          el.lineDisabled = getLastLine(code);
+        }
+        if (el.rules) {
+          el.rules.forEach((rule) => {
+            if (el.type === "disable") {
+              rulesDisabled[rule] = "off";
+            } else if (el.type === "enable") {
+              rulesDisabled[rule] = "on";
             }
-          }
+          });
         }
       }
-      return rulesDisabled;
     }
-  
+  }
+  return rulesDisabled;
+}
+
 module.exports = {
   /**
    * Gets value for a given key in allowed keys of ESLint's meta data
@@ -452,11 +431,9 @@ module.exports = {
       /* eslint-disable-next-line no-unused-vars */
       Object.entries(ruleDict).forEach(([, rules]) => {
         rules.forEach(function (rule) {
-          if (release) {
-            mdRules += `| ${rule.recommended} | ${rule.fixable} | ${rule.hasSuggestions} | | &nbsp; | [${rule.name}](Rules-released.md#${rule.name}) | ${rule.details}|\n`;
-          } else {
-            mdRules += `| ${rule.recommended} | ${rule.fixable} | ${rule.hasSuggestions} | ${rule.construction} | &nbsp; | [${rule.name}](Rules.md#${rule.name}) | ${rule.details}|\n`;
-          }
+          mdRules += release
+            ? `| ${rule.recommended} | ${rule.fixable} | ${rule.hasSuggestions} | | &nbsp; | [${rule.name}](Rules-released.md#${rule.name}) | ${rule.details}|\n`
+            : `| ${rule.recommended} | ${rule.fixable} | ${rule.hasSuggestions} | ${rule.construction} | &nbsp; | [${rule.name}](Rules.md#${rule.name}) | ${rule.details}|\n`;
         });
       });
       mdRules += "\n";
@@ -493,7 +470,7 @@ module.exports = {
     const mdRuleListCur = fs.readFileSync(ruleListDocsPath, "utf8");
 
     // Get rules table
-    let mdRuleList = module.exports.genMdRules(ruleDict, release, true);
+    const mdRuleList = module.exports.genMdRules(ruleDict, release, true);
 
     // Get rule details
     let mdRules = module.exports.genMdRules(ruleDict, release, false);
@@ -525,30 +502,21 @@ module.exports = {
       docsPath = path.join(__dirname, "../../docs");
       rulePath = path.join(__dirname, "../rules");
       testPath = path.join(__dirname, "../../test/rules");
-      release = JSON.parse(fs.readFileSync(path.join(__dirname, "../../../package.json"))).version;
+      release = JSON.parse(fs.readFileSync(path.join(__dirname, "../../package.json"))).version;
     } else {
       docsPath = path.join(projectPath, `${customRulesDir}/docs`);
       rulePath = path.join(projectPath, `${customRulesDir}/rules`);
       testPath = path.join(projectPath, `${customRulesDir}/tests`);
-      if (!fs.existsSync(docsPath)) {
-        await mkdirp(docsPath);
-      }
-      if (!fs.existsSync(rulePath)) {
-        await mkdirp(rulePath);
-      }
-      if (!fs.existsSync(testPath)) {
-        await mkdirp(testPath);
-      }
+      await Promise.all(
+        [docsPath, rulePath, testPath].filter((path) => !fs.existsSync(path)).map((path) => mkdirp(path))
+      );
     }
 
     if (registry) {
       // Get rules (internal on artifactory)
-      let versionInternal;
-      if (!prepareRelease) {
-        versionInternal = module.exports.getPackageVersion(registry);
-      } else {
-        versionInternal = JSON.parse(fs.readFileSync(path.join(__dirname, "../../../package.json"))).version;
-      }
+      const versionInternal = prepareRelease
+        ? JSON.parse(fs.readFileSync(path.join(__dirname, "../../package.json"))).version
+        : module.exports.getPackageVersion(registry);
       if (versionInternal) {
         console.log(`Updating internal rules from v>=${versionInternal}:\n${registry}\n`);
         const ruleDictInternal = module.exports.getRuleDict(docsPath, rulePath, testPath, versionInternal);
@@ -556,12 +524,9 @@ module.exports = {
       }
       // Get rules released (external on npm)
       const npmRegistry = "https://registry.npmjs.org";
-      let versionExternal;
-      if (!prepareRelease) {
-        versionExternal = module.exports.getPackageVersion(npmRegistry);
-      } else {
-        versionExternal = JSON.parse(fs.readFileSync(path.join(__dirname, "../../../package.json"))).version;
-      }
+      const versionExternal = prepareRelease
+        ? JSON.parse(fs.readFileSync(path.join(__dirname, "../../package.json"))).version
+        : module.exports.getPackageVersion(npmRegistry);
       if (versionExternal) {
         console.log(`Updating external rules from v>=${versionExternal}:\n${npmRegistry}\n`);
         const ruleDictExternal = module.exports.getRuleDict(docsPath, rulePath, testPath, versionExternal, release);
@@ -577,8 +542,8 @@ module.exports = {
 
   getRuleDict: function (docsPath, rulePath, testPath, versionRequired = "0.0.0", release = false) {
     let mdRule, mdRuleSources, mdRuleContents;
-    let ruleDict = {};
-    fs.readdirSync(rulePath).filter(function (file) {
+    const ruleDict = {};
+    fs.readdirSync(rulePath).filter((file) => {
       if (path.extname(file).toLowerCase() === ".js" && file !== "index.js") {
         const rule = path.basename(file).replace(path.extname(file), "");
         const ruleTestPath = path.join(testPath, rule, "rule.test.js");
@@ -596,25 +561,14 @@ module.exports = {
           const suggestions = ruleMeta.hasSuggestions;
 
           let underConstruction = "";
-          if (!release && semver.satisfies(version, `>${versionRequired}`)) {
+          if (!release && (version === "TBD" || semver.satisfies(version, `>${versionRequired}`))) {
             underConstruction = "🚧";
             console.log(`  > 🚧 Rule '${rule}' still under construction.\n`);
           }
 
-          let isFixable = "";
-          if (["code", "whitespace"].includes(fixable)) {
-            isFixable = "🔧";
-          }
-
-          let isRecommended = "";
-          if (recommended === true) {
-            isRecommended = "✔️";
-          }
-
-          let hasSuggestions = "";
-          if (suggestions === true) {
-            hasSuggestions = "💡";
-          }
+          const isFixable = ["code", "whitespace"].includes(fixable) ? "🔧" : "";
+          const isRecommended = recommended === true ? "✔️" : "";
+          const hasSuggestions = suggestions === true ? "💡" : "";
 
           const ruleDictEntry = {
             name: rule,
@@ -628,11 +582,12 @@ module.exports = {
           };
           mdRule = module.exports.getRuleExamples(ruleTestPath, testPath, ruleDictEntry);
           mdRuleContents = "";
-          if (!release && underConstruction) {
-            mdRuleContents += `## ${rule}\n<span class='shifted'>${underConstruction}&nbsp;&nbsp;<span class='label'>${category}</span></span>\n\n`;
-          } else {
-            mdRuleContents += `## ${rule}\n<span class='shifted label'>${category}</span>\n\n`;
-          }
+
+          mdRuleContents +=
+            !release && underConstruction
+              ? `## ${rule}\n<span class='shifted'>${underConstruction}&nbsp;&nbsp;<span class='label'>${category}</span></span>\n\n`
+              : `## ${rule}\n<span class='shifted label'>${category}</span>\n\n`;
+
           mdRuleContents += `### Rule Details\n${details}\n\n`;
           if (mdRule) {
             mdRuleContents += `### Examples\n${mdRule}\n\n`;
@@ -890,27 +845,27 @@ module.exports = {
               // Do not consider disabled content
               if (!isRuleDisabled(lint, thisArg)) {
                 const isModelLint = lint.file && isValidFile(lint.file, "MODEL_FILES") && !lint.err;
-                if (isModelLint) {
-                  if (module.exports.isDedicatedFile(lint, thisArg) && module.exports.isReportUnique(lint, "modelReports")) {
+                if (isModelLint && module.exports.isDedicatedFile(lint, thisArg)) {
+                  if (isVSCodeEditor()) {
                     report = true;
+                  } else {
+                    if (module.exports.isReportUnique(lint, "modelReports")) {
+                      report = true;
+                    }
                   }
                 }
                 if (!lint.loc) {
                   lint.loc = module.exports.addDefaultLoc();
                 }
-                if (!isModelLint && !lint.err) {
-                  if (module.exports.isReportUnique(lint, "envReports", thisArg.configPath)) {
-                    report = true;
-                  }
+                if (
+                  !isModelLint &&
+                  !lint.err &&
+                  module.exports.isReportUnique(lint, "envReports", thisArg.configPath)
+                ) {
+                  report = true;
                 }
-                if (lint.err) {
-                  if (lint.file) {
-                    report = true;
-                  } else {
-                    if (module.exports.isReportUnique(lint, "errReports", thisArg.configPath)) {
-                      report = true;
-                    }
-                  }
+                if (lint.err && (lint.file || module.exports.isReportUnique(lint, "errReports", thisArg.configPath))) {
+                  report = true;
                 }
                 if (report) {
                   return thisArg._context.report(lint);
@@ -924,20 +879,10 @@ module.exports = {
     return new Proxy(ruleReport, handler);
   },
 
-  resolveFilePath: function (file) {
-    let fileAbs;
-    if (!path.isAbsolute(file)) {
-      fileAbs = path.join(Cache.get("configpath"), file);
-    } else {
-      fileAbs = file;
-    }
-    return fileAbs;
-  },
+  resolveFilePath: (file) => (path.isAbsolute(file) ? file : path.join(Cache.get("configpath"), file)),
 
-  isDedicatedFile: function (lint, thisArg) {
-    let fileAbs = module.exports.resolveFilePath(lint.file);
-    return fileAbs === thisArg.filePath || lint.file === "<stdin>.cds";
-  },
+  isDedicatedFile: (lint, thisArg) =>
+    module.exports.resolveFilePath(lint.file) === thisArg.filePath || lint.file === "<stdin>.cds",
 
   isReportUnique: function (lint, name, uniqueness) {
     let report = false;
@@ -962,12 +907,10 @@ module.exports = {
     return report;
   },
 
-  addDefaultLoc: function () {
-    return {
-      start: { line: 0, column: -1 },
-      end: { line: 0, column: -1 },
-    };
-  },
+  addDefaultLoc: () => ({
+    start: { line: 0, column: -1 },
+    end: { line: 0, column: -1 },
+  }),
 
   getModel: function (code, filePath, configPath) {
     let model;
@@ -1013,11 +956,8 @@ module.exports = {
     }
   },
 
-  isParkedModelFile: function (filePath, configPath) {
-    const isValidModelFile = isValidFile(filePath, "MODEL_FILES");
-    const isInModel = isFileInModel(filePath, configPath);
-    return isValidModelFile && !isInModel;
-  },
+  isParkedModelFile: (filePath, configPath) =>
+    isValidFile(filePath, "MODEL_FILES") && !isFileInModel(filePath, configPath),
 
   getEnvironment: function (options) {
     let environment;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sap/eslint-plugin-cds",
-  "version": "2.3.3",
+  "version": "2.3.4",
   "description": "ESLint plugin including recommended SAP Cloud Application Programming model and environment rules",
   "homepage": "https://cap.cloud.sap/",
   "keywords": [