@abaplint/transpiler-cli 2.11.24 → 2.11.26

package/build/bundle.js

@@ -5957,7 +5957,7 @@ class NewObject extends combi_1.Expression {
         const lines = (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), _1.Source, (0, combi_1.tok)(tokens_1.WParenRightW)));
         const linesFields = (0, combi_1.plus)((0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), (0, combi_1.plus)(field_assignment_1.FieldAssignment), (0, combi_1.tok)(tokens_1.WParenRightW)));
         const neww = (0, combi_1.seq)("NEW", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.optPrio)((0, combi_1.alt)(_1.Source, _1.ParameterListS, lines, linesFields)), ")");
-        return (0, combi_1.ver)(version_1.Version.v740sp02, neww);
+        return (0, combi_1.ver)(version_1.Version.v740sp02, neww, version_1.Version.OpenABAP);
     }
 }
 exports.NewObject = NewObject;
@@ -6786,7 +6786,7 @@ class Source extends combi_1.Expression {
         // paren used for eg. "( 2 + 1 ) * 4"
         const paren = (0, combi_1.seq)((0, combi_1.tok)(tokens_1.WParenLeftW), Source, rparen);
         const after = (0, combi_1.seq)((0, combi_1.altPrio)("&", "&&", _1.ArithOperator), Source);
-        const bool = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v702, (0, combi_1.regex)(/^BOOLC$/i)), (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.regex)(/^XSDBOOL$/i))), (0, combi_1.tok)(tokens_1.ParenLeftW), _1.Cond, ")");
+        const bool = (0, combi_1.seq)((0, combi_1.altPrio)((0, combi_1.ver)(version_1.Version.v702, (0, combi_1.regex)(/^BOOLC$/i), version_1.Version.OpenABAP), (0, combi_1.ver)(version_1.Version.v740sp08, (0, combi_1.regex)(/^XSDBOOL$/i), version_1.Version.OpenABAP)), (0, combi_1.tok)(tokens_1.ParenLeftW), _1.Cond, ")");
         const prefix = (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WPlus), "BIT-NOT");
         const old = (0, combi_1.seq)((0, combi_1.optPrio)(prefix), (0, combi_1.altPrio)(_1.Constant, _1.StringTemplate, text_element_1.TextElement, bool, method, (0, combi_1.seq)(_1.FieldChain, deref), paren), (0, combi_1.optPrio)(after));
         const corr = (0, combi_1.ver)(version_1.Version.v740sp05, (0, combi_1.seq)("CORRESPONDING", _1.TypeNameOrInfer, (0, combi_1.tok)(tokens_1.ParenLeftW), _1.CorrespondingBody, rparen, (0, combi_1.optPrio)(after)));
