@abaplint/cli 2.102.44 → 2.102.45

package/build/cli.js

@@ -28174,6 +28174,9 @@ const target_1 = __webpack_require__(/*! ../expressions/target */ "./node_module
 const source_1 = __webpack_require__(/*! ../expressions/source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 const dynamic_1 = __webpack_require__(/*! ../expressions/dynamic */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/dynamic.js");
 const basic_types_1 = __webpack_require__(/*! ../basic_types */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/basic_types.js");
+const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@abaplint/core/build/src/abap/types/basic/index.js");
+const _typed_identifier_1 = __webpack_require__(/*! ../../types/_typed_identifier */ "./node_modules/@abaplint/core/build/src/abap/types/_typed_identifier.js");
+const _reference_1 = __webpack_require__(/*! ../_reference */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_reference.js");
 class CreateData {
     runSyntax(node, scope, filename) {
         for (const s of node.findDirectExpressions(Expressions.Source)) {
@@ -28187,7 +28190,23 @@ class CreateData {
         }
         const type = node.findDirectExpression(Expressions.TypeName);
         if (type) {
-            new basic_types_1.BasicTypes(filename, scope).resolveTypeName(type);
+            const found = new basic_types_1.BasicTypes(filename, scope).resolveTypeName(type);
+            if (found instanceof basic_1.UnknownType) {
+                if (node.concatTokens().toUpperCase().includes(" REF TO ")) {
+                    const def = scope.findObjectDefinition(type.concatTokens());
+                    if (def) {
+                        scope.addReference(type.getFirstToken(), def, _reference_1.ReferenceType.TypeReference, filename);
+                    }
+                    else {
+                        const identifier = new _typed_identifier_1.TypedIdentifier(type.getFirstToken(), filename, found);
+                        scope.addReference(type.getFirstToken(), identifier, _reference_1.ReferenceType.TypeReference, filename);
+                    }
+                }
+                else {
+                    const identifier = new _typed_identifier_1.TypedIdentifier(type.getFirstToken(), filename, found);
+                    scope.addReference(type.getFirstToken(), identifier, _reference_1.ReferenceType.TypeReference, filename);
+                }
+            }
         }
     }
 }
@@ -48915,7 +48934,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.102.44";
+        return "2.102.45";
     }
     getDDICReferences() {
         return this.ddicReferences;
@@ -53092,14 +53111,12 @@ exports.DefinitionsTop = exports.DefinitionsTopConf = void 0;
 const issue_1 = __webpack_require__(/*! ../issue */ "./node_modules/@abaplint/core/build/src/issue.js");
 const _statement_1 = __webpack_require__(/*! ../abap/2_statements/statements/_statement */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/_statement.js");
 const Statements = __webpack_require__(/*! ../abap/2_statements/statements */ "./node_modules/@abaplint/core/build/src/abap/2_statements/statements/index.js");
-const Expressions = __webpack_require__(/*! ../abap/2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const Structures = __webpack_require__(/*! ../abap/3_structures/structures */ "./node_modules/@abaplint/core/build/src/abap/3_structures/structures/index.js");
 const _abap_rule_1 = __webpack_require__(/*! ./_abap_rule */ "./node_modules/@abaplint/core/build/src/rules/_abap_rule.js");
 const _basic_rule_config_1 = __webpack_require__(/*! ./_basic_rule_config */ "./node_modules/@abaplint/core/build/src/rules/_basic_rule_config.js");
 const _irule_1 = __webpack_require__(/*! ./_irule */ "./node_modules/@abaplint/core/build/src/rules/_irule.js");
 const edit_helper_1 = __webpack_require__(/*! ../edit_helper */ "./node_modules/@abaplint/core/build/src/edit_helper.js");
 const nodes_1 = __webpack_require__(/*! ../abap/nodes */ "./node_modules/@abaplint/core/build/src/abap/nodes/index.js");
-const version_1 = __webpack_require__(/*! ../version */ "./node_modules/@abaplint/core/build/src/version.js");
 class DefinitionsTopConf extends _basic_rule_config_1.BasicRuleConfig {
 }
 exports.DefinitionsTopConf = DefinitionsTopConf;
@@ -53118,10 +53135,16 @@ class DefinitionsTop extends _abap_rule_1.ABAPRule {
             key: "definitions_top",
             title: "Place definitions in top of routine",
             shortDescription: `Checks that definitions are placed at the beginning of METHODs, FORMs and FUNCTIONs.`,
-            extendedInformation: `If the routine has inline definitions then no issues are reported
-
-https://docs.abapopenchecks.org/checks/17/`,
+            extendedInformation: `https://docs.abapopenchecks.org/checks/17/`,
             tags: [_irule_1.RuleTag.SingleFile, _irule_1.RuleTag.Quickfix],
+            badExample: `FROM foo.
+  WRITE 'hello'.
+  DATA int TYPE i.
+ENDFORM.`,
+            goodExample: `FROM foo.
+  DATA int TYPE i.
+  WRITE 'hello'.
+ENDFORM.`,
         };
     }
     getMessage() {
@@ -53150,10 +53173,6 @@ https://docs.abapopenchecks.org/checks/17/`,
             this.fixed = false;
             this.mode = DEFINITION;
             this.moveTo = (_a = r.getFirstStatement()) === null || _a === void 0 ? void 0 : _a.getLastToken().getEnd();
-            if (this.reg.getConfig().getVersion() !== version_1.Version.v702
-                && r.findFirstExpression(Expressions.InlineData)) {
-                continue;
-            }
             const found = this.walk(r, file);
             if (found) {
                 issues.push(found);
@@ -53214,16 +53233,19 @@ https://docs.abapopenchecks.org/checks/17/`,
                 && (get instanceof Statements.Data
                     || get instanceof Statements.Type
                     || get instanceof Statements.Constant
+                    || (get instanceof Statements.Move && c.concatTokens().toUpperCase().startsWith("DATA("))
                     || get instanceof Statements.Static
                     || get instanceof Statements.FieldSymbol)) {
                 if (this.mode === AFTER) {
                     // only one fix per routine, as it reorders a lot
-                    let fix = undefined;
-                    if (this.fixed === false && this.moveTo) {
-                        fix = this.buildFix(file, c, this.moveTo);
-                        this.fixed = true;
+                    if (!(get instanceof Statements.Move && c.concatTokens().toUpperCase().startsWith("DATA("))) {
+                        let fix = undefined;
+                        if (this.fixed === false && this.moveTo) {
+                            fix = this.buildFix(file, c, this.moveTo);
+                            this.fixed = true;
+                        }
+                        return issue_1.Issue.atStatement(file, c, this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
                     }
-                    return issue_1.Issue.atStatement(file, c, this.getMessage(), this.getMetadata().key, this.conf.severity, fix);
                 }
                 else {
                     this.moveTo = c.getLastToken().getEnd();
@@ -71497,6 +71519,7 @@ Builder.prototype.j2x = function(jObj, level) {
   let attrStr = '';
   let val = '';
   for (let key in jObj) {
+    if(!jObj.hasOwnProperty(key)) continue;
     if (typeof jObj[key] === 'undefined') {
       // supress undefined node only if it is not an attribute
       if (this.isAttribute(key)) {
@@ -71718,6 +71741,8 @@ function arrToStr(arr, options, jPath, indentation) {
     for (let i = 0; i < arr.length; i++) {
         const tagObj = arr[i];
         const tagName = propName(tagObj);
+        if(tagName === undefined) continue;
+
         let newJPath = "";
         if (jPath.length === 0) newJPath = tagName
         else newJPath = `${jPath}.${tagName}`;
@@ -71787,6 +71812,7 @@ function propName(obj) {
     const keys = Object.keys(obj);
     for (let i = 0; i < keys.length; i++) {
         const key = keys[i];
+        if(!obj.hasOwnProperty(key)) continue;
         if (key !== ":@") return key;
     }
 }
@@ -71795,6 +71821,7 @@ function attr_to_str(attrMap, options) {
     let attrStr = "";
     if (attrMap && !options.ignoreAttributes) {
         for (let attr in attrMap) {
+            if(!attrMap.hasOwnProperty(attr)) continue;
             let attrVal = options.attributeValueProcessor(attr, attrMap[attr]);
             attrVal = replaceEntitiesValue(attrVal, options);
             if (attrVal === true && options.suppressBooleanAttributes) {
@@ -72338,6 +72365,7 @@ const parseXml = function(xmlData) {
       }else {//Opening tag
         let result = readTagExp(xmlData,i, this.options.removeNSPrefix);
         let tagName= result.tagName;
+        const rawTagName = result.rawTagName;
         let tagExp = result.tagExp;
         let attrExpPresent = result.attrExpPresent;
         let closeIndex = result.closeIndex;
@@ -72363,7 +72391,7 @@ const parseXml = function(xmlData) {
         if(tagName !== xmlObj.tagname){
           jPath += jPath ? "." + tagName : tagName;
         }
-        if (this.isItStopNode(this.options.stopNodes, jPath, tagName)) { //TODO: namespace
+        if (this.isItStopNode(this.options.stopNodes, jPath, tagName)) {
           let tagContent = "";
           //self-closing tag
           if(tagExp.length > 0 && tagExp.lastIndexOf("/") === tagExp.length - 1){
@@ -72376,8 +72404,8 @@ const parseXml = function(xmlData) {
           //normal tag
           else{
             //read until closing tag is found
-            const result = this.readStopNodeData(xmlData, tagName, closeIndex + 1);
-            if(!result) throw new Error(`Unexpected end of ${tagName}`);
+            const result = this.readStopNodeData(xmlData, rawTagName, closeIndex + 1);
+            if(!result) throw new Error(`Unexpected end of ${rawTagName}`);
             i = result.i;
             tagContent = result.tagContent;
           }
@@ -72562,6 +72590,7 @@ function readTagExp(xmlData,i, removeNSPrefix, closingChar = ">"){
     tagExp = tagExp.substr(separatorIndex + 1);
   }
 
+  const rawTagName = tagName;
   if(removeNSPrefix){
     const colonIndex = tagName.indexOf(":");
     if(colonIndex !== -1){
@@ -72575,6 +72604,7 @@ function readTagExp(xmlData,i, removeNSPrefix, closingChar = ">"){
     tagExp: tagExp,
     closeIndex: closeIndex,
     attrExpPresent: attrExpPresent,
+    rawTagName: rawTagName,
   }
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@abaplint/cli",
-    "version": "2.102.44",
+    "version": "2.102.45",
     "description": "abaplint - Command Line Interface",
     "funding": "https://github.com/sponsors/larshp",
     "bin": {
@@ -38,7 +38,7 @@
     },
     "homepage": "https://abaplint.org",
     "devDependencies": {
-        "@abaplint/core": "^2.102.44",
+        "@abaplint/core": "^2.102.45",
         "@types/chai": "^4.3.6",
         "@types/glob": "^7.2.0",
         "@types/minimist": "^1.2.2",