diff --git a/__fixtures__/misc/output-base64/gogoproto/bundle.ts b/__fixtures__/misc/output-base64/gogoproto/bundle.ts index 727e551de..e4c9acff1 100644 --- a/__fixtures__/misc/output-base64/gogoproto/bundle.ts +++ b/__fixtures__/misc/output-base64/gogoproto/bundle.ts @@ -1,4 +1,4 @@ -import * as _184 from "./gogo"; +import * as _196 from "./gogo"; export const gogoproto = { - ..._184 + ..._196 }; \ No newline at end of file diff --git a/__fixtures__/misc/output-base64/google/bundle.ts b/__fixtures__/misc/output-base64/google/bundle.ts index 736c53a74..f3d01dff5 100644 --- a/__fixtures__/misc/output-base64/google/bundle.ts +++ b/__fixtures__/misc/output-base64/google/bundle.ts @@ -1,20 +1,20 @@ -import * as _185 from "./api/expr/v1alpha1/eval"; -import * as _186 from "./protobuf/any"; -import * as _187 from "./protobuf/descriptor"; -import * as _188 from "./protobuf/duration"; -import * as _189 from "./protobuf/timestamp"; +import * as _197 from "./api/expr/v1alpha1/eval"; +import * as _198 from "./protobuf/any"; +import * as _199 from "./protobuf/descriptor"; +import * as _200 from "./protobuf/duration"; +import * as _201 from "./protobuf/timestamp"; export namespace google { export namespace api { export namespace expr { export const v1alpha1 = { - ..._185 + ..._197 }; } } export const protobuf = { - ..._186, - ..._187, - ..._188, - ..._189 + ..._198, + ..._199, + ..._200, + ..._201 }; } \ No newline at end of file diff --git a/__fixtures__/misc/output-base64/misc/bundle.ts b/__fixtures__/misc/output-base64/misc/bundle.ts index b01459ff1..1295a6b92 100644 --- a/__fixtures__/misc/output-base64/misc/bundle.ts +++ b/__fixtures__/misc/output-base64/misc/bundle.ts @@ -1,20 +1,20 @@ -import * as _190 from "./all_fields"; -import * as _191 from "./eval_request"; -import * as _192 from "./nest"; -import * as _193 from "./tx"; -import * as _194 from "./tx.amino"; -import * as _195 from "./tx.registry"; -import * as _196 from "./tx.rpc.msg"; -import * as _197 from "./rpc.tx"; +import * as _202 from "./all_fields"; +import * as _203 from "./eval_request"; +import * as _204 from "./nest"; +import * as _205 from "./tx"; +import * as _206 from "./tx.amino"; +import * as _207 from "./tx.registry"; +import * as _208 from "./tx.rpc.msg"; +import * as _209 from "./rpc.tx"; export const misc = { - ..._190, - ..._191, - ..._192, - ..._193, - ..._194, - ..._195, - ..._196, + ..._202, + ..._203, + ..._204, + ..._205, + ..._206, + ..._207, + ..._208, ClientFactory: { - ..._197 + ..._209 } }; \ No newline at end of file diff --git a/__fixtures__/misc/output-decimals/agoric/gogoproto/bundle.ts b/__fixtures__/misc/output-decimals/agoric/gogoproto/bundle.ts index 60283e37a..7416b3a56 100644 --- a/__fixtures__/misc/output-decimals/agoric/gogoproto/bundle.ts +++ b/__fixtures__/misc/output-decimals/agoric/gogoproto/bundle.ts @@ -1,4 +1,4 @@ -import * as _170 from "./gogo"; +import * as _182 from "./gogo"; export const gogoproto = { - ..._170 + ..._182 }; \ No newline at end of file diff --git a/__fixtures__/misc/output-decimals/agoric/google/bundle.ts b/__fixtures__/misc/output-decimals/agoric/google/bundle.ts index a4672047c..e0690c698 100644 --- a/__fixtures__/misc/output-decimals/agoric/google/bundle.ts +++ b/__fixtures__/misc/output-decimals/agoric/google/bundle.ts @@ -1,20 +1,20 @@ -import * as _171 from "./api/expr/v1alpha1/eval"; -import * as _172 from "./protobuf/any"; -import * as _173 from "./protobuf/descriptor"; -import * as _174 from "./protobuf/duration"; -import * as _175 from "./protobuf/timestamp"; +import * as _183 from "./api/expr/v1alpha1/eval"; +import * as _184 from "./protobuf/any"; +import * as _185 from "./protobuf/descriptor"; +import * as _186 from "./protobuf/duration"; +import * as _187 from "./protobuf/timestamp"; export namespace google { export namespace api { export namespace expr { export const v1alpha1 = { - ..._171 + ..._183 }; } } export const protobuf = { - ..._172, - ..._173, - ..._174, - ..._175 + ..._184, + ..._185, + ..._186, + ..._187 }; } \ No newline at end of file diff --git a/__fixtures__/misc/output-decimals/agoric/misc/bundle.ts b/__fixtures__/misc/output-decimals/agoric/misc/bundle.ts index bd4363525..64683c39a 100644 --- a/__fixtures__/misc/output-decimals/agoric/misc/bundle.ts +++ b/__fixtures__/misc/output-decimals/agoric/misc/bundle.ts @@ -1,20 +1,20 @@ -import * as _176 from "./all_fields"; -import * as _177 from "./eval_request"; -import * as _178 from "./nest"; -import * as _179 from "./tx"; -import * as _180 from "./tx.amino"; -import * as _181 from "./tx.registry"; -import * as _182 from "./tx.rpc.msg"; -import * as _183 from "./rpc.tx"; +import * as _188 from "./all_fields"; +import * as _189 from "./eval_request"; +import * as _190 from "./nest"; +import * as _191 from "./tx"; +import * as _192 from "./tx.amino"; +import * as _193 from "./tx.registry"; +import * as _194 from "./tx.rpc.msg"; +import * as _195 from "./rpc.tx"; export const misc = { - ..._176, - ..._177, - ..._178, - ..._179, - ..._180, - ..._181, - ..._182, + ..._188, + ..._189, + ..._190, + ..._191, + ..._192, + ..._193, + ..._194, ClientFactory: { - ..._183 + ..._195 } }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/gogoproto/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/gogoproto/bundle.ts index f3ab41977..66f54faf0 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/gogoproto/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/gogoproto/bundle.ts @@ -1,4 +1,4 @@ -import * as _156 from "./gogo"; +import * as _168 from "./gogo"; export const gogoproto = { - ..._156 + ..._168 }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/bundle.ts index 4b59c735f..26a698e9c 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/google/bundle.ts @@ -1,20 +1,20 @@ -import * as _157 from "./api/expr/v1alpha1/eval"; -import * as _158 from "./protobuf/any"; -import * as _159 from "./protobuf/descriptor"; -import * as _160 from "./protobuf/duration"; -import * as _161 from "./protobuf/timestamp"; +import * as _169 from "./api/expr/v1alpha1/eval"; +import * as _170 from "./protobuf/any"; +import * as _171 from "./protobuf/descriptor"; +import * as _172 from "./protobuf/duration"; +import * as _173 from "./protobuf/timestamp"; export namespace google { export namespace api { export namespace expr { export const v1alpha1 = { - ..._157 + ..._169 }; } } export const protobuf = { - ..._158, - ..._159, - ..._160, - ..._161 + ..._170, + ..._171, + ..._172, + ..._173 }; } \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/misc/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/misc/bundle.ts index 02f9d91c1..d7fbadaf6 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/misc/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface-proto-optionality/misc/bundle.ts @@ -1,20 +1,20 @@ -import * as _162 from "./all_fields"; -import * as _163 from "./eval_request"; -import * as _164 from "./nest"; -import * as _165 from "./tx"; -import * as _166 from "./tx.amino"; -import * as _167 from "./tx.registry"; -import * as _168 from "./tx.rpc.msg"; -import * as _169 from "./rpc.tx"; +import * as _174 from "./all_fields"; +import * as _175 from "./eval_request"; +import * as _176 from "./nest"; +import * as _177 from "./tx"; +import * as _178 from "./tx.amino"; +import * as _179 from "./tx.registry"; +import * as _180 from "./tx.rpc.msg"; +import * as _181 from "./rpc.tx"; export const misc = { - ..._162, - ..._163, - ..._164, - ..._165, - ..._166, - ..._167, - ..._168, + ..._174, + ..._175, + ..._176, + ..._177, + ..._178, + ..._179, + ..._180, ClientFactory: { - ..._169 + ..._181 } }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-interface/gogoproto/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-interface/gogoproto/bundle.ts index f1b28eb28..51a22dcd4 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface/gogoproto/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface/gogoproto/bundle.ts @@ -1,4 +1,4 @@ -import * as _142 from "./gogo"; +import * as _154 from "./gogo"; export const gogoproto = { - ..._142 + ..._154 }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-interface/google/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-interface/google/bundle.ts index c96e55085..017ca9f72 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface/google/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface/google/bundle.ts @@ -1,20 +1,20 @@ -import * as _143 from "./api/expr/v1alpha1/eval"; -import * as _144 from "./protobuf/any"; -import * as _145 from "./protobuf/descriptor"; -import * as _146 from "./protobuf/duration"; -import * as _147 from "./protobuf/timestamp"; +import * as _155 from "./api/expr/v1alpha1/eval"; +import * as _156 from "./protobuf/any"; +import * as _157 from "./protobuf/descriptor"; +import * as _158 from "./protobuf/duration"; +import * as _159 from "./protobuf/timestamp"; export namespace google { export namespace api { export namespace expr { export const v1alpha1 = { - ..._143 + ..._155 }; } } export const protobuf = { - ..._144, - ..._145, - ..._146, - ..._147 + ..._156, + ..._157, + ..._158, + ..._159 }; } \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-interface/misc/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-interface/misc/bundle.ts index 82910caa7..c304c2c7d 100644 --- a/__fixtures__/misc/output-proto-amino/amino-interface/misc/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-interface/misc/bundle.ts @@ -1,20 +1,20 @@ -import * as _148 from "./all_fields"; -import * as _149 from "./eval_request"; -import * as _150 from "./nest"; -import * as _151 from "./tx"; -import * as _152 from "./tx.amino"; -import * as _153 from "./tx.registry"; -import * as _154 from "./tx.rpc.msg"; -import * as _155 from "./rpc.tx"; +import * as _160 from "./all_fields"; +import * as _161 from "./eval_request"; +import * as _162 from "./nest"; +import * as _163 from "./tx"; +import * as _164 from "./tx.amino"; +import * as _165 from "./tx.registry"; +import * as _166 from "./tx.rpc.msg"; +import * as _167 from "./rpc.tx"; export const misc = { - ..._148, - ..._149, - ..._150, - ..._151, - ..._152, - ..._153, - ..._154, + ..._160, + ..._161, + ..._162, + ..._163, + ..._164, + ..._165, + ..._166, ClientFactory: { - ..._155 + ..._167 } }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/gogoproto/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/gogoproto/bundle.ts index e6c0292c6..8e97c183b 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/gogoproto/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/gogoproto/bundle.ts @@ -1,4 +1,4 @@ -import * as _114 from "./gogo"; +import * as _126 from "./gogo"; export const gogoproto = { - ..._114 + ..._126 }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/bundle.ts index 8d77c56a8..ee1fbd908 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/google/bundle.ts @@ -1,20 +1,20 @@ -import * as _115 from "./api/expr/v1alpha1/eval"; -import * as _116 from "./protobuf/any"; -import * as _117 from "./protobuf/descriptor"; -import * as _118 from "./protobuf/duration"; -import * as _119 from "./protobuf/timestamp"; +import * as _127 from "./api/expr/v1alpha1/eval"; +import * as _128 from "./protobuf/any"; +import * as _129 from "./protobuf/descriptor"; +import * as _130 from "./protobuf/duration"; +import * as _131 from "./protobuf/timestamp"; export namespace google { export namespace api { export namespace expr { export const v1alpha1 = { - ..._115 + ..._127 }; } } export const protobuf = { - ..._116, - ..._117, - ..._118, - ..._119 + ..._128, + ..._129, + ..._130, + ..._131 }; } \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/misc/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/misc/bundle.ts index 52e363dda..47084cfd7 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-no-func/misc/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-no-func/misc/bundle.ts @@ -1,20 +1,20 @@ -import * as _120 from "./all_fields"; -import * as _121 from "./eval_request"; -import * as _122 from "./nest"; -import * as _123 from "./tx"; -import * as _124 from "./tx.amino"; -import * as _125 from "./tx.registry"; -import * as _126 from "./tx.rpc.msg"; -import * as _127 from "./rpc.tx"; +import * as _132 from "./all_fields"; +import * as _133 from "./eval_request"; +import * as _134 from "./nest"; +import * as _135 from "./tx"; +import * as _136 from "./tx.amino"; +import * as _137 from "./tx.registry"; +import * as _138 from "./tx.rpc.msg"; +import * as _139 from "./rpc.tx"; export const misc = { - ..._120, - ..._121, - ..._122, - ..._123, - ..._124, - ..._125, - ..._126, + ..._132, + ..._133, + ..._134, + ..._135, + ..._136, + ..._137, + ..._138, ClientFactory: { - ..._127 + ..._139 } }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/gogoproto/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/gogoproto/bundle.ts index 33a6fc1b6..01dc8250b 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/gogoproto/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/gogoproto/bundle.ts @@ -1,4 +1,4 @@ -import * as _100 from "./gogo"; +import * as _112 from "./gogo"; export const gogoproto = { - ..._100 + ..._112 }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/bundle.ts index ff2d148eb..b9b335619 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/google/bundle.ts @@ -1,20 +1,20 @@ -import * as _101 from "./api/expr/v1alpha1/eval"; -import * as _102 from "./protobuf/any"; -import * as _103 from "./protobuf/descriptor"; -import * as _104 from "./protobuf/duration"; -import * as _105 from "./protobuf/timestamp"; +import * as _113 from "./api/expr/v1alpha1/eval"; +import * as _114 from "./protobuf/any"; +import * as _115 from "./protobuf/descriptor"; +import * as _116 from "./protobuf/duration"; +import * as _117 from "./protobuf/timestamp"; export namespace google { export namespace api { export namespace expr { export const v1alpha1 = { - ..._101 + ..._113 }; } } export const protobuf = { - ..._102, - ..._103, - ..._104, - ..._105 + ..._114, + ..._115, + ..._116, + ..._117 }; } \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/misc/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/misc/bundle.ts index fb1ae3982..2a08e3e30 100644 --- a/__fixtures__/misc/output-proto-amino/amino-msg-with-func/misc/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-msg-with-func/misc/bundle.ts @@ -1,20 +1,20 @@ -import * as _106 from "./all_fields"; -import * as _107 from "./eval_request"; -import * as _108 from "./nest"; -import * as _109 from "./tx"; -import * as _110 from "./tx.amino"; -import * as _111 from "./tx.registry"; -import * as _112 from "./tx.rpc.msg"; -import * as _113 from "./rpc.tx"; +import * as _118 from "./all_fields"; +import * as _119 from "./eval_request"; +import * as _120 from "./nest"; +import * as _121 from "./tx"; +import * as _122 from "./tx.amino"; +import * as _123 from "./tx.registry"; +import * as _124 from "./tx.rpc.msg"; +import * as _125 from "./rpc.tx"; export const misc = { - ..._106, - ..._107, - ..._108, - ..._109, - ..._110, - ..._111, - ..._112, + ..._118, + ..._119, + ..._120, + ..._121, + ..._122, + ..._123, + ..._124, ClientFactory: { - ..._113 + ..._125 } }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/gogoproto/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/gogoproto/bundle.ts index eb10531c6..8a131ffa8 100644 --- a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/gogoproto/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/gogoproto/bundle.ts @@ -1,4 +1,4 @@ -import * as _128 from "./gogo"; +import * as _140 from "./gogo"; export const gogoproto = { - ..._128 + ..._140 }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/bundle.ts index 43864c577..30ecc37dc 100644 --- a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/google/bundle.ts @@ -1,20 +1,20 @@ -import * as _129 from "./api/expr/v1alpha1/eval"; -import * as _130 from "./protobuf/any"; -import * as _131 from "./protobuf/descriptor"; -import * as _132 from "./protobuf/duration"; -import * as _133 from "./protobuf/timestamp"; +import * as _141 from "./api/expr/v1alpha1/eval"; +import * as _142 from "./protobuf/any"; +import * as _143 from "./protobuf/descriptor"; +import * as _144 from "./protobuf/duration"; +import * as _145 from "./protobuf/timestamp"; export namespace google { export namespace api { export namespace expr { export const v1alpha1 = { - ..._129 + ..._141 }; } } export const protobuf = { - ..._130, - ..._131, - ..._132, - ..._133 + ..._142, + ..._143, + ..._144, + ..._145 }; } \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/misc/bundle.ts b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/misc/bundle.ts index a1876c750..d6cff5461 100644 --- a/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/misc/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/amino-no-msg-with-func/misc/bundle.ts @@ -1,20 +1,20 @@ -import * as _134 from "./all_fields"; -import * as _135 from "./eval_request"; -import * as _136 from "./nest"; -import * as _137 from "./tx"; -import * as _138 from "./tx.amino"; -import * as _139 from "./tx.registry"; -import * as _140 from "./tx.rpc.msg"; -import * as _141 from "./rpc.tx"; +import * as _146 from "./all_fields"; +import * as _147 from "./eval_request"; +import * as _148 from "./nest"; +import * as _149 from "./tx"; +import * as _150 from "./tx.amino"; +import * as _151 from "./tx.registry"; +import * as _152 from "./tx.rpc.msg"; +import * as _153 from "./rpc.tx"; export const misc = { - ..._134, - ..._135, - ..._136, - ..._137, - ..._138, - ..._139, - ..._140, + ..._146, + ..._147, + ..._148, + ..._149, + ..._150, + ..._151, + ..._152, ClientFactory: { - ..._141 + ..._153 } }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/proto-only-legacy/gogoproto/bundle.ts b/__fixtures__/misc/output-proto-amino/proto-only-legacy/gogoproto/bundle.ts index 81c0534fa..33a6fc1b6 100644 --- a/__fixtures__/misc/output-proto-amino/proto-only-legacy/gogoproto/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/proto-only-legacy/gogoproto/bundle.ts @@ -1,4 +1,4 @@ -import * as _88 from "./gogo"; +import * as _100 from "./gogo"; export const gogoproto = { - ..._88 + ..._100 }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/proto-only-legacy/google/bundle.ts b/__fixtures__/misc/output-proto-amino/proto-only-legacy/google/bundle.ts index 38a63df02..ff2d148eb 100644 --- a/__fixtures__/misc/output-proto-amino/proto-only-legacy/google/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/proto-only-legacy/google/bundle.ts @@ -1,20 +1,20 @@ -import * as _89 from "./api/expr/v1alpha1/eval"; -import * as _90 from "./protobuf/any"; -import * as _91 from "./protobuf/descriptor"; -import * as _92 from "./protobuf/duration"; -import * as _93 from "./protobuf/timestamp"; +import * as _101 from "./api/expr/v1alpha1/eval"; +import * as _102 from "./protobuf/any"; +import * as _103 from "./protobuf/descriptor"; +import * as _104 from "./protobuf/duration"; +import * as _105 from "./protobuf/timestamp"; export namespace google { export namespace api { export namespace expr { export const v1alpha1 = { - ..._89 + ..._101 }; } } export const protobuf = { - ..._90, - ..._91, - ..._92, - ..._93 + ..._102, + ..._103, + ..._104, + ..._105 }; } \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/proto-only-legacy/misc/bundle.ts b/__fixtures__/misc/output-proto-amino/proto-only-legacy/misc/bundle.ts index b9a3e5fb6..403a3aaf0 100644 --- a/__fixtures__/misc/output-proto-amino/proto-only-legacy/misc/bundle.ts +++ b/__fixtures__/misc/output-proto-amino/proto-only-legacy/misc/bundle.ts @@ -1,16 +1,16 @@ -import * as _94 from "./all_fields"; -import * as _95 from "./eval_request"; -import * as _96 from "./nest"; -import * as _97 from "./tx"; -import * as _98 from "./tx.rpc.msg"; -import * as _99 from "./rpc.tx"; +import * as _106 from "./all_fields"; +import * as _107 from "./eval_request"; +import * as _108 from "./nest"; +import * as _109 from "./tx"; +import * as _110 from "./tx.rpc.msg"; +import * as _111 from "./rpc.tx"; export const misc = { - ..._94, - ..._95, - ..._96, - ..._97, - ..._98, + ..._106, + ..._107, + ..._108, + ..._109, + ..._110, ClientFactory: { - ..._99 + ..._111 } }; \ No newline at end of file diff --git a/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/google/api/expr/v1alpha1/eval.ts b/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/google/api/expr/v1alpha1/eval.ts index ef08a65d3..3e6d655a2 100644 --- a/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/google/api/expr/v1alpha1/eval.ts +++ b/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/google/api/expr/v1alpha1/eval.ts @@ -4,14 +4,14 @@ import { DeepPartial, isSet } from "../../../../helpers"; export const protobufPackage = "google.api.expr.v1alpha1"; export interface ExprValue { /** The ids of the expressions with unknown values. */ - exprs?: IdRef[]; + exprs: IdRef[]; } export interface ExprValueProtoMsg { typeUrl: "/google.api.expr.v1alpha1.ExprValue"; value: Uint8Array; } export interface ExprValueSDKType { - exprs?: IdRefSDKType[]; + exprs: IdRefSDKType[]; } export interface IdRef { /** The expression id. */ diff --git a/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/google/protobuf/descriptor.ts b/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/google/protobuf/descriptor.ts index 2f6a9da35..4835a9c87 100644 --- a/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/google/protobuf/descriptor.ts +++ b/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/google/protobuf/descriptor.ts @@ -400,7 +400,7 @@ export function featureSet_Utf8ValidationToJSON(object: FeatureSet_Utf8Validatio * files it parses. */ export interface FileDescriptorSet { - file?: FileDescriptorProto[]; + file: FileDescriptorProto[]; } export interface FileDescriptorSetProtoMsg { typeUrl: "/google.protobuf.FileDescriptorSet"; @@ -411,7 +411,7 @@ export interface FileDescriptorSetProtoMsg { * files it parses. */ export interface FileDescriptorSetSDKType { - file?: FileDescriptorProtoSDKType[]; + file: FileDescriptorProtoSDKType[]; } /** Describes a complete .proto file. */ export interface FileDescriptorProto { @@ -429,10 +429,10 @@ export interface FileDescriptorProto { */ weakDependency: number[]; /** All top-level definitions in this file. */ - messageType?: DescriptorProto[]; - enumType?: EnumDescriptorProto[]; - service?: ServiceDescriptorProto[]; - extension?: FieldDescriptorProto[]; + messageType: DescriptorProto[]; + enumType: EnumDescriptorProto[]; + service: ServiceDescriptorProto[]; + extension: FieldDescriptorProto[]; options?: FileOptions; /** * This field contains optional information about the original source code. @@ -458,10 +458,10 @@ export interface FileDescriptorProtoSDKType { dependency: string[]; public_dependency: number[]; weak_dependency: number[]; - message_type?: DescriptorProtoSDKType[]; - enum_type?: EnumDescriptorProtoSDKType[]; - service?: ServiceDescriptorProtoSDKType[]; - extension?: FieldDescriptorProtoSDKType[]; + message_type: DescriptorProtoSDKType[]; + enum_type: EnumDescriptorProtoSDKType[]; + service: ServiceDescriptorProtoSDKType[]; + extension: FieldDescriptorProtoSDKType[]; options?: FileOptionsSDKType; source_code_info?: SourceCodeInfoSDKType; syntax: string; @@ -469,14 +469,14 @@ export interface FileDescriptorProtoSDKType { /** Describes a message type. */ export interface DescriptorProto { name: string; - field?: FieldDescriptorProto[]; - extension?: FieldDescriptorProto[]; - nestedType?: DescriptorProto[]; - enumType?: EnumDescriptorProto[]; - extensionRange?: DescriptorProto_ExtensionRange[]; - oneofDecl?: OneofDescriptorProto[]; + field: FieldDescriptorProto[]; + extension: FieldDescriptorProto[]; + nestedType: DescriptorProto[]; + enumType: EnumDescriptorProto[]; + extensionRange: DescriptorProto_ExtensionRange[]; + oneofDecl: OneofDescriptorProto[]; options?: MessageOptions; - reservedRange?: DescriptorProto_ReservedRange[]; + reservedRange: DescriptorProto_ReservedRange[]; /** * Reserved field names, which may not be used by fields in the same message. * A given name may only be reserved once. @@ -490,14 +490,14 @@ export interface DescriptorProtoProtoMsg { /** Describes a message type. */ export interface DescriptorProtoSDKType { name: string; - field?: FieldDescriptorProtoSDKType[]; - extension?: FieldDescriptorProtoSDKType[]; - nested_type?: DescriptorProtoSDKType[]; - enum_type?: EnumDescriptorProtoSDKType[]; - extension_range?: DescriptorProto_ExtensionRangeSDKType[]; - oneof_decl?: OneofDescriptorProtoSDKType[]; + field: FieldDescriptorProtoSDKType[]; + extension: FieldDescriptorProtoSDKType[]; + nested_type: DescriptorProtoSDKType[]; + enum_type: EnumDescriptorProtoSDKType[]; + extension_range: DescriptorProto_ExtensionRangeSDKType[]; + oneof_decl: OneofDescriptorProtoSDKType[]; options?: MessageOptionsSDKType; - reserved_range?: DescriptorProto_ReservedRangeSDKType[]; + reserved_range: DescriptorProto_ReservedRangeSDKType[]; reserved_name: string[]; } export interface DescriptorProto_ExtensionRange { @@ -542,25 +542,25 @@ export interface DescriptorProto_ReservedRangeSDKType { } export interface ExtensionRangeOptions { /** The parser stores options it doesn't recognize here. See above. */ - uninterpretedOption?: UninterpretedOption[]; + uninterpretedOption: UninterpretedOption[]; } export interface ExtensionRangeOptionsProtoMsg { typeUrl: "/google.protobuf.ExtensionRangeOptions"; value: Uint8Array; } export interface ExtensionRangeOptionsSDKType { - uninterpreted_option?: UninterpretedOptionSDKType[]; + uninterpreted_option: UninterpretedOptionSDKType[]; } /** Describes a field within a message. */ export interface FieldDescriptorProto { name: string; number: number; - label?: FieldDescriptorProto_Label; + label: FieldDescriptorProto_Label; /** * If type_name is set, this need not be set. If both this and type_name * are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP. */ - type?: FieldDescriptorProto_Type; + type: FieldDescriptorProto_Type; /** * For message and enum types, this is the name of the type. If the name * starts with a '.', it is fully-qualified. Otherwise, C++-like scoping @@ -604,8 +604,8 @@ export interface FieldDescriptorProtoProtoMsg { export interface FieldDescriptorProtoSDKType { name: string; number: number; - label?: FieldDescriptorProto_Label; - type?: FieldDescriptorProto_Type; + label: FieldDescriptorProto_Label; + type: FieldDescriptorProto_Type; type_name: string; extendee: string; default_value: string; @@ -630,14 +630,14 @@ export interface OneofDescriptorProtoSDKType { /** Describes an enum type. */ export interface EnumDescriptorProto { name: string; - value?: EnumValueDescriptorProto[]; + value: EnumValueDescriptorProto[]; options?: EnumOptions; /** * Range of reserved numeric values. Reserved numeric values may not be used * by enum values in the same enum declaration. Reserved ranges may not * overlap. */ - reservedRange?: EnumDescriptorProto_EnumReservedRange[]; + reservedRange: EnumDescriptorProto_EnumReservedRange[]; /** * Reserved enum value names, which may not be reused. A given name may only * be reserved once. @@ -651,9 +651,9 @@ export interface EnumDescriptorProtoProtoMsg { /** Describes an enum type. */ export interface EnumDescriptorProtoSDKType { name: string; - value?: EnumValueDescriptorProtoSDKType[]; + value: EnumValueDescriptorProtoSDKType[]; options?: EnumOptionsSDKType; - reserved_range?: EnumDescriptorProto_EnumReservedRangeSDKType[]; + reserved_range: EnumDescriptorProto_EnumReservedRangeSDKType[]; reserved_name: string[]; } /** @@ -705,7 +705,7 @@ export interface EnumValueDescriptorProtoSDKType { /** Describes a service. */ export interface ServiceDescriptorProto { name: string; - method?: MethodDescriptorProto[]; + method: MethodDescriptorProto[]; options?: ServiceOptions; } export interface ServiceDescriptorProtoProtoMsg { @@ -715,7 +715,7 @@ export interface ServiceDescriptorProtoProtoMsg { /** Describes a service. */ export interface ServiceDescriptorProtoSDKType { name: string; - method?: MethodDescriptorProtoSDKType[]; + method: MethodDescriptorProtoSDKType[]; options?: ServiceOptionsSDKType; } /** Describes a method of a service. */ @@ -783,7 +783,7 @@ export interface FileOptions { * This option has no effect on when used with the lite runtime. */ javaStringCheckUtf8: boolean; - optimizeFor?: FileOptions_OptimizeMode; + optimizeFor: FileOptions_OptimizeMode; /** * Sets the Go package where structs generated from this .proto will be * placed. If omitted, the Go package will be derived from the following: @@ -861,7 +861,7 @@ export interface FileOptions { * The parser stores options it doesn't recognize here. * See the documentation for the "Options" section above. */ - uninterpretedOption?: UninterpretedOption[]; + uninterpretedOption: UninterpretedOption[]; } export interface FileOptionsProtoMsg { typeUrl: "/google.protobuf.FileOptions"; @@ -874,7 +874,7 @@ export interface FileOptionsSDKType { /** @deprecated */ java_generate_equals_and_hash: boolean; java_string_check_utf8: boolean; - optimize_for?: FileOptions_OptimizeMode; + optimize_for: FileOptions_OptimizeMode; go_package: string; cc_generic_services: boolean; java_generic_services: boolean; @@ -889,7 +889,7 @@ export interface FileOptionsSDKType { php_namespace: string; php_metadata_namespace: string; ruby_package: string; - uninterpreted_option?: UninterpretedOptionSDKType[]; + uninterpreted_option: UninterpretedOptionSDKType[]; } export interface MessageOptions { /** @@ -951,7 +951,7 @@ export interface MessageOptions { */ mapEntry: boolean; /** The parser stores options it doesn't recognize here. See above. */ - uninterpretedOption?: UninterpretedOption[]; + uninterpretedOption: UninterpretedOption[]; } export interface MessageOptionsProtoMsg { typeUrl: "/google.protobuf.MessageOptions"; @@ -962,7 +962,7 @@ export interface MessageOptionsSDKType { no_standard_descriptor_accessor: boolean; deprecated: boolean; map_entry: boolean; - uninterpreted_option?: UninterpretedOptionSDKType[]; + uninterpreted_option: UninterpretedOptionSDKType[]; } export interface FieldOptions { /** @@ -971,7 +971,7 @@ export interface FieldOptions { * options below. This option is not yet implemented in the open source * release -- sorry, we'll try to include it in a future version! */ - ctype?: FieldOptions_CType; + ctype: FieldOptions_CType; /** * The packed option can be enabled for repeated primitive fields to enable * a more efficient representation on the wire. Rather than repeatedly @@ -993,7 +993,7 @@ export interface FieldOptions { * This option is an enum to permit additional types to be added, e.g. * goog.math.Integer. */ - jstype?: FieldOptions_JSType; + jstype: FieldOptions_JSType; /** * Should this field be parsed lazily? Lazy applies only to message-type * fields. It means that when the outer message is initially parsed, the @@ -1035,31 +1035,31 @@ export interface FieldOptions { /** For Google-internal migration only. Do not use. */ weak: boolean; /** The parser stores options it doesn't recognize here. See above. */ - uninterpretedOption?: UninterpretedOption[]; + uninterpretedOption: UninterpretedOption[]; } export interface FieldOptionsProtoMsg { typeUrl: "/google.protobuf.FieldOptions"; value: Uint8Array; } export interface FieldOptionsSDKType { - ctype?: FieldOptions_CType; + ctype: FieldOptions_CType; packed: boolean; - jstype?: FieldOptions_JSType; + jstype: FieldOptions_JSType; lazy: boolean; deprecated: boolean; weak: boolean; - uninterpreted_option?: UninterpretedOptionSDKType[]; + uninterpreted_option: UninterpretedOptionSDKType[]; } export interface OneofOptions { /** The parser stores options it doesn't recognize here. See above. */ - uninterpretedOption?: UninterpretedOption[]; + uninterpretedOption: UninterpretedOption[]; } export interface OneofOptionsProtoMsg { typeUrl: "/google.protobuf.OneofOptions"; value: Uint8Array; } export interface OneofOptionsSDKType { - uninterpreted_option?: UninterpretedOptionSDKType[]; + uninterpreted_option: UninterpretedOptionSDKType[]; } export interface EnumOptions { /** @@ -1075,7 +1075,7 @@ export interface EnumOptions { */ deprecated: boolean; /** The parser stores options it doesn't recognize here. See above. */ - uninterpretedOption?: UninterpretedOption[]; + uninterpretedOption: UninterpretedOption[]; } export interface EnumOptionsProtoMsg { typeUrl: "/google.protobuf.EnumOptions"; @@ -1084,7 +1084,7 @@ export interface EnumOptionsProtoMsg { export interface EnumOptionsSDKType { allow_alias: boolean; deprecated: boolean; - uninterpreted_option?: UninterpretedOptionSDKType[]; + uninterpreted_option: UninterpretedOptionSDKType[]; } export interface EnumValueOptions { /** @@ -1095,7 +1095,7 @@ export interface EnumValueOptions { */ deprecated: boolean; /** The parser stores options it doesn't recognize here. See above. */ - uninterpretedOption?: UninterpretedOption[]; + uninterpretedOption: UninterpretedOption[]; } export interface EnumValueOptionsProtoMsg { typeUrl: "/google.protobuf.EnumValueOptions"; @@ -1103,7 +1103,7 @@ export interface EnumValueOptionsProtoMsg { } export interface EnumValueOptionsSDKType { deprecated: boolean; - uninterpreted_option?: UninterpretedOptionSDKType[]; + uninterpreted_option: UninterpretedOptionSDKType[]; } export interface ServiceOptions { /** @@ -1114,7 +1114,7 @@ export interface ServiceOptions { */ deprecated: boolean; /** The parser stores options it doesn't recognize here. See above. */ - uninterpretedOption?: UninterpretedOption[]; + uninterpretedOption: UninterpretedOption[]; } export interface ServiceOptionsProtoMsg { typeUrl: "/google.protobuf.ServiceOptions"; @@ -1122,7 +1122,7 @@ export interface ServiceOptionsProtoMsg { } export interface ServiceOptionsSDKType { deprecated: boolean; - uninterpreted_option?: UninterpretedOptionSDKType[]; + uninterpreted_option: UninterpretedOptionSDKType[]; } export interface MethodOptions { /** @@ -1132,9 +1132,9 @@ export interface MethodOptions { * this is a formalization for deprecating methods. */ deprecated: boolean; - idempotencyLevel?: MethodOptions_IdempotencyLevel; + idempotencyLevel: MethodOptions_IdempotencyLevel; /** The parser stores options it doesn't recognize here. See above. */ - uninterpretedOption?: UninterpretedOption[]; + uninterpretedOption: UninterpretedOption[]; } export interface MethodOptionsProtoMsg { typeUrl: "/google.protobuf.MethodOptions"; @@ -1142,8 +1142,8 @@ export interface MethodOptionsProtoMsg { } export interface MethodOptionsSDKType { deprecated: boolean; - idempotency_level?: MethodOptions_IdempotencyLevel; - uninterpreted_option?: UninterpretedOptionSDKType[]; + idempotency_level: MethodOptions_IdempotencyLevel; + uninterpreted_option: UninterpretedOptionSDKType[]; } /** * A message representing a option the parser does not recognize. This only @@ -1154,7 +1154,7 @@ export interface MethodOptionsSDKType { * in them. */ export interface UninterpretedOption { - name?: UninterpretedOption_NamePart[]; + name: UninterpretedOption_NamePart[]; /** * The value of the uninterpreted option, in whatever type the tokenizer * identified it as during parsing. Exactly one of these should be set. @@ -1179,7 +1179,7 @@ export interface UninterpretedOptionProtoMsg { * in them. */ export interface UninterpretedOptionSDKType { - name?: UninterpretedOption_NamePartSDKType[]; + name: UninterpretedOption_NamePartSDKType[]; identifier_value: string; positive_int_value: bigint; negative_int_value: bigint; @@ -1263,7 +1263,7 @@ export interface SourceCodeInfo { * ignore those that it doesn't understand, as more types of locations could * be recorded in the future. */ - location?: SourceCodeInfo_Location[]; + location: SourceCodeInfo_Location[]; } export interface SourceCodeInfoProtoMsg { typeUrl: "/google.protobuf.SourceCodeInfo"; @@ -1274,7 +1274,7 @@ export interface SourceCodeInfoProtoMsg { * FileDescriptorProto was generated. */ export interface SourceCodeInfoSDKType { - location?: SourceCodeInfo_LocationSDKType[]; + location: SourceCodeInfo_LocationSDKType[]; } export interface SourceCodeInfo_Location { /** @@ -1385,7 +1385,7 @@ export interface GeneratedCodeInfo { * An Annotation connects some span of text in generated code to an element * of its generating .proto file. */ - annotation?: GeneratedCodeInfo_Annotation[]; + annotation: GeneratedCodeInfo_Annotation[]; } export interface GeneratedCodeInfoProtoMsg { typeUrl: "/google.protobuf.GeneratedCodeInfo"; @@ -1397,7 +1397,7 @@ export interface GeneratedCodeInfoProtoMsg { * source file, but may contain references to different source .proto files. */ export interface GeneratedCodeInfoSDKType { - annotation?: GeneratedCodeInfo_AnnotationSDKType[]; + annotation: GeneratedCodeInfo_AnnotationSDKType[]; } export interface GeneratedCodeInfo_Annotation { /** @@ -1430,14 +1430,14 @@ export interface GeneratedCodeInfo_AnnotationSDKType { end: number; } export interface FeatureSet { - utf8Validation?: FeatureSet_Utf8Validation; + utf8Validation: FeatureSet_Utf8Validation; } export interface FeatureSetProtoMsg { typeUrl: "/google.protobuf.FeatureSet"; value: Uint8Array; } export interface FeatureSetSDKType { - utf8_validation?: FeatureSet_Utf8Validation; + utf8_validation: FeatureSet_Utf8Validation; } function createBaseFileDescriptorSet(): FileDescriptorSet { return { @@ -2342,8 +2342,8 @@ function createBaseFieldDescriptorProto(): FieldDescriptorProto { return { name: "", number: 0, - label: undefined, - type: undefined, + label: 1, + type: 1, typeName: "", extendee: "", defaultValue: "", @@ -2361,10 +2361,10 @@ export const FieldDescriptorProto = { if (message.number !== 0) { writer.uint32(24).int32(message.number); } - if (message.label !== undefined) { + if (message.label !== 1) { writer.uint32(32).int32(message.label); } - if (message.type !== undefined) { + if (message.type !== 1) { writer.uint32(40).int32(message.type); } if (message.typeName !== "") { @@ -2463,8 +2463,8 @@ export const FieldDescriptorProto = { const message = createBaseFieldDescriptorProto(); message.name = object.name ?? ""; message.number = object.number ?? 0; - message.label = object.label ?? undefined; - message.type = object.type ?? undefined; + message.label = object.label ?? 1; + message.type = object.type ?? 1; message.typeName = object.typeName ?? ""; message.extendee = object.extendee ?? ""; message.defaultValue = object.defaultValue ?? ""; @@ -2479,8 +2479,8 @@ export const FieldDescriptorProto = { return { name: object?.name, number: object?.number, - label: isSet(object.label) ? fieldDescriptorProto_LabelFromJSON(object.label) : undefined, - type: isSet(object.type) ? fieldDescriptorProto_TypeFromJSON(object.type) : undefined, + label: isSet(object.label) ? fieldDescriptorProto_LabelFromJSON(object.label) : -1, + type: isSet(object.type) ? fieldDescriptorProto_TypeFromJSON(object.type) : -1, typeName: object?.type_name, extendee: object?.extendee, defaultValue: object?.default_value, @@ -2493,8 +2493,8 @@ export const FieldDescriptorProto = { return { name: isSet(object.name) ? String(object.name) : "", number: isSet(object.number) ? Number(object.number) : 0, - label: isSet(object.label) ? fieldDescriptorProto_LabelFromJSON(object.label) : undefined, - type: isSet(object.type) ? fieldDescriptorProto_TypeFromJSON(object.type) : undefined, + label: isSet(object.label) ? fieldDescriptorProto_LabelFromJSON(object.label) : -1, + type: isSet(object.type) ? fieldDescriptorProto_TypeFromJSON(object.type) : -1, type_name: isSet(object.type_name) ? String(object.type_name) : "", extendee: isSet(object.extendee) ? String(object.extendee) : "", default_value: isSet(object.default_value) ? String(object.default_value) : "", @@ -3212,7 +3212,7 @@ function createBaseFileOptions(): FileOptions { javaMultipleFiles: false, javaGenerateEqualsAndHash: false, javaStringCheckUtf8: false, - optimizeFor: undefined, + optimizeFor: 1, goPackage: "", ccGenericServices: false, javaGenericServices: false, @@ -3248,7 +3248,7 @@ export const FileOptions = { if (message.javaStringCheckUtf8 === true) { writer.uint32(216).bool(message.javaStringCheckUtf8); } - if (message.optimizeFor !== undefined) { + if (message.optimizeFor !== 1) { writer.uint32(72).int32(message.optimizeFor); } if (message.goPackage !== "") { @@ -3436,7 +3436,7 @@ export const FileOptions = { message.javaMultipleFiles = object.javaMultipleFiles ?? false; message.javaGenerateEqualsAndHash = object.javaGenerateEqualsAndHash ?? false; message.javaStringCheckUtf8 = object.javaStringCheckUtf8 ?? false; - message.optimizeFor = object.optimizeFor ?? undefined; + message.optimizeFor = object.optimizeFor ?? 1; message.goPackage = object.goPackage ?? ""; message.ccGenericServices = object.ccGenericServices ?? false; message.javaGenericServices = object.javaGenericServices ?? false; @@ -3461,7 +3461,7 @@ export const FileOptions = { javaMultipleFiles: object?.java_multiple_files, javaGenerateEqualsAndHash: object?.java_generate_equals_and_hash, javaStringCheckUtf8: object?.java_string_check_utf8, - optimizeFor: isSet(object.optimize_for) ? fileOptions_OptimizeModeFromJSON(object.optimize_for) : undefined, + optimizeFor: isSet(object.optimize_for) ? fileOptions_OptimizeModeFromJSON(object.optimize_for) : -1, goPackage: object?.go_package, ccGenericServices: object?.cc_generic_services, javaGenericServices: object?.java_generic_services, @@ -3486,7 +3486,7 @@ export const FileOptions = { java_multiple_files: isSet(object.java_multiple_files) ? Boolean(object.java_multiple_files) : false, java_generate_equals_and_hash: isSet(object.java_generate_equals_and_hash) ? Boolean(object.java_generate_equals_and_hash) : false, java_string_check_utf8: isSet(object.java_string_check_utf8) ? Boolean(object.java_string_check_utf8) : false, - optimize_for: isSet(object.optimize_for) ? fileOptions_OptimizeModeFromJSON(object.optimize_for) : undefined, + optimize_for: isSet(object.optimize_for) ? fileOptions_OptimizeModeFromJSON(object.optimize_for) : -1, go_package: isSet(object.go_package) ? String(object.go_package) : "", cc_generic_services: isSet(object.cc_generic_services) ? Boolean(object.cc_generic_services) : false, java_generic_services: isSet(object.java_generic_services) ? Boolean(object.java_generic_services) : false, @@ -3681,9 +3681,9 @@ export const MessageOptions = { }; function createBaseFieldOptions(): FieldOptions { return { - ctype: undefined, + ctype: 1, packed: false, - jstype: undefined, + jstype: 1, lazy: false, deprecated: false, weak: false, @@ -3693,13 +3693,13 @@ function createBaseFieldOptions(): FieldOptions { export const FieldOptions = { typeUrl: "/google.protobuf.FieldOptions", encode(message: FieldOptions, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.ctype !== undefined) { + if (message.ctype !== 1) { writer.uint32(8).int32(message.ctype); } if (message.packed === true) { writer.uint32(16).bool(message.packed); } - if (message.jstype !== undefined) { + if (message.jstype !== 1) { writer.uint32(48).int32(message.jstype); } if (message.lazy === true) { @@ -3779,9 +3779,9 @@ export const FieldOptions = { }, fromPartial(object: DeepPartial): FieldOptions { const message = createBaseFieldOptions(); - message.ctype = object.ctype ?? undefined; + message.ctype = object.ctype ?? 1; message.packed = object.packed ?? false; - message.jstype = object.jstype ?? undefined; + message.jstype = object.jstype ?? 1; message.lazy = object.lazy ?? false; message.deprecated = object.deprecated ?? false; message.weak = object.weak ?? false; @@ -3790,9 +3790,9 @@ export const FieldOptions = { }, fromSDK(object: FieldOptionsSDKType): FieldOptions { return { - ctype: isSet(object.ctype) ? fieldOptions_CTypeFromJSON(object.ctype) : undefined, + ctype: isSet(object.ctype) ? fieldOptions_CTypeFromJSON(object.ctype) : -1, packed: object?.packed, - jstype: isSet(object.jstype) ? fieldOptions_JSTypeFromJSON(object.jstype) : undefined, + jstype: isSet(object.jstype) ? fieldOptions_JSTypeFromJSON(object.jstype) : -1, lazy: object?.lazy, deprecated: object?.deprecated, weak: object?.weak, @@ -3801,9 +3801,9 @@ export const FieldOptions = { }, fromSDKJSON(object: any): FieldOptionsSDKType { return { - ctype: isSet(object.ctype) ? fieldOptions_CTypeFromJSON(object.ctype) : undefined, + ctype: isSet(object.ctype) ? fieldOptions_CTypeFromJSON(object.ctype) : -1, packed: isSet(object.packed) ? Boolean(object.packed) : false, - jstype: isSet(object.jstype) ? fieldOptions_JSTypeFromJSON(object.jstype) : undefined, + jstype: isSet(object.jstype) ? fieldOptions_JSTypeFromJSON(object.jstype) : -1, lazy: isSet(object.lazy) ? Boolean(object.lazy) : false, deprecated: isSet(object.deprecated) ? Boolean(object.deprecated) : false, weak: isSet(object.weak) ? Boolean(object.weak) : false, @@ -4217,7 +4217,7 @@ export const ServiceOptions = { function createBaseMethodOptions(): MethodOptions { return { deprecated: false, - idempotencyLevel: undefined, + idempotencyLevel: 1, uninterpretedOption: [] }; } @@ -4227,7 +4227,7 @@ export const MethodOptions = { if (message.deprecated === true) { writer.uint32(264).bool(message.deprecated); } - if (message.idempotencyLevel !== undefined) { + if (message.idempotencyLevel !== 1) { writer.uint32(272).int32(message.idempotencyLevel); } for (const v of message.uninterpretedOption) { @@ -4279,21 +4279,21 @@ export const MethodOptions = { fromPartial(object: DeepPartial): MethodOptions { const message = createBaseMethodOptions(); message.deprecated = object.deprecated ?? false; - message.idempotencyLevel = object.idempotencyLevel ?? undefined; + message.idempotencyLevel = object.idempotencyLevel ?? 1; message.uninterpretedOption = object.uninterpretedOption?.map(e => UninterpretedOption.fromPartial(e)) || []; return message; }, fromSDK(object: MethodOptionsSDKType): MethodOptions { return { deprecated: object?.deprecated, - idempotencyLevel: isSet(object.idempotency_level) ? methodOptions_IdempotencyLevelFromJSON(object.idempotency_level) : undefined, + idempotencyLevel: isSet(object.idempotency_level) ? methodOptions_IdempotencyLevelFromJSON(object.idempotency_level) : -1, uninterpretedOption: Array.isArray(object?.uninterpreted_option) ? object.uninterpreted_option.map((e: any) => UninterpretedOption.fromSDK(e)) : [] }; }, fromSDKJSON(object: any): MethodOptionsSDKType { return { deprecated: isSet(object.deprecated) ? Boolean(object.deprecated) : false, - idempotency_level: isSet(object.idempotency_level) ? methodOptions_IdempotencyLevelFromJSON(object.idempotency_level) : undefined, + idempotency_level: isSet(object.idempotency_level) ? methodOptions_IdempotencyLevelFromJSON(object.idempotency_level) : -1, uninterpreted_option: Array.isArray(object?.uninterpreted_option) ? object.uninterpreted_option.map((e: any) => UninterpretedOption.fromSDKJSON(e)) : [] }; }, @@ -5030,13 +5030,13 @@ export const GeneratedCodeInfo_Annotation = { }; function createBaseFeatureSet(): FeatureSet { return { - utf8Validation: undefined + utf8Validation: 1 }; } export const FeatureSet = { typeUrl: "/google.protobuf.FeatureSet", encode(message: FeatureSet, writer: BinaryWriter = BinaryWriter.create()): BinaryWriter { - if (message.utf8Validation !== undefined) { + if (message.utf8Validation !== 1) { writer.uint32(32).int32(message.utf8Validation); } return writer; @@ -5070,17 +5070,17 @@ export const FeatureSet = { }, fromPartial(object: DeepPartial): FeatureSet { const message = createBaseFeatureSet(); - message.utf8Validation = object.utf8Validation ?? undefined; + message.utf8Validation = object.utf8Validation ?? 1; return message; }, fromSDK(object: FeatureSetSDKType): FeatureSet { return { - utf8Validation: isSet(object.utf8_validation) ? featureSet_Utf8ValidationFromJSON(object.utf8_validation) : undefined + utf8Validation: isSet(object.utf8_validation) ? featureSet_Utf8ValidationFromJSON(object.utf8_validation) : -1 }; }, fromSDKJSON(object: any): FeatureSetSDKType { return { - utf8_validation: isSet(object.utf8_validation) ? featureSet_Utf8ValidationFromJSON(object.utf8_validation) : undefined + utf8_validation: isSet(object.utf8_validation) ? featureSet_Utf8ValidationFromJSON(object.utf8_validation) : -1 }; }, toSDK(message: FeatureSet): FeatureSetSDKType { diff --git a/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/misc/all_fields.ts b/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/misc/all_fields.ts index 1553459b4..7cfb0cdee 100644 --- a/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/misc/all_fields.ts +++ b/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/misc/all_fields.ts @@ -34,7 +34,7 @@ export interface EncodingTestForDontOmit { wasm: Uint8Array; dOWasm: Uint8Array; /** enum */ - opt?: VoteOption; + opt: VoteOption; dOOpt: VoteOption; /** duration */ period?: Duration; @@ -61,16 +61,16 @@ export interface EncodingTestForDontOmit { wasms: Uint8Array[]; dOWasms: Uint8Array[]; /** array enum */ - opts?: VoteOption[]; + opts: VoteOption[]; dOOpts: VoteOption[]; /** array duration */ - periods?: Duration[]; + periods: Duration[]; dOPeriods: Duration[]; /** array protoType */ - protos?: AccessConfig[]; + protos: AccessConfig[]; dOProtos: AccessConfig[]; /** array anyType */ - auths?: Any[]; + auths: Any[]; dOAuths: Any[]; /** dec */ dec: string; @@ -102,7 +102,7 @@ export interface EncodingTestForDontOmitSDKType { d_o_raw: Uint8Array; wasm: Uint8Array; d_o_wasm: Uint8Array; - opt?: VoteOption; + opt: VoteOption; d_o_opt: VoteOption; period?: DurationSDKType; d_o_period: DurationSDKType; @@ -120,13 +120,13 @@ export interface EncodingTestForDontOmitSDKType { d_o_raws: Uint8Array[]; wasms: Uint8Array[]; d_o_wasms: Uint8Array[]; - opts?: VoteOption[]; + opts: VoteOption[]; d_o_opts: VoteOption[]; - periods?: DurationSDKType[]; + periods: DurationSDKType[]; d_o_periods: DurationSDKType[]; - protos?: AccessConfigSDKType[]; + protos: AccessConfigSDKType[]; d_o_protos: AccessConfigSDKType[]; - auths?: AnySDKType[]; + auths: AnySDKType[]; d_o_auths: AnySDKType[]; dec: string; d_o_dec: string; @@ -160,7 +160,7 @@ export interface EncodingTestForOmit { wasm: Uint8Array; oWasm: Uint8Array; /** enum */ - opt?: VoteOption; + opt: VoteOption; oOpt: VoteOption; /** duration */ period?: Duration; @@ -187,16 +187,16 @@ export interface EncodingTestForOmit { wasms: Uint8Array[]; oWasms: Uint8Array[]; /** array enum */ - opts?: VoteOption[]; + opts: VoteOption[]; oOpts: VoteOption[]; /** array duration */ - periods?: Duration[]; + periods: Duration[]; oPeriods: Duration[]; /** array protoType */ - protos?: AccessConfig[]; + protos: AccessConfig[]; oProtos: AccessConfig[]; /** array anyType */ - auths?: Any[]; + auths: Any[]; oAuths: Any[]; /** dec */ dec: string; @@ -228,7 +228,7 @@ export interface EncodingTestForOmitSDKType { o_raw: Uint8Array; wasm: Uint8Array; o_wasm: Uint8Array; - opt?: VoteOption; + opt: VoteOption; o_opt: VoteOption; period?: DurationSDKType; o_period: DurationSDKType; @@ -246,13 +246,13 @@ export interface EncodingTestForOmitSDKType { o_raws: Uint8Array[]; wasms: Uint8Array[]; o_wasms: Uint8Array[]; - opts?: VoteOption[]; + opts: VoteOption[]; o_opts: VoteOption[]; - periods?: DurationSDKType[]; + periods: DurationSDKType[]; o_periods: DurationSDKType[]; - protos?: AccessConfigSDKType[]; + protos: AccessConfigSDKType[]; o_protos: AccessConfigSDKType[]; - auths?: AnySDKType[]; + auths: AnySDKType[]; o_auths: AnySDKType[]; dec: string; o_dec: string; @@ -279,7 +279,7 @@ function createBaseEncodingTestForDontOmit(): EncodingTestForDontOmit { dORaw: new Uint8Array(), wasm: new Uint8Array(), dOWasm: new Uint8Array(), - opt: undefined, + opt: 0, dOOpt: 0, period: undefined, dOPeriod: Duration.fromPartial({}), @@ -368,7 +368,7 @@ export const EncodingTestForDontOmit = { if (message.dOWasm.length !== 0) { writer.uint32(146).bytes(message.dOWasm); } - if (message.opt !== undefined) { + if (message.opt !== 0) { writer.uint32(152).int32(message.opt); } if (message.dOOpt !== 0) { @@ -888,7 +888,7 @@ export const EncodingTestForDontOmit = { message.dORaw = object.dORaw ?? new Uint8Array(); message.wasm = object.wasm ?? new Uint8Array(); message.dOWasm = object.dOWasm ?? new Uint8Array(); - message.opt = object.opt ?? undefined; + message.opt = object.opt ?? 0; message.dOOpt = object.dOOpt ?? 0; if (object.period !== undefined && object.period !== null) { message.period = Duration.fromPartial(object.period); @@ -948,7 +948,7 @@ export const EncodingTestForDontOmit = { dORaw: object?.d_o_raw, wasm: object?.wasm, dOWasm: object?.d_o_wasm, - opt: isSet(object.opt) ? voteOptionFromJSON(object.opt) : undefined, + opt: isSet(object.opt) ? voteOptionFromJSON(object.opt) : -1, dOOpt: isSet(object.d_o_opt) ? voteOptionFromJSON(object.d_o_opt) : -1, period: object.period ? Duration.fromSDK(object.period) : undefined, dOPeriod: object.d_o_period ? Duration.fromSDK(object.d_o_period) : undefined, @@ -1000,7 +1000,7 @@ export const EncodingTestForDontOmit = { d_o_raw: isSet(object.d_o_raw) ? bytesFromBase64(object.d_o_raw) : new Uint8Array(), wasm: isSet(object.wasm) ? bytesFromBase64(object.wasm) : new Uint8Array(), d_o_wasm: isSet(object.d_o_wasm) ? bytesFromBase64(object.d_o_wasm) : new Uint8Array(), - opt: isSet(object.opt) ? voteOptionFromJSON(object.opt) : undefined, + opt: isSet(object.opt) ? voteOptionFromJSON(object.opt) : -1, d_o_opt: isSet(object.d_o_opt) ? voteOptionFromJSON(object.d_o_opt) : -1, period: isSet(object.period) ? Duration.fromSDKJSON(object.period) : undefined, d_o_period: isSet(object.d_o_period) ? Duration.fromSDKJSON(object.d_o_period) : undefined, @@ -1197,7 +1197,7 @@ function createBaseEncodingTestForOmit(): EncodingTestForOmit { oRaw: new Uint8Array(), wasm: new Uint8Array(), oWasm: new Uint8Array(), - opt: undefined, + opt: 0, oOpt: 0, period: undefined, oPeriod: Duration.fromPartial({}), @@ -1286,7 +1286,7 @@ export const EncodingTestForOmit = { if (message.oWasm.length !== 0) { writer.uint32(146).bytes(message.oWasm); } - if (message.opt !== undefined) { + if (message.opt !== 0) { writer.uint32(152).int32(message.opt); } if (message.oOpt !== 0) { @@ -1806,7 +1806,7 @@ export const EncodingTestForOmit = { message.oRaw = object.oRaw ?? new Uint8Array(); message.wasm = object.wasm ?? new Uint8Array(); message.oWasm = object.oWasm ?? new Uint8Array(); - message.opt = object.opt ?? undefined; + message.opt = object.opt ?? 0; message.oOpt = object.oOpt ?? 0; if (object.period !== undefined && object.period !== null) { message.period = Duration.fromPartial(object.period); @@ -1866,7 +1866,7 @@ export const EncodingTestForOmit = { oRaw: object?.o_raw, wasm: object?.wasm, oWasm: object?.o_wasm, - opt: isSet(object.opt) ? voteOptionFromJSON(object.opt) : undefined, + opt: isSet(object.opt) ? voteOptionFromJSON(object.opt) : -1, oOpt: isSet(object.o_opt) ? voteOptionFromJSON(object.o_opt) : -1, period: object.period ? Duration.fromSDK(object.period) : undefined, oPeriod: object.o_period ? Duration.fromSDK(object.o_period) : undefined, @@ -1918,7 +1918,7 @@ export const EncodingTestForOmit = { o_raw: isSet(object.o_raw) ? bytesFromBase64(object.o_raw) : new Uint8Array(), wasm: isSet(object.wasm) ? bytesFromBase64(object.wasm) : new Uint8Array(), o_wasm: isSet(object.o_wasm) ? bytesFromBase64(object.o_wasm) : new Uint8Array(), - opt: isSet(object.opt) ? voteOptionFromJSON(object.opt) : undefined, + opt: isSet(object.opt) ? voteOptionFromJSON(object.opt) : -1, o_opt: isSet(object.o_opt) ? voteOptionFromJSON(object.o_opt) : -1, period: isSet(object.period) ? Duration.fromSDKJSON(object.period) : undefined, o_period: isSet(object.o_period) ? Duration.fromSDKJSON(object.o_period) : undefined, diff --git a/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/misc/eval_request.ts b/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/misc/eval_request.ts index 01918d090..96cee51c2 100644 --- a/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/misc/eval_request.ts +++ b/__fixtures__/misc/output-proto-amino/scalar-default-nullable-true/misc/eval_request.ts @@ -89,10 +89,10 @@ export interface EvalRequest { * Bindings for the external variables. The types SHOULD be compatible * with the type environment in [CheckRequest][google.api.expr.conformance.v1alpha1.CheckRequest], if checked. */ - bindings?: { + bindings: { [key: string]: ExprValue; }; - refs?: { + refs: { [key: string]: IdRef; }; testNum: number; @@ -103,7 +103,7 @@ export interface EvalRequest { id?: string; name?: string; testArray: string[]; - opt?: FeatureSet_Utf8Validation; + opt: FeatureSet_Utf8Validation; graph?: TestNest_Graph; } export interface EvalRequestProtoMsg { @@ -111,10 +111,10 @@ export interface EvalRequestProtoMsg { value: Uint8Array; } export interface EvalRequestSDKType { - bindings?: { + bindings: { [key: string]: ExprValueSDKType; }; - refs?: { + refs: { [key: string]: IdRefSDKType; }; test_num: number; @@ -124,7 +124,7 @@ export interface EvalRequestSDKType { id?: string; name?: string; test_array: string[]; - opt?: FeatureSet_Utf8Validation; + opt: FeatureSet_Utf8Validation; graph?: TestNest_GraphSDKType; } export interface AccessConfig { @@ -321,7 +321,7 @@ function createBaseEvalRequest(): EvalRequest { id: undefined, name: undefined, testArray: [], - opt: undefined, + opt: 0, graph: undefined }; } @@ -361,7 +361,7 @@ export const EvalRequest = { for (const v of message.testArray) { writer.uint32(114).string(v!); } - if (message.opt !== undefined) { + if (message.opt !== 0) { writer.uint32(120).int32(message.opt); } if (message.graph !== undefined) { @@ -503,7 +503,7 @@ export const EvalRequest = { message.id = object.id ?? undefined; message.name = object.name ?? undefined; message.testArray = object.testArray?.map(e => e) || []; - message.opt = object.opt ?? undefined; + message.opt = object.opt ?? 0; if (object.graph !== undefined && object.graph !== null) { message.graph = TestNest_Graph.fromPartial(object.graph); } @@ -530,7 +530,7 @@ export const EvalRequest = { id: object?.id, name: object?.name, testArray: Array.isArray(object?.test_array) ? object.test_array.map((e: any) => e) : [], - opt: isSet(object.opt) ? featureSet_Utf8ValidationFromJSON(object.opt) : undefined, + opt: isSet(object.opt) ? featureSet_Utf8ValidationFromJSON(object.opt) : -1, graph: object.graph ? TestNest_Graph.fromSDK(object.graph) : undefined }; }, @@ -555,7 +555,7 @@ export const EvalRequest = { id: isSet(object.id) ? String(object.id) : undefined, name: isSet(object.name) ? String(object.name) : undefined, test_array: Array.isArray(object?.test_array) ? object.test_array.map((e: any) => String(e)) : [], - opt: isSet(object.opt) ? featureSet_Utf8ValidationFromJSON(object.opt) : undefined, + opt: isSet(object.opt) ? featureSet_Utf8ValidationFromJSON(object.opt) : -1, graph: isSet(object.graph) ? TestNest_Graph.fromSDKJSON(object.graph) : undefined }; },