@bufbuild/protobuf 2.2.2 → 2.2.3

package/dist/cjs/equals.d.ts

@@ -1,9 +1,41 @@
 import type { MessageShape } from "./types.js";
-import type { DescMessage } from "./descriptors.js";
+import { type DescMessage } from "./descriptors.js";
+import type { Registry } from "./registry.js";
+interface EqualsOptions {
+    /**
+     * A registry to look up extensions, and messages packed in Any.
+     *
+     * @private Experimental API, does not follow semantic versioning.
+     */
+    registry: Registry;
+    /**
+     * Unpack google.protobuf.Any before comparing.
+     * If a type is not in the registry, comparison falls back to comparing the
+     * fields of Any.
+     *
+     * @private Experimental API, does not follow semantic versioning.
+     */
+    unpackAny?: boolean;
+    /**
+     * Consider extensions when comparing.
+     *
+     * @private Experimental API, does not follow semantic versioning.
+     */
+    extensions?: boolean;
+    /**
+     * Consider unknown fields when comparing.
+     * The registry is used to distinguish between extensions, and unknown fields
+     * caused by schema changes.
+     *
+     * @private Experimental API, does not follow semantic versioning.
+     */
+    unknown?: boolean;
+}
 /**
  * Compare two messages of the same type.
  *
  * Note that this function disregards extensions and unknown fields, and that
  * NaN is not equal NaN, following the IEEE standard.
  */
-export declare function equals<Desc extends DescMessage>(schema: Desc, a: MessageShape<Desc>, b: MessageShape<Desc>): boolean;
+export declare function equals<Desc extends DescMessage>(schema: Desc, a: MessageShape<Desc>, b: MessageShape<Desc>, options?: EqualsOptions): boolean;
+export {};

package/dist/cjs/equals.js

@@ -16,30 +16,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.equals = equals;
 const scalar_js_1 = require("./reflect/scalar.js");
 const reflect_js_1 = require("./reflect/reflect.js");
+const descriptors_js_1 = require("./descriptors.js");
+const index_js_1 = require("./wkt/index.js");
+const extensions_js_1 = require("./extensions.js");
 /**
  * Compare two messages of the same type.
  *
  * Note that this function disregards extensions and unknown fields, and that
  * NaN is not equal NaN, following the IEEE standard.
  */
