@abaplint/transpiler-cli 2.7.70 → 2.7.72

package/abap_transpile

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 require("./build/bundle");

package/build/bundle.js

@@ -13,6 +13,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.TranspilerConfig = void 0;
 const path = __webpack_require__(/*! path */ "path");
 const fs = __webpack_require__(/*! fs */ "fs");
+const transpiler_1 = __webpack_require__(/*! @abaplint/transpiler */ "./node_modules/@abaplint/transpiler/build/src/index.js");
 class TranspilerConfig {
     static find(filename) {
         if (filename !== undefined) {
@@ -47,7 +48,7 @@ class TranspilerConfig {
                 addFilenames: true,
                 addCommonJS: true,
                 skipConstants: false,
-                unknownTypes: "compileError",
+                unknownTypes: transpiler_1.UnknownTypesEnum.compileError,
             },
         };
     }
@@ -73157,12 +73158,14 @@ exports.HandleW3MI = HandleW3MI;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Transpiler = exports.config = void 0;
+exports.Transpiler = exports.UnknownTypesEnum = exports.config = void 0;
 const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const validation_1 = __webpack_require__(/*! ./validation */ "./node_modules/@abaplint/transpiler/build/src/validation.js");
 Object.defineProperty(exports, "config", ({ enumerable: true, get: function () { return validation_1.config; } }));
 const unit_test_1 = __webpack_require__(/*! ./unit_test */ "./node_modules/@abaplint/transpiler/build/src/unit_test.js");
 const keywords_1 = __webpack_require__(/*! ./keywords */ "./node_modules/@abaplint/transpiler/build/src/keywords.js");
+const types_1 = __webpack_require__(/*! ./types */ "./node_modules/@abaplint/transpiler/build/src/types.js");
+Object.defineProperty(exports, "UnknownTypesEnum", ({ enumerable: true, get: function () { return types_1.UnknownTypesEnum; } }));
 const db_1 = __webpack_require__(/*! ./db */ "./node_modules/@abaplint/transpiler/build/src/db/index.js");
 const handle_table_1 = __webpack_require__(/*! ./handlers/handle_table */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_table.js");
 const handle_abap_1 = __webpack_require__(/*! ./handlers/handle_abap */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_abap.js");
@@ -73181,7 +73184,7 @@ class Transpiler {
             this.options = {};
         }
         if (this.options.unknownTypes === undefined) {
-            this.options.unknownTypes = "compileError";
+            this.options.unknownTypes = types_1.UnknownTypesEnum.compileError;
         }
     }
     // workaround for web/webpack
@@ -74809,6 +74812,7 @@ const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abap
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
 const expressions_1 = __webpack_require__(/*! ../expressions */ "./node_modules/@abaplint/transpiler/build/src/expressions/index.js");
 const unique_identifier_1 = __webpack_require__(/*! ../unique_identifier */ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js");
+const types_1 = __webpack_require__(/*! ../types */ "./node_modules/@abaplint/transpiler/build/src/types.js");
 class CreateObjectTranspiler {
     transpile(node, traversal) {
         var _a, _b;
@@ -74870,7 +74874,7 @@ class CreateObjectTranspiler {
             return "object";
         }
         else if (!(type instanceof abaplint.BasicTypes.ObjectReferenceType)) {
-            if (((_a = traversal.options) === null || _a === void 0 ? void 0 : _a.unknownTypes) !== "runtimeError") {
+            if (((_a = traversal.options) === null || _a === void 0 ? void 0 : _a.unknownTypes) !== types_1.UnknownTypesEnum.runtimeError) {
                 throw new Error(`CreateObjectTranspiler, target variable "${target === null || target === void 0 ? void 0 : target.concatTokens()}" not a object reference`);
             }
             else {
@@ -79904,7 +79908,7 @@ class TryTranspiler {
             const catchNames = catchStatement.findDirectExpressions(abaplint.Expressions.ClassName).map(e => traversal.lookupClassOrInterface(e.concatTokens(), e.getFirstToken()));
             ret += first ? "" : " else ";
             first = false;
-            ret += "if (" + (catchNames === null || catchNames === void 0 ? void 0 : catchNames.map(n => "e instanceof " + n).join(" || ")) + ") {\n";
+            ret += "if (" + (catchNames === null || catchNames === void 0 ? void 0 : catchNames.map(n => "(" + n + " && e instanceof " + n + ")").join(" || ")) + ") {\n";
             const intoNode = catchStatement.findExpressionAfterToken("INTO");
             if (intoNode) {
                 ret += traversal.traverse(intoNode).getCode() + ".set(e);\n";
@@ -80099,11 +80103,15 @@ class TranspileTypes {
         else if (type instanceof abaplint.BasicTypes.StructureType) {
             resolved = "Structure";
             const list = [];
-            const renamingSuffix = {};
+            const suffix = {};
+            const asInclude = {};
             for (const c of type.getComponents()) {
                 list.push(`"` + c.name.toLowerCase() + `": ` + this.toType(c.type));
                 if (c.suffix) {
-                    renamingSuffix[c.name.toLowerCase()] = c.suffix;
+                    suffix[c.name.toLowerCase()] = c.suffix;
+                }
+                if (c.asInclude) {
+                    asInclude[c.name.toLowerCase()] = true;
                 }
             }
             extra = "{" + list.join(", ") + "}";
@@ -80119,7 +80127,8 @@ class TranspileTypes {
             else {
                 extra += ", undefined";
             }
-            extra += ", " + JSON.stringify(renamingSuffix);
+            extra += ", " + JSON.stringify(suffix);
+            extra += ", " + JSON.stringify(asInclude);
         }
         else if (type instanceof abaplint.BasicTypes.CLikeType
             || type instanceof abaplint.BasicTypes.CGenericType
@@ -80851,6 +80860,25 @@ exports.Traversal = Traversal;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/types.js":
+/*!**************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/types.js ***!
+  \**************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.UnknownTypesEnum = void 0;
+var UnknownTypesEnum;
+(function (UnknownTypesEnum) {
+    UnknownTypesEnum[UnknownTypesEnum["compileError"] = 0] = "compileError";
+    UnknownTypesEnum[UnknownTypesEnum["runtimeError"] = 1] = "runtimeError";
+})(UnknownTypesEnum || (exports.UnknownTypesEnum = UnknownTypesEnum = {}));
+//# sourceMappingURL=types.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/unique_identifier.js":
 /*!**************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/unique_identifier.js ***!
@@ -81277,6 +81305,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Validation = exports.config = void 0;
 const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
 const keywords_1 = __webpack_require__(/*! ./keywords */ "./node_modules/@abaplint/transpiler/build/src/keywords.js");
+const types_1 = __webpack_require__(/*! ./types */ "./node_modules/@abaplint/transpiler/build/src/types.js");
 exports.config = {
     "global": {
         "files": "/**/*.*",
@@ -81377,7 +81406,7 @@ class Validation {
                 exports.config.rules["forbidden_identifier"]["check"].push(add);
             }
         }
-        if (((_c = this.options) === null || _c === void 0 ? void 0 : _c.unknownTypes) === "runtimeError") {
+        if (((_c = this.options) === null || _c === void 0 ? void 0 : _c.unknownTypes) === types_1.UnknownTypesEnum.runtimeError) {
             // this is not a constant, just a regex that happens to not match anything
             exports.config.syntax.errorNamespace = "VOID_EVERYTHING";
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.7.70",
+  "version": "2.7.72",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -26,11 +26,11 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.7.70",
+    "@abaplint/transpiler": "^2.7.72",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@types/node": "^20.4.8",
+    "@types/node": "^20.4.9",
     "@abaplint/core": "^2.102.17",
     "progress": "^2.0.3",
     "webpack": "^5.88.2",