@@ -19939,7 +19939,7 @@ class BuiltIn {
     constructor() {
         this.row = 1;
     }
-    buildDefinition(method, name) {
+    static buildDefinition(method, name) {
         if (method.cache) {
             return method.cache;
         }
@@ -19948,7 +19948,7 @@ class BuiltIn {
         method.cache = result;
         return result;
     }
-    searchBuiltin(name) {
+    static searchBuiltin(name) {
         if (name === undefined) {
             return undefined;
         }
@@ -19958,7 +19958,7 @@ class BuiltIn {
         }
         return this.buildDefinition(def, name);
     }
-    isPredicate(name) {
+    static isPredicate(name) {
         if (name === undefined) {
             return undefined;
         }
@@ -25584,7 +25584,7 @@ class MethodCallChain {
                 // eslint-disable-next-line prefer-const
                 let { method, def: foundDef } = helper.searchMethodName(def, methodName);
                 if (method === undefined && current === first) {
-                    method = new _builtin_1.BuiltIn().searchBuiltin(methodName === null || methodName === void 0 ? void 0 : methodName.toUpperCase());
+                    method = _builtin_1.BuiltIn.searchBuiltin(methodName === null || methodName === void 0 ? void 0 : methodName.toUpperCase());
                     if (method) {
                         input.scope.addReference(methodToken, method, _reference_1.ReferenceType.BuiltinMethodReference, input.filename);
                     }
@@ -26345,11 +26345,15 @@ const basic_types_1 = __webpack_require__(/*! ../basic_types */ "./node_modules/
 const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
 const assert_error_1 = __webpack_require__(/*! ../assert_error */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/assert_error.js");
+const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
 class NewObject {
     static runSyntax(node, input, targetType) {
         let ret = undefined;
         const typeExpr = node.findDirectExpression(Expressions.TypeNameOrInfer);
         const typeToken = typeExpr === null || typeExpr === void 0 ? void 0 : typeExpr.getFirstToken();
+        if (typeToken === undefined) {
+            throw new Error("NewObject, child TypeNameOrInfer not found");
+        }
         const typeName = typeExpr === null || typeExpr === void 0 ? void 0 : typeExpr.concatTokens();
         if (typeName === undefined) {
             throw new assert_error_1.AssertError("NewObject, child TypeNameOrInfer not found");
@@ -26357,7 +26361,8 @@ class NewObject {
         else if (typeName === "#" && targetType && targetType instanceof basic_1.ObjectReferenceType) {
             const clas = input.scope.findClassDefinition(targetType.getIdentifierName());
             if (clas) {
-                input.scope.addReference(typeToken, clas, _reference_1.ReferenceType.InferredType, input.filename);
+                const tid = new _typed_identifier_1.TypedIdentifier(typeToken, input.filename, targetType);
+                input.scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, input.filename);
                 input.scope.addReference(typeToken, clas, _reference_1.ReferenceType.ConstructorReference, input.filename, { ooName: clas.getName() });
             }
             else {
@@ -26384,9 +26389,11 @@ class NewObject {
         if (ret === undefined) {
             const objDefinition = input.scope.findObjectDefinition(typeName);
             if (objDefinition) {
+                const objref = new basic_1.ObjectReferenceType(objDefinition);
+                const tid = new _typed_identifier_1.TypedIdentifier(typeToken, input.filename, objref);
+                input.scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, input.filename);
                 input.scope.addReference(typeToken, objDefinition, _reference_1.ReferenceType.ObjectOrientedReference, input.filename);
                 input.scope.addReference(typeToken, objDefinition, _reference_1.ReferenceType.ConstructorReference, input.filename, { ooName: objDefinition.getName() });
-                const objref = new basic_1.ObjectReferenceType(objDefinition);
                 const clas = input.scope.findClassDefinition(objref.getIdentifierName());
                 if ((clas === null || clas === void 0 ? void 0 : clas.isAbstract()) === true) {
                     const message = clas.getName() + " is abstract, cannot be instantiated";
@@ -26993,14 +27000,14 @@ class Source {
                     break;
                 case "BOOLC":
                     {
-                        const method = new _builtin_1.BuiltIn().searchBuiltin(tok);
+                        const method = _builtin_1.BuiltIn.searchBuiltin(tok);
                         input.scope.addReference(token, method, _reference_1.ReferenceType.BuiltinMethodReference, input.filename);
                         cond_1.Cond.runSyntax(node.findDirectExpression(Expressions.Cond), input);
                         return basic_1.StringType.get();
                     }
                 case "XSDBOOL":
                     {
-                        const method = new _builtin_1.BuiltIn().searchBuiltin(tok);
+                        const method = _builtin_1.BuiltIn.searchBuiltin(tok);
                         input.scope.addReference(token, method, _reference_1.ReferenceType.BuiltinMethodReference, input.filename);
                         cond_1.Cond.runSyntax(node.findDirectExpression(Expressions.Cond), input);
                         return new basic_1.CharacterType(1, { qualifiedName: "ABAP_BOOL", ddicName: "ABAP_BOOL" });
@@ -27237,15 +27244,16 @@ class Source {
         const basic = new basic_types_1.BasicTypes(input);
         const typeExpression = node.findDirectExpression(Expressions.TypeNameOrInfer);
         const typeToken = typeExpression === null || typeExpression === void 0 ? void 0 : typeExpression.getFirstToken();
-        const typeName = typeToken === null || typeToken === void 0 ? void 0 : typeToken.getStr();
+        //    const typeName = typeToken?.getStr();
         /*
         console.dir(inferredType);
         console.dir(typeToken);
         */
-        if (typeName === "#" && inferredType && typeToken) {
+        if (inferredType && typeToken) {
             const found = basic.lookupQualifiedName(inferredType.getQualifiedName());
             if (found) {
-                input.scope.addReference(typeToken, found, _reference_1.ReferenceType.InferredType, input.filename, { foundQualified: true });
+                const tid = new _typed_identifier_1.TypedIdentifier(typeToken, input.filename, inferredType);
+                input.scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, input.filename, { foundQualified: true });
             }
             else if (inferredType instanceof basic_1.ObjectReferenceType) {
                 const def = input.scope.findObjectDefinition(inferredType.getQualifiedName());
@@ -43115,7 +43123,7 @@ class LSPLookup {
             ret += "\n\n" + this.dumpType(ref.resolved);
         }
         else if (ref.referenceType === _reference_1.ReferenceType.BuiltinMethodReference) {
-            const builtinDef = new _builtin_1.BuiltIn().searchBuiltin((_e = (_d = ref.resolved) === null || _d === void 0 ? void 0 : _d.getName()) === null || _e === void 0 ? void 0 : _e.toUpperCase());
+            const builtinDef = _builtin_1.BuiltIn.searchBuiltin((_e = (_d = ref.resolved) === null || _d === void 0 ? void 0 : _d.getName()) === null || _e === void 0 ? void 0 : _e.toUpperCase());
             if (builtinDef === undefined) {
                 return "Error: builtin method signature not found";
             }
@@ -53712,7 +53720,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.168";
+        return "2.113.172";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -61578,7 +61586,7 @@ ${indentation}    output = ${uniqueName}.\n`;
             const spag = highSyntax.spaghetti.lookupPosition(high.getFirstToken().getStart(), lowFile.getFilename());
             for (const r of (spag === null || spag === void 0 ? void 0 : spag.getData().references) || []) {
                 if (r.referenceType === _reference_1.ReferenceType.BuiltinMethodReference &&
-                    new _builtin_1.BuiltIn().isPredicate(chain.getFirstToken().getStr().toUpperCase())) {
+                    _builtin_1.BuiltIn.isPredicate(chain.getFirstToken().getStr().toUpperCase())) {
                     predicate = true;
                     break;
                 }
@@ -61791,6 +61799,15 @@ ${indentation}    output = ${uniqueName}.\n`;
                         cdef = r.resolved;
                     }
                 }
+                if (cdef instanceof _typed_identifier_1.TypedIdentifier) {
+                    const foo = cdef.getType();
+                    if (foo instanceof basic_1.ObjectReferenceType) {
+                        cdef = foo.getIdentifier();
+                    }
+                    else {
+                        throw new Error("newParameters, downport, unexpected");
+                    }
+                }
                 if (cdef && cdef.getMethodDefinitions === undefined) {
                     return undefined; // something wrong
                 }
@@ -67352,9 +67369,8 @@ ENDCLASS.`,
         for (const classDef of file.getInfo().listClassDefinitions()) {
             methods = methods.concat(classDef.methods);
         }
-        const builtIn = new _builtin_1.BuiltIn();
         for (const method of methods) {
-            if (builtIn.searchBuiltin(method.name.toUpperCase())) {
+            if (_builtin_1.BuiltIn.searchBuiltin(method.name.toUpperCase())) {
                 const message = `Method name "${method.name}" overwrites built-in SAP function name`;
                 issues.push(issue_1.Issue.atIdentifier(method.identifier, message, this.getMetadata().key));
             }
@@ -78320,7 +78336,7 @@ class CompareTranspiler {
         const chain = node.findDirectExpression(core_1.Expressions.MethodCallChain);
         if (chain) {
             const name = chain.getFirstToken().getStr();
-            if (new core_1.BuiltIn().isPredicate(name)) {
+            if (core_1.BuiltIn.isPredicate(name)) {
                 // todo, this is not completely correct if there is a method shadowing the name
                 return new chunk_1.Chunk().appendString(`abap.compare.eq(` + traversal.traverse(chain).getCode() + `, abap.builtin.abap_true)`);
             }
@@ -79312,6 +79328,7 @@ __exportStar(__webpack_require__(/*! ./message_number */ "./node_modules/@abapli
 __exportStar(__webpack_require__(/*! ./method_call_body */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call_body.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_call_chain */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call_chain.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_call_param */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call_param.js"), exports);
+__exportStar(__webpack_require__(/*! ./new_object */ "./node_modules/@abaplint/transpiler/build/src/expressions/new_object.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_call */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_call.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_parameters */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_parameters.js"), exports);
 __exportStar(__webpack_require__(/*! ./method_source */ "./node_modules/@abaplint/transpiler/build/src/expressions/method_source.js"), exports);
@@ -79519,6 +79536,9 @@ class MethodCallChainTranspiler {
             else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.FieldChain) {
                 ret.appendChunk(traversal.traverse(c));
             }
+            else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.NewObject) {
+                ret.appendChunk(traversal.traverse(c));
+            }
             else if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.ClassName) {
                 ret = new chunk_1.Chunk().append(traversal.lookupClassOrInterface(c.getFirstToken().getStr(), c.getFirstToken()), c, traversal);
             }
@@ -79798,6 +79818,73 @@ exports.MethodSourceTranspiler = MethodSourceTranspiler;
 
 /***/ }),
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/expressions/new_object.js":
+/*!*******************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/expressions/new_object.js ***!
+  \*******************************************************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.NewObjectTranspiler = void 0;
+const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const abaplint = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js");
+const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+const type_name_or_infer_1 = __webpack_require__(/*! ./type_name_or_infer */ "./node_modules/@abaplint/transpiler/build/src/expressions/type_name_or_infer.js");
+const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
+class NewObjectTranspiler {
+    transpile(node, traversal) {
+        const ret = new chunk_1.Chunk();
+        const typeNameOrInfer = node.findDirectExpression(core_1.Expressions.TypeNameOrInfer);
+        if (typeNameOrInfer === undefined) {
+            throw new Error("NewObjectTranspiler: TypeNameOrInfer not found");
+        }
+        let para = "";
+        const parameters = node.findFirstExpression(abaplint.Expressions.ParameterListS);
+        if (parameters) {
+            para = traversal.traverse(parameters).getCode();
+        }
+        const type = new type_name_or_infer_1.TypeNameOrInfer().findType(typeNameOrInfer, traversal);
+        if (type instanceof abaplint.BasicTypes.ObjectReferenceType) {
+            if (node.getChildren()[3].get() instanceof abaplint.Expressions.Source) {
+                // single default parameter
+                const scope = traversal.findCurrentScopeByToken(typeNameOrInfer.getFirstToken());
+                const cdef = traversal.findClassDefinition(type.getIdentifierName(), scope);
+                const constr = this.findConstructor(cdef, scope);
+                const pname = constr?.getParameters().getDefaultImporting()?.toLowerCase();
+                para = `{${pname}: ${traversal.traverse(node.getChildren()[3]).getCode()}}`;
+            }
+            const clas = traversal.lookupClassOrInterface(type.getIdentifierName(), node.getFirstToken());
+            ret.appendString(transpile_types_1.TranspileTypes.toType(type) + ".set(await (new " + clas + "()).constructor_(" + para + "))");
+        }
+        else {
+            throw new Error("NewObjectTranspiler: only ObjectReferenceType currently handled, todo");
+        }
+        return ret;
+    }
+    findConstructor(cdef, spag) {
+        let def = cdef;
+        while (def !== undefined) {
+            const method = def?.getMethodDefinitions().getByName("CONSTRUCTOR");
+            if (method) {
+                return method;
+            }
+            const name = def.getSuperClass();
+            if (name) {
+                def = spag?.findClassDefinition(name);
+            }
+            else {
+                return undefined;
+            }
+        }
+    }
+}
+exports.NewObjectTranspiler = NewObjectTranspiler;
+//# sourceMappingURL=new_object.js.map
+
+/***/ }),
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/expressions/parameter_list_s.js":
 /*!*************************************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/expressions/parameter_list_s.js ***!
@@ -80149,6 +80236,10 @@ class SourceTranspiler {
                 ret.append("abap.builtin.boolc(", c, traversal);
                 post.append(")", c, traversal);
             }
+            else if (c instanceof core_1.Nodes.TokenNodeRegex && c.getFirstToken().getStr().toUpperCase() === "XSDBOOL") {
+                ret.append("abap.builtin.xsdbool(", c, traversal);
+                post.append(")", c, traversal);
+            }
             else if (c instanceof core_1.Nodes.TokenNode && c.getFirstToken().getStr().toUpperCase() === "VALUE") {
                 const typ = node.findDirectExpression(core_1.Expressions.TypeNameOrInfer);
                 if (typ === undefined) {
@@ -81176,14 +81267,15 @@ const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/tr
 const transpile_types_1 = __webpack_require__(/*! ../transpile_types */ "./node_modules/@abaplint/transpiler/build/src/transpile_types.js");
 class TypeNameOrInfer {
     findType(node, traversal) {
-        let type;
+        //    let type: AbstractType | undefined;
         const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
-        if (node.concatTokens() === "#") {
-            type = traversal.lookupInferred(node, scope);
-        }
-        else {
-            type = traversal.lookupType(node.getFirstChild(), scope);
-        }
+        //    if (node.concatTokens() === "#") {
+        const type = traversal.lookupInferred(node, scope);
+        /*
+      } else {
+        type = traversal.lookupType(node.getFirstChild() as Nodes.ExpressionNode, scope);
+      }
+        */
         if (type === undefined) {
             throw new Error("TypeNameOrInfer, type not found: " + node.concatTokens());
         }
@@ -90636,6 +90728,7 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
         }
         return ret;
     }
+    // todo: delete this method?
     lookupType(node, scope) {
         if (scope === undefined) {
             return undefined;
@@ -90705,9 +90798,10 @@ this.INTERNAL_ID = abap.internalIdCounter++;\n`;
     lookupInferred(node, scope) {
         if (scope === undefined) {
             return undefined;
-        }
-        else if (node.concatTokens() !== "#") {
+            /*
+          } else if (node.concatTokens() !== "#") {
             throw new Error("lookupInferred, unexpected, " + node.get());
+            */
         }
         return this.findInferredTypeReference(node.getFirstToken());
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.11.24",
+  "version": "2.11.26",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,8 +27,8 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.113.168",
-    "@abaplint/transpiler": "^2.11.24",
+    "@abaplint/core": "^2.113.172",
+    "@abaplint/transpiler": "^2.11.26",
     "@types/glob": "^8.1.0",
     "@types/node": "^24.2.1",
     "@types/progress": "^2.0.7",