@bufbuild/protobuf 0.0.1-alpha.1 → 0.0.2-alpha.2

package/dist/cjs/private/util-common.js

@@ -1,4 +1,17 @@
 "use strict";
+// Copyright 2021-2022 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeUtilCommon = void 0;
 const enum_js_1 = require("./enum.js");
@@ -6,224 +19,194 @@ const field_js_1 = require("../field.js");
 const scalars_js_1 = require("./scalars.js");
 /* eslint-disable @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-argument,no-case-declarations */
 function makeUtilCommon() {
-  return {
-    setEnumType: enum_js_1.setEnumType,
-    initPartial(source, target) {
-      if (source === undefined) {
-        return;
-      }
-      const type = target.getType();
-      for (const member of type.fields.byMember()) {
-        const localName = member.localName,
-          t = target,
-          s = source;
-        if (s[localName] === undefined) {
-          continue;
-        }
-        switch (member.kind) {
-          case "oneof":
-            const sk = s[localName].case;
-            if (sk === undefined) {
-              continue;
+    return {
+        setEnumType: enum_js_1.setEnumType,
+        initPartial(source, target) {
+            if (source === undefined) {
+                return;
             }
-            const sourceField = member.findField(sk);
-            let val = s[localName].value;
-            if (
-              sourceField &&
-              sourceField.kind == "message" &&
-              !(val instanceof sourceField.T)
-            ) {
-              val = new sourceField.T(val);
-            }
-            t[localName] = { case: sk, value: val };
-            break;
-          case "scalar":
-          case "enum":
-            t[localName] = s[localName];
-            break;
-          case "map":
-            switch (member.V.kind) {
-              case "scalar":
-              case "enum":
-                Object.assign(t[localName], s[localName]);
-                break;
-              case "message":
-                const messageType = member.V.T;
-                for (const k of Object.keys(s[localName])) {
-                  let val = s[localName][k];
-                  if (!messageType.fieldWrapper) {
-                    // We only take partial input for messages that are not a wrapper type.
-                    // For those messages, we recursively normalize the partial input.
-                    val = new messageType(val);
-                  }
-                  t[localName][k] = val;
+            const type = target.getType();
+            for (const member of type.fields.byMember()) {
+                const localName = member.localName, t = target, s = source;
+                if (s[localName] === undefined) {
+                    continue;
+                }
+                switch (member.kind) {
+                    case "oneof":
+                        const sk = s[localName].case;
+                        if (sk === undefined) {
+                            continue;
+                        }
+                        const sourceField = member.findField(sk);
+                        let val = s[localName].value;
+                        if (sourceField &&
+                            sourceField.kind == "message" &&
+                            !(val instanceof sourceField.T)) {
+                            val = new sourceField.T(val);
+                        }
+                        t[localName] = { case: sk, value: val };
+                        break;
+                    case "scalar":
+                    case "enum":
+                        t[localName] = s[localName];
+                        break;
+                    case "map":
+                        switch (member.V.kind) {
+                            case "scalar":
+                            case "enum":
+                                Object.assign(t[localName], s[localName]);
+                                break;
+                            case "message":
+                                const messageType = member.V.T;
+                                for (const k of Object.keys(s[localName])) {
+                                    let val = s[localName][k];
+                                    if (!messageType.fieldWrapper) {
+                                        // We only take partial input for messages that are not a wrapper type.
+                                        // For those messages, we recursively normalize the partial input.
+                                        val = new messageType(val);
+                                    }
+                                    t[localName][k] = val;
+                                }
+                                break;
+                        }
+                        break;
+                    case "message":
+                        const mt = member.T;
+                        if (member.repeated) {
+                            t[localName] = s[localName].map((val) => val instanceof mt ? val : new mt(val));
+                        }
+                        else if (s[localName] !== undefined) {
+                            const val = s[localName];
+                            if (mt.fieldWrapper) {
+                                t[localName] = val;
+                            }
+                            else {
+                                t[localName] = val instanceof mt ? mt : new mt(val);
+                            }
+                        }
+                        break;
                 }
-                break;
-            }
-            break;
-          case "message":
-            const mt = member.T;
-            if (member.repeated) {
-              t[localName] = s[localName].map((val) =>
-                val instanceof mt ? val : new mt(val)
-              );
-            } else if (s[localName] !== undefined) {
-              const val = s[localName];
-              if (mt.fieldWrapper) {
-                t[localName] = val;
-              } else {
-                t[localName] = val instanceof mt ? mt : new mt(val);
-              }
-            }
-            break;
-        }
-      }
-    },
-    equals(type, a, b) {
-      if (a === b) {
-        return true;
-      }
-      if (!a || !b) {
-        return false;
-      }
-      return type.fields.byMember().every((m) => {
-        const va = a[m.localName];
-        const vb = b[m.localName];
-        if (m.repeated) {
-          if (va.length !== vb.length) {
-            return false;
-          }
-          // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- repeated fields are never "map"
-          switch (m.kind) {
-            case "message":
-              return va.every((a, i) => m.T.equals(a, vb[i]));
-            case "scalar":
-              return va.every((a, i) =>
-                (0, scalars_js_1.scalarEquals)(m.T, a, vb[i])
-              );
-            case "enum":
-              return va.every((a, i) =>
-                (0, scalars_js_1.scalarEquals)(
-                  field_js_1.ScalarType.INT32,
-                  a,
-                  vb[i]
-                )
-              );
-          }
-          throw new Error(`repeated cannot contain ${m.kind}`);
-        }
-        switch (m.kind) {
-          case "message":
-            return m.T.equals(va, vb);
-          case "enum":
-            return (0, scalars_js_1.scalarEquals)(
-              field_js_1.ScalarType.INT32,
-              va,
-              vb
-            );
-          case "scalar":
-            return (0, scalars_js_1.scalarEquals)(m.T, va, vb);
-          case "oneof":
-            if (va.case !== vb.case) {
-              return false;
-            }
-            const k = va.case,
-              s = m.findField(k);
-            if (s === undefined) {
-              return true;
             }
-            // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- oneof fields are never "map"
-            switch (s.kind) {
-              case "message":
-                return s.T.equals(va[k], vb[k]);
-              case "enum":
-                return (0, scalars_js_1.scalarEquals)(
-                  field_js_1.ScalarType.INT32,
-                  va,
-                  vb
-                );
-              case "scalar":
-                return (0, scalars_js_1.scalarEquals)(s.T, va, vb);
+        },
+        equals(type, a, b) {
+            if (a === b) {
+                return true;
             }
-            throw new Error(`oneof cannot contain ${s.kind}`);
-          case "map":
-            const keys = Object.keys(va);
-            if (keys.some((k) => vb[k] === undefined)) {
-              return false;
+            if (!a || !b) {
+                return false;
             }
-            switch (m.V.kind) {
-              case "message":
-                const messageType = m.V.T;
-                return keys.every((k) => messageType.equals(va[k], vb[k]));
-              case "enum":
-                return keys.every((k) =>
-                  (0, scalars_js_1.scalarEquals)(
-                    field_js_1.ScalarType.INT32,
-                    va[k],
-                    vb[k]
-                  )
-                );
-              case "scalar":
-                const scalarType = m.V.T;
-                return keys.every((k) =>
-                  (0, scalars_js_1.scalarEquals)(scalarType, va[k], vb[k])
-                );
+            return type.fields.byMember().every((m) => {
+                const va = a[m.localName];
+                const vb = b[m.localName];
+                if (m.repeated) {
+                    if (va.length !== vb.length) {
+                        return false;
+                    }
+                    // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- repeated fields are never "map"
+                    switch (m.kind) {
+                        case "message":
+                            return va.every((a, i) => m.T.equals(a, vb[i]));
+                        case "scalar":
+                            return va.every((a, i) => (0, scalars_js_1.scalarEquals)(m.T, a, vb[i]));
+                        case "enum":
+                            return va.every((a, i) => (0, scalars_js_1.scalarEquals)(field_js_1.ScalarType.INT32, a, vb[i]));
+                    }
+                    throw new Error(`repeated cannot contain ${m.kind}`);
+                }
+                switch (m.kind) {
+                    case "message":
+                        return m.T.equals(va, vb);
+                    case "enum":
+                        return (0, scalars_js_1.scalarEquals)(field_js_1.ScalarType.INT32, va, vb);
+                    case "scalar":
+                        return (0, scalars_js_1.scalarEquals)(m.T, va, vb);
+                    case "oneof":
+                        if (va.case !== vb.case) {
+                            return false;
+                        }
+                        const k = va.case, s = m.findField(k);
+                        if (s === undefined) {
+                            return true;
+                        }
+                        // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- oneof fields are never "map"
+                        switch (s.kind) {
+                            case "message":
+                                return s.T.equals(va[k], vb[k]);
+                            case "enum":
+                                return (0, scalars_js_1.scalarEquals)(field_js_1.ScalarType.INT32, va, vb);
+                            case "scalar":
+                                return (0, scalars_js_1.scalarEquals)(s.T, va, vb);
+                        }
+                        throw new Error(`oneof cannot contain ${s.kind}`);
+                    case "map":
+                        const keys = Object.keys(va);
+                        if (keys.some((k) => vb[k] === undefined)) {
+                            return false;
+                        }
+                        switch (m.V.kind) {
+                            case "message":
+                                const messageType = m.V.T;
+                                return keys.every((k) => messageType.equals(va[k], vb[k]));
+                            case "enum":
+                                return keys.every((k) => (0, scalars_js_1.scalarEquals)(field_js_1.ScalarType.INT32, va[k], vb[k]));
+                            case "scalar":
+                                const scalarType = m.V.T;
+                                return keys.every((k) => (0, scalars_js_1.scalarEquals)(scalarType, va[k], vb[k]));
+                        }
+                        break;
+                }
+            });
+        },
+        clone(message) {
+            const type = message.getType(), target = new type(), any = target;
+            for (const member of type.fields.byMember()) {
+                const source = message[member.localName];
+                let copy;
+                if (member.repeated) {
+                    copy = source.map((e) => cloneSingularField(member, e));
+                }
+                else if (member.kind == "map") {
+                    copy = any[member.localName];
+                    for (const [key, v] of Object.entries(source)) {
+                        copy[key] = cloneSingularField(member.V, v);
+                    }
+                }
+                else if (member.kind == "oneof") {
+                    const f = member.findField(source.case);
+                    copy = f
+                        ? { case: source.case, value: cloneSingularField(f, source.value) }
+                        : { case: undefined };
+                }
+                else {
+                    copy = cloneSingularField(member, source);
+                }
+                any[member.localName] = copy;
             }
-            break;
-        }
-      });
-    },
-    clone(message) {
-      const type = message.getType(),
-        target = new type(),
-        any = target;
-      for (const member of type.fields.byMember()) {
-        const source = message[member.localName];
-        let copy;
-        if (member.repeated) {
-          copy = source.map((e) => cloneSingularField(member, e));
-        } else if (member.kind == "map") {
-          copy = any[member.localName];
-          for (const [key, v] of Object.entries(source)) {
-            copy[key] = cloneSingularField(member.V, v);
-          }
-        } else if (member.kind == "oneof") {
-          const f = member.findField(source.case);
-          copy = f
-            ? { case: source.case, value: cloneSingularField(f, source.value) }
-            : { case: undefined };
-        } else {
-          copy = cloneSingularField(member, source);
-        }
-        any[member.localName] = copy;
-      }
-      return target;
-    },
-  };
+            return target;
+        },
+    };
 }
 exports.makeUtilCommon = makeUtilCommon;
 // clone a single field value - i.e. the element type of repeated fields, the value type of maps
 function cloneSingularField(field, value) {
-  if (value === undefined) {
-    return value;
-  }
-  // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- unmatched "map" is unsupported
-  switch (field.kind) {
-    case "enum":
-      return value;
-    case "scalar":
-      if (field.T === field_js_1.ScalarType.BYTES) {
-        const c = new Uint8Array(value.byteLength);
-        c.set(value);
-        return c;
-      }
-      return value;
-    case "message":
-      if (field.T.fieldWrapper) {
-        return field.T.fieldWrapper.unwrapField(
-          field.T.fieldWrapper.wrapField(value).clone()
-        );
-      }
-      return value.clone();
-  }
+    if (value === undefined) {
+        return value;
+    }
+    // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check -- unmatched "map" is unsupported
+    switch (field.kind) {
+        case "enum":
+            return value;
+        case "scalar":
+            if (field.T === field_js_1.ScalarType.BYTES) {
+                const c = new Uint8Array(value.byteLength);
+                c.set(value);
+                return c;
+            }
+            return value;
+        case "message":
+            if (field.T.fieldWrapper) {
+                return field.T.fieldWrapper.unwrapField(field.T.fieldWrapper.wrapField(value).clone());
+            }
+            return value.clone();
+    }
 }

package/dist/cjs/private/util.js

@@ -1,2 +1,15 @@
 "use strict";
+// Copyright 2021-2022 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cjs/proto-int64.js

@@ -1,121 +1,133 @@
 "use strict";
+// Copyright 2021-2022 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.protoInt64 = void 0;
 const varint_js_1 = require("./google/varint.js");
 function makeInt64Support() {
-  const dv = new DataView(new ArrayBuffer(8));
-  // note that Safari 14 implements BigInt, but not the DataView methods
-  const ok =
-    globalThis.BigInt !== undefined && // eslint-disable-line @typescript-eslint/no-unnecessary-condition -- conditional for BigInt is very much necessary
-    typeof dv.getBigInt64 === "function" &&
-    typeof dv.getBigUint64 === "function" &&
-    typeof dv.setBigInt64 === "function" &&
-    typeof dv.setBigUint64 === "function";
-  if (ok) {
-    const MIN = BigInt("-9223372036854775808"),
-      MAX = BigInt("9223372036854775807"),
-      UMIN = BigInt("0"),
-      UMAX = BigInt("18446744073709551615");
-    return {
-      zero: BigInt(0),
-      supported: true,
-      parse(value) {
-        const bi = typeof value == "bigint" ? value : BigInt(value);
-        if (bi > MAX || bi < MIN) {
-          throw new Error(`int64 invalid: ${value}`);
-        }
-        return bi;
-      },
-      uParse(value) {
-        const bi = typeof value == "bigint" ? value : BigInt(value);
-        if (bi > UMAX || bi < UMIN) {
-          throw new Error(`uint64 invalid: ${value}`);
-        }
-        return bi;
-      },
-      enc(value) {
-        dv.setBigInt64(0, this.parse(value), true);
-        return {
-          lo: dv.getInt32(0, true),
-          hi: dv.getInt32(4, true),
-        };
-      },
-      uEnc(value) {
-        dv.setBigInt64(0, this.uParse(value), true);
+    const dv = new DataView(new ArrayBuffer(8));
+    // note that Safari 14 implements BigInt, but not the DataView methods
+    const ok = globalThis.BigInt !== undefined && // eslint-disable-line @typescript-eslint/no-unnecessary-condition -- conditional for BigInt is very much necessary
+        typeof dv.getBigInt64 === "function" &&
+        typeof dv.getBigUint64 === "function" &&
+        typeof dv.setBigInt64 === "function" &&
+        typeof dv.setBigUint64 === "function";
+    if (ok) {
+        const MIN = BigInt("-9223372036854775808"), MAX = BigInt("9223372036854775807"), UMIN = BigInt("0"), UMAX = BigInt("18446744073709551615");
         return {
-          lo: dv.getInt32(0, true),
-          hi: dv.getInt32(4, true),
+            zero: BigInt(0),
+            supported: true,
+            parse(value) {
+                const bi = typeof value == "bigint" ? value : BigInt(value);
+                if (bi > MAX || bi < MIN) {
+                    throw new Error(`int64 invalid: ${value}`);
+                }
+                return bi;
+            },
+            uParse(value) {
+                const bi = typeof value == "bigint" ? value : BigInt(value);
+                if (bi > UMAX || bi < UMIN) {
+                    throw new Error(`uint64 invalid: ${value}`);
+                }
+                return bi;
+            },
+            enc(value) {
+                dv.setBigInt64(0, this.parse(value), true);
+                return {
+                    lo: dv.getInt32(0, true),
+                    hi: dv.getInt32(4, true),
+                };
+            },
+            uEnc(value) {
+                dv.setBigInt64(0, this.uParse(value), true);
+                return {
+                    lo: dv.getInt32(0, true),
+                    hi: dv.getInt32(4, true),
+                };
+            },
+            dec(lo, hi) {
+                dv.setInt32(0, lo, true);
+                dv.setInt32(4, hi, true);
+                return dv.getBigInt64(0, true);
+            },
+            uDec(lo, hi) {
+                dv.setInt32(0, lo, true);
+                dv.setInt32(4, hi, true);
+                return dv.getBigUint64(0, true);
+            },
         };
-      },
-      dec(lo, hi) {
-        dv.setInt32(0, lo, true);
-        dv.setInt32(4, hi, true);
-        return dv.getBigInt64(0, true);
-      },
-      uDec(lo, hi) {
-        dv.setInt32(0, lo, true);
-        dv.setInt32(4, hi, true);
-        return dv.getBigUint64(0, true);
-      },
+    }
+    return {
+        zero: "0",
+        supported: false,
+        parse(value) {
+            if (!/^-?[0-9]+$/.test(value)) {
+                throw new Error(`int64 invalid: ${value}`);
+            }
+            return value;
+        },
+        uParse(value) {
+            if (!/^-?[0-9]+$/.test(value)) {
+                throw new Error(`uint64 invalid: ${value}`);
+            }
+            return value;
+        },
+        enc(value) {
+            if (typeof value == "string") {
+                if (!/^-?[0-9]+$/.test(value)) {
+                    throw new Error(`int64 invalid: ${value}`);
+                }
+            }
+            else {
+                value = value.toString(10);
+            }
+            const [, lo, hi] = (0, varint_js_1.int64fromString)(value);
+            return { lo, hi };
+        },
+        uEnc(value) {
+            if (typeof value == "string") {
+                if (!/^-?[0-9]+$/.test(value)) {
+                    throw new Error(`uint64 invalid: ${value}`);
+                }
+            }
+            else {
+                value = value.toString(10);
+            }
+            const [minus, lo, hi] = (0, varint_js_1.int64fromString)(value);
+            if (minus) {
+                throw new Error(`uint64 invalid: ${value}`);
+            }
+            return { lo, hi };
+        },
+        dec(lo, hi) {
+            const minus = (hi & 0x80000000) !== 0;
+            if (minus) {
+                // negate
+                hi = ~hi;
+                if (lo) {
+                    lo = ~lo + 1;
+                }
+                else {
+                    hi += 1;
+                }
+                return ("-" + (0, varint_js_1.int64toString)(lo, hi));
+            }
+            return (0, varint_js_1.int64toString)(lo, hi);
+        },
+        uDec(lo, hi) {
+            return (0, varint_js_1.int64toString)(lo, hi);
+        },
     };
-  }
-  return {
-    zero: "0",
-    supported: false,
-    parse(value) {
-      if (!/^-?[0-9]+$/.test(value)) {
-        throw new Error(`int64 invalid: ${value}`);
-      }
-      return value;
-    },
-    uParse(value) {
-      if (!/^-?[0-9]+$/.test(value)) {
-        throw new Error(`uint64 invalid: ${value}`);
-      }
-      return value;
-    },
-    enc(value) {
-      if (typeof value == "string") {
-        if (!/^-?[0-9]+$/.test(value)) {
-          throw new Error(`int64 invalid: ${value}`);
-        }
-      } else {
-        value = value.toString(10);
-      }
-      const [, lo, hi] = (0, varint_js_1.int64fromString)(value);
-      return { lo, hi };
-    },
-    uEnc(value) {
-      if (typeof value == "string") {
-        if (!/^-?[0-9]+$/.test(value)) {
-          throw new Error(`uint64 invalid: ${value}`);
-        }
-      } else {
-        value = value.toString(10);
-      }
-      const [minus, lo, hi] = (0, varint_js_1.int64fromString)(value);
-      if (minus) {
-        throw new Error(`uint64 invalid: ${value}`);
-      }
-      return { lo, hi };
-    },
-    dec(lo, hi) {
-      const minus = (hi & 0x80000000) !== 0;
-      if (minus) {
-        // negate
-        hi = ~hi;
-        if (lo) {
-          lo = ~lo + 1;
-        } else {
-          hi += 1;
-        }
-        return "-" + (0, varint_js_1.int64toString)(lo, hi);
-      }
-      return (0, varint_js_1.int64toString)(lo, hi);
-    },
-    uDec(lo, hi) {
-      return (0, varint_js_1.int64toString)(lo, hi);
-    },
-  };
 }
 exports.protoInt64 = makeInt64Support();