@flock/wirespec 0.9.18 → 0.9.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flock/wirespec",
-  "version": "0.9.18",
+  "version": "0.9.20",
   "main": "wirespec-src-plugin-npm.js",
   "types": "wirespec-src-plugin-npm.d.ts",
   "devDependencies": {

package/wirespec-src-compiler-core.js

@@ -401,7 +401,7 @@
   }
   function WirespecSpec() {
     WirespecSpec_instance = this;
-    this.v20_1 = listOf([to(Regex_init_$Create$('^type'), WsTypeDef_instance), to(Regex_init_$Create$('^enum'), WsEnumTypeDef_instance), to(Regex_init_$Create$('^endpoint'), WsEndpointDef_instance), to(Regex_init_$Create$('^[^\\S\\r\\n]+'), WhiteSpaceExceptNewLine_instance), to(Regex_init_$Create$('^[\\r\\n]'), NewLine_instance), to(Regex_init_$Create$('^\\{'), LeftCurly_instance), to(Regex_init_$Create$('^\\}'), RightCurly_instance), to(Regex_init_$Create$('^->'), Arrow_instance), to(Regex_init_$Create$('^='), Equals_instance), to(Regex_init_$Create$('^\\|'), Pipe_instance), to(Regex_init_$Create$('^:'), Colon_instance), to(Regex_init_$Create$('^,'), Comma_instance), to(Regex_init_$Create$('^\\?'), QuestionMark_instance), to(Regex_init_$Create$('^#'), Hash_instance), to(Regex_init_$Create$('^\\[\\]'), Brackets_instance), to(Regex_init_$Create$('^String'), WsString_instance), to(Regex_init_$Create$('^Integer'), WsInteger_instance), to(Regex_init_$Create$('^Number'), WsNumber_instance), to(Regex_init_$Create$('^Boolean'), WsBoolean_instance), to(Regex_init_$Create$('^Unit'), WsUnit_instance), to(Regex_init_$Create$('^GET|^POST|^PUT|^DELETE|^OPTIONS|^HEAD|^PATCH|^TRACE'), Method_instance), to(Regex_init_$Create$('^/.*/g'), CustomRegex_instance), to(Regex_init_$Create$('^[1-5][0-9][0-9]'), StatusCode_instance), to(Regex_init_$Create$('^[a-z`][a-zA-Z0-9`]*'), CustomValue_instance), to(Regex_init_$Create$('^[A-Z][a-zA-Z_]*'), CustomType_instance), to(Regex_init_$Create$('^/[a-zA-Z-_]+'), Path_instance), to(Regex_init_$Create$('^\\/\\*(\\*(?!\\/)|[^*])*\\*\\/'), WsComment_instance), to(Regex_init_$Create$('^/'), ForwardSlash_instance), to(Regex_init_$Create$('^.'), Invalid_instance)]);
+    this.v20_1 = listOf([to(Regex_init_$Create$('^type'), WsTypeDef_instance), to(Regex_init_$Create$('^enum'), WsEnumTypeDef_instance), to(Regex_init_$Create$('^endpoint'), WsEndpointDef_instance), to(Regex_init_$Create$('^[^\\S\\r\\n]+'), WhiteSpaceExceptNewLine_instance), to(Regex_init_$Create$('^[\\r\\n]'), NewLine_instance), to(Regex_init_$Create$('^\\{'), LeftCurly_instance), to(Regex_init_$Create$('^\\}'), RightCurly_instance), to(Regex_init_$Create$('^->'), Arrow_instance), to(Regex_init_$Create$('^='), Equals_instance), to(Regex_init_$Create$('^\\|'), Pipe_instance), to(Regex_init_$Create$('^:'), Colon_instance), to(Regex_init_$Create$('^,'), Comma_instance), to(Regex_init_$Create$('^\\?'), QuestionMark_instance), to(Regex_init_$Create$('^#'), Hash_instance), to(Regex_init_$Create$('^\\[\\]'), Brackets_instance), to(Regex_init_$Create$('^String'), WsString_instance), to(Regex_init_$Create$('^Integer'), WsInteger_instance), to(Regex_init_$Create$('^Number'), WsNumber_instance), to(Regex_init_$Create$('^Boolean'), WsBoolean_instance), to(Regex_init_$Create$('^Unit'), WsUnit_instance), to(Regex_init_$Create$('^GET|^POST|^PUT|^DELETE|^OPTIONS|^HEAD|^PATCH|^TRACE'), Method_instance), to(Regex_init_$Create$('^/.*/g'), CustomRegex_instance), to(Regex_init_$Create$('^[1-5][0-9][0-9]'), StatusCode_instance), to(Regex_init_$Create$('^[a-z`][a-zA-Z0-9`]*'), CustomValue_instance), to(Regex_init_$Create$('^[A-Z][a-zA-Z0-9_]*'), CustomType_instance), to(Regex_init_$Create$('^/[a-zA-Z-_]+'), Path_instance), to(Regex_init_$Create$('^\\/\\*(\\*(?!\\/)|[^*])*\\*\\/'), WsComment_instance), to(Regex_init_$Create$('^/'), ForwardSlash_instance), to(Regex_init_$Create$('^.'), Invalid_instance)]);
   }
   protoOf(WirespecSpec).w20 = function () {
     return this.v20_1;
@@ -5949,7 +5949,7 @@
     }
     var tmp3_elvis_lhs = tmp_0;
     var next = tmp3_elvis_lhs == null ? '' : tmp3_elvis_lhs;
