@bufbuild/protobuf 2.2.2 → 2.2.4

package/dist/cjs/clone.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/codegenv1/boot.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/codegenv1/embed.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/codegenv1/enum.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/codegenv1/extension.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/codegenv1/file.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/codegenv1/index.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/codegenv1/message.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/codegenv1/restore-json-names.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/codegenv1/scalar.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/codegenv1/service.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/codegenv1/symbols.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/codegenv1/types.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/create.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/descriptors.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

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

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.
@@ -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/extensions.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/fields.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/from-binary.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/from-json.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.
@@ -511,7 +511,7 @@ function timestampFromJson(timestamp, json) {
     if (typeof json !== "string") {
         throw new Error(`cannot decode message ${timestamp.$typeName} from JSON: ${(0, reflect_check_js_1.formatVal)(json)}`);
     }
-    const matches = json.match(/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(?:Z|\.([0-9]{3,9})Z|([+-][0-9][0-9]:[0-9][0-9]))$/);
+    const matches = json.match(/^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(?:\.([0-9]{1,9}))?(?:Z|([+-][0-9][0-9]:[0-9][0-9]))$/);
     if (!matches) {
         throw new Error(`cannot decode message ${timestamp.$typeName} from JSON: invalid RFC 3339 string`);
     }

package/dist/cjs/index.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/is-message.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/json-value.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/proto-int64.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/reflect/error.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/reflect/guard.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/reflect/index.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/reflect/names.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/reflect/nested-types.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/reflect/reflect-check.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.
@@ -135,33 +135,33 @@ function checkScalarValue(value, scalar) {
         case descriptors_js_1.ScalarType.SFIXED64:
         case descriptors_js_1.ScalarType.SINT64:
             // signed
-            if (typeof value != "string" &&
-                typeof value !== "bigint" &&
-                typeof value !== "number") {
-                return false;
-            }
-            try {
-                proto_int64_js_1.protoInt64.parse(value);
+            if (typeof value == "bigint" ||
+                typeof value == "number" ||
+                (typeof value == "string" && value.length > 0)) {
+                try {
+                    proto_int64_js_1.protoInt64.parse(value);
+                    return true;
+                }
+                catch (e) {
+                    return `${value} out of range`;
+                }
             }
-            catch (e) {
-                return `${value} out of range`;
-            }
-            return true;
+            return false;
         case descriptors_js_1.ScalarType.FIXED64:
         case descriptors_js_1.ScalarType.UINT64:
             // unsigned
-            if (typeof value != "string" &&
-                typeof value !== "bigint" &&
-                typeof value !== "number") {
-                return false;
-            }
-            try {
-                proto_int64_js_1.protoInt64.uParse(value);
+            if (typeof value == "bigint" ||
+                typeof value == "number" ||
+                (typeof value == "string" && value.length > 0)) {
+                try {
+                    proto_int64_js_1.protoInt64.uParse(value);
+                    return true;
+                }
+                catch (e) {
+                    return `${value} out of range`;
+                }
             }
-            catch (e) {
-                return `${value} out of range`;
-            }
-            return true;
+            return false;
     }
 }
 function reasonSingular(field, val, details) {

package/dist/cjs/reflect/reflect-types.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/reflect/reflect.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/reflect/scalar.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/reflect/unsafe.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.

package/dist/cjs/registry.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2021-2024 Buf Technologies, Inc.
+// Copyright 2021-2025 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.
@@ -230,7 +230,7 @@ const DELIMITED = 2;
 const OPEN = 1;
 // prettier-ignore
 // bootstrap-inject defaults: EDITION_PROTO2 to EDITION_2023: export const minimumEdition: SupportedEdition = $minimumEdition, maximumEdition: SupportedEdition = $maximumEdition;
-// generated from protoc v28.3
+// generated from protoc v30.0
 exports.minimumEdition = 998, exports.maximumEdition = 1000;
 const featureDefaults = {
     // EDITION_PROTO2
@@ -241,6 +241,7 @@ const featureDefaults = {
         utf8Validation: 3, // NONE,
         messageEncoding: 1, // LENGTH_PREFIXED,
         jsonFormat: 2, // LEGACY_BEST_EFFORT,
+        enforceNamingStyle: 2, // STYLE_LEGACY,
     },
     // EDITION_PROTO3
     999: {
@@ -250,6 +251,7 @@ const featureDefaults = {
         utf8Validation: 2, // VERIFY,
         messageEncoding: 1, // LENGTH_PREFIXED,
         jsonFormat: 1, // ALLOW,
+        enforceNamingStyle: 2, // STYLE_LEGACY,
     },
     // EDITION_2023
     1000: {
@@ -259,6 +261,7 @@ const featureDefaults = {
         utf8Validation: 2, // VERIFY,
         messageEncoding: 1, // LENGTH_PREFIXED,
         jsonFormat: 1, // ALLOW,
+        enforceNamingStyle: 2, // STYLE_LEGACY,
     },
 };
 /**