@abaplint/transpiler 2.13.86 → 2.13.88

package/build/src/db/populate_tables.js

@@ -1,6 +1,42 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PopulateTables = void 0;
+/* eslint-disable max-len */
+const abaplint = __importStar(require("@abaplint/core"));
+const w3mi_name_1 = require("../w3mi_name");
 class PopulateTables {
     hasREPOSRC;
     hasSEOSUBCO;
@@ -136,7 +172,9 @@ class PopulateTables {
             return "";
         }
         const type = obj.getType().toUpperCase();
-        const name = obj.getName().toUpperCase();
+        const name = obj instanceof abaplint.Objects.WebMIME
+            ? (0, w3mi_name_1.w3miObjectName)(obj)
+            : obj.getName().toUpperCase();
         return `INSERT INTO "tadir" ("pgmid", "object", "obj_name", "devclass", "korrnum", "srcsystem", "delflag", "genflag", "edtflag", "masterlang")
       VALUES ('R3TR', '${type}', '${this.escape(name)}', '$TMP', '', 'ABC', '', '', '', 'E');`;
     }
@@ -145,7 +183,7 @@ class PopulateTables {
             return [];
         }
         const ret = [];
-        const name = obj.getName().toUpperCase();
+        const name = (0, w3mi_name_1.w3miObjectName)(obj);
         for (const [key, value] of Object.entries(obj.getParameters())) {
             ret.push(`INSERT INTO "wwwparams" ("relid", "objid", "name", "value") VALUES ('MI', '${name}', '${this.escape(key)}', '${this.escape(value)}');`);
         }

package/build/src/expressions/source.d.ts

@@ -5,5 +5,6 @@ import { Traversal } from "../traversal";
 export declare class SourceTranspiler implements IExpressionTranspiler {
     private readonly addGet;
     constructor(addGet?: boolean);
+    private concatOperands;
     transpile(node: Nodes.ExpressionNode, traversal: Traversal, context?: AbstractType): Chunk;
 }

package/build/src/expressions/source.js

