add unit tests and fix params for test

integration/proto2-long/parameters.txt

@@ -1 +1 @@
-initializeFieldsAsUndefined=false,forceLong=long
+forceLong=long

integration/proto2-long/proto2-optionals-test.ts

@@ -0,0 +1,16 @@
+import { OptionalsTest } from "./simple";
+
+describe("proto2-optionals", () => {
+  it("it compiles", () => {
+    require("./simple");
+  });
+
+  it("creates a message and correctly doesn't set optional fields", () => {
+    const message = OptionalsTest.create();
+
+    const encoded = OptionalsTest.encode(message).finish();
+    const decoded = OptionalsTest.decode(encoded);
+
+    expect(decoded).toEqual(message);
+  });
+});

integration/proto2-long/simple.ts

@@ -103,6 +103,14 @@ function createBaseOptionalsTest(): OptionalsTest {
     repDescription: [],
     repData: [],
     repFloat: [],
+    optId: 0,
+    optChild: undefined,
+    optState: 0,
+    optLong: Long.ZERO,
+    optTruth: false,
+    optDescription: "",
+    optData: new Uint8Array(0),
+    optFloat: 0,
     reqId: 0,
     reqChild: undefined,
     reqState: 0,
@@ -118,6 +126,13 @@ function createBaseOptionalsTest(): OptionalsTest {
     reqDefvalDescription: "Some description",
     reqDefvalData: new Uint8Array(0),
     reqDefvalFloat: 0.12354,
+    optDefvalId: 100,
+    optDefvalState: 2,
+    optDefvalLong: Long.fromNumber(7812378193),
+    optDefvalTruth: true,
+    optDefvalDescription: "Some description",
+    optDefvalData: new Uint8Array(0),
+    optDefvalFloat: 0.12354,
     translations: {},
   };
 }
