@abaplint/cli 2.120.16 → 2.120.18

package/build/cli.js

@@ -25402,7 +25402,7 @@ BuiltIn.methods = {
         counter: BuiltIn.counter++,
         mandatory: {
             "val": basic_1.CLikeType.get(),
-            "format": basic_1.CLikeType.get(),
+            "format": basic_1.SimpleType.get(),
         },
         return: basic_1.StringType.get(),
         release: version_1.Release.v702,
@@ -25594,17 +25594,17 @@ BuiltIn.methods = {
     "NMAX": {
         counter: BuiltIn.counter++,
         mandatory: {
-            "val1": basic_1.CLikeType.get(),
-            "val2": basic_1.CLikeType.get(),
+            "val1": basic_1.SimpleType.get(),
+            "val2": basic_1.SimpleType.get(),
         },
         optional: {
-            "val3": basic_1.CLikeType.get(),
-            "val4": basic_1.CLikeType.get(),
-            "val5": basic_1.CLikeType.get(),
-            "val6": basic_1.CLikeType.get(),
-            "val7": basic_1.CLikeType.get(),
-            "val8": basic_1.CLikeType.get(),
-            "val9": basic_1.CLikeType.get(),
+            "val3": basic_1.SimpleType.get(),
+            "val4": basic_1.SimpleType.get(),
+            "val5": basic_1.SimpleType.get(),
+            "val6": basic_1.SimpleType.get(),
+            "val7": basic_1.SimpleType.get(),
+            "val8": basic_1.SimpleType.get(),
+            "val9": basic_1.SimpleType.get(),
         },
         return: basic_1.IntegerType.get(),
         release: version_1.Release.v702,
@@ -25612,17 +25612,17 @@ BuiltIn.methods = {
     "NMIN": {
         counter: BuiltIn.counter++,
         mandatory: {
-            "val1": basic_1.CLikeType.get(),
-            "val2": basic_1.CLikeType.get(),
+            "val1": basic_1.SimpleType.get(),
+            "val2": basic_1.SimpleType.get(),
         },
         optional: {
-            "val3": basic_1.CLikeType.get(),
-            "val4": basic_1.CLikeType.get(),
-            "val5": basic_1.CLikeType.get(),
-            "val6": basic_1.CLikeType.get(),
-            "val7": basic_1.CLikeType.get(),
-            "val8": basic_1.CLikeType.get(),
-            "val9": basic_1.CLikeType.get(),
+            "val3": basic_1.SimpleType.get(),
+            "val4": basic_1.SimpleType.get(),
+            "val5": basic_1.SimpleType.get(),
+            "val6": basic_1.SimpleType.get(),
+            "val7": basic_1.SimpleType.get(),
+            "val8": basic_1.SimpleType.get(),
+            "val9": basic_1.SimpleType.get(),
         },
         return: basic_1.IntegerType.get(),
         release: version_1.Release.v702,
@@ -25638,7 +25638,7 @@ BuiltIn.methods = {
         counter: BuiltIn.counter++,
         mandatory: {
             "val": basic_1.CLikeType.get(),
-            "occ": basic_1.CLikeType.get(),
+            "occ": basic_1.SimpleType.get(),
         },
         return: basic_1.StringType.get(),
         release: version_1.Release.v702,
@@ -27609,7 +27609,7 @@ class TypeUtils {
         return this.isAssignable(source, target);
     }
     isAssignableStrict(source, target, node) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const calculated = node ? this.isCalculated(node) : false;
         /*
             console.dir(source);
@@ -27620,9 +27620,23 @@ class TypeUtils {
             && (target instanceof basic_1.XStringType || target instanceof basic_1.XSequenceType)) {
             return false;
         }
+        if (target instanceof basic_1.NumericType
+            && (source instanceof basic_1.CharacterType || source instanceof basic_1.StringType)
+            && ((_a = source.getAbstractTypeData()) === null || _a === void 0 ? void 0 : _a.derivedFromConstant) === true) {
+            const constant = node === null || node === void 0 ? void 0 : node.concatTokens();
+            if (constant !== undefined
+                && ((constant.startsWith("'") && constant.endsWith("'"))
+                    || (constant.startsWith("`") && constant.endsWith("`")))
+                && /^\d*$/.test(constant.substring(1, constant.length - 1)) === false) {
+                return false;
+            }
+        }
         if (calculated) {
             return this.isAssignable(source, target);
         }
+        if (target instanceof basic_1.CLikeType) {
+            return this.isCharLikeStrict(source);
+        }
         if (target instanceof basic_1.PGenericType) {
             return source instanceof basic_1.PackedType
                 || source instanceof basic_1.PGenericType
@@ -27633,25 +27647,25 @@ class TypeUtils {
         }
         if (source instanceof basic_1.CharacterType) {
             if (target instanceof basic_1.CharacterType) {
-                if (((_a = source.getAbstractTypeData()) === null || _a === void 0 ? void 0 : _a.derivedFromConstant) === true) {
+                if (((_b = source.getAbstractTypeData()) === null || _b === void 0 ? void 0 : _b.derivedFromConstant) === true) {
                     return source.getLength() <= target.getLength();
                 }
                 return source.getLength() === target.getLength();
             }
             else if (target instanceof basic_1.IntegerType) {
-                if (((_b = source.getAbstractTypeData()) === null || _b === void 0 ? void 0 : _b.derivedFromConstant) === true) {
+                if (((_c = source.getAbstractTypeData()) === null || _c === void 0 ? void 0 : _c.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;
             }
             else if (target instanceof basic_1.XStringType) {
-                if (((_c = source.getAbstractTypeData()) === null || _c === void 0 ? void 0 : _c.derivedFromConstant) === true) {
+                if (((_d = source.getAbstractTypeData()) === null || _d === void 0 ? void 0 : _d.derivedFromConstant) === true) {
                     return (node === null || node === void 0 ? void 0 : node.concatTokens()) !== "''";
                 }
                 return false;
             }
             else if (target instanceof basic_1.StringType) {
-                if (((_d = source.getAbstractTypeData()) === null || _d === void 0 ? void 0 : _d.derivedFromConstant) === true) {
+                if (((_e = source.getAbstractTypeData()) === null || _e === void 0 ? void 0 : _e.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;
@@ -27659,7 +27673,7 @@ class TypeUtils {
         }
         else if (source instanceof basic_1.HexType) {
             if (target instanceof basic_1.HexType) {
-                if (((_e = source.getAbstractTypeData()) === null || _e === void 0 ? void 0 : _e.derivedFromConstant) === true) {
+                if (((_f = source.getAbstractTypeData()) === null || _f === void 0 ? void 0 : _f.derivedFromConstant) === true) {
                     return source.getLength() <= target.getLength();
                 }
                 return source.getLength() === target.getLength();
@@ -27668,7 +27682,7 @@ class TypeUtils {
                 return false;
             }
             else if (target instanceof basic_1.IntegerType || target instanceof basic_1.Integer8Type) {
-                if (((_f = source.getAbstractTypeData()) === null || _f === void 0 ? void 0 : _f.derivedFromConstant) === true) {
+                if (((_g = source.getAbstractTypeData()) === null || _g === void 0 ? void 0 : _g.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;
@@ -27679,13 +27693,13 @@ class TypeUtils {
                 return false;
             }
             else if (target instanceof basic_1.CharacterType) {
-                if (((_g = source.getAbstractTypeData()) === null || _g === void 0 ? void 0 : _g.derivedFromConstant) === true) {
+                if (((_h = source.getAbstractTypeData()) === null || _h === void 0 ? void 0 : _h.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;
             }
             else if (target instanceof basic_1.IntegerType) {
-                if (((_h = source.getAbstractTypeData()) === null || _h === void 0 ? void 0 : _h.derivedFromConstant) === true) {
+                if (((_j = source.getAbstractTypeData()) === null || _j === void 0 ? void 0 : _j.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;
@@ -27695,7 +27709,7 @@ class TypeUtils {
                 return false;
             }
             else if (target instanceof basic_1.XSequenceType || target instanceof basic_1.XStringType) {
-                if (((_j = source.getAbstractTypeData()) === null || _j === void 0 ? void 0 : _j.derivedFromConstant) === true) {
+                if (((_k = source.getAbstractTypeData()) === null || _k === void 0 ? void 0 : _k.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;
@@ -27739,7 +27753,7 @@ class TypeUtils {
                 return false;
             }
             else if (target instanceof basic_1.Integer8Type || target instanceof basic_1.PackedType) {
-                if (((_k = source.getAbstractTypeData()) === null || _k === void 0 ? void 0 : _k.derivedFromConstant) === true) {
+                if (((_l = source.getAbstractTypeData()) === null || _l === void 0 ? void 0 : _l.derivedFromConstant) === true) {
                     return true;
                 }
                 return false;
@@ -50584,6 +50598,12 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.SimpleType = void 0;
 const _abstract_type_1 = __webpack_require__(/*! ./_abstract_type */ "../core/build/src/abap/types/basic/_abstract_type.js");
 class SimpleType extends _abstract_type_1.AbstractType {
+    static get() {
+        return this.singleton;
+    }
+    constructor() {
+        super();
+    }
     toText() {
         return "```simple```";
     }
@@ -50601,6 +50621,7 @@ class SimpleType extends _abstract_type_1.AbstractType {
     }
 }
 exports.SimpleType = SimpleType;
+SimpleType.singleton = new SimpleType();
 //# sourceMappingURL=simple_type.js.map
 
 /***/ },
@@ -55430,7 +55451,7 @@ class DDIC {
             case "ANY":
                 return Types.AnyType.get({ qualifiedName: qualifiedName });
             case "SIMPLE":
-                return new Types.SimpleType({ qualifiedName: qualifiedName });
+                return Types.SimpleType.get();
             case "%_C_POINTER":
                 return new Types.HexType(8, qualifiedName);
             case "TABLE":
@@ -69450,7 +69471,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.js"
-        return "2.120.16";
+        return "2.120.18";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -101329,6 +101350,28 @@ exports.Total = Total;
 
 /***/ },
 
+/***/ "./build/src/git_clone.js"
+/*!********************************!*\
+  !*** ./build/src/git_clone.js ***!
+  \********************************/
+(__unused_webpack_module, exports) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.buildGitCloneArguments = buildGitCloneArguments;
+function buildGitCloneArguments(url, branch) {
+    const args = ["clone", "--quiet", "--depth", "1"];
+    if (branch) {
+        args.push("-b", branch);
+    }
+    args.push("--", url, ".");
+    return args;
+}
+//# sourceMappingURL=git_clone.js.map
+
+/***/ },
+
 /***/ "./build/src/index.js"
 /*!****************************!*\
   !*** ./build/src/index.js ***!
@@ -101387,6 +101430,7 @@ const _format_1 = __webpack_require__(/*! ./formatters/_format */ "./build/src/f
 const file_operations_1 = __webpack_require__(/*! ./file_operations */ "./build/src/file_operations.js");
 const apack_dependency_provider_1 = __webpack_require__(/*! ./apack_dependency_provider */ "./build/src/apack_dependency_provider.js");
 const fixes_1 = __webpack_require__(/*! ./fixes */ "./build/src/fixes.js");
+const git_clone_1 = __webpack_require__(/*! ./git_clone */ "./build/src/git_clone.js");
 const rename_1 = __webpack_require__(/*! ./rename */ "./build/src/rename.js");
 exports.GENERIC_ERROR = "generic_error";
 class Progress {
@@ -101508,11 +101552,8 @@ async function loadDependencies(config, compress, bar, base) {
         if (d.url) {
             process.stderr.write("Clone: " + d.url + "\n");
             const dir = fs.mkdtempSync(path.join(os.tmpdir(), "abaplint-"));
-            let branch = "";
-            if (d.branch) {
-                branch = "-b " + d.branch + " ";
-            }
-            childProcess.execSync("git clone --quiet --depth 1 " + branch + d.url + " .", { cwd: dir, stdio: "inherit" });
+            const args = (0, git_clone_1.buildGitCloneArguments)(d.url, d.branch);
+            childProcess.execFileSync("git", args, { cwd: dir, stdio: "inherit" });
             const names = file_operations_1.FileOperations.loadFileNames(file_operations_1.FileOperations.toUnixPath(dir) + d.files);
             files = files.concat(await file_operations_1.FileOperations.loadFiles(compress, names, bar));
             file_operations_1.FileOperations.deleteFolderRecursive(dir);

package/package.json

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