-function equals(schema, a, b) {
+function equals(schema, a, b, options) {
     if (a.$typeName != schema.typeName || b.$typeName != schema.typeName) {
         return false;
     }
     if (a === b) {
         return true;
     }
-    return reflectEquals((0, reflect_js_1.reflect)(schema, a), (0, reflect_js_1.reflect)(schema, b));
+    return reflectEquals((0, reflect_js_1.reflect)(schema, a), (0, reflect_js_1.reflect)(schema, b), options);
 }
-function reflectEquals(a, b) {
+function reflectEquals(a, b, opts) {
+    if (a.desc.typeName === "google.protobuf.Any" && (opts === null || opts === void 0 ? void 0 : opts.unpackAny) == true) {
+        return anyUnpackedEquals(a.message, b.message, opts);
+    }
     for (const f of a.fields) {
-        if (!fieldEquals(f, a, b)) {
+        if (!fieldEquals(f, a, b, opts)) {
             return false;
         }
     }
+    if ((opts === null || opts === void 0 ? void 0 : opts.unknown) == true && !unknownEquals(a, b, opts.registry)) {
+        return false;
+    }
+    if ((opts === null || opts === void 0 ? void 0 : opts.extensions) == true && !extensionsEquals(a, b, opts)) {
+        return false;
+    }
     return true;
 }
-function fieldEquals(f, a, b) {
+// TODO(tstamm) add an option to consider NaN equal to NaN?
+function fieldEquals(f, a, b, opts) {
     if (!a.isSet(f) && !b.isSet(f)) {
         return true;
     }
@@ -52,25 +65,26 @@ function fieldEquals(f, a, b) {
         case "enum":
             return a.get(f) === b.get(f);
         case "message":
-            return reflectEquals(a.get(f), b.get(f));
+            return reflectEquals(a.get(f), b.get(f), opts);
         case "map": {
-            const ma = a.get(f);
-            const mb = b.get(f);
-            const keysA = [];
-            for (const k of ma.keys()) {
-                if (!mb.has(k)) {
+            // TODO(tstamm) can't we compare sizes first?
+            const mapA = a.get(f);
+            const mapB = b.get(f);
+            const keys = [];
+            for (const k of mapA.keys()) {
+                if (!mapB.has(k)) {
                     return false;
                 }
-                keysA.push(k);
+                keys.push(k);
             }
-            for (const k of mb.keys()) {
-                if (!ma.has(k)) {
+            for (const k of mapB.keys()) {
+                if (!mapA.has(k)) {
                     return false;
                 }
             }
-            for (const key of keysA) {
-                const va = ma.get(key);
-                const vb = mb.get(key);
+            for (const key of keys) {
+                const va = mapA.get(key);
+                const vb = mapB.get(key);
                 if (va === vb) {
                     continue;
                 }
@@ -78,7 +92,7 @@ function fieldEquals(f, a, b) {
                     case "enum":
                         return false;
                     case "message":
-                        if (!reflectEquals(va, vb)) {
+                        if (!reflectEquals(va, vb, opts)) {
                             return false;
                         }
                         break;
@@ -92,14 +106,14 @@ function fieldEquals(f, a, b) {
             break;
         }
         case "list": {
-            const la = a.get(f);
-            const lb = b.get(f);
-            if (la.size != lb.size) {
+            const listA = a.get(f);
+            const listB = b.get(f);
+            if (listA.size != listB.size) {
                 return false;
             }
-            for (let i = 0; i < la.size; i++) {
-                const va = la.get(i);
-                const vb = lb.get(i);
+            for (let i = 0; i < listA.size; i++) {
+                const va = listA.get(i);
+                const vb = listB.get(i);
                 if (va === vb) {
                     continue;
                 }
@@ -107,7 +121,7 @@ function fieldEquals(f, a, b) {
                     case "enum":
                         return false;
                     case "message":
-                        if (!reflectEquals(va, vb)) {
+                        if (!reflectEquals(va, vb, opts)) {
                             return false;
                         }
                         break;
@@ -123,3 +137,67 @@ function fieldEquals(f, a, b) {
     }
     return true;
 }
+function anyUnpackedEquals(a, b, opts) {
+    if (a.typeUrl !== b.typeUrl) {
+        return false;
+    }
+    const unpackedA = (0, index_js_1.anyUnpack)(a, opts.registry);
+    const unpackedB = (0, index_js_1.anyUnpack)(b, opts.registry);
+    if (unpackedA && unpackedB) {
+        const schema = opts.registry.getMessage(unpackedA.$typeName);
+        if (schema) {
+            return equals(schema, unpackedA, unpackedB, opts);
+        }
+    }
+    return (0, scalar_js_1.scalarEquals)(descriptors_js_1.ScalarType.BYTES, a.value, b.value);
+}
+function unknownEquals(a, b, registry) {
+    function getTrulyUnknown(msg, registry) {
+        var _a;
+        const u = (_a = msg.getUnknown()) !== null && _a !== void 0 ? _a : [];
+        return registry
+            ? u.filter((uf) => !registry.getExtensionFor(msg.desc, uf.no))
+            : u;
+    }
+    const unknownA = getTrulyUnknown(a, registry);
+    const unknownB = getTrulyUnknown(b, registry);
+    if (unknownA.length != unknownB.length) {
+        return false;
+    }
+    for (let i = 0; i < unknownA.length; i++) {
+        const a = unknownA[i], b = unknownB[i];
+        if (a.no != b.no) {
+            return false;
+        }
+        if (a.wireType != b.wireType) {
+            return false;
+        }
+        if (!(0, scalar_js_1.scalarEquals)(descriptors_js_1.ScalarType.BYTES, a.data, b.data)) {
+            return false;
+        }
+    }
+    return true;
+}
+function extensionsEquals(a, b, opts) {
+    function getSetExtensions(msg, registry) {
+        var _a;
+        return ((_a = msg.getUnknown()) !== null && _a !== void 0 ? _a : [])
+            .map((uf) => registry.getExtensionFor(msg.desc, uf.no))
+            .filter((e) => e != undefined)
+            .filter((e, index, arr) => arr.indexOf(e) === index);
+    }
+    const extensionsA = getSetExtensions(a, opts.registry);
+    const extensionsB = getSetExtensions(b, opts.registry);
+    if (extensionsA.length != extensionsB.length ||
+        extensionsA.some((e) => !extensionsB.includes(e))) {
+        return false;
+    }
+    for (const extension of extensionsA) {
+        const [containerA, field] = (0, extensions_js_1.createExtensionContainer)(extension, (0, extensions_js_1.getExtension)(a.message, extension));
+        const [containerB] = (0, extensions_js_1.createExtensionContainer)(extension, (0, extensions_js_1.getExtension)(b.message, extension));
+        if (!fieldEquals(field, containerA, containerB, opts)) {
+            return false;
+        }
+    }
+    return true;
+}

package/dist/cjs/wire/size-delimited.js

@@ -23,7 +23,7 @@ var __await = (this && this.__await) || function (v) { return this instanceof __
 var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
     if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
     var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+    return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
     function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
     function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
     function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }

package/dist/cjs/wkt/any.js

@@ -48,7 +48,7 @@ function anyUnpack(any, registryOrMessageDesc) {
     const desc = registryOrMessageDesc.kind == "message"
         ? registryOrMessageDesc
         : registryOrMessageDesc.getMessage(typeUrlToName(any.typeUrl));
-    if (!desc) {
+    if (!desc || !anyIs(any, desc)) {
         return undefined;
     }
     return (0, from_binary_js_1.fromBinary)(desc, any.value);
@@ -57,7 +57,7 @@ function anyUnpack(any, registryOrMessageDesc) {
  * Same as anyUnpack but unpacks into the target message.
  */
 function anyUnpackTo(any, schema, message) {
-    if (any.typeUrl === "") {
+    if (!anyIs(any, schema)) {
         return undefined;
     }
     return (0, from_binary_js_1.mergeFromBinary)(schema, message, any.value);

package/dist/esm/equals.d.ts

@@ -1,9 +1,41 @@
 import type { MessageShape } from "./types.js";
-import type { DescMessage } from "./descriptors.js";
+import { type DescMessage } from "./descriptors.js";
+import type { Registry } from "./registry.js";
+interface EqualsOptions {
+    /**
+     * A registry to look up extensions, and messages packed in Any.
+     *
+     * @private Experimental API, does not follow semantic versioning.
+     */
+    registry: Registry;
+    /**
+     * Unpack google.protobuf.Any before comparing.
+     * If a type is not in the registry, comparison falls back to comparing the
+     * fields of Any.
+     *
+     * @private Experimental API, does not follow semantic versioning.
+     */
+    unpackAny?: boolean;
+    /**
+     * Consider extensions when comparing.
+     *
+     * @private Experimental API, does not follow semantic versioning.
+     */
+    extensions?: boolean;
+    /**
+     * Consider unknown fields when comparing.
+     * The registry is used to distinguish between extensions, and unknown fields
+     * caused by schema changes.
+     *
+     * @private Experimental API, does not follow semantic versioning.
+     */
+    unknown?: boolean;
+}
 /**
  * Compare two messages of the same type.
  *
  * Note that this function disregards extensions and unknown fields, and that
  * NaN is not equal NaN, following the IEEE standard.
  */
-export declare function equals<Desc extends DescMessage>(schema: Desc, a: MessageShape<Desc>, b: MessageShape<Desc>): boolean;
+export declare function equals<Desc extends DescMessage>(schema: Desc, a: MessageShape<Desc>, b: MessageShape<Desc>, options?: EqualsOptions): boolean;
+export {};

package/dist/esm/equals.js

@@ -13,30 +13,43 @@
 // limitations under the License.
 import { scalarEquals } from "./reflect/scalar.js";
 import { reflect } from "./reflect/reflect.js";
+import { ScalarType, } from "./descriptors.js";
+import { anyUnpack } from "./wkt/index.js";
+import { createExtensionContainer, getExtension } from "./extensions.js";
 /**
  * Compare two messages of the same type.
  *
  * Note that this function disregards extensions and unknown fields, and that
  * NaN is not equal NaN, following the IEEE standard.
  */
-export function equals(schema, a, b) {
+export function equals(schema, a, b, options) {
     if (a.$typeName != schema.typeName || b.$typeName != schema.typeName) {
         return false;
     }
     if (a === b) {
         return true;
     }
-    return reflectEquals(reflect(schema, a), reflect(schema, b));
+    return reflectEquals(reflect(schema, a), reflect(schema, b), options);
 }
-function reflectEquals(a, b) {
+function reflectEquals(a, b, opts) {
+    if (a.desc.typeName === "google.protobuf.Any" && (opts === null || opts === void 0 ? void 0 : opts.unpackAny) == true) {
+        return anyUnpackedEquals(a.message, b.message, opts);
+    }
     for (const f of a.fields) {
-        if (!fieldEquals(f, a, b)) {
+        if (!fieldEquals(f, a, b, opts)) {
             return false;
         }
     }
+    if ((opts === null || opts === void 0 ? void 0 : opts.unknown) == true && !unknownEquals(a, b, opts.registry)) {
+        return false;
+    }
+    if ((opts === null || opts === void 0 ? void 0 : opts.extensions) == true && !extensionsEquals(a, b, opts)) {
+        return false;
+    }
     return true;
 }
-function fieldEquals(f, a, b) {
+// TODO(tstamm) add an option to consider NaN equal to NaN?
+function fieldEquals(f, a, b, opts) {
     if (!a.isSet(f) && !b.isSet(f)) {
         return true;
     }
@@ -49,25 +62,26 @@ function fieldEquals(f, a, b) {
         case "enum":
             return a.get(f) === b.get(f);
         case "message":
-            return reflectEquals(a.get(f), b.get(f));
+            return reflectEquals(a.get(f), b.get(f), opts);
         case "map": {
-            const ma = a.get(f);
-            const mb = b.get(f);
-            const keysA = [];
-            for (const k of ma.keys()) {
-                if (!mb.has(k)) {
+            // TODO(tstamm) can't we compare sizes first?
+            const mapA = a.get(f);
+            const mapB = b.get(f);
+            const keys = [];
+            for (const k of mapA.keys()) {
+                if (!mapB.has(k)) {
                     return false;
                 }
-                keysA.push(k);
+                keys.push(k);
             }
-            for (const k of mb.keys()) {
-                if (!ma.has(k)) {
+            for (const k of mapB.keys()) {
+                if (!mapA.has(k)) {
                     return false;
                 }
             }
-            for (const key of keysA) {
-                const va = ma.get(key);
-                const vb = mb.get(key);
+            for (const key of keys) {
+                const va = mapA.get(key);
+                const vb = mapB.get(key);
                 if (va === vb) {
                     continue;
                 }
@@ -75,7 +89,7 @@ function fieldEquals(f, a, b) {
                     case "enum":
                         return false;
                     case "message":
-                        if (!reflectEquals(va, vb)) {
+                        if (!reflectEquals(va, vb, opts)) {
                             return false;
                         }
                         break;
@@ -89,14 +103,14 @@ function fieldEquals(f, a, b) {
             break;
         }
         case "list": {
-            const la = a.get(f);
-            const lb = b.get(f);
-            if (la.size != lb.size) {
+            const listA = a.get(f);
+            const listB = b.get(f);
+            if (listA.size != listB.size) {
                 return false;
             }
-            for (let i = 0; i < la.size; i++) {
-                const va = la.get(i);
-                const vb = lb.get(i);
+            for (let i = 0; i < listA.size; i++) {
+                const va = listA.get(i);
+                const vb = listB.get(i);
                 if (va === vb) {
                     continue;
                 }
@@ -104,7 +118,7 @@ function fieldEquals(f, a, b) {
                     case "enum":
                         return false;
                     case "message":
-                        if (!reflectEquals(va, vb)) {
+                        if (!reflectEquals(va, vb, opts)) {
                             return false;
                         }
                         break;
@@ -120,3 +134,67 @@ function fieldEquals(f, a, b) {
     }
     return true;
 }
+function anyUnpackedEquals(a, b, opts) {
+    if (a.typeUrl !== b.typeUrl) {
+        return false;
+    }
+    const unpackedA = anyUnpack(a, opts.registry);
+    const unpackedB = anyUnpack(b, opts.registry);
+    if (unpackedA && unpackedB) {
+        const schema = opts.registry.getMessage(unpackedA.$typeName);
+        if (schema) {
+            return equals(schema, unpackedA, unpackedB, opts);
+        }
+    }
+    return scalarEquals(ScalarType.BYTES, a.value, b.value);
+}
+function unknownEquals(a, b, registry) {
+    function getTrulyUnknown(msg, registry) {
+        var _a;
+        const u = (_a = msg.getUnknown()) !== null && _a !== void 0 ? _a : [];
+        return registry
+            ? u.filter((uf) => !registry.getExtensionFor(msg.desc, uf.no))
+            : u;
+    }
+    const unknownA = getTrulyUnknown(a, registry);
+    const unknownB = getTrulyUnknown(b, registry);
+    if (unknownA.length != unknownB.length) {
+        return false;
+    }
+    for (let i = 0; i < unknownA.length; i++) {
+        const a = unknownA[i], b = unknownB[i];
+        if (a.no != b.no) {
+            return false;
+        }
+        if (a.wireType != b.wireType) {
+            return false;
+        }
+        if (!scalarEquals(ScalarType.BYTES, a.data, b.data)) {
+            return false;
+        }
+    }
+    return true;
+}
+function extensionsEquals(a, b, opts) {
+    function getSetExtensions(msg, registry) {
+        var _a;
+        return ((_a = msg.getUnknown()) !== null && _a !== void 0 ? _a : [])
+            .map((uf) => registry.getExtensionFor(msg.desc, uf.no))
+            .filter((e) => e != undefined)
+            .filter((e, index, arr) => arr.indexOf(e) === index);
+    }
+    const extensionsA = getSetExtensions(a, opts.registry);
+    const extensionsB = getSetExtensions(b, opts.registry);
+    if (extensionsA.length != extensionsB.length ||
+        extensionsA.some((e) => !extensionsB.includes(e))) {
+        return false;
+    }
+    for (const extension of extensionsA) {
+        const [containerA, field] = createExtensionContainer(extension, getExtension(a.message, extension));
+        const [containerB] = createExtensionContainer(extension, getExtension(b.message, extension));
+        if (!fieldEquals(field, containerA, containerB, opts)) {
+            return false;
+        }
+    }
+    return true;
+}

package/dist/esm/wire/size-delimited.js

@@ -22,7 +22,7 @@ var __await = (this && this.__await) || function (v) { return this instanceof __
 var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
     if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
     var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+    return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
     function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
     function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
     function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }

package/dist/esm/wkt/any.js

@@ -42,7 +42,7 @@ export function anyUnpack(any, registryOrMessageDesc) {
     const desc = registryOrMessageDesc.kind == "message"
         ? registryOrMessageDesc
         : registryOrMessageDesc.getMessage(typeUrlToName(any.typeUrl));
-    if (!desc) {
+    if (!desc || !anyIs(any, desc)) {
         return undefined;
     }
     return fromBinary(desc, any.value);
@@ -51,7 +51,7 @@ export function anyUnpack(any, registryOrMessageDesc) {
  * Same as anyUnpack but unpacks into the target message.
  */
 export function anyUnpackTo(any, schema, message) {
-    if (any.typeUrl === "") {
+    if (!anyIs(any, schema)) {
         return undefined;
     }
     return mergeFromBinary(schema, message, any.value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bufbuild/protobuf",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "license": "(Apache-2.0 AND BSD-3-Clause)",
   "description": "A complete implementation of Protocol Buffers in TypeScript, suitable for web browsers and Node.js.",
   "keywords": [