More protoc-gen-kaja tests & fixes

protoc-gen-kaja/scripts/test

@@ -139,7 +139,16 @@ run_test() {
   fi
 
   # If one succeeded and the other failed, it's a failure
+  # Exception: if protoc-gen-ts crashed (JS stack trace) but protoc-gen-kaja
+  # succeeded, treat as PASS — Go correctly handles what TS can't.
   if [ "$ts_ok" != "$kaja_ok" ]; then
+    if [ "$ts_ok" = false ] && [ "$kaja_ok" = true ]; then
+      ts_err=$(cat "$ts_error_file" 2>/dev/null || echo "")
+      if echo "$ts_err" | grep -q '    at '; then
+        echo "PASS $ts_elapsed $kaja_elapsed" > "$result_file"
+        return
+      fi
+    fi
     echo "FAIL $ts_elapsed $kaja_elapsed" > "$result_file"
     if [ "$ts_ok" = true ]; then
       {

protoc-gen-kaja/tests/239_wkt_custom_option/options.proto

@@ -0,0 +1,9 @@
+syntax = "proto2";
+package test;
+
+import "google/protobuf/descriptor.proto";
+import "google/protobuf/duration.proto";
+
+extend google.protobuf.FieldOptions {
+  optional google.protobuf.Duration timeout = 50001;
+}

protoc-gen-kaja/tests/239_wkt_custom_option/test.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+package test;
+
+import "options.proto";
+
+// Tests that custom field options with WKT message types
+// (like google.protobuf.Duration) are correctly emitted.
+message TestMsg {
+  string name = 1 [(timeout) = { seconds: 30 }];
+}

protoc-gen-kaja/tests/240_custom_option_hyphen_json_name/test.proto

@@ -0,0 +1,21 @@
+// Tests custom message option where nested message has a
+// field with json_name containing a hyphen. The property key
+// must be quoted in the generated TypeScript.
+syntax = "proto3";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+message RuleConfig {
+  string value = 1 [json_name = "my-value"];
+  int32 count = 2 [json_name = "item-count"];
+}
+
+extend google.protobuf.MessageOptions {
+  optional RuleConfig rule = 50001;
+}
+
+message MyMessage {
+  option (rule) = { value: "hello", count: 5 };
+  string name = 1;
+}

protoc-gen-kaja/tests/241_custom_option_string_vtab/test.proto

@@ -0,0 +1,16 @@
+// Tests that custom string option values containing vertical tab (\v, 0x0B)
+// are properly escaped in the generated TypeScript output.
+// The TS plugin escapes \v via TypeScript's string literal printer.
+// The Go plugin only escapes \, ", \n, \r, \t — missing \v.
+syntax = "proto3";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.FieldOptions {
+  string label = 50001;
+}
+
+message TestMsg {
+  string name = 1 [(label) = "hello\013world"];
+}

protoc-gen-kaja/tests/242_custom_map_int_key_order/test.proto

@@ -0,0 +1,25 @@
+// Tests that map<int32, string> entries in custom options are ordered by
+// ascending numeric key, matching JavaScript's Object.keys() enumeration
+// (integer indices come first in numeric order). The Go plugin preserves
+// wire order instead of re-sorting, so keys 10,1 stay as {"10","1"}
+// while the TS plugin outputs {"1","10"}.
+syntax = "proto3";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+message Limits {
+  map<int32, string> thresholds = 1;
+}
+
+extend google.protobuf.MessageOptions {
+  Limits limits = 50001;
+}
+
+message Alert {
+  option (limits) = {
+    thresholds: { key: 10, value: "high" }
+    thresholds: { key: 1, value: "low" }
+  };
+  string name = 1;
+}

protoc-gen-kaja/tests/243_custom_option_repeated_single/test.proto

@@ -0,0 +1,24 @@
+// Tests that a repeated field with a single element in a custom option
+// is emitted as an array [42], not a bare scalar 42.
+// The TS plugin uses type.toJson() which always produces arrays for
+// repeated fields, even with one element. The Go plugin may not wrap
+// single repeated values in an array.
+syntax = "proto3";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+message Metadata {
+  repeated string tags = 1;
+}
+
+extend google.protobuf.MessageOptions {
+  Metadata meta = 50001;
+}
+
+message Item {
+  option (meta) = {
+    tags: "solo"
+  };
+  string name = 1;
+}

protoc-gen-kaja/tests/244_custom_option_string_linesep/test.proto

@@ -0,0 +1,17 @@
+// Tests that U+2028 LINE SEPARATOR in a custom option string value is
+// escaped as \u2028. TypeScript's printer escapes U+2028 and U+2029
+// because they are not valid unescaped inside JS string literals
+// (pre-ES2019). The Go plugin only escapes characters < U+0020,
+// so it emits the raw byte sequence instead of \u2028.
+syntax = "proto3";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.FieldOptions {
+  string separator = 50001;
+}
+
+message Document {
+  string content = 1 [(separator) = "line\xe2\x80\xa8sep"];
+}

protoc-gen-kaja/tests/245_repeated_extension_single/test.proto

@@ -0,0 +1,19 @@
+// Tests that a repeated top-level extension field with a single value
+// is emitted as an array ["solo"], not a bare scalar "solo".
+// The TS plugin uses type.toJson() which always wraps repeated fields
+// in arrays. The Go plugin's parseCustomOptions only wraps repeated
+// values when mergeRepeatedOptions finds multiple entries; a single
+// repeated entry is left unwrapped.
+syntax = "proto3";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.MessageOptions {
+  repeated string labels = 50001;
+}
+
+message Item {
+  option (labels) = "solo";
+  string name = 1;
+}

protoc-gen-kaja/tests/246_custom_map_string_key_escape/test.proto

@@ -0,0 +1,25 @@
+// Tests that map<string, string> keys containing special characters
+// (backslash, quotes, newlines) are properly escaped when quoted as
+// JS object property keys. The Go plugin wraps keys in quotes via
+// needsQuoteAsPropertyKey but does not escape the content, so a key
+// like "a\b" becomes "a\b" (backspace escape) instead of "a\\b".
+syntax = "proto3";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+message Config {
+  map<string, string> meta = 1;
+}
+
+extend google.protobuf.MessageOptions {
+  Config cfg = 50001;
+}
+
+message Widget {
+  option (cfg) = {
+    meta: { key: "back\\slash" value: "val1" }
+    meta: { key: "has\"quote" value: "val2" }
+  };
+  string name = 1;
+}

protoc-gen-kaja/tests/247_custom_option_string_nextline/test.proto

@@ -0,0 +1,19 @@
+// Tests that U+0085 (NEXT LINE) in a custom option string is escaped as
+// \u0085 in the generated TypeScript. The TypeScript compiler's escapeString
+// explicitly includes U+0085 in its regex:
+//   /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g
+// The Go plugin's escapeStringForJS only checks r < 0x20, 0x2028, 0x2029,
+// missing U+0085 which is 0x85 (above 0x20).
+syntax = "proto3";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.MessageOptions {
+  string note = 50001;
+}
+
+message Doc {
+  option (note) = "line1\302\205line2";
+  string id = 1;
+}

protoc-gen-kaja/tests/248_custom_option_string_null_digit/test.proto

@@ -0,0 +1,16 @@
+// Tests that null byte (\0) followed by a digit in custom option strings
+// is escaped as \x00 (not \0) to avoid ambiguity with octal escape sequences.
+// TypeScript's printer uses \x00 when null is followed by 0-9.
+// The Go plugin always uses \0, which creates an octal escape when followed by a digit.
+syntax = "proto3";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.FieldOptions {
+  string label = 50001;
+}
+
+message TestMsg {
+  string name = 1 [(label) = "before\0001after"];
+}

protoc-gen-kaja/tests/249_custom_option_cross_file_order/a_options.proto

@@ -0,0 +1,9 @@
+// Extension with higher field number, in a file sorted first alphabetically.
+syntax = "proto2";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.FieldOptions {
+  optional string alpha_tag = 50002;
+}

protoc-gen-kaja/tests/249_custom_option_cross_file_order/b_options.proto

@@ -0,0 +1,9 @@
+// Extension with lower field number, in a file sorted second alphabetically.
+syntax = "proto2";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.FieldOptions {
+  optional string beta_tag = 50001;
+}

protoc-gen-kaja/tests/249_custom_option_cross_file_order/test.proto

@@ -0,0 +1,20 @@
+// Tests ordering of custom options from different files.
+// a_options.proto defines alpha_tag at field 50002.
+// b_options.proto defines beta_tag  at field 50001.
+//
+// The TS plugin builds a synthetic type with extensions in registry
+// order (= file processing order).  Since a_options.proto is imported
+// first, alpha_tag (50002) appears before beta_tag (50001) in the
+// field list and therefore in the toJson() output.
+//
+// The Go plugin reads the binary data in wire order (field-number
+// order), so beta_tag (50001) comes before alpha_tag (50002).
+syntax = "proto3";
+package test;
+
+import "a_options.proto";
+import "b_options.proto";
+
+message TestMsg {
+  string name = 1 [(alpha_tag) = "aaa", (beta_tag) = "bbb"];
+}

protoc-gen-kaja/tests/250_custom_option_field_order/field_order.proto

@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+package fieldorder;
+
+import "google/protobuf/descriptor.proto";
+
+// Message with fields declared in REVERSE field-number order.
+// protoc serializes by field number (alpha=1 first, beta=2 second),
+// but the TS plugin emits JSON keys in declaration order (beta first, alpha second).
+message StyleOption {
+  string beta = 2;
+  string alpha = 1;
+}
+
+extend google.protobuf.FieldOptions {
+  StyleOption style = 50001;
+}
+
+message StyledMessage {
+  string value = 1 [(style) = { beta: "round", alpha: "bold" }];
+}

protoc-gen-kaja/tests/251_custom_option_string_del/options.proto

@@ -0,0 +1,8 @@
+syntax = "proto2";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.FieldOptions {
+  optional string annotation = 50001;
+}

protoc-gen-kaja/tests/251_custom_option_string_del/test.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+package test;
+
+import "options.proto";
+
+// Tests that the DEL character (U+007F) in a custom option string
+// is NOT escaped — the TS compiler's escapeString only covers U+0000-U+001F,
+// not DEL. The Go plugin incorrectly escapes it as \u007f.
+message TestMsg {
+  string name = 1 [(annotation) = "hello\x7fworld"];
+}

protoc-gen-kaja/tests/252_custom_option_string_bom/options.proto

@@ -0,0 +1,8 @@
+syntax = "proto2";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.FieldOptions {
+  optional string annotation = 50001;
+}

protoc-gen-kaja/tests/252_custom_option_string_bom/test.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+package test;
+
+import "options.proto";
+
+// Tests that U+FEFF (BOM) in a custom option string is escaped with
+// UPPERCASE hex digits. The TS compiler emits \uFEFF but the Go plugin
+// emits \ufeff because it uses fmt %04x (lowercase) instead of %04X.
+message TestMsg {
+  string name = 1 [(annotation) = "hello\xEF\xBB\xBFworld"];
+}

protoc-gen-kaja/tests/253_custom_option_string_nonascii/options.proto

@@ -0,0 +1,8 @@
+syntax = "proto2";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.FieldOptions {
+  optional string label = 50001;
+}

protoc-gen-kaja/tests/253_custom_option_string_nonascii/test.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+package test;
+
+import "options.proto";
+
+// Tests that non-ASCII characters in custom option string values
+// are escaped as \uXXXX (matching TypeScript printer's escapeNonAsciiString).
+message TestMsg {
+  string name = 1 [(label) = "café"];
+}

protoc-gen-kaja/tests/254_custom_option_string_emoji/options.proto

@@ -0,0 +1,8 @@
+syntax = "proto2";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.FieldOptions {
+  optional string emoji_label = 50001;
+}

protoc-gen-kaja/tests/254_custom_option_string_emoji/test.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+package test;
+
+import "options.proto";
+
+// Tests that supplementary plane characters (above U+FFFF) in custom option
+// strings are escaped as surrogate pairs (\uD83C\uDF89) matching the TS
+// compiler, not as ES2015 \u{1F389} which the Go plugin produces.
+message TestMsg {
+  string name = 1 [(emoji_label) = "🎉"];
+}

protoc-gen-kaja/tests/255_group_field_options/test.proto

@@ -0,0 +1,16 @@
+syntax = "proto2";
+package test;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.FieldOptions {
+  optional int32 my_tag = 50000;
+}
+
+message Foo {
+  optional int32 before = 1 [(my_tag) = 111];
+  optional group MyGroup = 2 {
+    optional int32 inner = 3;
+  }
+  optional int32 after = 4 [(my_tag) = 444];
+}