@abaplint/transpiler 2.3.74 → 2.3.75

package/build/src/keywords.d.ts

@@ -1,4 +1,5 @@
 import * as abaplint from "@abaplint/core";
+export declare const defaultKeywords: string[];
 /** Replaces javascript keywords in ABAP source code, in-memory only */
 export declare class Keywords {
     private readonly keywords;

package/build/src/keywords.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Keywords = void 0;
+exports.Keywords = exports.defaultKeywords = void 0;
 const abaplint = require("@abaplint/core");
 // https://www.w3schools.com/js/js_reserved.asp
-const defaultKeywords = [
+exports.defaultKeywords = [
     "abstract", "arguments", "await",
     "break", "byte", "catch",
     "char", "class", "const", "continue",
@@ -31,7 +31,7 @@ class Keywords {
             this.keywords = keywords;
         }
         else {
-            this.keywords = defaultKeywords;
+            this.keywords = exports.defaultKeywords;
         }
     }
     handle(reg) {

package/build/src/validation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Validation = exports.config = void 0;
 const core_1 = require("@abaplint/core");
+const keywords_1 = require("./keywords");
 exports.config = {
     "global": {
         "files": "/**/*.*",
@@ -67,45 +68,40 @@ exports.config = {
             "setExtended": true,
         },
         "forbidden_identifier": {
-            "check": [
-                "^abstract$", "^arguments$", "^await$",
-                "^break$", "^byte$", "^catch$",
-                "^char$", "^class$", "^const$", "^continue$",
-                "^debugger$", "^default$", "^do$",
-                "^double$", "^else$", "^enum$", "^eval$",
-                "^export$", "^extends$", "^false$", "^final$",
-                "^finally$", "^for$", "^function$",
-                "^goto$", "^if$", "^implements$", "^import$",
-                "^in$", "^instanceof$", "^interface$",
-                "^let$", "^long$", "^native$", "^new$",
-                "^null$", "^package$", "^private$",
-                //        "^protected$",
-                "^public$", "^return$", "^short$", "^static$",
-                "^switch$", "^synchronized$", "^this$",
-                "^throw$", "^throws$", "^transient$", "^true$",
-                "^try$", "^typeof$", "^var$", "^void$",
-                "^volatile$", "^while$", "^yield$",
-                "^unique\\d+$"
-            ],
+            "check": [],
         },
     },
 };
 // todo, make sure nothing is overloaded, eg "lines()", there is a rule for this in abaplint now
+// hmm this ^ is okay? since lines will be prefixed with "abap.builtin"?
 class Validation {
     constructor(options) {
         this.options = options;
     }
     run(reg) {
-        var _a, _b;
+        var _a, _b, _c;
         if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.ignoreSyntaxCheck) === true) {
             exports.config.rules["check_syntax"] = false;
         }
         else {
             exports.config.rules["check_syntax"] = true;
         }
-        if (((_b = this.options) === null || _b === void 0 ? void 0 : _b.unknownTypes) === "runtimeError") {
-            exports.config.syntax.errorNamespace = "VOID_EVERYTHING"; // this is not a constant, just a regex that happens to not match anything
-            //      config.rules["unknown_types"] = false;
+        exports.config.rules["forbidden_identifier"]["check"] = ["^unique\\d+$"];
+        if (((_b = this.options) === null || _b === void 0 ? void 0 : _b.keywords) === undefined) {
+            for (const d of keywords_1.defaultKeywords) {
+                const add = "^" + d + "$";
+                exports.config.rules["forbidden_identifier"]["check"].push(add);
+            }
+        }
+        else {
+            for (const d of this.options.keywords) {
+                const add = "^" + d + "$";
+                exports.config.rules["forbidden_identifier"]["check"].push(add);
+            }
+        }
+        if (((_c = this.options) === null || _c === void 0 ? void 0 : _c.unknownTypes) === "runtimeError") {
+            // this is not a constant, just a regex that happens to not match anything
+            exports.config.syntax.errorNamespace = "VOID_EVERYTHING";
         }
         const conf = new core_1.Config(JSON.stringify(exports.config));
         reg.setConfig(conf);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.3.74",
+  "version": "2.3.75",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",