@abaplint/transpiler-cli 2.5.28 → 2.5.30

package/build/bundle.js

@@ -21642,6 +21642,9 @@ const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@a
 const _object_oriented_1 = __webpack_require__(/*! ../_object_oriented */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_object_oriented.js");
 class ComponentChain {
     runSyntax(context, node, scope, filename) {
+        if (context === undefined) {
+            return undefined;
+        }
         const children = node.getChildren();
         for (let i = 0; i < children.length; i++) {
             if (context instanceof void_type_1.VoidType || context instanceof basic_1.UnknownType) {
@@ -21704,7 +21707,7 @@ class ComponentChain {
                     }
                 }
                 else {
-                    throw new Error("ComponentChain, not a structure");
+                    throw new Error("ComponentChain, not a structure, " + (context === null || context === void 0 ? void 0 : context.constructor.name));
                 }
             }
         }
@@ -21727,7 +21730,7 @@ exports.ComponentChain = ComponentChain;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.ComponentCompare = void 0;
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
-const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const component_chain_1 = __webpack_require__(/*! ./component_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_chain.js");
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 class ComponentCompare {
     runSyntax(node, scope, filename, type) {
@@ -21735,23 +21738,7 @@ class ComponentCompare {
         if (chain === undefined) {
             throw new Error("ComponentCompare, chain not found");
         }
-        // todo, handle deep chain
-        if (chain.getChildren().length === 1
-            && type !== undefined
-            && !(type instanceof basic_1.VoidType)
-            && !(type instanceof basic_1.UnknownType)
-            && !(type instanceof basic_1.AnyType)) {
-            const fieldName = chain.concatTokens();
-            if (fieldName.toLowerCase() !== "table_line") {
-                if (!(type instanceof basic_1.StructureType)) {
-                    throw new Error("ComponentCompare, source not structured");
-                }
-                if (type.getComponentByName(fieldName) === undefined) {
-                    throw new Error("Component \"" + fieldName + "\" not part of structure");
-                }
-                // todo, check type compatibility
-            }
-        }
+        new component_chain_1.ComponentChain().runSyntax(type, chain, scope, filename);
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
@@ -26571,12 +26558,14 @@ const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_module
 const source_1 = __webpack_require__(/*! ../expressions/source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 const component_compare_1 = __webpack_require__(/*! ../expressions/component_compare */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_compare.js");
 const component_cond_1 = __webpack_require__(/*! ../expressions/component_cond */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/component_cond.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 class DeleteInternal {
     runSyntax(node, scope, filename) {
         var _a;
         for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
+        let targetType = undefined;
         const target = node.findDirectExpression(Expressions.Target);
         if (target) {
             let tabl = undefined;
@@ -26588,14 +26577,17 @@ class DeleteInternal {
                 }
             }
             if (tabl === undefined) {
-                new target_1.Target().runSyntax(target, scope, filename);
+                targetType = new target_1.Target().runSyntax(target, scope, filename);
+                if (targetType instanceof basic_1.TableType) {
+                    targetType = targetType.getRowType();
+                }
             }
         }
         for (const t of node.findDirectExpressions(Expressions.ComponentCompare)) {
-            new component_compare_1.ComponentCompare().runSyntax(t, scope, filename);
+            new component_compare_1.ComponentCompare().runSyntax(t, scope, filename, targetType);
         }
         for (const t of node.findDirectExpressions(Expressions.ComponentCond)) {
-            new component_cond_1.ComponentCond().runSyntax(t, scope, filename);
+            new component_cond_1.ComponentCond().runSyntax(t, scope, filename, targetType);
         }
     }
 }
@@ -46210,7 +46202,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.38";
+        return "2.95.39";
     }
     getDDICReferences() {
         return this.references;
@@ -73994,7 +73986,7 @@ class PerformTranspiler {
             return new chunk_1.Chunk(`throw new Error("PerformTranspiler FormName not found");`);
         }
         // todo, parameters
-        if (node.concatTokens().includes(" IN PROGRAM ")) {
+        if (node.concatTokens().toUpperCase().includes(" IN PROGRAM ")) {
             return new chunk_1.Chunk(`throw new Error("PerformTranspiler IN PROGRAM, transpiler todo");`);
         }
         return new chunk_1.Chunk("await " + formName.concatTokens() + "();");
@@ -75892,7 +75884,7 @@ class ClassImplementationTranspiler {
         return false;
     }
     /** Finds static attributes + constants including those from interfaces (from superclass is ingored) */
-    findStaticAttributes(cdef, scope) {
+    findStaticAttributes(cdef, scope, traversal) {
         const ret = [];
         ret.push(...cdef.getAttributes().getStatic().map(a => { return { identifier: a, prefix: "" }; }));
         ret.push(...cdef.getAttributes().getConstants().map(a => { return { identifier: a, prefix: "" }; }));
@@ -75902,14 +75894,17 @@ class ClassImplementationTranspiler {
             if (i === undefined) {
                 break;
             }
-            const intf = scope.findInterfaceDefinition(i.name);
+            const intf = traversal.findInterfaceDefinition(i.name, scope);
             if (intf === undefined) {
                 continue;
             }
-            // todo, constants from interface?
             implementing.push(...intf.getImplementing());
-            ret.push(...intf.getAttributes().getStatic().map(a => { return { identifier: a, prefix: intf.getName().toLowerCase() + "$" }; }));
-            ret.push(...intf.getAttributes().getConstants().map(a => { return { identifier: a, prefix: intf.getName().toLowerCase() + "$" }; }));
+            ret.push(...intf.getAttributes().getStatic().map(a => {
+                return { identifier: a, prefix: intf.getName().toLowerCase() + "$" };
+            }));
+            ret.push(...intf.getAttributes().getConstants().map(a => {
+                return { identifier: a, prefix: intf.getName().toLowerCase() + "$" };
+            }));
         }
         return ret;
     }
@@ -75943,7 +75938,7 @@ class ClassImplementationTranspiler {
         }
         let ret = "";
         const clasName = node.getFirstToken().getStr().toLowerCase();
-        const staticAttributes = this.findStaticAttributes(cdef, scope);
+        const staticAttributes = this.findStaticAttributes(cdef, scope, traversal);
         for (const attr of staticAttributes) {
             const name = traversal_1.Traversal.escapeNamespace(clasName) + "." + traversal_1.Traversal.escapeNamespace(attr.prefix) + traversal_1.Traversal.escapeNamespace(attr.identifier.getName().toLowerCase());
             ret += name + " = " + new transpile_types_1.TranspileTypes().toType(attr.identifier.getType()) + ";\n";
@@ -76745,6 +76740,12 @@ class TranspileTypes {
             if (type.getQualifiedName() !== undefined) {
                 extra += ", \"" + type.getQualifiedName() + "\"";
             }
+            else {
+                extra += ", undefined";
+            }
+            if (type.getDDICName() !== undefined) {
+                extra += ", \"" + type.getQualifiedName() + "\"";
+            }
         }
         else if (type instanceof abaplint.BasicTypes.CLikeType
             || type instanceof abaplint.BasicTypes.CSequenceType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.5.28",
+  "version": "2.5.30",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,13 +25,13 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.5.28",
+    "@abaplint/transpiler": "^2.5.30",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@abaplint/core": "^2.95.38",
+    "@abaplint/core": "^2.95.39",
     "progress": "^2.0.3",
-    "webpack": "^5.76.0",
+    "webpack": "^5.76.1",
     "webpack-cli": "^5.0.1",
     "typescript": "=4.8.4"
   }