@abaplint/transpiler 2.10.59 → 2.10.61

package/build/src/index.js

@@ -45,8 +45,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,
         };

package/build/src/initialization.d.ts

@@ -1,8 +1,9 @@
 import { DatabaseSetupResult } from "./db/database_setup_result";
 import * as abaplint from "@abaplint/core";
+import { ITranspilerOptions } from "./types";
 export declare function escapeNamespaceFilename(filename: string): string;
 export declare class Initialization {
-    script(reg: abaplint.IRegistry, dbSetup: DatabaseSetupResult, extraSetup?: string, useImport?: boolean): string;
+    script(reg: abaplint.IRegistry, dbSetup: DatabaseSetupResult, options: ITranspilerOptions | undefined, useImport?: boolean): string;
     private buildImports;
     private hasClassConstructor;
 }

package/build/src/initialization.js

@@ -9,7 +9,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 */
@@ -20,7 +20,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`;
@@ -43,17 +43,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 = [];
@@ -92,7 +92,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);
             }

package/build/src/statements/data.js

@@ -30,10 +30,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) {

package/build/src/statements/field_symbol.js

@@ -22,9 +22,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/build/src/types.d.ts

@@ -61,4 +61,6 @@ export interface ITranspilerOptions {
     skipReposrc?: boolean;
     /** ignore source map */
     ignoreSourceMap?: boolean;
+    /** import programs */
+    importProg?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler",
-  "version": "2.10.59",
+  "version": "2.10.61",
   "description": "Transpiler",
   "main": "build/src/index.js",
   "typings": "build/src/index.d.ts",
@@ -29,14 +29,14 @@
   "author": "abaplint",
   "license": "MIT",
   "dependencies": {
-    "@abaplint/core": "^2.113.125",
+    "@abaplint/core": "^2.113.131",
     "source-map": "^0.7.4"
   },
   "devDependencies": {
     "@types/chai": "^4.3.20",
     "@types/mocha": "^10.0.10",
     "chai": "^4.5.0",
-    "mocha": "^11.5.0",
+    "mocha": "^11.7.1",
     "source-map-support": "^0.5.21",
     "typescript": "^5.8.3"
   }