@abaplint/transpiler-cli 2.12.28 → 2.12.29

package/build/bundle.js

@@ -40515,7 +40515,9 @@ const cds_annotation_array_1 = __webpack_require__(/*! ./cds_annotation_array */
 class CDSAnnotation extends combi_1.Expression {
     getRunnable() {
         const nameWithSlash = (0, combi_1.seq)((0, combi_1.regex)(/^\w+$/), (0, combi_1.star)((0, combi_1.seq)("/", (0, combi_1.regex)(/^\w+$/))));
-        return (0, combi_1.seq)((0, combi_1.regex)(/^@\w+$/), (0, combi_1.star)((0, combi_1.seq)(".", nameWithSlash)), (0, combi_1.opt)(":"), (0, combi_1.opt)((0, combi_1.alt)(cds_annotation_array_1.CDSAnnotationArray, _1.CDSAnnotationObject, _1.CDSAnnotationSimple)));
+        // Support both "@Name" (single token) and "@ Name" (two tokens with space)
+        const annotationStart = (0, combi_1.alt)((0, combi_1.regex)(/^@\w+$/), (0, combi_1.seq)("@", (0, combi_1.regex)(/^\w+$/)));
+        return (0, combi_1.seq)(annotationStart, (0, combi_1.star)((0, combi_1.seq)(".", nameWithSlash)), (0, combi_1.opt)((0, combi_1.seq)(":", (0, combi_1.alt)(cds_annotation_array_1.CDSAnnotationArray, _1.CDSAnnotationObject, _1.CDSAnnotationSimple))));
     }
 }
 exports.CDSAnnotation = CDSAnnotation;
@@ -40615,11 +40617,14 @@ class CDSArithmetics extends combi_1.Expression {
         const name = (0, combi_1.seq)(_1.CDSName, (0, combi_1.optPrio)((0, combi_1.seq)(".", _1.CDSName)));
         const val = (0, combi_1.altPrio)(cds_integer_1.CDSInteger, _1.CDSFunction, _1.CDSCase, _1.CDSCast, _1.CDSString, _1.CDSAggregate, name);
         const operator = (0, combi_1.altPrio)("+", "-", "*", "/");
+        // Support unary operators (e.g., "- field" in CASE expressions)
+        const unary = (0, combi_1.altPrio)("-", "+");
+        const unaryExpression = (0, combi_1.seq)(unary, val);
         const operatorValue = (0, combi_1.seq)(operator, val);
         const paren = (0, combi_1.seq)("(", val, (0, combi_1.plusPrio)(operatorValue), ")");
         const noParen = (0, combi_1.seq)(val, (0, combi_1.plusPrio)(operatorValue));
         // todo: this is pretty bad, it needs a rewrite
-        return (0, combi_1.altPrio)((0, combi_1.seq)(paren, (0, combi_1.starPrio)(operatorValue)), noParen);
+        return (0, combi_1.altPrio)(unaryExpression, (0, combi_1.seq)(paren, (0, combi_1.starPrio)(operatorValue)), noParen);
     }
 }
 exports.CDSArithmetics = CDSArithmetics;
@@ -52027,7 +52032,15 @@ class RenamerHelper {
             }
         }
         // start with the last reference in the file first, if there are multiple refs per line
-        return this.replaceRefs(refs, oldName, newName).reverse();
+        // sort refs by position descending (row desc, then col desc) so edits don't corrupt positions
+        refs.sort((a, b) => {
+            const rowDiff = b.getStart().getRow() - a.getStart().getRow();
+            if (rowDiff !== 0) {
+                return rowDiff;
+            }
+            return b.getStart().getCol() - a.getStart().getCol();
+        });
+        return this.replaceRefs(refs, oldName, newName);
     }
     renameDDICCodeReferences(obj, oldName, newName) {
         const changes = [];
@@ -52167,8 +52180,14 @@ class RenamerHelper {
     ////////////////////////
     replaceRefs(refs, oldName, newName) {
         const changes = [];
+        const seen = new Set();
         // "zif_abapgit_auth~is_allowed" is a single token so only replace the first part of a token
         for (const r of refs) {
+            const key = r.getFilename() + ":" + r.getStart().getRow() + ":" + r.getStart().getCol();
+            if (seen.has(key)) {
+                continue;
+            }
+            seen.add(key);
             const range = vscode_languageserver_types_1.Range.create(r.getStart().getRow() - 1, r.getStart().getCol() - 1, r.getStart().getRow() - 1, r.getStart().getCol() - 1 + oldName.length);
             changes.push(vscode_languageserver_types_1.TextDocumentEdit.create({ uri: r.getFilename(), version: 1 }, [vscode_languageserver_types_1.TextEdit.replace(range, newName.toLowerCase())]));
         }
@@ -54395,7 +54414,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.115.23";
+        return "2.115.25";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -85362,7 +85381,29 @@ class AssignTranspiler {
         options.push("target: " + fs);
         if (sources.length !== 0
             && assignSource?.findDirectExpression(abaplint.Expressions.Dynamic) === undefined) {
-            options.push("source: " + sources.pop());
+            // Check for struct-(var) pattern: dynamic component access via FieldLength after -
+            const sourceExprForCheck = assignSource?.findDirectExpressionsMulti([abaplint.Expressions.Source, abaplint.Expressions.SimpleSource3])[0];
+            const fieldChainForCheck = sourceExprForCheck?.findFirstExpression(abaplint.Expressions.FieldChain);
+            const fcChildren = fieldChainForCheck?.getChildren() ?? [];
+            const lastFC = fcChildren[fcChildren.length - 1];
+            const prevFC = fcChildren[fcChildren.length - 2];
+            const isStructDynField = fieldChainForCheck !== undefined
+                && lastFC instanceof abaplint.Nodes.ExpressionNode
+                && lastFC.get() instanceof abaplint.Expressions.FieldLength
+                && prevFC instanceof abaplint.Nodes.TokenNode
+                && prevFC.getFirstToken().getStr() === "-";
+            if (isStructDynField) {
+                const componentCode = new expressions_1.FieldLengthTranspiler().transpile(lastFC, traversal).getCode();
+                const fullSource = sources.pop();
+                // Strip trailing .get().getOffset(...) to recover the base structure variable
+                const getOffsetIdx = fullSource.lastIndexOf(".get().getOffset(");
+                const baseSourceCode = getOffsetIdx >= 0 ? fullSource.substring(0, getOffsetIdx) : fullSource;
+                options.push("component: " + componentCode);
+                options.push("source: " + baseSourceCode);
+            }
+            else {
+                options.push("source: " + sources.pop());
+            }
         }
         else {
             let dynamicName = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.12.28",
+  "version": "2.12.29",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,8 +27,8 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.115.23",
-    "@abaplint/transpiler": "^2.12.28",
+    "@abaplint/core": "^2.115.25",
+    "@abaplint/transpiler": "^2.12.29",
     "@types/glob": "^8.1.0",
     "@types/node": "^24.10.13",
     "@types/progress": "^2.0.7",
@@ -38,6 +38,6 @@
     "typescript": "^5.9.3",
     "p-limit": "^3.1.0",
     "webpack-cli": "^6.0.1",
-    "webpack": "^5.105.1"
+    "webpack": "^5.105.2"
   }
 }