-    $this.q29_1.j20(prev + curr + next);
+    $this.q29_1.z2a(prev + curr + next);
   }
   function printTokens$default($this, previousToken, $super) {
     previousToken = previousToken === VOID ? null : previousToken;
@@ -6580,15 +6580,15 @@
   function IdxAndLength(idx, length) {
     idx = idx === VOID ? 0 : idx;
     length = length === VOID ? 0 : length;
-    this.z2a_1 = idx;
-    this.a2b_1 = length;
+    this.a2b_1 = idx;
+    this.b2b_1 = length;
   }
   protoOf(IdxAndLength).toString = function () {
-    return 'IdxAndLength(idx=' + this.z2a_1 + ', length=' + this.a2b_1 + ')';
+    return 'IdxAndLength(idx=' + this.a2b_1 + ', length=' + this.b2b_1 + ')';
   };
   protoOf(IdxAndLength).hashCode = function () {
-    var result = this.z2a_1;
-    result = imul(result, 31) + this.a2b_1 | 0;
+    var result = this.a2b_1;
+    result = imul(result, 31) + this.b2b_1 | 0;
     return result;
   };
   protoOf(IdxAndLength).equals = function (other) {
@@ -6597,10 +6597,10 @@
     if (!(other instanceof IdxAndLength))
       return false;
     var tmp0_other_with_cast = other instanceof IdxAndLength ? other : THROW_CCE();
-    if (!(this.z2a_1 === tmp0_other_with_cast.z2a_1))
-      return false;
     if (!(this.a2b_1 === tmp0_other_with_cast.a2b_1))
       return false;
+    if (!(this.b2b_1 === tmp0_other_with_cast.b2b_1))
+      return false;
     return true;
   };
   function Coordinates(line, position, idxAndLength) {
@@ -6611,14 +6611,14 @@
     this.m29_1 = position;
     this.n29_1 = idxAndLength;
   }
-  protoOf(Coordinates).b2b = function (line, position, idxAndLength) {
+  protoOf(Coordinates).c2b = function (line, position, idxAndLength) {
     return new Coordinates(line, position, idxAndLength);
   };
-  protoOf(Coordinates).c2b = function (line, position, idxAndLength, $super) {
+  protoOf(Coordinates).d2b = function (line, position, idxAndLength, $super) {
     line = line === VOID ? this.l29_1 : line;
     position = position === VOID ? this.m29_1 : position;
     idxAndLength = idxAndLength === VOID ? this.n29_1 : idxAndLength;
-    return $super === VOID ? this.b2b(line, position, idxAndLength) : $super.b2b.call(this, line, position, idxAndLength);
+    return $super === VOID ? this.c2b(line, position, idxAndLength) : $super.c2b.call(this, line, position, idxAndLength);
   };
   protoOf(Coordinates).toString = function () {
     return 'Coordinates(line=' + this.l29_1 + ', position=' + this.m29_1 + ', idxAndLength=' + this.n29_1 + ')';
@@ -6651,14 +6651,14 @@
   protoOf(Token).p2 = function () {
     return this.h29_1;
   };
-  protoOf(Token).d2b = function (value, type, coordinates) {
+  protoOf(Token).e2b = function (value, type, coordinates) {
     return new Token(value, type, coordinates);
   };
   protoOf(Token).p29 = function (value, type, coordinates, $super) {
     value = value === VOID ? this.h29_1 : value;
     type = type === VOID ? this.i29_1 : type;
     coordinates = coordinates === VOID ? this.j29_1 : coordinates;
-    return $super === VOID ? this.d2b(value, type, coordinates) : $super.d2b.call(this, value, type, coordinates);
+    return $super === VOID ? this.e2b(value, type, coordinates) : $super.e2b.call(this, value, type, coordinates);
   };
   protoOf(Token).toString = function () {
     return 'Token(value=' + this.h29_1 + ', type=' + this.i29_1 + ', coordinates=' + this.j29_1 + ')';
@@ -6684,10 +6684,10 @@
     return true;
   };
   function plus_1(_this__u8e3s4, length) {
-    return new IdxAndLength(_this__u8e3s4.z2a_1 + length | 0, length);
+    return new IdxAndLength(_this__u8e3s4.a2b_1 + length | 0, length);
   }
   function plus_2(_this__u8e3s4, length) {
-    return _this__u8e3s4.c2b(VOID, _this__u8e3s4.m29_1 + length | 0, plus_1(_this__u8e3s4.n29_1, length));
+    return _this__u8e3s4.d2b(VOID, _this__u8e3s4.m29_1 + length | 0, plus_1(_this__u8e3s4.n29_1, length));
   }
   function tokenize(_this__u8e3s4, source) {
     var tmp1_coordinates = new Coordinates();
@@ -7396,7 +7396,7 @@
     return StartOfProgram_instance;
   }
   function EndOfProgram() {
-    this.e2b_1 = 'EOP';
+    this.f2b_1 = 'EOP';
   }
   protoOf(EndOfProgram).toString = function () {
     return 'EndOfProgram';
@@ -7434,6 +7434,16 @@
     enableLogging = enableLogging === VOID ? false : enableLogging;
     this.i20_1 = enableLogging;
   }
+  protoOf(Logger).z2a = function (s) {
+    var tmp;
+    if (this.i20_1) {
+      println(s);
+      tmp = Unit_instance;
+    } else {
+      tmp = Unit_instance;
+    }
+    return tmp;
+  };
   protoOf(Logger).j20 = function (s) {
     var tmp;
     if (this.i20_1) {