@abaplint/transpiler-cli 2.13.100 → 2.14.0

package/build/bundle.js

@@ -240,6 +240,7 @@ class FileOperations {
             return limit(async () => {
                 // read as latin1, written as latin1: anything else re-encodes the
                 // bytes on the way out and undoes the careful read
+                await fsPromises.mkdir(path.dirname(file.path), { recursive: true });
                 await fsPromises.writeFile(file.path, file.contents, this.isBinaryFilename(file.path) ? { encoding: "latin1" } : undefined);
             });
         });
@@ -315,16 +316,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const fs = __importStar(__webpack_require__(/*! fs */ "fs"));
 const path = __importStar(__webpack_require__(/*! path */ "path"));
-const childProcess = __importStar(__webpack_require__(/*! child_process */ "child_process"));
-const os = __importStar(__webpack_require__(/*! os */ "os"));
-const module_1 = __webpack_require__(/*! module */ "module");
 const progress_1 = __importDefault(__webpack_require__(/*! progress */ "./node_modules/progress/index.js"));
 const Transpiler = __importStar(__webpack_require__(/*! @abaplint/transpiler */ "./node_modules/@abaplint/transpiler/build/src/index.js"));
-const abaplint = __importStar(__webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js"));
 const config_1 = __webpack_require__(/*! ./config */ "./build/config.js");
 const file_operations_1 = __webpack_require__(/*! ./file_operations */ "./build/file_operations.js");
-const git_clone_1 = __webpack_require__(/*! ./git_clone */ "./build/git_clone.js");
-const lib_folder_1 = __webpack_require__(/*! ./lib_folder */ "./build/lib_folder.js");
+const libraries_1 = __webpack_require__(/*! ./libraries */ "./build/libraries.js");
+const write_objects_1 = __webpack_require__(/*! ./write_objects */ "./build/write_objects.js");
 class Progress {
     bar;
     set(total, _text) {
@@ -335,142 +332,30 @@ class Progress {
         this.bar.render();
     }
 }
-async function loadLib(config) {
-    const files = [];
-    for (const lib of config.libs || []) {
-        let dir = "";
-        let cleanupFolder = false;
-        const folder = (0, lib_folder_1.resolveLibFolder)(lib.folder, process.cwd());
-        if (folder !== undefined && fs.existsSync(folder)) {
-            console.log("From folder: " + folder);
-            dir = folder;
-        }
-        else {
-            if (lib.url === undefined || lib.url === "") {
-                if (folder === undefined) {
-                    throw new Error("Library must define a non-empty url or an existing folder");
-                }
-                throw new Error("Library folder not found: " + folder);
-            }
-            console.log("Clone: " + lib.url);
-            dir = fs.mkdtempSync(path.join(os.tmpdir(), "abap_transpile-"));
-            const args = (0, git_clone_1.buildGitCloneArguments)(lib.url);
-            childProcess.execFileSync("git", args, { cwd: dir, stdio: "inherit" });
-            cleanupFolder = true;
-        }
-        let patterns = ["/src/**"];
-        if (lib.files !== undefined && typeof lib.files === "string" && lib.files !== "") {
-            patterns = [lib.files];
-        }
-        else if (Array.isArray(lib.files)) {
-            patterns = lib.files;
-        }
-        const excludeFilters = (lib.exclude_filter ?? []).map(pattern => new RegExp(pattern, "i"));
-        const filesToRead = [];
-        for (const pattern of patterns) {
-            for (const filename of file_operations_1.FileOperations.globSync(dir + pattern)) {
-                if (filename.endsWith(".clas.testclasses.abap")) {
-                    continue;
-                }
-                else if (excludeFilters.length > 0 && excludeFilters.some(a => a.test(filename)) === true) {
-                    continue;
-                }
-                filesToRead.push(filename);
-            }
-        }
-        files.push(...await file_operations_1.FileOperations.readAllFiles(filesToRead, ""));
-        console.log("\t" + filesToRead.length + " files added from lib");
-        if (cleanupFolder === true) {
-            file_operations_1.FileOperations.deleteFolderRecursive(dir);
-        }
-    }
-    return files;
-}
-async function writeObjects(outputFiles, config, outputFolder, files) {
-    const writeSourceMaps = config.write_source_map || false;
-    const filesToWrite = [];
-    for (const output of outputFiles) {
-        const type = output.object.type.toUpperCase();
-        let contents = output.chunk.getCode();
-        // PROG output gets a runtime bootstrap line prepended, which shifts every
-        // generated line down by one - the source map must account for this offset
-        let generatedLineOffset = 0;
-        if (type === "PROG") {
-            // hmm, will this work for INCLUDEs ?
-            contents = `if (!globalThis.abap) await import("./_init.mjs");\n` + contents;
-            generatedLineOffset = 1;
-        }
-        if (writeSourceMaps === true
-            && (type === "PROG" || type === "FUGR" || type === "CLAS")) {
-            const name = output.filename + ".map";
-            // SourceMappingUrl needs to be percent-encoded, ref https://github.com/microsoft/TypeScript/issues/40951
-            contents = contents + `\n//# sourceMappingURL=` + name.replace(/%/g, "%25").replace(/#/g, "%23");
-            // map the bare abap filename each mapping carries to its path on disk;
-            // source map "sources" are URLs, so always forward slashes, also on Windows
-            const sourcePaths = {};
-            for (const f of files) {
-                if (f.relative === undefined) {
-                    continue;
-                }
-                const rel = f.relative.split(path.sep).join("/");
-                sourcePaths[f.filename] = rel === "" ? f.filename : `${rel}/${f.filename}`;
-            }
-            const map = output.chunk.getMap(output.filename, { generatedLineOffset, sourcePaths });
-            filesToWrite.push({ path: outputFolder + path.sep + name, contents: map });
-        }
-        filesToWrite.push({ path: outputFolder + path.sep + output.filename, contents });
-    }
-    await file_operations_1.FileOperations.writeFiles(filesToWrite);
-}
-const PLUGIN_MODULE = "@abaplint/transpiler-extras";
-function loadPlugin() {
-    // createRequire so the plugin resolves from the project consuming the CLI, also after webpacking
-    const projectRequire = (0, module_1.createRequire)(path.join(process.cwd(), "package.json"));
-    try {
-        projectRequire.resolve(PLUGIN_MODULE);
-    }
-    catch {
-        // plugin package not installed
-        return undefined;
-    }
-    const plugin = projectRequire(PLUGIN_MODULE).plugin;
-    if (plugin === undefined) {
-        throw new Error(PLUGIN_MODULE + " does not export a plugin");
-    }
-    console.log("Plugin loaded: " + PLUGIN_MODULE + ", object types: " + plugin.objectTypes().join(", "));
-    console.log("Note this requires license for commercial use");
-    return plugin;
-}
 async function build(config, files) {
-    const libFiles = await loadLib(config);
+    const libraries = await (0, libraries_1.loadLibraries)(config);
     const options = { ...config.options };
     if (config.write_source_map !== true) {
         // Do not pay to allocate and copy mappings that the CLI will not write.
         options.ignoreSourceMap = true;
     }
-    const t = new Transpiler.Transpiler(options, loadPlugin());
-    const reg = new abaplint.Registry();
-    for (const f of files) {
-        reg.addFile(new abaplint.MemoryFile(f.filename, f.contents));
-    }
-    for (const l of libFiles) {
-        reg.addDependency(new abaplint.MemoryFile(l.filename, l.contents));
-    }
-    const output = await t.run(reg, new Progress());
-    return output;
+    const t = new Transpiler.Transpiler(options);
+    const { reg, folders, sources } = (0, libraries_1.libraryRegistry)(files, libraries);
+    const output = await t.run(reg, new Progress(), folders);
+    return { output, sources };
 }
 async function run() {
     console.log("Transpiler CLI");
     const config = config_1.TranspilerConfig.find(process.argv[2]);
     const files = await file_operations_1.FileOperations.loadFiles(config);
     console.log("\nBuilding");
-    const output = await build(config, files);
+    const { output, sources } = await build(config, files);
     console.log("\nOutput");
     const outputFolder = config.output_folder;
     if (!fs.existsSync(outputFolder)) {
-        fs.mkdirSync(outputFolder);
+        fs.mkdirSync(outputFolder, { recursive: true });
     }
-    await writeObjects(output.objects, config, outputFolder, files);
+    await (0, write_objects_1.writeObjects)(output.objects, config, sources);
     console.log(output.objects.length + " objects written to disk");
     if (config.write_unit_tests === true) {
         // breaking change? rename this output file,
@@ -553,6 +438,267 @@ function resolveLibFolder(folder, cwd) {
 
 /***/ },
 
+/***/ "./build/libraries.js"
+/*!****************************!*\
+  !*** ./build/libraries.js ***!
+  \****************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"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.libraryNames = libraryNames;
+exports.loadLibraries = loadLibraries;
+exports.libraryRegistry = libraryRegistry;
+const fs = __importStar(__webpack_require__(/*! fs */ "fs"));
+const path = __importStar(__webpack_require__(/*! path */ "path"));
+const childProcess = __importStar(__webpack_require__(/*! child_process */ "child_process"));
+const os = __importStar(__webpack_require__(/*! os */ "os"));
+const abaplint = __importStar(__webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js"));
+const file_operations_1 = __webpack_require__(/*! ./file_operations */ "./build/file_operations.js");
+const git_clone_1 = __webpack_require__(/*! ./git_clone */ "./build/git_clone.js");
+const lib_folder_1 = __webpack_require__(/*! ./lib_folder */ "./build/lib_folder.js");
+function libraryNames(libs) {
+    const used = new Set(["project"]);
+    return libs.map(lib => {
+        const source = (lib.url || lib.folder || "").replace(/\\/g, "/").replace(/\/+$/, "");
+        const name = lib.name ?? source.substring(Math.max(source.lastIndexOf("/"), source.lastIndexOf(":")) + 1)
+            .replace(/\.git$/i, "");
+        if (typeof name !== "string" || name.length === 0 || name === "." || name === ".."
+            || /[<>:"/\\|?*\u0000-\u001f]/.test(name) || /[. ]$/.test(name)
+            || /^(con|prn|aux|nul|com[1-9¹²³]|lpt[1-9¹²³])(\.|$)/i.test(name)) {
+            throw new Error("Invalid library name: " + JSON.stringify(name) + ". Set libs[].name to a valid folder name.");
+        }
+        if (used.has(name.toLowerCase())) {
+            throw new Error("Duplicate or reserved library name: " + name + ". Set a different libs[].name.");
+        }
+        used.add(name.toLowerCase());
+        return name;
+    });
+}
+async function loadLibraries(config) {
+    const libs = config.libs || [];
+    const names = libraryNames(libs);
+    const result = [];
+    for (const [index, lib] of libs.entries()) {
+        let dir;
+        let cleanupFolder = false;
+        const folder = (0, lib_folder_1.resolveLibFolder)(lib.folder, process.cwd());
+        if (folder !== undefined && fs.existsSync(folder)) {
+            console.log("From folder: " + folder);
+            dir = folder;
+        }
+        else {
+            if (!lib.url) {
+                throw new Error(folder === undefined
+                    ? "Library must define a non-empty url or an existing folder"
+                    : "Library folder not found: " + folder);
+            }
+            console.log("Clone: " + lib.url);
+            dir = fs.mkdtempSync(path.join(os.tmpdir(), "abap_transpile-"));
+            cleanupFolder = true;
+        }
+        try {
+            if (cleanupFolder) {
+                childProcess.execFileSync("git", (0, git_clone_1.buildGitCloneArguments)(lib.url), { cwd: dir, stdio: "inherit" });
+            }
+            const patterns = typeof lib.files === "string" && lib.files !== "" ? [lib.files]
+                : Array.isArray(lib.files) ? lib.files : ["/src/**"];
+            const excludeFilters = (lib.exclude_filter ?? []).map(pattern => new RegExp(pattern, "i"));
+            const filesToRead = new Set();
+            for (const pattern of patterns) {
+                for (const filename of file_operations_1.FileOperations.globSync(dir + pattern)) {
+                    if (filename.endsWith(".clas.testclasses.abap") || excludeFilters.some(filter => filter.test(filename))) {
+                        continue;
+                    }
+                    filesToRead.add(filename);
+                }
+            }
+            const files = await file_operations_1.FileOperations.readAllFiles([...filesToRead], config.output_folder);
+            result.push({ name: names[index], files });
+            console.log("\t" + files.length + " files added from lib");
+        }
+        finally {
+            if (cleanupFolder) {
+                file_operations_1.FileOperations.deleteFolderRecursive(dir);
+            }
+        }
+    }
+    return result;
+}
+function libraryRegistry(files, libraries) {
+    const reg = new abaplint.Registry();
+    const folders = new Map();
+    const objects = new Map();
+    const sources = new Map();
+    // Libraries first: addFile() then replaces a dependency object with the project's object.
+    for (const lib of libraries) {
+        for (const file of lib.files) {
+            const memory = new abaplint.MemoryFile(file.filename, file.contents);
+            const type = memory.getObjectType()?.toUpperCase();
+            if (type === undefined || file.filename.split(".").length <= 2) {
+                continue;
+            }
+            const key = type + ":" + memory.getObjectName().toUpperCase();
+            const owner = objects.get(key);
+            // abapGit repeats package.devc.xml across repositories; the registry keeps the last copy.
+            if (key !== "DEVC:PACKAGE" && owner !== undefined && owner !== lib.name) {
+                throw new Error("Ambiguous dependency object " + key + " in " + owner + " and " + lib.name);
+            }
+            objects.set(key, lib.name);
+            reg.addDependency(memory);
+            folders.set(file.filename.toLowerCase(), lib.name);
+            sources.set(file.filename.toLowerCase(), file);
+        }
+    }
+    for (const file of files) {
+        reg.addFile(new abaplint.MemoryFile(file.filename, file.contents));
+        folders.set(file.filename.toLowerCase(), "project");
+        sources.set(file.filename.toLowerCase(), file);
+    }
+    return { reg, folders, sources: [...sources.values()] };
+}
+//# sourceMappingURL=libraries.js.map
+
+/***/ },
+
+/***/ "./build/write_objects.js"
+/*!********************************!*\
+  !*** ./build/write_objects.js ***!
+  \********************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"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.writeObjects = writeObjects;
+const path = __importStar(__webpack_require__(/*! path */ "path"));
+const url_1 = __webpack_require__(/*! url */ "url");
+const transpiler_1 = __webpack_require__(/*! @abaplint/transpiler */ "./node_modules/@abaplint/transpiler/build/src/index.js");
+const file_operations_1 = __webpack_require__(/*! ./file_operations */ "./build/file_operations.js");
+async function writeObjects(outputFiles, config, files) {
+    const root = path.resolve(config.output_folder);
+    const filesToWrite = [];
+    const destinations = new Set();
+    const sources = new Map(files.map(file => [file.filename.toLowerCase(), file]));
+    const add = (filename, contents) => {
+        const target = path.resolve(root, filename);
+        const relative = path.relative(root, target);
+        if (relative === "" || relative.startsWith(".." + path.sep) || relative === ".." || path.isAbsolute(relative)) {
+            throw new Error("Output file escapes output_folder: " + filename);
+        }
+        const key = target.toLowerCase();
+        if (destinations.has(key)) {
+            throw new Error("Conflicting output file: " + filename);
+        }
+        destinations.add(key);
+        filesToWrite.push({ path: target, contents });
+    };
+    for (const output of outputFiles) {
+        const type = output.object.type.toUpperCase();
+        let contents = output.chunk.getCode();
+        let generatedLineOffset = 0;
+        if (type === "PROG") {
+            contents = 'if (!globalThis.abap) await import("' + (0, transpiler_1.importPath)(output.filename, "_init.mjs") + '");\n' + contents;
+            generatedLineOffset = 1;
+        }
+        if (config.write_source_map === true && (type === "PROG" || type === "FUGR" || type === "CLAS")) {
+            const name = output.filename + ".map";
+            contents += "\n//# sourceMappingURL=" + encodeURIComponent(path.basename(name));
+            const sourcePaths = {};
+            const sourceContents = {};
+            const mapDirectory = path.dirname(path.join(root, name));
+            for (const filename of new Set(output.chunk.mappings.map(mapping => mapping.source))) {
+                const file = sources.get(filename.toLowerCase());
+                if (file === undefined) {
+                    continue;
+                }
+                if (file.relative !== undefined) {
+                    const source = path.resolve(root, file.relative, file.filename);
+                    const relative = path.relative(mapDirectory, source);
+                    // Sources on another Windows drive cannot be expressed as relative paths.
+                    sourcePaths[filename] = path.isAbsolute(relative) ? (0, url_1.pathToFileURL)(source).href
+                        : relative.split(path.sep).map(segment => encodeURIComponent(segment)).join("/");
+                }
+                // Include sources for local and cloned libraries; clones are removed before emission.
+                sourceContents[filename] = file.contents;
+            }
+            add(name, output.chunk.getMap(path.basename(output.filename), { generatedLineOffset, sourcePaths, sourceContents }));
+        }
+        add(output.filename, contents);
+    }
+    await file_operations_1.FileOperations.writeFiles(filesToWrite);
+}
+//# sourceMappingURL=write_objects.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/core/build/src/abap/1_lexer/lexer.js"
 /*!*********************************************************************!*\
   !*** ./node_modules/@abaplint/core/build/src/abap/1_lexer/lexer.js ***!
@@ -10941,7 +11087,7 @@ class StringTemplateFormatting extends combi_1.Expression {
         const alpha = (0, combi_1.ver)(version_1.Release.v740sp02, (0, combi_1.seq)("ALPHA =", alphaOptions), { also: combi_1.AlsoIn.OpenABAP });
         const xsd = (0, combi_1.ver)(version_1.Release.v740sp02, (0, combi_1.seq)("XSD =", zeroXSDOptions));
         const country = (0, combi_1.seq)("COUNTRY =", _1.Source);
-        const formatting = (0, combi_1.altPrio)((0, combi_1.seq)("TIME =", dateTimeOptions), (0, combi_1.seq)("DATE =", dateTimeOptions), (0, combi_1.seq)("CASE =", caseOptions), (0, combi_1.seq)("EXPONENT", _1.Source), (0, combi_1.seq)("ZERO =", zeroXSDOptions), xsd, (0, combi_1.seq)("STYLE =", styleOptions), (0, combi_1.seq)("CURRENCY =", _1.Source), (0, combi_1.per)(sign, number, decimals, width, pad, alpha, align, country), (0, combi_1.per)(timezone, timestamp));
+        const formatting = (0, combi_1.altPrio)((0, combi_1.seq)("TIME =", dateTimeOptions), (0, combi_1.seq)("DATE =", dateTimeOptions), (0, combi_1.seq)("CASE =", caseOptions), (0, combi_1.seq)("ZERO =", zeroXSDOptions), xsd, (0, combi_1.seq)("STYLE =", styleOptions), (0, combi_1.seq)("CURRENCY =", _1.Source), (0, combi_1.per)(sign, number, decimals, width, pad, alpha, align, country, (0, combi_1.seq)("EXPONENT =", _1.Source)), (0, combi_1.per)(timezone, timestamp));
         return formatting;
     }
 }
@@ -30673,12 +30819,15 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.Compare = void 0;
 const Expressions = __importStar(__webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js"));
+const nodes_1 = __webpack_require__(/*! ../../nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 const method_call_chain_1 = __webpack_require__(/*! ./method_call_chain */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/method_call_chain.js");
 const source_field_symbol_1 = __webpack_require__(/*! ./source_field_symbol */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source_field_symbol.js");
 const _syntax_input_1 = __webpack_require__(/*! ../_syntax_input */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_syntax_input.js");
 const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
 const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
+const _builtin_1 = __webpack_require__(/*! ../_builtin */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_builtin.js");
+const _object_oriented_1 = __webpack_require__(/*! ../_object_oriented */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_object_oriented.js");
 class Compare {
     static runSyntax(node, input) {
         var _a;
@@ -30693,6 +30842,11 @@ class Compare {
         for (const t of node.findDirectExpressions(Expressions.MethodCallChain)) {
             method_call_chain_1.MethodCallChain.runSyntax(t, input);
         }
+        const initialMessage = this.checkInitialOperand(node, input);
+        if (initialMessage !== undefined) {
+            input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), initialMessage));
+            return;
+        }
         const typeUtils = new _type_utils_1.TypeUtils(input.scope);
         const compareOperator = (_a = node.findDirectExpression(Expressions.CompareOperator)) === null || _a === void 0 ? void 0 : _a.concatTokens().toUpperCase();
         if (compareOperator === "CS"
@@ -30716,6 +30870,46 @@ class Compare {
             input.issues.push((0, _syntax_input_1.syntaxIssue)(input, node.getFirstToken(), message));
         }
     }
+    // a built-in function with a character-like result cannot be the operand of IS [NOT] INITIAL,
+    // "Unexpected operator IS" on a system, while one with a numeric result, lines( ), can
+    static checkInitialOperand(node, input) {
+        var _a, _b, _c, _d;
+        if (input.scope.getOpenABAP()) {
+            return undefined;
+        }
+        const tokens = node.getChildren().filter(c => c instanceof nodes_1.TokenNode).map(c => c.getFirstToken().getStr().toUpperCase());
+        if (tokens.includes("IS") === false || tokens[tokens.length - 1] !== "INITIAL") {
+            return undefined;
+        }
+        const chain = (_a = node.findDirectExpression(Expressions.Source)) === null || _a === void 0 ? void 0 : _a.getChildren();
+        // xsdbool( ) and boolc( ) are their own form in the Source grammar, a condition in parentheses
+        const first = (_b = chain === null || chain === void 0 ? void 0 : chain[0]) === null || _b === void 0 ? void 0 : _b.getFirstToken().getStr().toUpperCase();
+        if ((chain === null || chain === void 0 ? void 0 : chain.length) === 4 && chain[0] instanceof nodes_1.TokenNode && (first === "XSDBOOL" || first === "BOOLC")) {
+            return `Built-in function "${chain[0].getFirstToken().getStr()}" cannot be the operand of IS INITIAL`;
+        }
+        if ((chain === null || chain === void 0 ? void 0 : chain.length) !== 1 || !(chain[0] instanceof nodes_1.ExpressionNode) || !(chain[0].get() instanceof Expressions.MethodCallChain)) {
+            return undefined;
+        }
+        const calls = chain[0].getChildren();
+        if (calls.length !== 1 || !(calls[0] instanceof nodes_1.ExpressionNode) || !(calls[0].get() instanceof Expressions.MethodCall)) {
+            return undefined;
+        }
+        const name = (_c = calls[0].findDirectExpression(Expressions.MethodName)) === null || _c === void 0 ? void 0 : _c.concatTokens();
+        const builtin = _builtin_1.BuiltIn.searchBuiltin(name);
+        if (name === undefined || builtin === undefined) {
+            return undefined;
+        }
+        // a method of the same name hides the built-in function
+        const enclosing = input.scope.findClassDefinition(input.scope.getEnclosingClassName());
+        if (enclosing !== undefined && new _object_oriented_1.ObjectOriented(input.scope).searchMethodName(enclosing, name).method !== undefined) {
+            return undefined;
+        }
+        const returning = (_d = builtin.getParameters().getReturning()) === null || _d === void 0 ? void 0 : _d.getType();
+        if (returning instanceof basic_1.StringType || returning instanceof basic_1.CharacterType) {
+            return `Built-in function "${name}" cannot be the operand of IS INITIAL`;
+        }
+        return undefined;
+    }
 }
 exports.Compare = Compare;
 //# sourceMappingURL=compare.js.map
@@ -71077,7 +71271,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.69";
+        return "2.120.71";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -73766,7 +73960,7 @@ exports.CDSCheckSyntaxConf = CDSCheckSyntaxConf;
 const KNOWN_QUAN_DATA_ELEMENTS = ["MENGE_D"];
 const KNOWN_CURR_DATA_ELEMENTS = ["BWERT", "DZWERT"];
 // Reserved names, cannot be used as element names, see DDIC table TRESE
-const RESERVED_ELEMENT_NAMES = ["BEGIN", "NUMBER", "POSITION"];
+const RESERVED_ELEMENT_NAMES = ["BEGIN", "NUMBER", "POSITION", "ZONE", "HANDLER", "SECTION"];
 const MAX_LABEL_LENGTH = 40;
 // Annotations which are not supported in CDS view entities
 const VIEW_ENTITY_FORBIDDEN_ANNOTATIONS = ["Semantics.unitOfMeasure", "Semantics.currencyCode"];
@@ -95476,7 +95670,8 @@ class RedundantConversion {
             key: "redundant_conversion",
             title: "Redundant Conversion",
             shortDescription: `Find redundant CONV expressions`,
-            extendedInformation: `Reports CONV expressions whose operand already has the conversion's target type.`,
+            extendedInformation: `Reports CONV expressions whose operand already has the conversion's target type,
+including the result of a built-in function with a fixed result type, like to_upper( ) or strlen( ).`,
             tags: [_irule_1.RuleTag.Quickfix],
             badExample: `DATA text TYPE string.
 text = CONV string( text ).`,
@@ -95513,7 +95708,8 @@ text = text.`,
             if (structure === undefined) {
                 continue;
             }
-            for (const source of structure.findAllExpressions(Expressions.Source)) {
+            // recursive, a CONV can be the argument of a built-in function, which is itself a Source
+            for (const source of structure.findAllExpressionsRecursive(Expressions.Source)) {
                 if (source.getFirstToken().getStr().toUpperCase() !== "CONV") {
                     continue;
                 }
@@ -95572,6 +95768,15 @@ text = text.`,
     }
     sourceType(source, scope) {
         let context;
+        // boolc( <condition> ) is not a MethodCallChain, xsdbool( ) has the same shape but is not reported
+        const first = source.getFirstToken();
+        if (first.getStr().toUpperCase() === "BOOLC"
+            && source.findDirectExpression(Expressions.Cond) !== undefined
+            && source.getChildren().length === 4
+            && scope.getData().references.some(reference => reference.referenceType === _reference_1.ReferenceType.BuiltinMethodReference
+                && reference.position.getStart().equals(first.getStart()))) {
+            return basic_1.StringType.get();
+        }
         for (const child of source.getChildren()) {
             if (!(child instanceof nodes_1.ExpressionNode)) {
                 continue;
@@ -95582,6 +95787,15 @@ text = text.`,
                     return undefined;
                 }
             }
+            else if (child.get() instanceof Expressions.MethodCallChain) {
+                if (source.getChildren().length !== 1) {
+                    return undefined;
+                }
+                context = this.builtinResultType(child, scope);
+                if (context === undefined) {
+                    return undefined;
+                }
+            }
             else if (child.get() instanceof Expressions.Constant) {
                 context = this.infer(context, constant_1.Constant.runSyntax(child));
             }
@@ -95602,6 +95816,32 @@ text = text.`,
         }
         return context;
     }
+    /** The result type of a call to a built-in function whose result type does not depend on its arguments,
+     *  undefined for anything else, e.g. abs( ) or xsdbool( ), or a method of the same name */
+    builtinResultType(chain, scope) {
+        var _a;
+        const children = chain.getChildren();
+        if (children.length !== 1 || !(children[0].get() instanceof Expressions.MethodCall)) {
+            return undefined;
+        }
+        const name = (_a = children[0].findDirectExpression(Expressions.MethodName)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+        if (name === undefined) {
+            return undefined;
+        }
+        const isBuiltin = scope.getData().references.some(reference => reference.referenceType === _reference_1.ReferenceType.BuiltinMethodReference
+            && reference.position.getStart().equals(name.getStart()));
+        if (isBuiltin === false) {
+            return undefined;
+        }
+        const upper = name.getStr().toUpperCase();
+        if (RedundantConversion.stringResult.has(upper)) {
+            return basic_1.StringType.get();
+        }
+        else if (RedundantConversion.integerResult.has(upper)) {
+            return basic_1.IntegerType.get();
+        }
+        return undefined;
+    }
     fieldChainType(fieldChain, scope) {
         var _a;
         const operand = (_a = scope.getData().references.find(reference => reference.referenceType === _reference_1.ReferenceType.DataReadReference
@@ -95666,6 +95906,17 @@ text = text.`,
     }
 }
 exports.RedundantConversion = RedundantConversion;
+// built-in functions that always return a string, whatever their arguments
+RedundantConversion.stringResult = new Set([
+    "BOOLC", "CONCAT_LINES_OF", "CONDENSE", "ESCAPE", "FROM_MIXED", "INSERT", "REPEAT", "REPLACE",
+    "REVERSE", "SEGMENT", "SHIFT_LEFT", "SHIFT_RIGHT", "SUBSTRING", "SUBSTRING_AFTER", "SUBSTRING_BEFORE",
+    "SUBSTRING_FROM", "SUBSTRING_TO", "TO_LOWER", "TO_MIXED", "TO_UPPER", "TRANSLATE"
+]);
+// built-in functions that always return an i
+RedundantConversion.integerResult = new Set([
+    "CHARLEN", "COUNT", "COUNT_ANY_NOT_OF", "COUNT_ANY_OF", "DBMAXLEN", "DISTANCE", "FIND", "FIND_ANY_NOT_OF",
+    "FIND_ANY_OF", "FIND_END", "LINES", "NUMOFCHAR", "STRLEN", "XSTRLEN"
+]);
 //# sourceMappingURL=redundant_conversion.js.map
 
 /***/ },
@@ -102871,7 +103122,7 @@ class XMLConsistency {
     }
     runTable(obj, file) {
         var _a, _b, _c, _d;
-        var _e;
+        var _e, _f;
         const issues = [];
         for (const field of (_e = obj.getFields()) !== null && _e !== void 0 ? _e : []) {
             if (field.DATATYPE === "QUAN" && (!((_a = field.REFTABLE) === null || _a === void 0 ? void 0 : _a.trim()) || !((_b = field.REFFIELD) === null || _b === void 0 ? void 0 : _b.trim()))) {
@@ -102880,6 +103131,14 @@ class XMLConsistency {
             }
         }
         if (obj.getTableCategory() === Objects.TableCategory.Transparent) {
+            // Confirmed reserved database field names, see issue #4331, DAY and HOUR reported by activation.
+            // TRESE also contains names such as TEXT and LENGTH which are allowed here.
+            const reservedFieldNames = ["ZONE", "HANDLER", "SECTION", "PARAMETER", "DAY", "HOUR"];
+            for (const field of (_f = obj.getFields()) !== null && _f !== void 0 ? _f : []) {
+                if (reservedFieldNames.includes(field.FIELDNAME.toUpperCase())) {
+                    issues.push(issue_1.Issue.atRow(file, 1, `Table field name "${field.FIELDNAME}" is reserved`, this.getMetadata().key, this.conf.severity));
+                }
+            }
             if (!((_c = obj.getDeliveryClass()) === null || _c === void 0 ? void 0 : _c.trim())) {
                 const message = `Transparent table must have delivery class(CONTFLAG in DD02V) set`;
                 issues.push(issue_1.Issue.atRow(file, 1, message, this.getMetadata().key, this.conf.transparentTableSeverity));
@@ -104490,6 +104749,12 @@ class Chunk {
             original: m.original,
             generated: { line: m.generated.line + offset, column: m.generated.column },
         }));
+        for (const source of new Set(this.mappings.map(m => m.source))) {
+            const contents = options?.sourceContents?.[source];
+            if (contents !== undefined) {
+                sourceMapGenerator.setSourceContent(sourcePaths[source] ?? source, contents);
+            }
+        }
         const json = sourceMapGenerator.toJSON();
         json.file = generatedFilename;
         json.sourceRoot = "";
@@ -104501,6 +104766,231 @@ exports.Chunk = Chunk;
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/db/cds_database_view.js"
+/*!*****************************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/db/cds_database_view.js ***!
+  \*****************************************************************************/
+(__unused_webpack_module, exports, __webpack_require__) {
+
+"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.CDSDatabaseView = void 0;
+const abaplint = __importStar(__webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js"));
+const cds = abaplint.ExpressionsCDS;
+/** SQL for the supported relational subset of CDS. Never discard unknown syntax. */
+class CDSDatabaseView {
+    reg;
+    viewName = "";
+    sources = [];
+    constructor(reg) {
+        this.reg = reg;
+    }
+    build(obj) {
+        this.viewName = obj.getName();
+        const tree = new abaplint.CDSParser().parse(obj.findSourceFile());
+        if (tree === undefined) {
+            return this.unsupported("could not parse CDS definition");
+        }
+        else if (!(tree.get() instanceof cds.CDSDefineView)) {
+            return undefined; // Abstract/custom entities have no database view.
+        }
+        const name = tree.findDirectExpression(cds.CDSName);
+        const select = tree.findDirectExpression(cds.CDSSelect);
+        if (name === undefined || select === undefined) {
+            return this.unsupported("expected a SELECT view");
+        }
+        this.viewName = this.name(name);
+        for (const child of tree.getChildren()) {
+            if (child === name || child === select || child.get() instanceof cds.CDSAnnotation) {
+                continue;
+            }
+            this.keyword(child, ["DEFINE", "ROOT", "VIEW", "ENTITY", "AS", ";"]);
+        }
+        const source = select.findDirectExpression(cds.CDSSource);
+        if (source === undefined) {
+            return this.unsupported("missing source");
+        }
+        const from = [this.source(source)];
+        for (const join of select.findDirectExpressions(cds.CDSJoin)) {
+            from.push(this.join(join));
+        }
+        const elements = select.findDirectExpressions(cds.CDSElement);
+        if (elements.length === 0) {
+            return this.unsupported("expected explicit projected fields");
+        }
+        const columns = elements.map(e => this.element(e)).join(", ");
+        let where = "";
+        for (const child of select.getChildren()) {
+            if (child === source || child.get() instanceof cds.CDSJoin || child.get() instanceof cds.CDSElement) {
+                continue;
+            }
+            else if (child.get() instanceof cds.CDSWhere) {
+                where = " " + this.expression(child);
+            }
+            else {
+                this.keyword(child, ["SELECT", "DISTINCT", "FROM", "{", "}", ","]);
+            }
+        }
+        const distinct = select.findDirectTokenByText("DISTINCT") ? "DISTINCT " : "";
+        return `CREATE VIEW ${this.quote(this.viewName)} AS SELECT ${distinct}${columns} FROM ${from.join(" ")}${where};`;
+    }
+    source(node) {
+        const nameNode = node.findDirectExpression(cds.CDSPrefixedName);
+        if (nameNode === undefined) {
+            return this.unsupported("expected a table source");
+        }
+        const name = this.name(nameNode);
+        if (this.reg.getObject("TABL", name)?.getType() !== "TABL") {
+            return this.unsupported(`source ${name} does not resolve to a TABL`);
+        }
+        const as = node.findDirectExpression(cds.CDSAs);
+        const alias = as?.findDirectExpression(cds.CDSName) || node.findDirectExpression(cds.CDSName);
+        for (const child of node.getChildren()) {
+            if (child !== nameNode && child !== as && child !== alias) {
+                return this.unsupported("source parameters, filters or nested joins");
+            }
+        }
+        this.sources.push(alias ? this.name(alias) : name);
+        return this.quote(name) + (alias ? " AS " + this.quote(this.name(alias)) : "");
+    }
+    join(node) {
+        const sources = node.findDirectExpressions(cds.CDSSource);
+        const conditions = node.findDirectExpressions(cds.CDSCondition);
+        const words = node.getDirectTokens().map(t => t.getStr().toUpperCase()).join(" ");
+        const match = /^(?:(INNER|LEFT OUTER|RIGHT OUTER|CROSS) )?JOIN(?: ON)?$/.exec(words);
+        if (sources.length !== 1 || match === null) {
+            return this.unsupported("join shape: " + node.concatTokens());
+        }
+        const kind = match[1] || "INNER";
+        if (conditions.length !== (kind === "CROSS" ? 0 : 1)) {
+            return this.unsupported("join requires an ON condition (except CROSS JOIN)");
+        }
+        const source = this.source(sources[0]);
+        return kind + " JOIN " + source + (conditions.length ? " ON " + this.expression(conditions[0]) : "");
+    }
+    element(node) {
+        const field = node.findDirectExpression(cds.CDSPrefixedName);
+        const as = node.findDirectExpression(cds.CDSAs);
+        for (const child of node.getChildren()) {
+            if (child === field || child === as || child.get() instanceof cds.CDSAnnotation) {
+                continue;
+            }
+            this.keyword(child, ["KEY"]);
+        }
+        if (field === undefined) {
+            return this.unsupported("expected a projected source field");
+        }
+        const parts = this.fieldParts(field);
+        const alias = as?.findDirectExpression(cds.CDSName);
+        return this.field(field) + " AS " + this.quote(alias ? this.name(alias) : parts[parts.length - 1]);
+    }
+    expression(node) {
+        if (node instanceof abaplint.Nodes.TokenNode) {
+            return this.keyword(node, ["WHERE", "AND", "OR", "NOT", "IS", "NULL", "LIKE", "ESCAPE", "BETWEEN",
+                "=", "!", "<", ">", "(", ")"]);
+        }
+        else if (node.get() instanceof cds.CDSPrefixedName) {
+            if (node.getTokens().map(t => t.getStr()).join("").toLowerCase() === "$session.system_language") {
+                return "'E'";
+            }
+            return this.field(node);
+        }
+        else if (node.get() instanceof cds.CDSString || node.get() instanceof cds.CDSInteger) {
+            return node.getTokens().map(t => t.getStr()).join("");
+        }
+        else if (node.get() instanceof cds.CDSCondition || node.get() instanceof cds.CDSWhere) {
+            const parts = [];
+            for (const child of node.getChildren()) {
+                const part = this.expression(child);
+                if (["<", ">", "!"].includes(parts[parts.length - 1]) && ["=", ">"].includes(part)) {
+                    parts[parts.length - 1] += part;
+                }
+                else {
+                    parts.push(part);
+                }
+            }
+            return parts.join(" ");
+        }
+        return this.unsupported(node.concatTokens());
+    }
+    field(node) {
+        const parts = this.fieldParts(node);
+        if (parts.length === 1 && this.sources.length === 1) {
+            parts.unshift(this.sources[0]);
+        }
+        else if (parts.length === 2 && !this.sources.includes(parts[0])) {
+            return this.unsupported("unknown source qualifier " + parts[0]);
+        }
+        return parts.map(p => this.quote(p)).join(".");
+    }
+    fieldParts(node) {
+        const text = node.getTokens().map(t => t.getStr()).join("").toLowerCase();
+        const parts = text.split(".");
+        if (parts.length > 2 || parts.some(p => !/^(\/\w+\/)?\w+$/.test(p))) {
+            return this.unsupported("field path " + text);
+        }
+        return parts;
+    }
+    name(node) {
+        const name = node.getTokens().map(t => t.getStr()).join("").toLowerCase();
+        if (!/^(\/\w+\/)?\w+$/.test(name)) {
+            return this.unsupported("identifier " + name);
+        }
+        return name;
+    }
+    keyword(node, allowed) {
+        const text = node.concatTokens().toUpperCase();
+        if (!(node instanceof abaplint.Nodes.TokenNode) || !allowed.includes(text)) {
+            return this.unsupported(node.concatTokens());
+        }
+        return text;
+    }
+    quote(name) {
+        return '"' + name.toLowerCase().replace(/"/g, '""') + '"';
+    }
+    unsupported(detail) {
+        throw new Error(`CDS view ${this.viewName}: unsupported database definition: ${detail}`);
+    }
+}
+exports.CDSDatabaseView = CDSDatabaseView;
+//# sourceMappingURL=cds_database_view.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/db/index.js"
 /*!*****************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/db/index.js ***!
@@ -104549,6 +105039,7 @@ const sqlite_database_schema_1 = __webpack_require__(/*! ./schema_generation/sql
 const pg_database_schema_1 = __webpack_require__(/*! ./schema_generation/pg_database_schema */ "./node_modules/@abaplint/transpiler/build/src/db/schema_generation/pg_database_schema.js");
 const snowflake_database_schema_1 = __webpack_require__(/*! ./schema_generation/snowflake_database_schema */ "./node_modules/@abaplint/transpiler/build/src/db/schema_generation/snowflake_database_schema.js");
 const populate_tables_1 = __webpack_require__(/*! ./populate_tables */ "./node_modules/@abaplint/transpiler/build/src/db/populate_tables.js");
+const cds_database_view_1 = __webpack_require__(/*! ./cds_database_view */ "./node_modules/@abaplint/transpiler/build/src/db/cds_database_view.js");
 /////////////////////////
 // NOTES
 /////////////////////////
@@ -104560,9 +105051,11 @@ class DatabaseSetup {
         this.reg = reg;
     }
     run(options) {
+        // CDS views are dialect independent SQL, added after the tables and views they select from
+        const cdsViews = this.buildCDSViews();
         return {
             schemas: {
-                sqlite: this.driver(new sqlite_database_schema_1.SQLiteDatabaseSchema(this.reg)),
+                sqlite: [...this.driver(new sqlite_database_schema_1.SQLiteDatabaseSchema(this.reg)), ...cdsViews],
                 // HANA takes the PG schema unchanged -- measured against HANA Express
                 // on a tree of 77 tables. The one thing it needs is that identifiers
                 // reach it quoted in UPPER case, and that is not a dialect of DDL: the
@@ -104571,13 +105064,25 @@ class DatabaseSetup {
                 // here. (Unquoted would nearly work and then meet a column called
                 // `cross`, which is one of HANA's reserved words.)
                 hdb: this.driver(new pg_database_schema_1.PGDatabaseSchema(this.reg)),
-                pg: this.driver(new pg_database_schema_1.PGDatabaseSchema(this.reg)),
-                snowflake: this.driver(new snowflake_database_schema_1.SnowflakeDatabaseSchema(this.reg)),
+                pg: [...this.driver(new pg_database_schema_1.PGDatabaseSchema(this.reg)), ...cdsViews],
+                snowflake: [...this.driver(new snowflake_database_schema_1.SnowflakeDatabaseSchema(this.reg)), ...cdsViews],
             },
             insert: this.buildInsert(options),
         };
     }
     ////////////////////
+    buildCDSViews() {
+        const views = [];
+        for (const obj of this.reg.getObjects()) {
+            if (obj instanceof abaplint.Objects.DataDefinition) {
+                const view = new cds_database_view_1.CDSDatabaseView(this.reg).build(obj);
+                if (view !== undefined) {
+                    views.push(view);
+                }
+            }
+        }
+        return views;
+    }
     driver(schemaGenerator) {
         const statements = [];
         // CREATE TABLEs
@@ -105728,12 +106233,12 @@ class CompareTranspiler {
                 const field = concat.replace(" IS NOT REQUESTED", "").toLowerCase();
                 return new chunk_1.Chunk().appendString(pre + "INPUT && INPUT." + field + " === undefined && INPUT.importing?." + field + " === undefined");
             }
-            if (concat.includes(" IS INSTANCE OF ")) {
-                const notted = concat.startsWith("NOT ") || concat.includes(" IS NOT INSTANCE OF ");
+            if (concat.includes(" IS INSTANCE OF ") || concat.includes(" IS NOT INSTANCE OF ")) {
+                const notted = concat.startsWith("NOT ") !== concat.includes(" IS NOT INSTANCE OF ");
                 const falsed = notted ? " === false" : "";
                 const expr = node.findDirectExpression(core_1.Expressions.ClassName);
                 const cname = expr?.concatTokens();
-                const lookup = traversal.lookupClassOrInterface(cname, expr?.getFirstToken());
+                const lookup = cname?.toUpperCase() === "OBJECT" ? '"OBJECT"' : traversal.lookupClassOrInterface(cname, expr?.getFirstToken());
                 return new chunk_1.Chunk().appendString("abap.compare.instance_of(").appendChunk(s0).appendString(`, ${lookup})` + falsed);
             }
         }
@@ -111383,10 +111888,12 @@ const traversal_1 = __webpack_require__(/*! ../traversal */ "./node_modules/@aba
 const requires_1 = __webpack_require__(/*! ../requires */ "./node_modules/@abaplint/transpiler/build/src/requires.js");
 const rearranger_1 = __webpack_require__(/*! ../rearranger */ "./node_modules/@abaplint/transpiler/build/src/rearranger.js");
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
-const initialization_1 = __webpack_require__(/*! ../initialization */ "./node_modules/@abaplint/transpiler/build/src/initialization.js");
+const output_layout_1 = __webpack_require__(/*! ../output_layout */ "./node_modules/@abaplint/transpiler/build/src/output_layout.js");
 class HandleABAP {
+    layout;
     options;
-    constructor(options) {
+    constructor(options, layout = new output_layout_1.OutputLayout()) {
+        this.layout = layout;
         this.options = options;
     }
     runObject(obj, reg) {
@@ -111487,11 +111994,12 @@ class HandleABAP {
             if (filename === output.filename) {
                 continue;
             }
+            const specifier = (0, output_layout_1.importPath)(this.layout.file(output.object, output.filename), this.layout.sourceModule(r.filename));
             if (name) {
-                contents.appendString("const {" + traversal_1.Traversal.escapeNamespace(name) + "} = await import(\"./" + (0, initialization_1.escapeFilenameForImport)(filename) + "\");\n");
+                contents.appendString("const {" + traversal_1.Traversal.escapeNamespace(name) + "} = await import(\"" + specifier + "\");\n");
             }
             else {
-                contents.appendString("await import(\"./" + (0, initialization_1.escapeFilenameForImport)(filename) + "\");\n");
+                contents.appendString("await import(\"" + specifier + "\");\n");
             }
         }
         contents.appendChunk(output.chunk);
@@ -111819,7 +112327,13 @@ exports.HandleOA2P = HandleOA2P;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.HandleSMIM = void 0;
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+const output_layout_1 = __webpack_require__(/*! ../output_layout */ "./node_modules/@abaplint/transpiler/build/src/output_layout.js");
 class HandleSMIM {
+    layout;
+    constructor(layout = new output_layout_1.OutputLayout()) {
+        this.layout = layout;
+        // Asset paths are relative to the output root.
+    }
     runObject(obj, _reg) {
         const filename = obj.getXMLFile()?.getFilename().replace(".xml", ".mjs").toLowerCase();
         if (filename === undefined) {
@@ -111827,9 +112341,10 @@ class HandleSMIM {
         }
         obj.parse();
         const dataFile = obj.getDataFile();
+        const dataFilename = dataFile ? this.layout.file({ name: obj.getName(), type: obj.getType() }, dataFile.getFilename()) : undefined;
         const chunk = new chunk_1.Chunk().appendString(`abap.SMIM["${obj.getName().toUpperCase()}"] = {
   "objectType": "SMIM",
-  "filename": ${JSON.stringify(dataFile?.getFilename())},
+  "filename": ${JSON.stringify(dataFilename)},
   "url": ${JSON.stringify(obj.getURL())},
   "class": ${JSON.stringify(obj.getClass())},
 };`);
@@ -112102,8 +112617,14 @@ exports.HandleView = HandleView;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.HandleW3MI = void 0;
 const chunk_1 = __webpack_require__(/*! ../chunk */ "./node_modules/@abaplint/transpiler/build/src/chunk.js");
+const output_layout_1 = __webpack_require__(/*! ../output_layout */ "./node_modules/@abaplint/transpiler/build/src/output_layout.js");
 const w3mi_name_1 = __webpack_require__(/*! ../w3mi_name */ "./node_modules/@abaplint/transpiler/build/src/w3mi_name.js");
 class HandleW3MI {
+    layout;
+    constructor(layout = new output_layout_1.OutputLayout()) {
+        this.layout = layout;
+        // Asset paths are relative to the output root.
+    }
     runObject(obj, _reg) {
         const filename = obj.getXMLFile()?.getFilename().replace(".xml", ".mjs").toLowerCase();
         if (filename === undefined) {
@@ -112111,9 +112632,10 @@ class HandleW3MI {
         }
         obj.parse();
         const dataFile = obj.getDataFile();
+        const dataFilename = dataFile ? this.layout.file({ name: obj.getName(), type: obj.getType() }, dataFile.getFilename()) : undefined;
         const chunk = new chunk_1.Chunk().appendString(`abap.W3MI["${(0, w3mi_name_1.w3miObjectName)(obj)}"] = {
   "objectType": "W3MI",
-  "filename": ${JSON.stringify(dataFile?.getFilename())},
+  "filename": ${JSON.stringify(dataFilename)},
 };`);
         const output = {
             object: {
@@ -112189,7 +112711,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Transpiler = exports.Chunk = exports.UnknownTypesEnum = exports.config = void 0;
+exports.Transpiler = exports.Chunk = exports.UnknownTypesEnum = exports.config = exports.importPath = exports.OutputLayout = void 0;
 const abaplint = __importStar(__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; } }));
@@ -112213,12 +112735,14 @@ const handle_msag_1 = __webpack_require__(/*! ./handlers/handle_msag */ "./node_
 const handle_oa2p_1 = __webpack_require__(/*! ./handlers/handle_oa2p */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_oa2p.js");
 const handle_fugr_1 = __webpack_require__(/*! ./handlers/handle_fugr */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_fugr.js");
 const initialization_1 = __webpack_require__(/*! ./initialization */ "./node_modules/@abaplint/transpiler/build/src/initialization.js");
+const output_layout_1 = __webpack_require__(/*! ./output_layout */ "./node_modules/@abaplint/transpiler/build/src/output_layout.js");
+var output_layout_2 = __webpack_require__(/*! ./output_layout */ "./node_modules/@abaplint/transpiler/build/src/output_layout.js");
+Object.defineProperty(exports, "OutputLayout", ({ enumerable: true, get: function () { return output_layout_2.OutputLayout; } }));
+Object.defineProperty(exports, "importPath", ({ enumerable: true, get: function () { return output_layout_2.importPath; } }));
 class Transpiler {
     options;
-    plugin;
-    constructor(options, plugin) {
+    constructor(options) {
         this.options = options;
-        this.plugin = plugin;
         if (this.options === undefined) {
             this.options = {};
         }
@@ -112232,23 +112756,22 @@ class Transpiler {
         const reg = new abaplint.Registry().addFiles(memory);
         return this.run(reg);
     }
-    async run(reg, progress) {
+    async run(reg, progress, folders) {
         // Validation installs the transpiler configuration and findIssues() parses
         // dirty registries. Parsing before that would be wasted because setConfig()
         // marks every registry object dirty again.
         this.validate(reg);
+        const layout = new output_layout_1.OutputLayout(reg, folders);
         const dbSetup = new db_1.DatabaseSetup(reg).run(this.options);
-        this.plugin?.amendDatabaseSetup?.(dbSetup, reg, this.options || {});
         const output = {
             objects: [],
-            unitTestScript: new unit_test_1.UnitTest().unitTestScript(reg, this.options?.skip),
-            unitTestScriptOpen: new unit_test_1.UnitTest().unitTestScriptOpen(reg, this.options?.skip),
+            unitTestScript: new unit_test_1.UnitTest(layout).unitTestScript(reg, this.options?.skip),
+            unitTestScriptOpen: new unit_test_1.UnitTest(layout).unitTestScriptOpen(reg, this.options?.skip),
             initializationScript: "",
             initializationScript2: "",
             databaseSetup: dbSetup,
             reg: reg,
         };
-        const pluginOutputs = [];
         progress?.set(reg.getObjectCount().total, "Building");
         for (const obj of reg.getObjects()) {
             await progress?.tick("Building, " + obj.getName());
@@ -112265,7 +112788,7 @@ class Transpiler {
                 output.objects.push(...new handle_fugr_1.HandleFUGR(this.options).runObject(obj, reg));
             }
             else if (obj instanceof abaplint.ABAPObject) {
-                output.objects.push(...new handle_abap_1.HandleABAP(this.options).runObject(obj, reg));
+                output.objects.push(...new handle_abap_1.HandleABAP(this.options, layout).runObject(obj, reg));
             }
             else if (obj instanceof abaplint.Objects.Oauth2Profile) {
                 output.objects.push(...new handle_oa2p_1.HandleOA2P().runObject(obj, reg));
@@ -112286,30 +112809,25 @@ class Transpiler {
                 output.objects.push(...new handle_table_type_1.HandleTableType().runObject(obj, reg));
             }
             else if (obj instanceof abaplint.Objects.MIMEObject) {
-                output.objects.push(...new handle_smim_1.HandleSMIM().runObject(obj, reg));
+                output.objects.push(...new handle_smim_1.HandleSMIM(layout).runObject(obj, reg));
             }
             else if (obj instanceof abaplint.Objects.WebMIME) {
-                output.objects.push(...new handle_w3mi_1.HandleW3MI().runObject(obj, reg));
+                output.objects.push(...new handle_w3mi_1.HandleW3MI(layout).runObject(obj, reg));
             }
             else if (obj instanceof abaplint.Objects.MessageClass) {
                 output.objects.push(...new handle_msag_1.HandleMSAG().runObject(obj, reg));
             }
-            else if (this.plugin !== undefined) {
-                const handled = this.plugin.handleObject(obj, reg, this.options || {});
-                if (handled !== undefined) {
-                    output.objects.push(...handled);
-                    pluginOutputs.push(...handled);
-                }
-            }
         }
-        // after the object loop, plugin output files are imported by the initialization scripts
-        output.initializationScript = new initialization_1.Initialization().script(reg, dbSetup, this.options, false, pluginOutputs);
-        output.initializationScript2 = new initialization_1.Initialization().script(reg, dbSetup, this.options, true, pluginOutputs);
+        output.initializationScript = new initialization_1.Initialization(layout).script(reg, dbSetup, this.options, false);
+        output.initializationScript2 = new initialization_1.Initialization(layout).script(reg, dbSetup, this.options, true);
+        for (const file of output.objects) {
+            file.filename = layout.file(file.object, file.filename);
+        }
         return output;
     }
     // ///////////////////////////////
     validate(reg) {
-        const issues = new validation_1.Validation(this.options, this.plugin).run(reg);
+        const issues = new validation_1.Validation(this.options).run(reg);
         if (issues.length > 0) {
             const messages = issues.map(i => i.getKey() + ", " +
                 i.getMessage() + ", " +
@@ -112371,6 +112889,7 @@ exports.escapeNamespaceFilename = escapeNamespaceFilename;
 exports.escapeFilenameForImport = escapeFilenameForImport;
 const abaplint = __importStar(__webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js"));
 const handle_fugr_1 = __webpack_require__(/*! ./handlers/handle_fugr */ "./node_modules/@abaplint/transpiler/build/src/handlers/handle_fugr.js");
+const output_layout_1 = __webpack_require__(/*! ./output_layout */ "./node_modules/@abaplint/transpiler/build/src/output_layout.js");
 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.
@@ -112388,7 +112907,12 @@ function escapeFilenameForImport(filename) {
     return filename.replace(/%/g, "%25").replace(/#/g, "%23");
 }
 class Initialization {
-    script(reg, dbSetup, options, useImport, pluginOutputs) {
+    layout;
+    constructor(layout = new output_layout_1.OutputLayout()) {
+        this.layout = layout;
+        // Flat output unless the caller supplies ownership information.
+    }
+    script(reg, dbSetup, options, useImport) {
         let ret = "";
         if (useImport === true) {
             ret = `/* eslint-disable import/newline-after-import */
@@ -112431,28 +112955,24 @@ globalThis.abap = new runtime.ABAP();\n`;
         }
         ret += `}\n\n`;
         ret += `await initializeABAP();\n\n`;
-        ret += `${this.buildImports(reg, useImport, options, pluginOutputs)}`;
+        ret += `${this.buildImports(reg, useImport, options)}`;
         if (options?.setup?.postFunction !== undefined) {
             ret += `\n\nawait setup.${options?.setup?.postFunction}();\n`;
         }
         return ret;
     }
-    buildImports(reg, useImport, options, pluginOutputs) {
+    buildImports(reg, useImport, options) {
         // note: ES modules are hoised, so use the dynamic import(), due to setting of globalThis.abap
         // some sorting required: eg. a class constructor using constant from interface
         const list = [];
         const late = [];
         const imp = (filename) => {
-            if (useImport === true) {
-                return `import "./${filename}.mjs";`;
-            }
-            else {
-                return `await import("./${filename}.mjs");`;
-            }
+            const specifier = (0, output_layout_1.importPath)("init.mjs", filename);
+            return {
+                filename: specifier.split("/").pop(),
+                code: useImport === true ? `import "${specifier}";` : `await import("${specifier}");`,
+            };
         };
-        for (const pluginOutput of pluginOutputs || []) {
-            list.push(imp(pluginOutput.filename.replace(/\.mjs$/i, "")));
-        }
         for (const obj of reg.getObjects()) {
             if (obj instanceof abaplint.Objects.Table
                 || obj instanceof abaplint.Objects.DataElement
@@ -112464,11 +112984,11 @@ globalThis.abap = new runtime.ABAP();\n`;
                 || obj instanceof abaplint.Objects.TypePool
                 || obj instanceof abaplint.Objects.TableType
                 || obj instanceof abaplint.Objects.View) {
-                list.push(imp(`${escapeNamespaceFilename(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`));
+                list.push(imp(this.layout.objectModule(obj)));
             }
         }
         for (const obj of reg.getObjects()) {
-            const name = imp(`${escapeNamespaceFilename(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}`);
+            const name = imp(this.layout.objectModule(obj));
             if (obj instanceof abaplint.Objects.Class
                 && obj.getName().toUpperCase() !== "CL_ABAP_CHAR_UTILITIES"
                 && this.hasClassConstructor(reg, obj)) {
@@ -112488,7 +113008,9 @@ globalThis.abap = new runtime.ABAP();\n`;
                 list.push(name);
             }
         }
-        return [...list.sort(), ...late].join("\n");
+        // Folder names must not change the original module initialization order.
+        list.sort((a, b) => a.filename < b.filename ? -1 : a.filename > b.filename ? 1 : 0);
+        return [...list, ...late].map(entry => entry.code).join("\n");
     }
     // class constructors might make early use of eg. constants from interfaces
     // sub classes will import() super classes and trigger a class constructor of the super
@@ -112640,6 +113162,89 @@ exports.DEFAULT_KEYWORDS = new Set([
 
 /***/ },
 
+/***/ "./node_modules/@abaplint/transpiler/build/src/output_layout.js"
+/*!**********************************************************************!*\
+  !*** ./node_modules/@abaplint/transpiler/build/src/output_layout.js ***!
+  \**********************************************************************/
+(__unused_webpack_module, exports) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.OutputLayout = void 0;
+exports.importPath = importPath;
+/** Browser-safe paths: generated modules use POSIX paths on every platform. */
+class OutputLayout {
+    grouped;
+    objectFolders = new Map();
+    sourceFolders = new Map();
+    constructor(reg, folders) {
+        this.grouped = folders !== undefined;
+        if (folders === undefined) {
+            return;
+        }
+        for (const [filename, folder] of folders) {
+            this.sourceFolders.set(filename.toLowerCase(), folder);
+        }
+        for (const obj of reg?.getObjects() || []) {
+            const owners = new Set(obj.getFiles().map(f => this.sourceFolders.get(f.getFilename().toLowerCase()))
+                .filter((folder) => folder !== undefined));
+            if (owners.size !== 1) {
+                throw new Error("Ambiguous output ownership for " + obj.getType() + " " + obj.getName());
+            }
+            const folder = [...owners][0];
+            this.objectFolders.set(this.key({ type: obj.getType(), name: obj.getName() }), folder);
+            for (const file of obj.getFiles()) {
+                // Class locals are merged into a single module.
+                this.sourceFolders.set(file.getFilename().toLowerCase().replace(/\.locals_(def|imp)\.abap$/, ".locals.abap"), folder);
+            }
+        }
+    }
+    key(obj) {
+        return obj.type.toUpperCase() + ":" + obj.name.toUpperCase();
+    }
+    file(obj, filename) {
+        const folder = this.objectFolders.get(this.key(obj));
+        if (this.grouped && folder === undefined) {
+            throw new Error("Missing output ownership for " + obj.type + " " + obj.name);
+        }
+        if (folder !== undefined && (filename.startsWith("/") || /[\\:]/.test(filename)
+            || filename.split("/").some(segment => segment === "" || segment === "." || segment === ".."))) {
+            throw new Error("Invalid output filename: " + filename);
+        }
+        return folder === undefined ? filename : folder + "/" + filename;
+    }
+    sourceModule(filename) {
+        const folder = this.sourceFolders.get(filename.toLowerCase());
+        if (this.grouped && folder === undefined) {
+            throw new Error("Missing output ownership for source " + filename);
+        }
+        const module = filename.replace(/\.abap$/i, ".mjs").toLowerCase();
+        return folder === undefined ? module : folder + "/" + module;
+    }
+    objectModule(obj, suffix = "") {
+        const identifier = { name: obj.getName(), type: obj.getType() };
+        const filename = obj.getName().toLowerCase().replace(/\//g, "#") + "." + obj.getType().toLowerCase() + suffix + ".mjs";
+        return this.file(identifier, filename);
+    }
+}
+exports.OutputLayout = OutputLayout;
+/** Escape each segment without turning directory separators into namespace markers. */
+function importPath(from, to) {
+    const source = from.split("/").slice(0, -1);
+    const target = to.split("/");
+    while (source.length > 0 && target.length > 0 && source[0] === target[0]) {
+        source.shift();
+        target.shift();
+    }
+    const relative = [...source.map(() => ".."), ...target].join("/");
+    const escaped = relative.split("/").map(segment => encodeURIComponent(segment)).join("/");
+    return escaped.startsWith("../") ? escaped : "./" + escaped;
+}
+//# sourceMappingURL=output_layout.js.map
+
+/***/ },
+
 /***/ "./node_modules/@abaplint/transpiler/build/src/rearranger.js"
 /*!*******************************************************************!*\
   !*** ./node_modules/@abaplint/transpiler/build/src/rearranger.js ***!
@@ -113502,6 +114107,22 @@ throw error;
 }
 })())`;
     }
+    /** ASSIGN of a statically specified data object, e.g. a variable, an attribute or an offset/length,
+     *  does not set sy-subrc, a dereference, a table expression or COMPONENT does */
+    isStaticDataObject(node, source) {
+        const concat = node.concatTokens().toUpperCase();
+        if (source === undefined
+            || concat.startsWith("ASSIGN COMPONENT ")
+            || concat.includes(" INCREMENT ")
+            || concat.includes(" ELSE UNASSIGN")
+            || source.findFirstExpression(abaplint.Expressions.Dereference) !== undefined
+            || source.findFirstExpression(abaplint.Expressions.TableExpression) !== undefined) {
+            return false;
+        }
+        // field symbols are left as they are, not measured
+        const first = source.findFirstExpression(abaplint.Expressions.FieldChain)?.getFirstChild();
+        return first !== undefined && !(first.get() instanceof abaplint.Expressions.SourceFieldSymbol);
+    }
     transpile(node, traversal) {
         const assignSource = node.findDirectExpression(abaplint.Expressions.AssignSource);
         const sourceExpressions = assignSource?.findDirectExpressionsMulti([abaplint.Expressions.Source, abaplint.Expressions.SimpleSource3]) || [];
@@ -113541,6 +114162,9 @@ throw error;
             }
             else {
                 options.push("source: " + sources.pop());
+                if (this.isStaticDataObject(node, sourceExprForCheck)) {
+                    options.push("keepSubrc: true");
+                }
             }
         }
         else {
@@ -114572,7 +115196,7 @@ static INTERNAL_TYPE = 'CLAS';
 static INTERNAL_NAME = '${traversal.buildInternalName(token.getStr(), def)}';
 static IMPLEMENTED_INTERFACES = [${this.findImplementedByClass(traversal, def, scope).map(e => `"` + e.toUpperCase() + `"`).join(",")}];
 static ATTRIBUTES = {${Array.from(traversal.buildAttributes(def, scope)).join(",\n")}};
-static METHODS = {${traversal.buildMethods(def).join(",\n")}};`, node, traversal);
+static METHODS = {${traversal.buildMethods(def, scope).join(",\n")}};`, node, traversal);
     }
     findImplementedInterface(traversal, def, scope) {
         if (def === undefined || scope === undefined) {
@@ -118964,6 +119588,16 @@ class MethodImplementationTranspiler {
                     else {
                         after += `let ${varPrefixed} = ${unique}?.${varName};\n`;
                     }
+                    if (passByValue === true) {
+                        // pass by value: the method works on its own copy, also for a generic type,
+                        // which keeps the type of the actual parameter.
+                        // A field symbol that is unassigned or assigned with CASTING is passed on as it is
+                        after += `if (${varPrefixed} instanceof abap.types.FieldSymbol) {
+  if (${varPrefixed}.getPointer()?.clone !== undefined) { ${varPrefixed} = ${varPrefixed}.getPointer().clone(); }
+} else if (${unique}?.${varName} !== undefined && ${varPrefixed}?.clone !== undefined) {
+  ${varPrefixed} = ${varPrefixed}.clone();
+}\n`;
+                    }
                     if (type instanceof abaplint.BasicTypes.NumericGenericType) {
                         after += `if (${varPrefixed}.constructor.name === "Character") {
   ${varPrefixed} = ${transpile_types_1.TranspileTypes.toType(identifier.getType())};
@@ -121516,10 +122150,10 @@ abap.builtin.sy.get().dbcnt.set(${target}.getArrayLength());
             + ` : (("" + ${code}.get()).trim() === "" ? "" : "${keyword} " + ${code}.get()))`;
     }
     dynamicHavingClause(code) {
-        return `((value) => {
-const condition = value instanceof abap.types.Table || value instanceof abap.types.HashedTable
-  ? value.array().map(row => row.get()).join(" ") : value.get();
-return condition.trim() === "" ? "" : "HAVING " + abap.expandDynamic(condition, (name) => {try { return eval(name);} catch {}});
+        return `((value) => {
+const condition = value instanceof abap.types.Table || value instanceof abap.types.HashedTable
+  ? value.array().map(row => row.get()).join(" ") : value.get();
+return condition.trim() === "" ? "" : "HAVING " + abap.expandDynamic(condition, (name) => {try { return eval(name);} catch {}});
 })(${code})`;
     }
     isWhereExpression(node, expression) {
@@ -124762,8 +125396,11 @@ class InterfaceTranspiler {
                 ret += `static INTERNAL_TYPE = 'INTF';\n`;
                 ret += `static INTERNAL_NAME = '${traversal.buildInternalName(token.getStr(), def)}';\n`;
                 ret += `static ATTRIBUTES = {${Array.from(traversal.buildAttributes(def, scope)).join(",\n")}};\n`;
-                ret += `static METHODS = {${traversal.buildMethods(def).join(",\n")}};\n`;
-                // todo, add IMPLEMENTED_INTERFACES ?
+                ret += `static METHODS = {${traversal.buildMethods(def, scope).join(",\n")}};\n`;
+                const interfaces = def?.getImplementing().map(i => `"${i.name.toUpperCase()}"`) || [];
+                if (interfaces.length > 0) {
+                    ret += `static IMPLEMENTED_INTERFACES = [${interfaces.join(",")}];\n`;
+                }
             }
             else if (c instanceof abaplint.Nodes.StatementNode && c.get() instanceof abaplint.Statements.EndInterface) {
                 ret += "}\n";
@@ -125558,8 +126195,22 @@ class TranspileTypes {
         if (type instanceof abaplint.BasicTypes.ObjectReferenceType
             || type instanceof abaplint.BasicTypes.GenericObjectReferenceType) {
             resolved = "ABAPObject";
-            extra = "{qualifiedName: " + JSON.stringify(type.getQualifiedName()?.toUpperCase()) +
-                ", RTTIName: " + JSON.stringify(type.getRTTIName()?.toUpperCase()) + "}";
+            const qualifiedName = type.getQualifiedName()
+                ?? (type instanceof abaplint.BasicTypes.ObjectReferenceType ? type.getIdentifierName() : undefined);
+            let RTTIName = type.getRTTIName();
+            if (type instanceof abaplint.BasicTypes.ObjectReferenceType && RTTIName === undefined) {
+                const id = type.getIdentifier();
+                // NEW and CAST can omit metadata; recover it from the referenced definition.
+                const [name, kind] = id.getFilename().split("/").pop().replace(/#/g, "/").split(".");
+                const local = (id instanceof abaplint.Types.ClassDefinition || id instanceof abaplint.Types.InterfaceDefinition)
+                    && id.isGlobal() === false;
+                const prefix = local && kind === "prog" ? "\\PROGRAM=" + name
+                    : local && kind === "clas" ? "\\CLASS-POOL=" + name : "";
+                const category = id instanceof abaplint.Types.InterfaceDefinition || kind === "intf" ? "INTERFACE" : "CLASS";
+                RTTIName = prefix + "\\" + category + "=" + id.getName();
+            }
+            extra = "{qualifiedName: " + JSON.stringify(qualifiedName?.toUpperCase()) +
+                ", RTTIName: " + JSON.stringify(RTTIName?.toUpperCase()) + "}";
         }
         else if (type instanceof abaplint.BasicTypes.TableType) {
             resolved = "Table";
@@ -125687,6 +126338,11 @@ class TranspileTypes {
             resolved = "Packed";
             extra = "{length: 8, decimals: 2}";
         }
+        else if (type instanceof abaplint.BasicTypes.PGenericType) {
+            // if not supplied its a P LENGTH 8 DECIMALS 0
+            resolved = "Packed";
+            extra = "{length: 8, decimals: 0}";
+        }
         else if (type instanceof abaplint.BasicTypes.XStringType) {
             resolved = "XString";
             if (type.getQualifiedName() !== undefined) {
@@ -126112,7 +126768,7 @@ class Traversal {
         }
         return undefined;
     }
-    buildMethods(def) {
+    buildMethods(def, scope) {
         const methods = [];
         if (def === undefined) {
             return methods;
@@ -126123,29 +126779,57 @@ class Traversal {
             throw new Error("buildMethods: unexpected undefined, " + def.getName());
         }
         for (const m of methodDefinitions.getAll()) {
-            const parameters = [];
-            for (const p of m.getParameters().getAll()) {
-                const type = transpile_types_1.TranspileTypes.toType(p.getType());
-                const optional = m.getParameters().getOptional().includes(p.getName()) ? "X" : " ";
-                let pKind = "";
-                if (pKind === "") {
-                    pKind = m.getParameters().getImporting().find((t) => { return t.getName() === p.getName(); }) ? "I" : "";
-                }
-                if (pKind === "") {
-                    pKind = m.getParameters().getChanging().find((t) => { return t.getName() === p.getName(); }) ? "C" : "";
-                }
-                if (pKind === "") {
-                    pKind = m.getParameters().getExporting().find((t) => { return t.getName() === p.getName(); }) ? "E" : "";
-                }
-                if (pKind === "") {
-                    pKind = m.getParameters().getReturning()?.getName() === p.getName() ? "R" : "";
-                }
-                parameters.push(`"${p.getName().toUpperCase()}": {"type": () => {return ${type};}, "is_optional": "${optional}", "parm_kind": "${pKind}", "type_name": "${p.getType().constructor.name}"}`);
+            methods.push(this.buildMethod(m.getName(), m, m.getVisibility()));
+        }
+        // an alias for an interface method is listed under its own name, pointing to the method
+        for (const a of def.getAliases() || []) {
+            const [intfName, methodName] = a.getComponent().split("~");
+            if (methodName === undefined) {
+                continue;
+            }
+            const aliased = this.findInterfaceDefinition(intfName, scope)?.getMethodDefinitions()?.getByName(methodName);
+            if (aliased === undefined) {
+                // not a method, or the interface is unknown
+                continue;
             }
-            methods.push(`"${m.getName().toUpperCase()}": {"visibility": "${this.mapVisibility(m.getVisibility())}", "parameters": {${parameters.join(", ")}}}`);
+            methods.push(this.buildMethod(a.getName(), aliased, a.getVisibility(), a.getComponent()));
         }
         return methods;
     }
+    buildMethod(name, m, visibility, aliasFor) {
+        const optionalNames = m.getParameters().getOptional().map(o => o.toUpperCase());
+        const parameters = [];
+        for (const p of m.getParameters().getAll()) {
+            const type = transpile_types_1.TranspileTypes.toType(p.getType());
+            const optional = optionalNames.includes(p.getName().toUpperCase()) ? "X" : " ";
+            let pKind = "";
+            if (pKind === "") {
+                pKind = m.getParameters().getImporting().find((t) => { return t.getName() === p.getName(); }) ? "I" : "";
+            }
+            if (pKind === "") {
+                pKind = m.getParameters().getChanging().find((t) => { return t.getName() === p.getName(); }) ? "C" : "";
+            }
+            if (pKind === "") {
+                pKind = m.getParameters().getExporting().find((t) => { return t.getName() === p.getName(); }) ? "E" : "";
+            }
+            if (pKind === "") {
+                pKind = m.getParameters().getReturning()?.getName() === p.getName() ? "R" : "";
+            }
+            parameters.push(`"${p.getName().toUpperCase()}": {"type": () => {return ${type};}, "is_optional": "${optional}", "parm_kind": "${pKind}", "type_name": "${p.getType().constructor.name}"}`);
+        }
+        // only written when set, a method without them is described as before
+        let extra = "";
+        if (m.isStatic() === true) {
+            extra += `"is_class": "X", `;
+        }
+        if (m.getRaising().length > 0) {
+            extra += `"exceptions": [${m.getRaising().map(e => `"${e.toUpperCase()}"`).join(", ")}], `;
+        }
+        if (aliasFor !== undefined) {
+            extra += `"alias_for": "${aliasFor.toUpperCase()}", `;
+        }
+        return `"${name.toUpperCase()}": {"visibility": "${this.mapVisibility(visibility)}", ${extra}"parameters": {${parameters.join(", ")}}}`;
+    }
     mapVisibility(vis) {
         switch (vis) {
             case abaplint.Visibility.Private:
@@ -127039,8 +127723,13 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.UnitTest = void 0;
 /* eslint-disable max-len */
 const abaplint = __importStar(__webpack_require__(/*! @abaplint/core */ "./node_modules/@abaplint/core/build/src/index.js"));
-const initialization_1 = __webpack_require__(/*! ./initialization */ "./node_modules/@abaplint/transpiler/build/src/initialization.js");
+const output_layout_1 = __webpack_require__(/*! ./output_layout */ "./node_modules/@abaplint/transpiler/build/src/output_layout.js");
 class UnitTest {
+    layout;
+    constructor(layout = new output_layout_1.OutputLayout()) {
+        this.layout = layout;
+        // Test runners live at the output root.
+    }
     unitTestScriptOpen(reg, _skip) {
         let ret = `/* eslint-disable curly */
 import fs from "fs";
@@ -127061,7 +127750,7 @@ async function run() {
             }
             const hasTestFile = obj.getFiles().some(f => { return f.getFilename().includes(".testclasses."); });
             if (hasTestFile === true) {
-                ret += `  await import("./${(0, initialization_1.escapeNamespaceFilename)(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}.testclasses.mjs");\n`;
+                ret += `  await import("${(0, output_layout_1.importPath)("index.mjs", this.layout.objectModule(obj, ".testclasses"))}");\n`;
             }
             for (const file of obj.getABAPFiles()) {
                 for (const def of file.getInfo().listClassDefinitions()) {
@@ -127123,7 +127812,7 @@ run().then(() => {
                     }
                     tests.push({
                         obj,
-                        filename: `./${(0, initialization_1.escapeNamespaceFilename)(obj.getName().toLowerCase())}.${obj.getType().toLowerCase()}.testclasses.mjs`,
+                        filename: `${(0, output_layout_1.importPath)("index.mjs", this.layout.objectModule(obj, ".testclasses"))}`,
                         localClass: def.name.toLowerCase(),
                         riskLevel: def.riskLevel,
                         duration: def.duration,
@@ -127268,8 +127957,12 @@ const core_1 = __webpack_require__(/*! @abaplint/core */ "./node_modules/@abapli
 const types_1 = __webpack_require__(/*! ./types */ "./node_modules/@abaplint/transpiler/build/src/types.js");
 const defaultAllowedObjectTypes = [
     "APIS",
+    "APLO",
     "AUTH",
+    "BDEF",
     "CLAS",
+    "DDLS",
+    "DDLX",
     "DEVC",
     "DOMA",
     "DTEL",
@@ -127291,13 +127984,19 @@ const defaultAllowedObjectTypes = [
     "PARA",
     "PINF",
     "PROG",
+    "SAJC",
+    "SAJT",
+    "SCO2",
     "WAPA",
     "SHLP",
     "SHMA",
+    "SIA6",
     "SICF",
     "SMIM",
     "SPLO",
     "SRFC",
+    "SRVB",
+    "SRVD",
     "SUSC",
     "SUSH",
     "SUSO",
@@ -127373,10 +128072,8 @@ exports.config = {
 // hmm this ^ is okay? since lines will be prefixed with "abap.builtin"?
 class Validation {
     options;
-    plugin;
-    constructor(options, plugin) {
+    constructor(options) {
         this.options = options;
-        this.plugin = plugin;
     }
     run(reg) {
         if (this.options?.ignoreSyntaxCheck === true) {
@@ -127386,13 +128083,6 @@ class Validation {
             exports.config.rules.check_syntax = true;
         }
         exports.config.rules.forbidden_identifier.check = ["^unique\\d+$"];
-        const allowed = [...defaultAllowedObjectTypes];
-        for (const type of this.plugin?.objectTypes() || []) {
-            if (allowed.includes(type.toUpperCase()) === false) {
-                allowed.push(type.toUpperCase());
-            }
-        }
-        exports.config.rules.allowed_object_types.allowed = allowed;
         if (this.options?.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";
@@ -130878,17 +131568,6 @@ module.exports = require("fs");
 
 /***/ },
 
-/***/ "module"
-/*!*************************!*\
-  !*** external "module" ***!
-  \*************************/
-(module) {
-
-"use strict";
-module.exports = require("module");
-
-/***/ },
-
 /***/ "node:events"
 /*!******************************!*\
   !*** external "node:events" ***!