@abaplint/core 2.102.65 → 2.102.67

package/build/src/abap/5_syntax/expressions/new_object.js

@@ -8,6 +8,7 @@ const source_1 = require("./source");
 const _object_oriented_1 = require("../_object_oriented");
 const method_parameters_1 = require("./method_parameters");
 const basic_types_1 = require("../basic_types");
+const _type_utils_1 = require("../_type_utils");
 class NewObject {
     runSyntax(node, scope, targetType, filename) {
         let ret = undefined;
@@ -89,7 +90,10 @@ class NewObject {
             if (type === undefined) {
                 throw new Error("NewObject, no default importing parameter found for constructor, " + name);
             }
-            new source_1.Source().runSyntax(source, scope, filename, type);
+            const sourceType = new source_1.Source().runSyntax(source, scope, filename, type);
+            if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(sourceType, type) === false) {
+                throw new Error(`NEW parameter type not compatible`);
+            }
         }
         else if (parameters) {
             // parameters with names

package/build/src/abap/5_syntax/expressions/reduce_body.js

@@ -25,7 +25,12 @@ class ReduceBody {
                 scope.push(_scope_type_1.ScopeType.Let, "LET", node.getFirstToken().getStart(), filename);
                 scoped = true;
             }
-            const found = new inline_field_definition_1.InlineFieldDefinition().runSyntax(i, scope, filename, targetType);
+            let foundType = targetType;
+            const source = i.findDirectExpression(Expressions.Source);
+            if (source) {
+                foundType = new source_1.Source().runSyntax(source, scope, filename, targetType);
+            }
+            const found = new inline_field_definition_1.InlineFieldDefinition().runSyntax(i, scope, filename, foundType);
             if (found && first === undefined) {
                 first = found;
             }

package/build/src/abap/5_syntax/expressions/select.js

@@ -18,6 +18,9 @@ class Select {
         const token = node.getFirstToken();
         const from = node.findDirectExpression(Expressions.SQLFrom);
         const dbSources = from ? new sql_from_1.SQLFrom().runSyntax(from, scope, filename) : [];
+        if (dbSources.length === 0) {
+            throw new Error(`Missing FROM`);
+        }
         const fields = this.findFields(node);
         if (fields.length === 0
             && node.findDirectExpression(Expressions.SQLFieldListLoop) === undefined) {

package/build/src/abap/5_syntax/expressions/string_template.js

@@ -17,7 +17,7 @@ class StringTemplate {
             }
             else if ((typeUtils.isCharLike(type) === false && typeUtils.isHexLike(type) === false)
                 || type instanceof basic_1.StructureType) {
-                throw new Error("Not character like, " + type.constructor.name);
+                throw new Error("String template, not character like, " + type.constructor.name);
             }
             const format = templateSource.findDirectExpression(Expressions.StringTemplateFormatting);
             const formatConcat = format === null || format === void 0 ? void 0 : format.concatTokens();

package/build/src/abap/5_syntax/statements/create_object.js

@@ -9,6 +9,7 @@ const _reference_1 = require("../_reference");
 const basic_1 = require("../../types/basic");
 const types_1 = require("../../types");
 const _object_oriented_1 = require("../_object_oriented");
+const _type_utils_1 = require("../_type_utils");
 class CreateObject {
     runSyntax(node, scope, filename) {
         let cdef = undefined;
@@ -32,7 +33,7 @@ class CreateObject {
             }
         }
         // just recurse
-        for (const s of node.findAllExpressions(Expressions.Source)) {
+        for (const s of node.findDirectExpressions(Expressions.Source)) {
             new source_1.Source().runSyntax(s, scope, filename);
         }
         let first = true;
@@ -76,26 +77,35 @@ class CreateObject {
         for (const t of node.findDirectExpressions(Expressions.Dynamic)) {
             new dynamic_1.Dynamic().runSyntax(t, scope, filename);
         }
-        this.validateParameters(cdef, node, scope);
+        this.validateParameters(cdef, node, scope, filename);
     }
-    validateParameters(cdef, node, scope) {
-        var _a, _b, _c;
+    validateParameters(cdef, node, scope, filename) {
+        var _a, _b, _c, _d;
         if (cdef === undefined) {
+            const sources = (_a = node.findDirectExpression(Expressions.ParameterListS)) === null || _a === void 0 ? void 0 : _a.findAllExpressions(Expressions.Source);
+            for (const s of sources || []) {
+                new source_1.Source().runSyntax(s, scope, filename);
+            }
             return;
         }
         const methodDef = new _object_oriented_1.ObjectOriented(scope).searchMethodName(cdef, "CONSTRUCTOR");
-        const methodParameters = (_a = methodDef.method) === null || _a === void 0 ? void 0 : _a.getParameters();
+        const methodParameters = (_b = methodDef.method) === null || _b === void 0 ? void 0 : _b.getParameters();
         const allImporting = (methodParameters === null || methodParameters === void 0 ? void 0 : methodParameters.getImporting()) || [];
         const requiredImporting = new Set(methodParameters === null || methodParameters === void 0 ? void 0 : methodParameters.getRequiredParameters().map(i => i.getName().toUpperCase()));
-        // todo, validate types
-        for (const p of ((_b = node.findDirectExpression(Expressions.ParameterListS)) === null || _b === void 0 ? void 0 : _b.findAllExpressions(Expressions.ParameterS)) || []) {
-            const name = (_c = p.findDirectExpression(Expressions.ParameterName)) === null || _c === void 0 ? void 0 : _c.concatTokens().toUpperCase();
+        for (const p of ((_c = node.findDirectExpression(Expressions.ParameterListS)) === null || _c === void 0 ? void 0 : _c.findAllExpressions(Expressions.ParameterS)) || []) {
+            const name = (_d = p.findDirectExpression(Expressions.ParameterName)) === null || _d === void 0 ? void 0 : _d.concatTokens().toUpperCase();
             if (name === undefined) {
                 continue;
             }
-            if ((allImporting === null || allImporting === void 0 ? void 0 : allImporting.some(p => p.getName().toUpperCase() === name)) === false) {
+            const source = p.findDirectExpression(Expressions.Source);
+            const sourceType = new source_1.Source().runSyntax(source, scope, filename);
+            const found = allImporting === null || allImporting === void 0 ? void 0 : allImporting.find(p => p.getName().toUpperCase() === name);
+            if (found === undefined) {
                 throw new Error(`constructor parameter "${name}" does not exist`);
             }
+            else if (new _type_utils_1.TypeUtils(scope).isAssignableStrict(sourceType, found.getType()) === false) {
+                throw new Error(`constructor parameter "${name}" type not compatible`);
+            }
             requiredImporting.delete(name);
         }
         for (const r of requiredImporting.values()) {

package/build/src/files/_abstract_file.js

@@ -9,10 +9,17 @@ class AbstractFile {
         return this.filename;
     }
     baseName() {
-        const first = this.getFilename().split("\\");
-        const base1 = first[first.length - 1];
-        const base2 = base1.split("/");
-        return base2[base2.length - 1];
+        let name = this.getFilename();
+        let index = name.lastIndexOf("\\");
+        if (index) {
+            index = index + 1;
+        }
+        name = name.substring(index);
+        index = name.lastIndexOf("/");
+        if (index) {
+            index = index + 1;
+        }
+        return name.substring(index);
     }
     getObjectType() {
         var _a;

package/build/src/registry.js

@@ -65,7 +65,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.65";
+        return "2.102.67";
     }
     getDDICReferences() {
         return this.ddicReferences;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/core",
-    "version": "2.102.65",
+    "version": "2.102.67",
     "description": "abaplint - Core API",
     "main": "build/src/index.js",
     "typings": "build/abaplint.d.ts",
@@ -50,10 +50,10 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@microsoft/api-extractor": "^7.38.0",
+        "@microsoft/api-extractor": "^7.38.1",
         "@types/chai": "^4.3.9",
         "@types/mocha": "^10.0.3",
-        "@types/node": "^20.8.9",
+        "@types/node": "^20.8.10",
         "chai": "^4.3.10",
         "eslint": "^8.52.0",
         "mocha": "^10.2.0",