kaitai-struct-compiler 0.10.0-SNAPSHOT20220801.120454.5340ff36 → 0.10.0-SNAPSHOT20220801.215207.be695f54

package/kaitai-struct-compiler.js

@@ -1290,6 +1290,16 @@ function $isArrayOf_Lio_kaitai_struct_exprlang_Ast$cmpop(obj, depth) {
 function $asArrayOf_Lio_kaitai_struct_exprlang_Ast$cmpop(obj, depth) {
   return (($isArrayOf_Lio_kaitai_struct_exprlang_Ast$cmpop(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lio.kaitai.struct.exprlang.Ast$cmpop;", depth))
 }
+function $f_Lio_kaitai_struct_exprlang_Ast$expr__evaluateStrConst__s_Option($thiz) {
+  var x1 = $m_Lio_kaitai_struct_exprlang_ConstEvaluator$().evaluate__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_ConstEvaluator$value($thiz);
+  if ((x1 instanceof $c_Lio_kaitai_struct_exprlang_ConstEvaluator$value$Str)) {
+    var x2 = $as_Lio_kaitai_struct_exprlang_ConstEvaluator$value$Str(x1);
+    var x = x2.value$1;
+    return new $c_s_Some().init___O(x)
+  } else {
+    return $m_s_None$()
+  }
+}
 function $is_Lio_kaitai_struct_exprlang_Ast$expr(obj) {
   return (!(!((obj && obj.$classData) && obj.$classData.ancestors.Lio_kaitai_struct_exprlang_Ast$expr)))
 }
@@ -4494,9 +4504,9 @@ function $h_Lio_kaitai_struct_Version$() {
 $h_Lio_kaitai_struct_Version$.prototype = $c_Lio_kaitai_struct_Version$.prototype;
 $c_Lio_kaitai_struct_Version$.prototype.init___ = (function() {
   this.name$1 = "kaitai-struct-compiler-js";
-  this.version$1 = "0.10-SNAPSHOT20220801.120454.5340ff36";
-  this.gitCommit$1 = "5340ff36";
-  this.gitTime$1 = "2022-08-01T12:04:54+00:00";
+  this.version$1 = "0.10-SNAPSHOT20220801.215207.be695f54";
+  this.gitCommit$1 = "be695f54";
+  this.gitTime$1 = "2022-08-01T21:52:07+00:00";
   return this
 });
 var $d_Lio_kaitai_struct_Version$ = new $TypeData().initClass({
@@ -47912,6 +47922,12 @@ $c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.productPrefix__T = (fu
 $c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.productArity__I = (function() {
   return 3
 });
+$c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.init___Lio_kaitai_struct_exprlang_Ast$identifier__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$typeId = (function(enumName, id, inType) {
+  this.enumName$1 = enumName;
+  this.id$1 = id;
+  this.inType$1 = inType;
+  return this
+});
 $c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.equals__O__Z = (function(x$1) {
   if ((this === x$1)) {
     return true
@@ -47937,12 +47953,6 @@ $c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.equals__O__Z = (functi
     return false
   }
 });
-$c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.init___Lio_kaitai_struct_exprlang_Ast$identifier__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$typeId = (function(enumName, id, inType) {
-  this.enumName$1 = enumName;
-  this.id$1 = id;
-  this.inType$1 = inType;
-  return this
-});
 $c_Lio_kaitai_struct_exprlang_Ast$expr$EnumById.prototype.productElement__I__O = (function(x$1) {
   switch (x$1) {
     case 0: {
@@ -48753,14 +48763,14 @@ $h_Lio_kaitai_struct_exprlang_Ast$expr$UnaryOp.prototype = $c_Lio_kaitai_struct_
 $c_Lio_kaitai_struct_exprlang_Ast$expr$UnaryOp.prototype.productPrefix__T = (function() {
   return "UnaryOp"
 });
+$c_Lio_kaitai_struct_exprlang_Ast$expr$UnaryOp.prototype.productArity__I = (function() {
+  return 2
+});
 $c_Lio_kaitai_struct_exprlang_Ast$expr$UnaryOp.prototype.init___Lio_kaitai_struct_exprlang_Ast$unaryop__Lio_kaitai_struct_exprlang_Ast$expr = (function(op, operand) {
   this.op$1 = op;
   this.operand$1 = operand;
   return this
 });
-$c_Lio_kaitai_struct_exprlang_Ast$expr$UnaryOp.prototype.productArity__I = (function() {
-  return 2
-});
 $c_Lio_kaitai_struct_exprlang_Ast$expr$UnaryOp.prototype.equals__O__Z = (function(x$1) {
   if ((this === x$1)) {
     return true
@@ -66702,12 +66712,12 @@ $c_Lio_kaitai_struct_translators_JavaTranslator.prototype.arraySize__Lio_kaitai_
   return this.arraySize__Lio_kaitai_struct_exprlang_Ast$expr__T(a)
 });
 $c_Lio_kaitai_struct_translators_JavaTranslator.prototype.doStrCompareOp__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$cmpop__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(left, op, right) {
-  var x$2 = $m_Lio_kaitai_struct_exprlang_Ast$cmpop$Eq$();
-  if (((op !== null) && (op === x$2))) {
+  var x = $m_Lio_kaitai_struct_exprlang_Ast$cmpop$Eq$();
+  if ((x === op)) {
     return (((this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(left) + ".equals(") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(right)) + ")")
   } else {
-    var x$4 = $m_Lio_kaitai_struct_exprlang_Ast$cmpop$NotEq$();
-    if (((op !== null) && (op === x$4))) {
+    var x$3 = $m_Lio_kaitai_struct_exprlang_Ast$cmpop$NotEq$();
+    if ((x$3 === op)) {
       return (((("!(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(left)) + ").equals(") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(right)) + ")")
     } else {
       return (((((("(" + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(left)) + ".compareTo(") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(right)) + ") ") + $f_Lio_kaitai_struct_translators_CommonOps__cmpOp__Lio_kaitai_struct_exprlang_Ast$cmpop__T(this, op)) + " 0)")
@@ -68055,7 +68065,20 @@ $c_Lio_kaitai_struct_translators_RubyTranslator.prototype.strToInt__Lio_kaitai_s
   return this.strToInt__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_exprlang_Ast$expr__T(s, base)
 });
 $c_Lio_kaitai_struct_translators_RubyTranslator.prototype.bytesToStr__T__Lio_kaitai_struct_exprlang_Ast$expr__T = (function(bytesExpr, encoding) {
-  return (((("(" + bytesExpr) + ").force_encoding(") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(encoding)) + ")")
+  var encodingOpt = $f_Lio_kaitai_struct_exprlang_Ast$expr__evaluateStrConst__s_Option(encoding);
+  if ((encodingOpt instanceof $c_s_Some)) {
+    var x2 = $as_s_Some(encodingOpt);
+    var encodingConst = $as_T(x2.value$2);
+    var encodingConstLower = $as_T(encodingConst.toLowerCase());
+    var needEncode = ((encodingConstLower !== "utf8") && (encodingConstLower !== "utf-8"))
+  } else {
+    var x = $m_s_None$();
+    if ((!(x === encodingOpt))) {
+      throw new $c_s_MatchError().init___O(encodingOpt)
+    };
+    var needEncode = true
+  };
+  return ((((("(" + bytesExpr) + ").force_encoding(") + this.translate__Lio_kaitai_struct_exprlang_Ast$expr__T(encoding)) + ")") + (needEncode ? ".encode('UTF-8')" : ""))
 });
 $c_Lio_kaitai_struct_translators_RubyTranslator.prototype.enumToInt__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType$EnumType__O = (function(value, et) {
   return this.enumToInt__Lio_kaitai_struct_exprlang_Ast$expr__Lio_kaitai_struct_datatype_DataType$EnumType__T(value, et)

package/package.json

@@ -35,5 +35,5 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
-  "version": "0.10.0-SNAPSHOT20220801.120454.5340ff36"
+  "version": "0.10.0-SNAPSHOT20220801.215207.be695f54"
 }