@abaplint/transpiler-cli 2.4.8 → 2.4.9

package/build/bundle.js

@@ -7322,7 +7322,7 @@ const tokens_1 = __webpack_require__(/*! ../../1_lexer/tokens */ "./node_modules
 class Throw extends combi_1.Expression {
     getRunnable() {
         // todo, MESSAGE
-        return (0, combi_1.seq)("THROW", (0, combi_1.opt)("RESUMABLE"), _1.ClassName, (0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.opt)((0, combi_1.alt)(_1.Source, _1.ParameterListS)), (0, combi_1.tok)(tokens_1.WParenRightW));
+        return (0, combi_1.seq)("THROW", (0, combi_1.opt)("RESUMABLE"), _1.ClassName, (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.ParenLeftW), (0, combi_1.tok)(tokens_1.ParenLeft)), (0, combi_1.opt)((0, combi_1.alt)(_1.Source, _1.ParameterListS)), (0, combi_1.altPrio)((0, combi_1.tok)(tokens_1.WParenRightW), (0, combi_1.tok)(tokens_1.ParenRightW)));
     }
 }
 exports.Throw = Throw;
@@ -21431,16 +21431,17 @@ const basic_1 = __webpack_require__(/*! ../../types/basic */ "./node_modules/@ab
 const Expressions = __webpack_require__(/*! ../../2_statements/expressions */ "./node_modules/@abaplint/core/build/src/abap/2_statements/expressions/index.js");
 const source_1 = __webpack_require__(/*! ./source */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/expressions/source.js");
 const _type_utils_1 = __webpack_require__(/*! ../_type_utils */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/_type_utils.js");
+const basic_types_1 = __webpack_require__(/*! ../basic_types */ "./node_modules/@abaplint/core/build/src/abap/5_syntax/basic_types.js");
 class Cast {
     runSyntax(node, scope, targetType, filename) {
-        var _a;
         const sourceNode = node.findDirectExpression(Expressions.Source);
         if (sourceNode === undefined) {
             throw new Error("Cast, source node not found");
         }
         const sourceType = new source_1.Source().runSyntax(sourceNode, scope, filename);
         let tt = undefined;
-        const typeName = (_a = node.findDirectExpression(Expressions.TypeNameOrInfer)) === null || _a === void 0 ? void 0 : _a.getFirstToken().getStr();
+        const typeExpression = node.findDirectExpression(Expressions.TypeNameOrInfer);
+        const typeName = typeExpression === null || typeExpression === void 0 ? void 0 : typeExpression.concatTokens();
         if (typeName === undefined) {
             throw new Error("Cast, child TypeNameOrInfer not found");
         }
@@ -21450,18 +21451,28 @@ class Cast {
         else if (typeName === "#") {
             throw new Error("Cast, todo, infer type");
         }
-        if (tt === undefined) {
-            const found = scope.findObjectDefinition(typeName);
-            if (found === undefined && scope.getDDIC().inErrorNamespace(typeName) === false) {
+        if (tt === undefined && typeExpression) {
+            const basic = new basic_types_1.BasicTypes(filename, scope);
+            tt = basic.parseType(typeExpression);
+            if (tt === undefined || tt instanceof basic_1.VoidType || tt instanceof basic_1.UnknownType) {
+                const found = scope.findObjectDefinition(typeName);
+                if (found) {
+                    tt = new basic_1.ObjectReferenceType(found, typeName);
+                }
+            }
+            else {
+                tt = new basic_1.DataReference(tt, typeName);
+            }
+            if (tt === undefined && scope.getDDIC().inErrorNamespace(typeName) === false) {
                 tt = new basic_1.VoidType(typeName);
             }
-            else if (found === undefined) {
+            else if (typeName.toUpperCase() === "OBJECT") {
+                return new basic_1.GenericObjectReferenceType();
+            }
+            else if (tt === undefined) {
                 // todo, this should be an UnknownType instead?
                 throw new Error("Type \"" + typeName + "\" not found in scope, Cast");
             }
-            else {
-                tt = new basic_1.ObjectReferenceType(found, typeName);
-            }
         }
         new source_1.Source().addIfInferred(node, scope, filename, tt);
         if (new _type_utils_1.TypeUtils(scope).isCastable(sourceType, tt) === false) {
@@ -24583,6 +24594,11 @@ class ValueBody {
         if (node === undefined) {
             return targetType;
         }
+        let letScoped = false;
+        const letNode = node.findDirectExpression(Expressions.Let);
+        if (letNode) {
+            letScoped = new let_1.Let().runSyntax(letNode, scope, filename);
+        }
         let forScopes = 0;
         for (const forNode of node.findDirectExpressions(Expressions.For) || []) {
             const scoped = new for_1.For().runSyntax(forNode, scope, filename);
@@ -24590,11 +24606,6 @@ class ValueBody {
                 forScopes++;
             }
         }
-        let letScoped = false;
-        const letNode = node.findDirectExpression(Expressions.Let);
-        if (letNode) {
-            letScoped = new let_1.Let().runSyntax(letNode, scope, filename);
-        }
         for (const s of node.findDirectExpressions(Expressions.FieldAssignment)) {
             new field_assignment_1.FieldAssignment().runSyntax(s, scope, filename, targetType);
         }
@@ -27992,6 +28003,9 @@ class Parameter {
     runSyntax(node, scope, filename) {
         var _a;
         const nameToken = (_a = node.findFirstExpression(Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+        if (nameToken && nameToken.getStr().length > 8) {
+            throw new Error("Parameter name too long, " + nameToken.getStr());
+        }
         const bfound = new basic_types_1.BasicTypes(filename, scope).parseType(node);
         if (nameToken && bfound) {
             scope.addIdentifier(new _typed_identifier_1.TypedIdentifier(nameToken, filename, bfound));
@@ -28641,6 +28655,9 @@ class SelectOption {
     runSyntax(node, scope, filename) {
         var _a;
         const nameToken = (_a = node.findFirstExpression(Expressions.FieldSub)) === null || _a === void 0 ? void 0 : _a.getFirstToken();
+        if (nameToken && nameToken.getStr().length > 8) {
+            throw new Error("Select-option name too long, " + nameToken.getStr());
+        }
         for (const d of node.findDirectExpressions(Expressions.Dynamic)) {
             new dynamic_1.Dynamic().runSyntax(d, scope, filename);
         }
@@ -44407,8 +44424,12 @@ class Table extends _abstract_object_1.AbstractObject {
         return undefined;
     }
     getAllowedNaming() {
+        let length = 30;
+        if (this.getTableCategory() === TableCategory.Transparent) {
+            length = 16;
+        }
         return {
-            maxLength: 30,
+            maxLength: length,
             allowNamespace: true,
         };
     }
@@ -44963,7 +44984,7 @@ class View extends _abstract_object_1.AbstractObject {
     }
     getAllowedNaming() {
         return {
-            maxLength: 30,
+            maxLength: 16,
             allowNamespace: true,
         };
     }
@@ -45829,7 +45850,7 @@ class Registry {
     }
     static abaplintVersion() {
         // magic, see build script "version.sh"
-        return "2.95.9";
+        return "2.95.13";
     }
     getDDICReferences() {
         return this.references;
@@ -77775,20 +77796,6 @@ function Builder(options) {
     this.tagEndChar = '>';
     this.newLine = '';
   }
-
-  if (this.options.suppressEmptyNode) {
-    this.buildTextNode = buildEmptyTextNode;
-    this.buildObjNode = buildEmptyObjNode;
-  } else {
-    this.buildTextNode = buildTextValNode;
-    this.buildObjNode = buildObjectNode;
-  }
-
-  this.buildTextValNode = buildTextValNode;
-  this.buildObjectNode = buildObjectNode;
-
-  this.replaceEntitiesValue = replaceEntitiesValue;
-  this.buildAttrPairStr = buildAttrPairStr;
 }
 
 Builder.prototype.build = function(jObj) {
@@ -77815,7 +77822,7 @@ Builder.prototype.j2x = function(jObj, level) {
       else val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
       // val += this.indentate(level) + '<' + key + '/' + this.tagEndChar;
     } else if (jObj[key] instanceof Date) {
-      val += this.buildTextNode(jObj[key], key, '', level);
+      val += this.buildTextValNode(jObj[key], key, '', level);
     } else if (typeof jObj[key] !== 'object') {
       //premitive type
       const attr = this.isAttribute(key);
@@ -77827,7 +77834,7 @@ Builder.prototype.j2x = function(jObj, level) {
           let newval = this.options.tagValueProcessor(key, '' + jObj[key]);
           val += this.replaceEntitiesValue(newval);
         } else {
-          val += this.buildTextNode(jObj[key], key, '', level);
+          val += this.buildTextValNode(jObj[key], key, '', level);
         }
       }
     } else if (Array.isArray(jObj[key])) {
@@ -77844,7 +77851,7 @@ Builder.prototype.j2x = function(jObj, level) {
         } else if (typeof item === 'object') {
           val += this.processTextOrObjNode(item, key, level)
         } else {
-          val += this.buildTextNode(item, key, '', level);
+          val += this.buildTextValNode(item, key, '', level);
         }
       }
     } else {
@@ -77863,7 +77870,7 @@ Builder.prototype.j2x = function(jObj, level) {
   return {attrStr: attrStr, val: val};
 };
 
-function buildAttrPairStr(attrName, val){
+Builder.prototype.buildAttrPairStr = function(attrName, val){
   val = this.options.attributeValueProcessor(attrName, '' + val);
   val = this.replaceEntitiesValue(val);
   if (this.options.suppressBooleanAttributes && val === "true") {
@@ -77874,31 +77881,51 @@ function buildAttrPairStr(attrName, val){
 function processTextOrObjNode (object, key, level) {
   const result = this.j2x(object, level + 1);
   if (object[this.options.textNodeName] !== undefined && Object.keys(object).length === 1) {
-    return this.buildTextNode(object[this.options.textNodeName], key, result.attrStr, level);
+    return this.buildTextValNode(object[this.options.textNodeName], key, result.attrStr, level);
   } else {
-    return this.buildObjNode(result.val, key, result.attrStr, level);
+    return this.buildObjectNode(result.val, key, result.attrStr, level);
   }
 }
 
-function buildObjectNode(val, key, attrStr, level) {
-  let tagEndExp = '</' + key + this.tagEndChar;
-  let piClosingChar = "";
+Builder.prototype.buildObjectNode = function(val, key, attrStr, level) {
+  if(val === ""){
+    if(key[0] === "?") return  this.indentate(level) + '<' + key + attrStr+ '?' + this.tagEndChar;
+    else {
+      return this.indentate(level) + '<' + key + attrStr + this.closeTag(key) + this.tagEndChar;
+    }
+  }else{
+
+    let tagEndExp = '</' + key + this.tagEndChar;
+    let piClosingChar = "";
+    
+    if(key[0] === "?") {
+      piClosingChar = "?";
+      tagEndExp = "";
+    }
   
-  if(key[0] === "?") {
-    piClosingChar = "?";
-    tagEndExp = "";
+    if (attrStr && val.indexOf('<') === -1) {
+      return ( this.indentate(level) + '<' +  key + attrStr + piClosingChar + '>' + val + tagEndExp );
+    } else if (this.options.commentPropName !== false && key === this.options.commentPropName && piClosingChar.length === 0) {
+      return this.indentate(level) + `<!--${val}-->` + this.newLine;
+    }else {
+      return (
+        this.indentate(level) + '<' + key + attrStr + piClosingChar + this.tagEndChar +
+        val +
+        this.indentate(level) + tagEndExp    );
+    }
   }
+}
 
-  if (attrStr && val.indexOf('<') === -1) {
-    return ( this.indentate(level) + '<' +  key + attrStr + piClosingChar + '>' + val + tagEndExp );
-  } else if (this.options.commentPropName !== false && key === this.options.commentPropName && piClosingChar.length === 0) {
-    return this.indentate(level) + `<!--${val}-->` + this.newLine;
-  }else {
-    return (
-      this.indentate(level) + '<' + key + attrStr + piClosingChar + this.tagEndChar +
-      val +
-      this.indentate(level) + tagEndExp    );
+Builder.prototype.closeTag = function(key){
+  let closeTag = "";
+  if(this.options.unpairedTags.indexOf(key) !== -1){ //unpaired
+    if(!this.options.suppressUnpairedNode) closeTag = "/"
+  }else if(this.options.suppressEmptyNode){ //empty
+    closeTag = "/";
+  }else{
+    closeTag = `></${key}`
   }
+  return closeTag;
 }
 
 function buildEmptyObjNode(val, key, attrStr, level) {
@@ -77906,36 +77933,35 @@ function buildEmptyObjNode(val, key, attrStr, level) {
     return this.buildObjectNode(val, key, attrStr, level);
   } else {
     if(key[0] === "?") return  this.indentate(level) + '<' + key + attrStr+ '?' + this.tagEndChar;
-    else return  this.indentate(level) + '<' + key + attrStr + '/' + this.tagEndChar;
+    else {
+      return  this.indentate(level) + '<' + key + attrStr + '/' + this.tagEndChar;
+      // return this.buildTagStr(level,key, attrStr);
+    }
   }
 }
 
-function buildTextValNode(val, key, attrStr, level) {
+Builder.prototype.buildTextValNode = function(val, key, attrStr, level) {
   if (this.options.cdataPropName !== false && key === this.options.cdataPropName) {
     return this.indentate(level) + `<![CDATA[${val}]]>` +  this.newLine;
   }else if (this.options.commentPropName !== false && key === this.options.commentPropName) {
     return this.indentate(level) + `<!--${val}-->` +  this.newLine;
+  }else if(key[0] === "?") {//PI tag
+    return  this.indentate(level) + '<' + key + attrStr+ '?' + this.tagEndChar; 
   }else{
     let textValue = this.options.tagValueProcessor(key, val);
     textValue = this.replaceEntitiesValue(textValue);
   
-    if( textValue === '' && this.options.unpairedTags.indexOf(key) !== -1){ //unpaired
-      if(this.options.suppressUnpairedNode){
-        return this.indentate(level) + '<' + key + this.tagEndChar;
-      }else{
-        return this.indentate(level) + '<' + key + "/" + this.tagEndChar;
-      }
-    } else{
-      return (
-        this.indentate(level) + '<' + key + attrStr + '>' +
+    if( textValue === ''){
+      return this.indentate(level) + '<' + key + attrStr + this.closeTag(key) + this.tagEndChar;
+    }else{
+      return this.indentate(level) + '<' + key + attrStr + '>' +
          textValue +
-        '</' + key + this.tagEndChar  );
+        '</' + key + this.tagEndChar;
     }
-
   }
 }
 
-function replaceEntitiesValue(textValue){
+Builder.prototype.replaceEntitiesValue = function(textValue){
   if(textValue && textValue.length > 0 && this.options.processEntities){
     for (let i=0; i<this.options.entities.length; i++) {
       const entity = this.options.entities[i];
@@ -77945,21 +77971,6 @@ function replaceEntitiesValue(textValue){
   return textValue;
 }
 
-function buildEmptyTextNode(val, key, attrStr, level) {
-  if( val === '' && this.options.unpairedTags.indexOf(key) !== -1){ //unpaired
-    if(this.options.suppressUnpairedNode){
-      return this.indentate(level) + '<' + key + this.tagEndChar;
-    }else{
-      return this.indentate(level) + '<' + key + "/" + this.tagEndChar;
-    }
-  }else if (val !== '') { //empty
-    return this.buildTextValNode(val, key, attrStr, level);
-  } else {
-    if(key[0] === "?") return  this.indentate(level) + '<' + key + attrStr+ '?' + this.tagEndChar; //PI tag
-    else return  this.indentate(level) + '<' + key + attrStr + '/' + this.tagEndChar; //normal
-  }
-}
-
 function indentate(level) {
   return this.options.indentBy.repeat(level);
 }
@@ -78140,7 +78151,7 @@ function readDocType(xmlData, i){
         let hasBody = false, entity = false, comment = false;
         let exp = "";
         for(;i<xmlData.length;i++){
-            if (xmlData[i] === '<') {
+            if (xmlData[i] === '<' && !comment) {
                 if( hasBody && 
                      xmlData[i+1] === '!' &&
                      xmlData[i+2] === 'E' &&
@@ -78204,14 +78215,15 @@ function readDocType(xmlData, i){
                 if(comment){
                     if( xmlData[i - 1] === "-" && xmlData[i - 2] === "-"){
                         comment = false;
-                    }else{
-                        throw new Error(`Invalid XML comment in DOCTYPE`);
+                        angleBracketsCount--;
+                    }
+                }else{
+                    if(entity) {
+                        parseEntityExp(exp, entities);
+                        entity = false;
                     }
-                }else if(entity){
-                    parseEntityExp(exp, entities);
-                    entity = false;
+                    angleBracketsCount--;
                 }
-                angleBracketsCount--;
                 if (angleBracketsCount === 0) {
                   break;
                 }
@@ -78267,7 +78279,7 @@ const defaultOptions = {
     numberParseOptions: {
       hex: true,
       leadingZeros: true,
-      eNotation: false
+      eNotation: true
     },
     tagValueProcessor: function(tagName, val) {
       return val;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abaplint/transpiler-cli",
-  "version": "2.4.8",
+  "version": "2.4.9",
   "description": "Transpiler - Command Line Interface",
   "bin": {
     "abap_transpile": "./abap_transpile"
@@ -25,11 +25,11 @@
   "author": "abaplint",
   "license": "MIT",
   "devDependencies": {
-    "@abaplint/transpiler": "^2.4.8",
+    "@abaplint/transpiler": "^2.4.9",
     "@types/glob": "^7.2.0",
     "glob": "=7.2.0",
     "@types/progress": "^2.0.5",
-    "@abaplint/core": "^2.95.9",
+    "@abaplint/core": "^2.95.13",
     "progress": "^2.0.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1",