@flock/wirespec 0.16.1 → 0.16.3

package/package.json

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

package/wirespec-src-compiler-core.mjs

@@ -2446,7 +2446,7 @@ function emitDeserializedParams_4(_this__u8e3s4, $this, endpoint) {
   // Inline function 'kotlin.contracts.contract' call
   // Inline function 'community.flock.wirespec.compiler.core.emit.PythonEmitter.emitDeserializedParams.<anonymous>' call
   var it = joinToString(listOfNotNull([tmp_0, tmp_1, tmp_2, tmp_3]), ',\n');
-  return isBlank(it) ? '' : '(\n' + it + '\n)';
+  return isBlank(it) ? '()' : '(\n' + it + '\n)';
 }
 function emitDeserialized_3(_this__u8e3s4, $this) {
   return Spacer_instance.e25(3) + $this.o25(_this__u8e3s4.rd_1.p25_1) + ' = serialization.deserialize(request.path[' + _this__u8e3s4.qd_1 + '], ' + emitType_0(_this__u8e3s4.rd_1.q25_1, $this) + ')';
@@ -3157,96 +3157,101 @@ function emitType_2(_this__u8e3s4, $this, endpoint) {
 }
 function emitFunction(_this__u8e3s4, $this, endpoint) {
   var tmp = Spacer_instance.toString();
+  var tmp_0 = $this.x28(_this__u8e3s4, endpoint);
+  var tmp_1 = joinToObject(tmp_0, $this, TypeScriptEmitter$emitFunction$lambda($this));
+  var tmp_2 = Spacer_instance.toString();
   // Inline function 'kotlin.text.orEmpty' call
   // Inline function 'kotlin.takeIf' call
   var this_0 = $this.x28(_this__u8e3s4, endpoint);
   // Inline function 'kotlin.contracts.contract' call
-  var tmp_0;
+  var tmp_3;
   // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emitFunction.<anonymous>' call
   // Inline function 'kotlin.collections.isNotEmpty' call
   if (!this_0.l()) {
-    tmp_0 = this_0;
+    tmp_3 = this_0;
   } else {
-    tmp_0 = null;
+    tmp_3 = null;
   }
-  var tmp0_safe_receiver = tmp_0;
-  var tmp_1;
-  if (tmp0_safe_receiver == null) {
-    tmp_1 = null;
+  var tmp_4;
+  if (tmp_3 == null) {
+    tmp_4 = null;
   } else {
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emitFunction.<anonymous>' call
-    tmp_1 = 'props: ' + joinToObject(tmp0_safe_receiver, $this, TypeScriptEmitter$emitFunction$lambda($this));
+    tmp_4 = 'params: RequestParams';
   }
-  var tmp0_elvis_lhs = tmp_1;
-  var tmp_2 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
-  var tmp_3 = Spacer_instance.e25(2);
-  var tmp_4 = $this.j25(endpoint);
-  var tmp_5 = joinToObject(tmp_4, $this, TypeScriptEmitter$emitFunction$lambda_0($this));
+  var tmp0_elvis_lhs = tmp_4;
+  var tmp_5 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
   var tmp_6 = Spacer_instance.e25(2);
-  var tmp_7 = endpoint.t24_1.toString();
-  var tmp_8 = Spacer_instance.e25(2);
-  var tmp_9 = joinToObject(endpoint.v24_1, $this, TypeScriptEmitter$emitFunction$lambda_1($this));
-  var tmp_10 = Spacer_instance.e25(2);
-  var tmp_11 = joinToObject(endpoint.w24_1, $this, TypeScriptEmitter$emitFunction$lambda_2($this));
-  var tmp_12 = Spacer_instance.e25(2);
-  var tmp_13;
+  var tmp_7 = $this.j25(endpoint);
+  var tmp_8 = joinToObject(tmp_7, $this, TypeScriptEmitter$emitFunction$lambda_0($this));
+  var tmp_9 = Spacer_instance.e25(2);
+  var tmp_10 = endpoint.t24_1.toString();
+  var tmp_11 = Spacer_instance.e25(2);
+  var tmp_12 = joinToObject(endpoint.v24_1, $this, TypeScriptEmitter$emitFunction$lambda_1($this));
+  var tmp_13 = Spacer_instance.e25(2);
+  var tmp_14 = joinToObject(endpoint.w24_1, $this, TypeScriptEmitter$emitFunction$lambda_2($this));
+  var tmp_15 = Spacer_instance.e25(2);
+  var tmp_16;
   if (_this__u8e3s4.f25_1 == null) {
-    tmp_13 = null;
+    tmp_16 = null;
   } else {
     // Inline function 'kotlin.let' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emitFunction.<anonymous>' call
-    tmp_13 = 'props.body';
+    tmp_16 = 'params.body';
   }
-  var tmp2_elvis_lhs = tmp_13;
-  return trimIndent('\n      |' + tmp + 'export const request = (' + tmp_2 + '): Request => ({\n      |' + tmp_3 + 'path: ' + tmp_5 + ',\n      |' + tmp_6 + 'method: "' + tmp_7 + '",\n      |' + tmp_8 + 'queries: ' + tmp_9 + ',\n      |' + tmp_10 + 'headers: ' + tmp_11 + ',\n      |' + tmp_12 + 'body: ' + (tmp2_elvis_lhs == null ? 'undefined' : tmp2_elvis_lhs) + ',\n      |' + Spacer_instance.toString() + '})\n    ');
+  var tmp2_elvis_lhs = tmp_16;
+  return trimIndent('\n      |' + tmp + 'export type RequestParams = ' + tmp_1 + '\n      |' + tmp_2 + 'export const request = (' + tmp_5 + '): Request => ({\n      |' + tmp_6 + 'path: ' + tmp_8 + ',\n      |' + tmp_9 + 'method: "' + tmp_10 + '",\n      |' + tmp_11 + 'queries: ' + tmp_12 + ',\n      |' + tmp_13 + 'headers: ' + tmp_14 + ',\n      |' + tmp_15 + 'body: ' + (tmp2_elvis_lhs == null ? 'undefined' : tmp2_elvis_lhs) + ',\n      |' + Spacer_instance.toString() + '})\n    ');
 }
 function emitFunction_0(_this__u8e3s4, $this) {
   var tmp = Spacer_instance.toString();
   var tmp_0 = Companion_instance_5.l25(_this__u8e3s4.z24_1);
+  var tmp_1 = $this.y28(_this__u8e3s4);
+  var tmp_2 = joinToObject(tmp_1, $this, TypeScriptEmitter$emitFunction$lambda_3($this));
+  var tmp_3 = Spacer_instance.toString();
+  var tmp_4 = Companion_instance_5.l25(_this__u8e3s4.z24_1);
   // Inline function 'kotlin.text.orEmpty' call
   // Inline function 'kotlin.takeIf' call
   var this_0 = $this.y28(_this__u8e3s4);
   // Inline function 'kotlin.contracts.contract' call
-  var tmp_1;
+  var tmp_5;
   // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emitFunction.<anonymous>' call
   // Inline function 'kotlin.collections.isNotEmpty' call
   if (!this_0.l()) {
-    tmp_1 = this_0;
+    tmp_5 = this_0;
   } else {
-    tmp_1 = null;
+    tmp_5 = null;
   }
-  var tmp0_safe_receiver = tmp_1;
-  var tmp_2;
-  if (tmp0_safe_receiver == null) {
-    tmp_2 = null;
+  var tmp_6;
+  if (tmp_5 == null) {
+    tmp_6 = null;
   } else {
     // Inline function 'kotlin.run' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emitFunction.<anonymous>' call
-    tmp_2 = 'props: ' + joinToObject(tmp0_safe_receiver, $this, TypeScriptEmitter$emitFunction$lambda_3($this));
+    tmp_6 = 'params: Response' + Companion_instance_5.l25(_this__u8e3s4.z24_1) + 'Params';
   }
-  var tmp0_elvis_lhs = tmp_2;
-  var tmp_3 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
-  var tmp_4 = Companion_instance_5.l25(_this__u8e3s4.z24_1);
-  var tmp_5 = Spacer_instance.e25(2);
-  var tmp_6 = $this.c28(_this__u8e3s4.z24_1);
-  var tmp_7 = Spacer_instance.e25(2);
-  var tmp_8 = joinToObject(_this__u8e3s4.a25_1, $this, TypeScriptEmitter$emitFunction$lambda_4($this));
+  var tmp0_elvis_lhs = tmp_6;
+  var tmp_7 = tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs;
+  var tmp_8 = Companion_instance_5.l25(_this__u8e3s4.z24_1);
   var tmp_9 = Spacer_instance.e25(2);
-  var tmp_10;
+  var tmp_10 = $this.c28(_this__u8e3s4.z24_1);
+  var tmp_11 = Spacer_instance.e25(2);
+  var tmp_12 = joinToObject(_this__u8e3s4.a25_1, $this, TypeScriptEmitter$emitFunction$lambda_4($this));
+  var tmp_13 = Spacer_instance.e25(2);
+  var tmp_14;
   if (_this__u8e3s4.b25_1 == null) {
-    tmp_10 = null;
+    tmp_14 = null;
   } else {
     // Inline function 'kotlin.let' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'community.flock.wirespec.compiler.core.emit.TypeScriptEmitter.emitFunction.<anonymous>' call
-    tmp_10 = 'props.body';
+    tmp_14 = 'params.body';
   }
-  var tmp2_elvis_lhs = tmp_10;
-  return trimIndent('\n      |' + tmp + 'export const response' + tmp_0 + ' = (' + tmp_3 + '): Response' + tmp_4 + ' => ({\n      |' + tmp_5 + 'status: ' + tmp_6 + ',\n      |' + tmp_7 + 'headers: ' + tmp_8 + ',\n      |' + tmp_9 + 'body: ' + (tmp2_elvis_lhs == null ? 'undefined' : tmp2_elvis_lhs) + ',\n      |' + Spacer_instance.toString() + '})\n    ');
+  var tmp2_elvis_lhs = tmp_14;
+  return trimIndent('\n      |' + tmp + 'export type Response' + tmp_0 + 'Params = ' + tmp_2 + '\n      |' + tmp_3 + 'export const response' + tmp_4 + ' = (' + tmp_7 + '): Response' + tmp_8 + ' => ({\n      |' + tmp_9 + 'status: ' + tmp_10 + ',\n      |' + tmp_11 + 'headers: ' + tmp_12 + ',\n      |' + tmp_13 + 'body: ' + (tmp2_elvis_lhs == null ? 'undefined' : tmp2_elvis_lhs) + ',\n      |' + Spacer_instance.toString() + '})\n    ');
 }
 function joinToObject(_this__u8e3s4, $this, transform) {
   return joinToString(_this__u8e3s4, ', ', '{', '}', VOID, VOID, transform);
@@ -3415,17 +3420,17 @@ function TypeScriptEmitter$emitFunction$lambda(this$0) {
 }
 function TypeScriptEmitter$emitFunction$lambda_0(this$0) {
   return function (it) {
-    return this$0.o25(it.p25_1) + ': props[' + this$0.o25(it.p25_1) + ']';
+    return this$0.o25(it.p25_1) + ': params[' + this$0.o25(it.p25_1) + ']';
   };
 }
 function TypeScriptEmitter$emitFunction$lambda_1(this$0) {
   return function (it) {
-    return this$0.o25(it.m25_1) + ': props[' + this$0.o25(it.m25_1) + ']';
+    return this$0.o25(it.m25_1) + ': params[' + this$0.o25(it.m25_1) + ']';
   };
 }
 function TypeScriptEmitter$emitFunction$lambda_2(this$0) {
   return function (it) {
-    return this$0.o25(it.m25_1) + ': props[' + this$0.o25(it.m25_1) + ']';
+    return this$0.o25(it.m25_1) + ': params[' + this$0.o25(it.m25_1) + ']';
   };
 }
 function TypeScriptEmitter$emitFunction$lambda_3(this$0) {
@@ -3435,7 +3440,7 @@ function TypeScriptEmitter$emitFunction$lambda_3(this$0) {
 }
 function TypeScriptEmitter$emitFunction$lambda_4(this$0) {
   return function (it) {
-    return this$0.o25(it.m25_1) + ': props[' + this$0.o25(it.m25_1) + ']';
+    return this$0.o25(it.m25_1) + ': params[' + this$0.o25(it.m25_1) + ']';
   };
 }
 function TypeScriptEmitter$emitType$lambda_0(this$0) {
@@ -11576,7 +11581,11 @@ function extractRegex(_this__u8e3s4, source, regex, incompleteTokens) {
     tmp = tokenize_1(_this__u8e3s4, source, incompleteTokens.pk(token));
   } else {
     if (escapedForwardSlash.ub(source)) {
-      tmp = extractRegex(_this__u8e3s4, drop_0(source, 2), regex + toString_0(first(source)), incompleteTokens);
+      var tmp_1 = drop_0(source, 2);
+      // Inline function 'kotlin.text.substring' call
+      // Inline function 'kotlin.js.asDynamic' call
+      var tmp$ret$2 = source.substring(0, 2);
+      tmp = extractRegex(_this__u8e3s4, tmp_1, regex + tmp$ret$2, incompleteTokens);
     } else {
       if (match == null) {
         tmp = extractRegex(_this__u8e3s4, drop_0(source, 1), regex + toString_0(first(source)), incompleteTokens);