@@ -610,14 +625,14 @@ export const OptionalsTest = {
         : [],
       repData: globalThis.Array.isArray(object?.repData) ? object.repData.map((e: any) => bytesFromBase64(e)) : [],
       repFloat: globalThis.Array.isArray(object?.repFloat) ? object.repFloat.map((e: any) => globalThis.Number(e)) : [],
-      optId: isSet(object.optId) ? globalThis.Number(object.optId) : undefined,
+      optId: isSet(object.optId) ? globalThis.Number(object.optId) : 0,
       optChild: isSet(object.optChild) ? Child.fromJSON(object.optChild) : undefined,
-      optState: isSet(object.optState) ? stateEnumFromJSON(object.optState) : undefined,
-      optLong: isSet(object.optLong) ? Long.fromValue(object.optLong) : undefined,
-      optTruth: isSet(object.optTruth) ? globalThis.Boolean(object.optTruth) : undefined,
-      optDescription: isSet(object.optDescription) ? globalThis.String(object.optDescription) : undefined,
-      optData: isSet(object.optData) ? bytesFromBase64(object.optData) : undefined,
-      optFloat: isSet(object.optFloat) ? globalThis.Number(object.optFloat) : undefined,
+      optState: isSet(object.optState) ? stateEnumFromJSON(object.optState) : 0,
+      optLong: isSet(object.optLong) ? Long.fromValue(object.optLong) : Long.ZERO,
+      optTruth: isSet(object.optTruth) ? globalThis.Boolean(object.optTruth) : false,
+      optDescription: isSet(object.optDescription) ? globalThis.String(object.optDescription) : "",
+      optData: isSet(object.optData) ? bytesFromBase64(object.optData) : new Uint8Array(0),
+      optFloat: isSet(object.optFloat) ? globalThis.Number(object.optFloat) : 0,
       reqId: isSet(object.reqId) ? globalThis.Number(object.reqId) : 0,
       reqChild: isSet(object.reqChild) ? Child.fromJSON(object.reqChild) : undefined,
       reqState: isSet(object.reqState) ? stateEnumFromJSON(object.reqState) : 0,
@@ -635,15 +650,15 @@ export const OptionalsTest = {
         : "Some description",
       reqDefvalData: isSet(object.reqDefvalData) ? bytesFromBase64(object.reqDefvalData) : new Uint8Array(0),
       reqDefvalFloat: isSet(object.reqDefvalFloat) ? globalThis.Number(object.reqDefvalFloat) : 0.12354,
-      optDefvalId: isSet(object.optDefvalId) ? globalThis.Number(object.optDefvalId) : undefined,
-      optDefvalState: isSet(object.optDefvalState) ? stateEnumFromJSON(object.optDefvalState) : undefined,
-      optDefvalLong: isSet(object.optDefvalLong) ? Long.fromValue(object.optDefvalLong) : undefined,
-      optDefvalTruth: isSet(object.optDefvalTruth) ? globalThis.Boolean(object.optDefvalTruth) : undefined,
+      optDefvalId: isSet(object.optDefvalId) ? globalThis.Number(object.optDefvalId) : 100,
+      optDefvalState: isSet(object.optDefvalState) ? stateEnumFromJSON(object.optDefvalState) : 2,
+      optDefvalLong: isSet(object.optDefvalLong) ? Long.fromValue(object.optDefvalLong) : Long.fromNumber(7812378193),
+      optDefvalTruth: isSet(object.optDefvalTruth) ? globalThis.Boolean(object.optDefvalTruth) : true,
       optDefvalDescription: isSet(object.optDefvalDescription)
         ? globalThis.String(object.optDefvalDescription)
-        : undefined,
-      optDefvalData: isSet(object.optDefvalData) ? bytesFromBase64(object.optDefvalData) : undefined,
-      optDefvalFloat: isSet(object.optDefvalFloat) ? globalThis.Number(object.optDefvalFloat) : undefined,
+        : "Some description",
+      optDefvalData: isSet(object.optDefvalData) ? bytesFromBase64(object.optDefvalData) : new Uint8Array(0),
+      optDefvalFloat: isSet(object.optDefvalFloat) ? globalThis.Number(object.optDefvalFloat) : 0.12354,
       translations: isObject(object.translations)
         ? Object.entries(object.translations).reduce<{ [key: string]: string }>((acc, [key, value]) => {
           acc[key] = String(value);

integration/proto2-no-default-vals/parameters.txt

@@ -1 +1 @@
-initializeFieldsAsUndefined=false,disableProto2DefaultValues=true
+disableProto2DefaultValues=true

integration/proto2-no-default-vals/proto2-optionals-test.ts

@@ -0,0 +1,16 @@
+import { OptionalsTest } from "./simple";
+
+describe("proto2-optionals", () => {
+  it("it compiles", () => {
+    require("./simple");
+  });
+
+  it("creates a message and correctly doesn't set optional fields", () => {
+    const message = OptionalsTest.create();
+
+    const encoded = OptionalsTest.encode(message).finish();
+    const decoded = OptionalsTest.decode(encoded);
+
+    expect(decoded).toEqual(message);
+  });
+});

integration/proto2-no-default-vals/simple.ts

@@ -103,6 +103,14 @@ function createBaseOptionalsTest(): OptionalsTest {
     repDescription: [],
     repData: [],
     repFloat: [],
+    optId: 0,
+    optChild: undefined,
+    optState: 0,
+    optLong: 0,
+    optTruth: false,
+    optDescription: "",
+    optData: new Uint8Array(0),
+    optFloat: 0,
     reqId: 0,
     reqChild: undefined,
     reqState: 0,
@@ -118,6 +126,13 @@ function createBaseOptionalsTest(): OptionalsTest {
     reqDefvalDescription: "",
     reqDefvalData: new Uint8Array(0),
     reqDefvalFloat: 0,
+    optDefvalId: 0,
+    optDefvalState: 0,
+    optDefvalLong: 0,
+    optDefvalTruth: false,
+    optDefvalDescription: "",
+    optDefvalData: new Uint8Array(0),
+    optDefvalFloat: 0,
     translations: {},
   };
 }
@@ -610,14 +625,14 @@ export const OptionalsTest = {
         : [],
       repData: globalThis.Array.isArray(object?.repData) ? object.repData.map((e: any) => bytesFromBase64(e)) : [],
       repFloat: globalThis.Array.isArray(object?.repFloat) ? object.repFloat.map((e: any) => globalThis.Number(e)) : [],
-      optId: isSet(object.optId) ? globalThis.Number(object.optId) : undefined,
+      optId: isSet(object.optId) ? globalThis.Number(object.optId) : 0,
       optChild: isSet(object.optChild) ? Child.fromJSON(object.optChild) : undefined,
-      optState: isSet(object.optState) ? stateEnumFromJSON(object.optState) : undefined,
-      optLong: isSet(object.optLong) ? globalThis.Number(object.optLong) : undefined,
-      optTruth: isSet(object.optTruth) ? globalThis.Boolean(object.optTruth) : undefined,
-      optDescription: isSet(object.optDescription) ? globalThis.String(object.optDescription) : undefined,
-      optData: isSet(object.optData) ? bytesFromBase64(object.optData) : undefined,
-      optFloat: isSet(object.optFloat) ? globalThis.Number(object.optFloat) : undefined,
+      optState: isSet(object.optState) ? stateEnumFromJSON(object.optState) : 0,
+      optLong: isSet(object.optLong) ? globalThis.Number(object.optLong) : 0,
+      optTruth: isSet(object.optTruth) ? globalThis.Boolean(object.optTruth) : false,
+      optDescription: isSet(object.optDescription) ? globalThis.String(object.optDescription) : "",
+      optData: isSet(object.optData) ? bytesFromBase64(object.optData) : new Uint8Array(0),
+      optFloat: isSet(object.optFloat) ? globalThis.Number(object.optFloat) : 0,
       reqId: isSet(object.reqId) ? globalThis.Number(object.reqId) : 0,
       reqChild: isSet(object.reqChild) ? Child.fromJSON(object.reqChild) : undefined,
       reqState: isSet(object.reqState) ? stateEnumFromJSON(object.reqState) : 0,
@@ -633,15 +648,13 @@ export const OptionalsTest = {
       reqDefvalDescription: isSet(object.reqDefvalDescription) ? globalThis.String(object.reqDefvalDescription) : "",
       reqDefvalData: isSet(object.reqDefvalData) ? bytesFromBase64(object.reqDefvalData) : new Uint8Array(0),
       reqDefvalFloat: isSet(object.reqDefvalFloat) ? globalThis.Number(object.reqDefvalFloat) : 0,
-      optDefvalId: isSet(object.optDefvalId) ? globalThis.Number(object.optDefvalId) : undefined,
-      optDefvalState: isSet(object.optDefvalState) ? stateEnumFromJSON(object.optDefvalState) : undefined,
-      optDefvalLong: isSet(object.optDefvalLong) ? globalThis.Number(object.optDefvalLong) : undefined,
-      optDefvalTruth: isSet(object.optDefvalTruth) ? globalThis.Boolean(object.optDefvalTruth) : undefined,
-      optDefvalDescription: isSet(object.optDefvalDescription)
-        ? globalThis.String(object.optDefvalDescription)
-        : undefined,
-      optDefvalData: isSet(object.optDefvalData) ? bytesFromBase64(object.optDefvalData) : undefined,
-      optDefvalFloat: isSet(object.optDefvalFloat) ? globalThis.Number(object.optDefvalFloat) : undefined,
+      optDefvalId: isSet(object.optDefvalId) ? globalThis.Number(object.optDefvalId) : 0,
+      optDefvalState: isSet(object.optDefvalState) ? stateEnumFromJSON(object.optDefvalState) : 0,
+      optDefvalLong: isSet(object.optDefvalLong) ? globalThis.Number(object.optDefvalLong) : 0,
+      optDefvalTruth: isSet(object.optDefvalTruth) ? globalThis.Boolean(object.optDefvalTruth) : false,
+      optDefvalDescription: isSet(object.optDefvalDescription) ? globalThis.String(object.optDefvalDescription) : "",
+      optDefvalData: isSet(object.optDefvalData) ? bytesFromBase64(object.optDefvalData) : new Uint8Array(0),
+      optDefvalFloat: isSet(object.optDefvalFloat) ? globalThis.Number(object.optDefvalFloat) : 0,
       translations: isObject(object.translations)
         ? Object.entries(object.translations).reduce<{ [key: string]: string }>((acc, [key, value]) => {
           acc[key] = String(value);

integration/proto2-no-optionals/parameters.txt

@@ -1 +1 @@
-initializeFieldsAsUndefined=false,disableProto2Optionals=true
+disableProto2Optionals=true

integration/proto2-no-optionals/proto2-optionals-test.ts

@@ -0,0 +1,16 @@
+import { OptionalsTest } from "./simple";
+
+describe("proto2-optionals", () => {
+  it("it compiles", () => {
+    require("./simple");
+  });
+
+  it("creates a message and correctly doesn't set optional fields", () => {
+    const message = OptionalsTest.create();
+
+    const encoded = OptionalsTest.encode(message).finish();
+    const decoded = OptionalsTest.decode(encoded);
+
+    expect(decoded).toEqual(message);
+  });
+});

integration/proto2/parameters.txt

@@ -1 +0,0 @@
-initializeFieldsAsUndefined=false

integration/proto2/proto2-optionals-test.ts

@@ -0,0 +1,16 @@
+import { OptionalsTest } from "./simple";
+
+describe("proto2-optionals", () => {
+  it("it compiles", () => {
+    require("./simple");
+  });
+
+  it("creates a message and correctly doesn't set optional fields", () => {
+    const message = OptionalsTest.create();
+
+    const encoded = OptionalsTest.encode(message).finish();
+    const decoded = OptionalsTest.decode(encoded);
+
+    expect(decoded).toEqual(message);
+  });
+});

integration/proto2/simple.ts

@@ -103,6 +103,14 @@ function createBaseOptionalsTest(): OptionalsTest {
     repDescription: [],
     repData: [],
     repFloat: [],
+    optId: 0,
+    optChild: undefined,
+    optState: 0,
+    optLong: 0,
+    optTruth: false,
+    optDescription: "",
+    optData: new Uint8Array(0),
+    optFloat: 0,
     reqId: 0,
     reqChild: undefined,
     reqState: 0,
@@ -118,6 +126,13 @@ function createBaseOptionalsTest(): OptionalsTest {
     reqDefvalDescription: "Some description",
     reqDefvalData: new Uint8Array(0),
     reqDefvalFloat: 0.12354,
+    optDefvalId: 100,
+    optDefvalState: 2,
+    optDefvalLong: 7812378193,
+    optDefvalTruth: true,
+    optDefvalDescription: "Some description",
+    optDefvalData: new Uint8Array(0),
+    optDefvalFloat: 0.12354,
     translations: {},
   };
 }
@@ -610,14 +625,14 @@ export const OptionalsTest = {
         : [],
       repData: globalThis.Array.isArray(object?.repData) ? object.repData.map((e: any) => bytesFromBase64(e)) : [],
       repFloat: globalThis.Array.isArray(object?.repFloat) ? object.repFloat.map((e: any) => globalThis.Number(e)) : [],
-      optId: isSet(object.optId) ? globalThis.Number(object.optId) : undefined,
+      optId: isSet(object.optId) ? globalThis.Number(object.optId) : 0,
       optChild: isSet(object.optChild) ? Child.fromJSON(object.optChild) : undefined,
-      optState: isSet(object.optState) ? stateEnumFromJSON(object.optState) : undefined,
-      optLong: isSet(object.optLong) ? globalThis.Number(object.optLong) : undefined,
-      optTruth: isSet(object.optTruth) ? globalThis.Boolean(object.optTruth) : undefined,
-      optDescription: isSet(object.optDescription) ? globalThis.String(object.optDescription) : undefined,
-      optData: isSet(object.optData) ? bytesFromBase64(object.optData) : undefined,
-      optFloat: isSet(object.optFloat) ? globalThis.Number(object.optFloat) : undefined,
+      optState: isSet(object.optState) ? stateEnumFromJSON(object.optState) : 0,
+      optLong: isSet(object.optLong) ? globalThis.Number(object.optLong) : 0,
+      optTruth: isSet(object.optTruth) ? globalThis.Boolean(object.optTruth) : false,
+      optDescription: isSet(object.optDescription) ? globalThis.String(object.optDescription) : "",
+      optData: isSet(object.optData) ? bytesFromBase64(object.optData) : new Uint8Array(0),
+      optFloat: isSet(object.optFloat) ? globalThis.Number(object.optFloat) : 0,
       reqId: isSet(object.reqId) ? globalThis.Number(object.reqId) : 0,
       reqChild: isSet(object.reqChild) ? Child.fromJSON(object.reqChild) : undefined,
       reqState: isSet(object.reqState) ? stateEnumFromJSON(object.reqState) : 0,
@@ -635,15 +650,15 @@ export const OptionalsTest = {
         : "Some description",
       reqDefvalData: isSet(object.reqDefvalData) ? bytesFromBase64(object.reqDefvalData) : new Uint8Array(0),
       reqDefvalFloat: isSet(object.reqDefvalFloat) ? globalThis.Number(object.reqDefvalFloat) : 0.12354,
-      optDefvalId: isSet(object.optDefvalId) ? globalThis.Number(object.optDefvalId) : undefined,
-      optDefvalState: isSet(object.optDefvalState) ? stateEnumFromJSON(object.optDefvalState) : undefined,
-      optDefvalLong: isSet(object.optDefvalLong) ? globalThis.Number(object.optDefvalLong) : undefined,
-      optDefvalTruth: isSet(object.optDefvalTruth) ? globalThis.Boolean(object.optDefvalTruth) : undefined,
+      optDefvalId: isSet(object.optDefvalId) ? globalThis.Number(object.optDefvalId) : 100,
+      optDefvalState: isSet(object.optDefvalState) ? stateEnumFromJSON(object.optDefvalState) : 2,
+      optDefvalLong: isSet(object.optDefvalLong) ? globalThis.Number(object.optDefvalLong) : 7812378193,
+      optDefvalTruth: isSet(object.optDefvalTruth) ? globalThis.Boolean(object.optDefvalTruth) : true,
       optDefvalDescription: isSet(object.optDefvalDescription)
         ? globalThis.String(object.optDefvalDescription)
-        : undefined,
-      optDefvalData: isSet(object.optDefvalData) ? bytesFromBase64(object.optDefvalData) : undefined,
-      optDefvalFloat: isSet(object.optDefvalFloat) ? globalThis.Number(object.optDefvalFloat) : undefined,
+        : "Some description",
+      optDefvalData: isSet(object.optDefvalData) ? bytesFromBase64(object.optDefvalData) : new Uint8Array(0),
+      optDefvalFloat: isSet(object.optDefvalFloat) ? globalThis.Number(object.optDefvalFloat) : 0.12354,
       translations: isObject(object.translations)
         ? Object.entries(object.translations).reduce<{ [key: string]: string }>((acc, [key, value]) => {
           acc[key] = String(value);