@abaplint/transpiler-cli 2.10.59 → 2.10.60

package/build/bundle.js

@@ -21384,6 +21384,19 @@ class CurrentScope {
         }
         return false;
     }
+    isAnyOO() {
+        let curr = this.current;
+        while (curr !== undefined) {
+            const stype = curr.getIdentifier().stype;
+            if (stype === _scope_type_1.ScopeType.ClassDefinition
+                || stype === _scope_type_1.ScopeType.ClassImplementation
+                || stype === _scope_type_1.ScopeType.Interface) {
+                return true;
+            }
+            curr = curr.getParent();
+        }
+        return false;
+    }
     isGlobalOO() {
         return this.parentObj.getType() === "INTF" || this.parentObj.getType() === "CLAS";
     }
@@ -22802,7 +22815,7 @@ class BasicTypes {
             if (type === undefined) {
                 type = (_a = this.input.scope.getDDIC().lookupNoVoid(name)) === null || _a === void 0 ? void 0 : _a.type;
             }
-            if (type === undefined && this.input.scope.isOO() === false && this.input.scope.getDDIC().inErrorNamespace(name) === false) {
+            if (type === undefined && this.input.scope.isAnyOO() === false && this.input.scope.getDDIC().inErrorNamespace(name) === false) {
                 this.input.scope.addReference(chain.getChildren()[0].getFirstToken(), undefined, _reference_1.ReferenceType.VoidType, this.input.filename);
                 return new Types.VoidType(name);
             }
@@ -24373,7 +24386,6 @@ class DataDefinition {
             }
         }
         if (name) {
-            console.dir("undef");
             return new _typed_identifier_1.TypedIdentifier(name.getFirstToken(), input.filename, new basic_1.UnknownType("DataDefinition, fallback"));
         }
         return undefined;
@@ -53139,7 +53151,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.125";
+        return "2.113.126";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -75861,7 +75873,7 @@ class XMLConsistency {
                 issues.push(issue_1.Issue.atRow(file, 1, "Class matching XML name not found in ABAP file", this.getMetadata().key, this.conf.severity));
             }
         }
-        if (obj instanceof Objects.Interface) {
+        else if (obj instanceof Objects.Interface) {
             const name = obj.getNameFromXML();
             if (name === undefined) {
                 issues.push(issue_1.Issue.atRow(file, 1, "Name undefined in XML", this.getMetadata().key, this.conf.severity));
@@ -81073,8 +81085,8 @@ class Transpiler {
             objects: [],
             unitTestScript: new unit_test_1.UnitTest().unitTestScript(reg, this.options?.skip),
             unitTestScriptOpen: new unit_test_1.UnitTest().unitTestScriptOpen(reg, this.options?.skip),
-            initializationScript: new initialization_1.Initialization().script(reg, dbSetup, this.options?.extraSetup),
-            initializationScript2: new initialization_1.Initialization().script(reg, dbSetup, this.options?.extraSetup, true),
+            initializationScript: new initialization_1.Initialization().script(reg, dbSetup, this.options),
+            initializationScript2: new initialization_1.Initialization().script(reg, dbSetup, this.options, true),
             databaseSetup: dbSetup,
             reg: reg,
         };
@@ -81155,7 +81167,7 @@ function escapeNamespaceFilename(filename) {
     return filename.replace(/\//g, "%23");
 }
 class Initialization {
-    script(reg, dbSetup, extraSetup, useImport) {
+    script(reg, dbSetup, options, useImport) {
         let ret = "";
         if (useImport === true) {
             ret = `/* eslint-disable import/newline-after-import */
@@ -81166,7 +81178,7 @@ import "./_top.mjs";\n`;
 import runtime from "@abaplint/runtime";
 globalThis.abap = new runtime.ABAP();\n`;
         }
-        ret += `${this.buildImports(reg, useImport)}
+        ret += `${this.buildImports(reg, useImport, options)}
 
 export async function initializeABAP() {\n`;
         ret += `  const sqlite = [];\n`;
@@ -81189,17 +81201,17 @@ export async function initializeABAP() {\n`;
             ret += `  insert.push(\`${i}\`);\n`;
         }
         ret += `\n`;
-        if (extraSetup === undefined || extraSetup === "") {
+        if (options?.extraSetup === undefined || options?.extraSetup === "") {
             ret += `// no setup logic specified in config\n`;
         }
         else {
-            ret += `  const {setup} = await import("${extraSetup}");\n` +
+            ret += `  const {setup} = await import("${options?.extraSetup}");\n` +
                 `  await setup(globalThis.abap, schemas, insert);\n`;
         }
         ret += `}`;
         return ret;
     }
-    buildImports(reg, useImport) {
+    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 = [];
@@ -81238,7 +81250,7 @@ export async function initializeABAP() {\n`;
             }
             else if (obj instanceof abaplint.Objects.Interface
                 || obj instanceof abaplint.Objects.FunctionGroup
-                // hmm          || obj instanceof abaplint.Objects.Program
+                || (options?.importProg === true && obj instanceof abaplint.Objects.Program)
                 || obj instanceof abaplint.Objects.Class) {
                 list.push(name);
             }
@@ -82964,10 +82976,10 @@ class DataTranspiler {
         }
         const ret = new chunk_1.Chunk()
             .appendString("let ")
-            .append(traversal_1.Traversal.prefixVariable(traversal_1.Traversal.escapeNamespace(found.getName().toLowerCase())), token, traversal)
+            .appendString(traversal_1.Traversal.prefixVariable(traversal_1.Traversal.escapeNamespace(found.getName().toLowerCase())))
             .appendString(" = " + new transpile_types_1.TranspileTypes().toType(found.getType()))
-            .append(";", node.getLastToken(), traversal)
-            .append(value, node.getLastToken(), traversal);
+            .appendString(";")
+            .appendString(value);
         return ret;
     }
     static buildValue(node, name, traversal) {
@@ -83810,9 +83822,9 @@ class FieldSymbolTranspiler {
         }
         if (name) {
             return new chunk_1.Chunk()
-                .append("let ", node, traversal)
-                .appendChunk(new field_symbol_1.FieldSymbolTranspiler().transpile(name, traversal))
-                .append(" = new abap.types.FieldSymbol(" + new transpile_types_1.TranspileTypes().toType(found.getType()) + ");", node.getLastToken(), traversal);
+                .appendString("let ")
+                .appendString(new field_symbol_1.FieldSymbolTranspiler().transpile(name, traversal).getCode())
+                .appendString(" = new abap.types.FieldSymbol(" + new transpile_types_1.TranspileTypes().toType(found.getType()) + ");");
         }
         throw new Error("FieldSymbolTranspiler, name not found");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.10.59",
+  "version": "2.10.60",
   "description": "Transpiler - Command Line Interface",
   "funding": "https://github.com/sponsors/larshp",
   "bin": {
@@ -27,10 +27,10 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/core": "^2.113.125",
-    "@abaplint/transpiler": "^2.10.59",
+    "@abaplint/core": "^2.113.126",
+    "@abaplint/transpiler": "^2.10.60",
     "@types/glob": "^8.1.0",
-    "@types/node": "^22.15.29",
+    "@types/node": "^22.15.30",
     "@types/progress": "^2.0.7",
     "glob": "=7.2.0",
     "progress": "^2.0.3",