@flock/wirespec 0.14.6 → 0.14.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flock/wirespec",
-  "version": "0.14.6",
+  "version": "0.14.8",
   "main": "wirespec-src-plugin-npm.mjs",
   "types": "wirespec-src-plugin-npm.d.ts",
   "devDependencies": {

package/wirespec-src-compiler-core.mjs

@@ -21,11 +21,12 @@ import {
   mapOf1xd03cq9cnmy8 as mapOf,
   removePrefix279df90bhrqqg as removePrefix,
   removeSuffix3d61x5lsuvuho as removeSuffix,
+  startsWith26w8qjqapeeq6 as startsWith,
   isCharSequence1ju9jr1w86plq as isCharSequence,
   trim11nh7r46at6sx as trim,
   isBlank1dvkhjjvox3p0 as isBlank,
   _Char___init__impl__6a9atx367vrx0avsvbg as _Char___init__impl__6a9atx,
-  startsWith1bgirhbedtv2y as startsWith,
+  startsWith1bgirhbedtv2y as startsWith_0,
   endsWith278181ii8uuo as endsWith,
   until1jbpn0z3f8lbg as until,
   substring2pnd9wgs9hwtx as substring,
@@ -57,7 +58,6 @@ import {
   dropLastlqc2oyv04br0 as dropLast,
   replace3le3ie7l9k8aq as replace,
   first58ocm7j58k3q as first_0,
-  last1vo29oleiqj36 as last,
   emptyList1g2z5xcrvp2zy as emptyList,
   plus310ted5e4i90h as plus,
   flatten2dh4kibw1u0qq as flatten,
@@ -68,6 +68,7 @@ import {
   hashCodeq5arwsb9dgti as hashCode,
   compareValues1n2ayl87ihzfk as compareValues,
   sortedWith2csnbbb21k0lg as sortedWith,
+  last1vo29oleiqj36 as last,
   trimIndent1qytc1wvt8suh as trimIndent,
   prependIndentkl9wuvcodvmu as prependIndent,
   toSet2orjxp16sotqu as toSet,
@@ -430,7 +431,7 @@ function WirespecSpec() {
   WirespecSpec_instance = this;
   this.o23_1 = WirespecType_getInstance();
   this.p23_1 = WirespecField_getInstance();
-  this.q23_1 = listOf([to(Regex_init_$Create$('^\\btype\\b'), TypeDefinition_instance), to(Regex_init_$Create$('^\\benum\\b'), EnumTypeDefinition_instance), to(Regex_init_$Create$('^\\bendpoint\\b'), EndpointDefinition_instance), to(Regex_init_$Create$('^\\bchannel\\b'), ChannelDefinition_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$('^\\b(GET|POST|PUT|DELETE|OPTIONS|HEAD|PATCH|TRACE)\\b'), Method_instance), to(Regex_init_$Create$('^[1-5][0-9][0-9]'), StatusCode_instance), to(Regex_init_$Create$('^[a-z`][a-zA-Z0-9_\\-`]*'), this.p23_1), to(Regex_init_$Create$('^\\b[A-Z][a-zA-Z0-9_]*\\b'), this.o23_1), to(Regex_init_$Create$('^/[a-zA-Z0-9-_]+'), Path_instance), to(Regex_init_$Create$('^\\/\\*(\\*(?!\\/)|[^*])*\\*\\/'), Comment_instance), to(Regex_init_$Create$('^/'), ForwardSlash_instance), to(Regex_init_$Create$('^.'), Character_instance)]);
+  this.q23_1 = listOf([to(Regex_init_$Create$('^\\btype\\b'), TypeDefinition_instance), to(Regex_init_$Create$('^\\benum\\b'), EnumTypeDefinition_instance), to(Regex_init_$Create$('^\\bendpoint\\b'), EndpointDefinition_instance), to(Regex_init_$Create$('^\\bchannel\\b'), ChannelDefinition_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$('^\\b(GET|POST|PUT|DELETE|OPTIONS|HEAD|PATCH|TRACE)\\b'), Method_instance), to(Regex_init_$Create$('^[1-5][0-9][0-9]'), StatusCode_instance), to(Regex_init_$Create$('^[a-z`][a-zA-Z0-9_\\-`]*'), this.p23_1), to(Regex_init_$Create$('^\\b[A-Z][a-zA-Z0-9_]*\\b'), this.o23_1), to(Regex_init_$Create$('^/[a-zA-Z0-9-_]+'), Path_instance), to(Regex_init_$Create$('^//.*'), Comment_instance), to(Regex_init_$Create$('^\\/\\*(\\*(?!\\/)|[^*])*\\*\\/'), Comment_instance), to(Regex_init_$Create$('^/'), ForwardSlash_instance), to(Regex_init_$Create$('^.'), Character_instance)]);
 }
 protoOf(WirespecSpec).r23 = function () {
   return this.o23_1;
@@ -504,8 +505,14 @@ function WirespecField_getInstance() {
   return WirespecField_instance;
 }
 function removeCommentMarkers(_this__u8e3s4) {
+  var tmp;
+  if (startsWith(_this__u8e3s4, '//')) {
+    tmp = removePrefix(_this__u8e3s4, '//');
+  } else {
+    tmp = removeSuffix(removePrefix(_this__u8e3s4, '/*'), '*/');
+  }
   // Inline function 'kotlin.text.trim' call
-  var this_0 = removeSuffix(removePrefix(_this__u8e3s4, '/*'), '*/');
+  var this_0 = tmp;
   return toString(trim(isCharSequence(this_0) ? this_0 : THROW_CCE()));
 }
 function removeBackticks(_this__u8e3s4) {
@@ -532,7 +539,7 @@ function addBackticks(_this__u8e3s4) {
   return '`' + _this__u8e3s4 + '`';
 }
 function hasBackticks(_this__u8e3s4) {
-  return _this__u8e3s4.length > 1 && startsWith(_this__u8e3s4, _Char___init__impl__6a9atx(96)) && endsWith(_this__u8e3s4, _Char___init__impl__6a9atx(96));
+  return _this__u8e3s4.length > 1 && startsWith_0(_this__u8e3s4, _Char___init__impl__6a9atx(96)) && endsWith(_this__u8e3s4, _Char___init__impl__6a9atx(96));
 }
 function removeFirstAndLastChar(_this__u8e3s4) {
   return substring(_this__u8e3s4, until(1, _this__u8e3s4.length - 1 | 0));
@@ -1122,9 +1129,9 @@ protoOf(JavaEmitter).a27 = function (module_0, logger) {
   var this_0 = protoOf(Emitter).a27.call(this, module_0, logger);
   // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
   var destruct = this_0.uk_1;
-  var typeName = destruct.yd();
+  var file = destruct.yd();
   var result = destruct.zd();
-  var tmp = this.d24_1.f27() + sanitizeSymbol(typeName, this);
+  var tmp = this.d24_1.f27() + sanitizeSymbol(file, this);
   // Inline function 'kotlin.text.trimStart' call
   var this_1 = trimMargin('\n                            |package ' + this.d24_1.toString() + ';\n                            |' + (Companion_getInstance_4().g27(module_0) ? this.f24_1 : '') + '\n                            |' + result + '\n                        ');
   var tmp$ret$0 = toString(trimStart(isCharSequence(this_1) ? this_1 : THROW_CCE()));
@@ -1137,9 +1144,9 @@ protoOf(JavaEmitter).a27 = function (module_0, logger) {
   while (_iterator__ex2g4s.h()) {
     var item = _iterator__ex2g4s.i();
     // Inline function 'community.flock.wirespec.compiler.core.emit.JavaEmitter.emit.<anonymous>' call
-    var typeName_0 = item.yd();
+    var file_0 = item.yd();
     var result_0 = item.zd();
-    var tmp_1 = this.d24_1.f27() + sanitizeSymbol(typeName_0, this);
+    var tmp_1 = this.d24_1.f27() + sanitizeSymbol(file_0, this);
     // Inline function 'kotlin.text.trimStart' call
     var this_3 = trimMargin('\n                            |package ' + this.d24_1.toString() + ';\n                            |' + (Companion_getInstance_4().g27(module_0) ? this.f24_1 : '') + '\n                            |' + result_0 + '\n                        ');
     var tmp$ret$2 = toString(trimStart(isCharSequence(this_3) ? this_3 : THROW_CCE()));
@@ -1840,29 +1847,35 @@ protoOf(KotlinEmitter).z26 = function () {
   return this.h28_1;
 };
 protoOf(KotlinEmitter).a27 = function (module_0, logger) {
-  var tmp = this.c28_1.f27() + Companion_getInstance_4().o25(last(split(module_0.m27_1, ['/'])));
-  var tmp_0 = this.c28_1.toString();
-  var tmp_1 = Companion_getInstance_4().g27(module_0) ? this.e28_1 : '';
   // Inline function 'arrow.core.NonEmptyList.map' call
   var this_0 = protoOf(Emitter).a27.call(this, module_0, logger);
-  // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.stub_for_inlining' call
-  var tmp_2 = this_0.uk_1.c27_1;
+  // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>' call
+  var destruct = this_0.uk_1;
+  var file = destruct.yd();
+  var result = destruct.zd();
+  var tmp = this.c28_1.f27() + sanitizeSymbol_0(file, this);
+  // Inline function 'kotlin.text.trimStart' call
+  var this_1 = trimMargin('\n                            |package ' + this.c28_1.toString() + '\n                            |' + (Companion_getInstance_4().g27(module_0) ? this.e28_1 : '') + '\n                            |' + result + '\n                        ');
+  var tmp$ret$0 = toString(trimStart(isCharSequence(this_1) ? this_1 : THROW_CCE()));
+  var tmp_0 = new Emitted(tmp, tmp$ret$0);
   // Inline function 'kotlin.collections.map' call
-  var this_1 = this_0.vk_1;
+  var this_2 = this_0.vk_1;
   // Inline function 'kotlin.collections.mapTo' call
-  var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_1, 10));
-  var _iterator__ex2g4s = this_1.g();
+  var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_2, 10));
+  var _iterator__ex2g4s = this_2.g();
   while (_iterator__ex2g4s.h()) {
     var item = _iterator__ex2g4s.i();
-    // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.stub_for_inlining' call
-    var tmp$ret$1 = item.c27_1;
-    destination.e(tmp$ret$1);
+    // Inline function 'community.flock.wirespec.compiler.core.emit.KotlinEmitter.emit.<anonymous>' call
+    var file_0 = item.yd();
+    var result_0 = item.zd();
+    var tmp_1 = this.c28_1.f27() + sanitizeSymbol_0(file_0, this);
+    // Inline function 'kotlin.text.trimStart' call
+    var this_3 = trimMargin('\n                            |package ' + this.c28_1.toString() + '\n                            |' + (Companion_getInstance_4().g27(module_0) ? this.e28_1 : '') + '\n                            |' + result_0 + '\n                        ');
+    var tmp$ret$2 = toString(trimStart(isCharSequence(this_3) ? this_3 : THROW_CCE()));
+    var tmp$ret$3 = new Emitted(tmp_1, tmp$ret$2);
+    destination.e(tmp$ret$3);
   }
-  var tmp$ret$4 = new NonEmptyList(tmp_2, destination);
-  // Inline function 'kotlin.text.trimStart' call
-  var this_2 = trimMargin('\n                    |package ' + tmp_0 + '\n                    |' + tmp_1 + '\n                    |' + joinToString(tmp$ret$4, '\n') + '\n                ');
-  var tmp$ret$5 = toString(trimStart(isCharSequence(this_2) ? this_2 : THROW_CCE()));
-  var emitted = nonEmptyListOf(new Emitted(tmp, tmp$ret$5), []);
+  var emitted = new NonEmptyList(tmp_0, destination);
   return this.d28_1 ? emitted.al(new Emitted(Companion_instance_6.f26('community.flock.wirespec.generated').f27() + 'Wirespec', this.h26().k28_1)) : emitted;
 };
 protoOf(KotlinEmitter).j27 = function (type, module_0) {
@@ -4261,8 +4274,8 @@ var Spacer_instance;
 function Spacer_getInstance() {
   return Spacer_instance;
 }
-function Emitted(typeName, result) {
-  this.b27_1 = typeName;
+function Emitted(file, result) {
+  this.b27_1 = file;
   this.c27_1 = result;
 }
 protoOf(Emitted).yd = function () {
@@ -4272,7 +4285,7 @@ protoOf(Emitted).zd = function () {
   return this.c27_1;
 };
 protoOf(Emitted).toString = function () {
-  return 'Emitted(typeName=' + this.b27_1 + ', result=' + this.c27_1 + ')';
+  return 'Emitted(file=' + this.b27_1 + ', result=' + this.c27_1 + ')';
 };
 protoOf(Emitted).hashCode = function () {
   var result = getStringHashCode(this.b27_1);
@@ -9595,7 +9608,6 @@ export {
   Emitted as Emitted3cm6ez40hij29,
   Emitter as Emitter1jsaltl7ktuoe,
   get_entries as get_entries4pic4pnz9ji1,
-  PackageName as PackageName35p0zgv8tekor,
   JavaEmitter as JavaEmitter1iajkiqm8e1w2,
   KotlinEmitter as KotlinEmitter3u2bd89c6zjpn,
   PythonEmitter as PythonEmitter2ympv43525ly9,