@abaplint/cli 2.113.156 → 2.113.158

package/build/cli.js

@@ -99,6 +99,14 @@ class FileOperations {
         }
         fs.rmSync(dir, { recursive: true });
     }
+    static toUnixPath(path) {
+        if (os.platform() === "win32") {
+            return path.replace(/[\\/]+/g, "/").replace(/^([a-zA-Z]+:|\.\/)/, "");
+        }
+        else {
+            return path;
+        }
+    }
     static loadFileNames(arg, error = true) {
         const files = glob.sync(arg, { nodir: true, absolute: true, posix: true });
         if (files.length === 0 && error) {
@@ -966,14 +974,10 @@ async function loadDependencies(config, compress, bar, base) {
                 continue;
             }
         }
-        const toUnixPath = (path) => path.replace(/[\\/]+/g, "/").replace(/^([a-zA-Z]+:|\.\/)/, "");
         if (d.url) {
             process.stderr.write("Clone: " + d.url + "\n");
             let dir = fs.mkdtempSync(path.join(os.tmpdir(), "abaplint-"));
-            if (os.platform() === "win32") {
-                // must be converted to posix for glob patterns like "/{foo,src}/**/*.*" to work
-                dir = toUnixPath(dir);
-            }
+            dir = file_operations_1.FileOperations.toUnixPath(dir);
             let branch = "";
             if (d.branch) {
                 branch = "-b " + d.branch + " ";
@@ -1163,16 +1167,18 @@ class Rename {
     }
     ////////////////////////
     write(rconfig, base, fs) {
-        const outputFolder = base + path.sep + rconfig.output;
+        const outputFolder = base + path.posix.sep + rconfig.output;
         console.log("Base: " + base);
         console.log("Output folder: " + outputFolder);
         file_operations_1.FileOperations.deleteFolderRecursive(outputFolder);
+        const myBase = file_operations_1.FileOperations.toUnixPath(path.resolve(base));
         for (const o of this.reg.getObjects()) {
             if (this.reg.isDependency(o) === true) {
                 continue;
             }
             for (const f of o.getFiles()) {
-                const n = outputFolder + f.getFilename().replace(base, "");
+                // yea, ffs
+                const n = outputFolder + f.getFilename().replace(myBase, "").replace("//?/C:", "");
                 console.log("Write " + n);
                 fs.mkdirSync(path.dirname(n), { recursive: true });
                 fs.writeFileSync(n, f.getRaw());
@@ -28109,6 +28115,10 @@ class Source {
                     {
                         const foundType = this.determineType(node, input, targetType);
                         const bodyType = cond_body_1.CondBody.runSyntax(node.findDirectExpression(Expressions.CondBody), input, foundType);
+                        /*
+                        console.log("COND BODY type;:");
+                        console.dir(bodyType);
+                        */
                         if (foundType === undefined || foundType.isGeneric()) {
                             this.addIfInferred(node, input, bodyType);
                         }
@@ -28136,15 +28146,28 @@ class Source {
                     }
                 case "REF":
                     {
-                        const foundType = this.determineType(node, input, targetType);
+                        let foundType = this.determineType(node, input, targetType);
                         const s = Source.runSyntax(node.findDirectExpression(Expressions.Source), input);
+                        /*
+                        console.dir(node.concatTokens());
+                        console.dir(targetType);
+                        console.dir(foundType);
+                        console.dir(s);
+                        */
                         if (foundType === undefined && s) {
-                            return new basic_1.DataReference(s);
+                            foundType = new basic_1.DataReference(s);
+                        }
+                        else if (foundType && targetType === undefined) {
+                            foundType = new basic_1.DataReference(foundType);
                         }
-                        else if (foundType) {
-                            return new basic_1.DataReference(foundType);
+                        /*
+                        if (targetType && !(targetType instanceof DataReference)) {
+                          const message = `REF: Types not compatible, ` + targetType.constructor.name;
+                          input.issues.push(syntaxIssue(input, node.getFirstToken(), message));
                         }
-                        return undefined;
+                        */
+                        this.addIfInferred(node, input, foundType);
+                        return foundType;
                     }
                 case "FILTER":
                     {
@@ -28294,11 +28317,20 @@ class Source {
         const typeExpression = node.findDirectExpression(Expressions.TypeNameOrInfer);
         const typeToken = typeExpression === null || typeExpression === void 0 ? void 0 : typeExpression.getFirstToken();
         const typeName = typeToken === null || typeToken === void 0 ? void 0 : typeToken.getStr();
+        /*
+        console.dir(inferredType);
+        console.dir(typeToken);
+        */
+        // hmm, need to align all this
         if (typeName === "#" && inferredType && typeToken) {
             const found = basic.lookupQualifiedName(inferredType.getQualifiedName());
             if (found) {
                 input.scope.addReference(typeToken, found, _reference_1.ReferenceType.InferredType, input.filename);
             }
+            else if (inferredType instanceof basic_1.DataReference) {
+                const tid = new _typed_identifier_1.TypedIdentifier(typeToken, input.filename, inferredType);
+                input.scope.addReference(typeToken, tid, _reference_1.ReferenceType.InferredType, input.filename);
+            }
             else if (inferredType instanceof basic_1.ObjectReferenceType) {
                 const def = input.scope.findObjectDefinition(inferredType.getQualifiedName());
                 if (def) {
@@ -54759,7 +54791,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.113.155";
+        return "2.113.158";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.113.156",
+    "version": "2.113.158",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.113.155",
+        "@abaplint/core": "^2.113.158",
         "@types/chai": "^4.3.20",
         "@types/minimist": "^1.2.5",
         "@types/mocha": "^10.0.10",