@@ -15,10 +15,50 @@ class SourceTranspiler {
     constructor(addGet = false) {
         this.addGet = addGet;
     }
+    // the operands of a chain of & / && (the rearranger leaves them as a binary
+    // tree of Source nodes); an empty list when the node is not such a chain
+    concatOperands(node) {
+        const children = node.getChildren();
+        if (children.length !== 3) {
+            return [];
+        }
+        const op = children[1];
+        if (!(op instanceof core_1.Nodes.TokenNode) || (op.getFirstToken().getStr() !== "&&" && op.getFirstToken().getStr() !== "&")) {
+            return [];
+        }
+        const side = (c) => {
+            if (c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.Source) {
+                const inner = this.concatOperands(c);
+                return inner.length > 0 ? inner : [c];
+            }
+            const wrapped = new core_1.Nodes.ExpressionNode(new core_1.Expressions.Source());
+            wrapped.setChildren([c]);
+            return [wrapped];
+        };
+        return [...side(children[0]), ...side(children[2])];
+    }
     transpile(node, traversal, context) {
         let ret = new chunk_1.Chunk();
         const post = new chunk_1.Chunk();
         const children = node.getChildren();
+        // a & b & c ... : one flat concat([a, b, c]) instead of one nested
+        // concat( ) per operand (a long chain would otherwise exhaust the stack
+        // of a parser with a small budget, e.g. a service worker's)
+        const operands = this.concatOperands(node);
+        if (operands.length > 2) {
+            const flat = new chunk_1.Chunk().appendString("abap.operators.concat([");
+            for (let i = 0; i < operands.length; i++) {
+                if (i > 0) {
+                    flat.appendString(",");
+                }
+                flat.appendChunk(new SourceTranspiler(false).transpile(operands[i], traversal, context));
+            }
+            flat.appendString("])");
+            if (this.addGet) {
+                flat.appendString(".get()");
+            }
+            return flat;
+        }
         // Pre-scan for unary prefix +/- tokens (WDashW / WPlusW) before any expression
         let prefixNegated = false;
         let startIdx = 0;

package/build/src/handlers/handle_abap.js

@@ -39,6 +39,7 @@ const traversal_1 = require("../traversal");
 const requires_1 = require("../requires");
 const rearranger_1 = require("../rearranger");
 const chunk_1 = require("../chunk");
+const initialization_1 = require("../initialization");
 class HandleABAP {
     options;
     constructor(options) {
@@ -143,10 +144,10 @@ class HandleABAP {
                 continue;
             }
             if (name) {
-                contents.appendString("const {" + traversal_1.Traversal.escapeNamespace(name) + "} = await import(\"./" + filename.replace(/#/g, "%23") + "\");\n");
+                contents.appendString("const {" + traversal_1.Traversal.escapeNamespace(name) + "} = await import(\"./" + (0, initialization_1.escapeFilenameForImport)(filename) + "\");\n");
             }
             else {
-                contents.appendString("await import(\"./" + filename.replace(/#/g, "%23") + "\");\n");
+                contents.appendString("await import(\"./" + (0, initialization_1.escapeFilenameForImport)(filename) + "\");\n");
             }
         }
         contents.appendChunk(output.chunk);

package/build/src/handlers/handle_w3mi.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HandleW3MI = void 0;
 const chunk_1 = require("../chunk");
+const w3mi_name_1 = require("../w3mi_name");
 class HandleW3MI {
     runObject(obj, _reg) {
         const filename = obj.getXMLFile()?.getFilename().replace(".xml", ".mjs").toLowerCase();
@@ -10,7 +11,7 @@ class HandleW3MI {
         }
         obj.parse();
         const dataFile = obj.getDataFile();
-        const chunk = new chunk_1.Chunk().appendString(`abap.W3MI["${obj.getName().toUpperCase()}"] = {
+        const chunk = new chunk_1.Chunk().appendString(`abap.W3MI["${(0, w3mi_name_1.w3miObjectName)(obj)}"] = {
   "objectType": "W3MI",
   "filename": ${JSON.stringify(dataFile?.getFilename())},
 };`);

package/build/src/initialization.d.ts

@@ -2,6 +2,7 @@ import { DatabaseSetupResult } from "./db/database_setup_result";
 import * as abaplint from "@abaplint/core";
 import { ITranspilerOptions, IOutputFile } from "./types";
 export declare function escapeNamespaceFilename(filename: string): string;
+export declare function escapeFilenameForImport(filename: string): string;
 export declare class Initialization {
     script(reg: abaplint.IRegistry, dbSetup: DatabaseSetupResult, options: ITranspilerOptions | undefined, useImport?: boolean, pluginOutputs?: readonly IOutputFile[]): string;
     private buildImports;

package/build/src/initialization.js

@@ -35,12 +35,24 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Initialization = void 0;
 exports.escapeNamespaceFilename = escapeNamespaceFilename;
+exports.escapeFilenameForImport = escapeFilenameForImport;
 const abaplint = __importStar(require("@abaplint/core"));
 const handle_fugr_1 = require("./handlers/handle_fugr");
 function escapeNamespaceFilename(filename) {
     // ES modules are resolved and cached as URLs. This means that special characters must be
     // percent-encoded, such as # with %23 and ? with %3F.
-    return filename.replace(/\//g, "%23");
+    //
+    // The percent sign goes first, and the order is the whole point. A URL is
+    // percent-decoded before it is resolved, so a file whose *name* contains a
+    // percent has to carry it escaped or the decoding eats it: abapGit stores
+    // ZO4D_06_PLASMA.PNG as zo4d_06_plasma%2epng, and "./zo4d_06_plasma%2epng.w3mi.mjs"
+    // resolves to zo4d_06_plasma.png.w3mi.mjs, which is not there. Escaping the
+    // percent after the slash would corrupt the %23 this function just wrote.
+    return filename.replace(/%/g, "%25").replace(/\//g, "%23");
+}
+// The same rule for a name that already carries abapGit's # rather than a slash
+function escapeFilenameForImport(filename) {
+    return filename.replace(/%/g, "%25").replace(/#/g, "%23");
 }
 class Initialization {
     script(reg, dbSetup, options, useImport, pluginOutputs) {

package/build/src/keywords.js

@@ -20,7 +20,11 @@ exports.DEFAULT_KEYWORDS = new Set([
     "throw", "throws", "transient", "true",
     "try", "typeof", "var", "void",
     "delete",
-    "volatile", "while", "yield"
+    "volatile", "while", "yield",
+    // both produce a SyntaxError in the emitted module: they are reserved words
+    // in JavaScript and legal ABAP names. "super" is NOT in this list on purpose -
+    // the emitted code uses the JS `super` for ABAP's `super->method( )`, and
+    // escaping it turns that call into `$super.get().method()`
+    "case", "with"
 ]);
-// "with"
 //# sourceMappingURL=keywords.js.map

package/build/src/rearranger.js

@@ -189,7 +189,23 @@ class Rearranger {
             return node;
         }
         const withoutLast = node.getChildren().slice(0, children.length - 1);
-        const flat = withoutLast.concat(last.getChildren());
+        // The nested children come up so that precedence can be decided across
+        // the whole chain, and everything before the nested operator has to
+        // arrive as one operand. For "a * b / c" that is already true, b being a
+        // single Source. For "a * CONV f( b ) / c" it is not: CONV is five
+        // children, and hoisting them one by one puts the type name and the
+        // body beside the arithmetic, where the transpiler reads them as
+        // operands and loses the rest of the expression. So the head is wrapped
+        // back into one Source before it moves.
+        const nested = last.getChildren();
+        const firstOperator = nested.findIndex((c) => c instanceof core_1.Nodes.ExpressionNode && c.get() instanceof core_1.Expressions.ArithOperator);
+        let head = nested.slice(0, firstOperator);
+        if (head.length > 1) {
+            const operand = new core_1.Nodes.ExpressionNode(last.get());
+            operand.setChildren(head);
+            head = [operand];
+        }
+        const flat = withoutLast.concat(head, nested.slice(firstOperator));
         node.setChildren(flat);
         return node;
     }

package/build/src/statements/create_object.d.ts

@@ -4,5 +4,11 @@ import { Traversal } from "../traversal";
 import { Chunk } from "../chunk";
 export declare class CreateObjectTranspiler implements IStatementTranspiler {
     transpile(node: abaplint.Nodes.StatementNode, traversal: Traversal): Chunk;
+    /** The name of the target reference's STATIC type, or undefined when there
+     * is nothing to check against - a generic `REF TO object`, or a target this
+     * cannot resolve (which is reported by findClassName on the static path and
+     * must not turn a working dynamic CREATE OBJECT into a transpile error
+     * here). */
+    private findTargetTypeName;
     private findClassName;
 }

package/build/src/statements/create_object.js

@@ -77,11 +77,39 @@ class CreateObjectTranspiler {
             ret += `  ${id} = abap.Classes[${internalName}.get().trimEnd()];\n`;
             ret += `}\n`;
             ret += `if (${id} === undefined) { throw new ${cx}; }\n`;
+            // ...and it has to be compatible with the STATIC type of the target.
+            // A system raises CX_SY_CREATE_OBJECT_ERROR for a class that is not,
+            // before the constructor runs; without this the class was assigned to
+            // the reference whatever it was, and the mismatch surfaced later as a
+            // javascript TypeError on the first member access - which no CATCH
+            // takes, so a caller that guards its dynamic CREATE OBJECT the way the
+            // documentation asks for was not guarded at all
+            const staticName = this.findTargetTypeName(node, traversal);
+            if (staticName !== undefined) {
+                const staticType = traversal.lookupClassOrInterface(staticName, node.getFirstToken());
+                ret += `abap.statements.checkCreateObjectType(${id}, ${staticType}, "${staticName.toUpperCase()}");\n`;
+            }
             clas = id;
         }
         ret += target + ".set(await (new " + clas + "()).constructor_(" + para + "));";
         return new chunk_1.Chunk(ret);
     }
+    /** The name of the target reference's STATIC type, or undefined when there
+     * is nothing to check against - a generic `REF TO object`, or a target this
+     * cannot resolve (which is reported by findClassName on the static path and
+     * must not turn a working dynamic CREATE OBJECT into a transpile error
+     * here). */
+    findTargetTypeName(node, traversal) {
+        const scope = traversal.findCurrentScopeByToken(node.getFirstToken());
+        if (scope === undefined) {
+            return undefined;
+        }
+        const type = traversal.determineType(node, scope);
+        if (type instanceof abaplint.BasicTypes.ObjectReferenceType) {
+            return type.getIdentifierName();
+        }
+        return undefined;
+    }
     findClassName(node, traversal) {
         const c = node.findDirectExpression(abaplint.Expressions.ClassName);
         if (c) {

package/build/src/structures/function_module.js

@@ -87,16 +87,16 @@ class FunctionModuleTranspiler {
                 direction = "importing";
             }
             // note: all directions are optional
-            let name = p.name.toLowerCase();
-            if (traversal.options?.keywords?.some(a => a === name)) {
-                name += "_";
-            }
-            ret += `let ${name} = INPUT.${direction}?.${name};\n`;
+            const name = p.name.toLowerCase();
+            // a parameter named like a JavaScript keyword, RETURN on every BAPI,
+            // is declared the way the function body refers to it
+            const variable = traversal_1.Traversal.prefixVariable(name);
+            ret += `let ${variable} = INPUT.${direction}?.${name};\n`;
             const type = scope?.findVariable(name)?.getType();
             if (type !== undefined && p.optional === true) {
                 // todo, set DEFAULT value
-                ret += `if (${name} === undefined) {
-  ${name} = ${transpile_types_1.TranspileTypes.toType(type)};
+                ret += `if (${variable} === undefined) {
+  ${variable} = ${transpile_types_1.TranspileTypes.toType(type)};
 }\n`;
             }
         }

package/build/src/w3mi_name.d.ts

@@ -0,0 +1,16 @@
+import * as abaplint from "@abaplint/core";
+/**
+ * The name a system knows a Web Repository object by: `wwwdata-objid`.
+ *
+ * It is not the file name. abapGit percent-escapes the characters a file name
+ * cannot hold, so `ZOISEE-EAR-02.MP3` is stored as `zoisee-ear-02%2emp3`, and
+ * abaplint derives an object's name from the file it was read from. Keying
+ * anything a caller sees on that spelling turns an abapGit storage detail into
+ * an API: ABAP that asks `SELECT ... FROM wwwparams WHERE objid = 'X.MP3'`,
+ * which is how the object is addressed on a system, then finds nothing.
+ *
+ * The real name is in the object's own XML, and abapGit puts it there from the
+ * key itself — `io_xml->add( iv_name = 'NAME' ig_data = ms_key-objid )` in
+ * `zcl_abapgit_object_w3xx_super`, in both serializer versions.
+ */
+export declare function w3miObjectName(obj: abaplint.Objects.WebMIME): string;

package/build/src/w3mi_name.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.w3miObjectName = w3miObjectName;
+/**
+ * The name a system knows a Web Repository object by: `wwwdata-objid`.
+ *
+ * It is not the file name. abapGit percent-escapes the characters a file name
+ * cannot hold, so `ZOISEE-EAR-02.MP3` is stored as `zoisee-ear-02%2emp3`, and
+ * abaplint derives an object's name from the file it was read from. Keying
+ * anything a caller sees on that spelling turns an abapGit storage detail into
+ * an API: ABAP that asks `SELECT ... FROM wwwparams WHERE objid = 'X.MP3'`,
+ * which is how the object is addressed on a system, then finds nothing.
+ *
+ * The real name is in the object's own XML, and abapGit puts it there from the
+ * key itself — `io_xml->add( iv_name = 'NAME' ig_data = ms_key-objid )` in
+ * `zcl_abapgit_object_w3xx_super`, in both serializer versions.
+ */
+function w3miObjectName(obj) {
+    const raw = obj.getXMLFile()?.getRaw();
+    if (raw !== undefined) {
+        // every entry of <PARAMS> carries a <NAME> of its own, so only the part
+        // before the parameter list can be searched for the object's
+        const head = raw.split(/<PARAMS[\s/>]/)[0];
+        const found = /<NAME>([^<]*)<\/NAME>/.exec(head);
+        const name = found === null ? "" : unescapeXML(found[1]).trim();
+        if (name.length > 0) {
+            return name.toUpperCase();
+        }
+    }
+    // an object with no XML, or an XML from something that is not abapGit: the
+    // file name is the only name there is, and a wrong key beats no key
+    return obj.getName().toUpperCase();
+}
+function unescapeXML(value) {
+    // a W3MI name may hold < and > and &, which reach the file escaped
+    return value.replace(/&lt;/g, "<")
+        .replace(/&gt;/g, ">")
+        .replace(/&quot;/g, "\"")
+        .replace(/&apos;/g, "'")
+        .replace(/&amp;/g, "&");
+}
+//# sourceMappingURL=w3mi_name.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.13.86",
+  "version": "2.13.88",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,14 +29,14 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.120.50",
+    "@abaplint/core": "^2.120.54",
     "source-map": "^0.8.0"
   },
   "devDependencies": {
     "@types/chai": "^5.2.3",
     "@types/mocha": "^10.0.10",
     "chai": "^6.2.2",
-    "mocha": "^12.0.1",
+    "mocha": "^12.0.2",
     "source-map-support": "^0.5.21",
     "typescript": "^6.0.3"
   }