@bufbuild/protobuf 2.0.0-alpha.1 → 2.0.0-alpha.3

package/dist/esm/reflect/reflect.js

@@ -11,130 +11,138 @@
 // 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.
+import { ScalarType, } from "../descriptors.js";
 import { checkField, checkListItem, checkMapEntry } from "./reflect-check.js";
 import { FieldError } from "./error.js";
 import { unsafeAddListItem, unsafeClear, unsafeGet, unsafeIsSet, unsafeLocal, unsafeOneofCase, unsafeSet, unsafeSetMapEntry, } from "./unsafe.js";
 import { create } from "../create.js";
 import { isWrapper, isWrapperDesc } from "../wkt/wrappers.js";
-import { LongType, ScalarType } from "./scalar.js";
+import { scalarZeroValue } from "./scalar.js";
 import { protoInt64 } from "../proto-int64.js";
 import { isReflectList, isReflectMap, isReflectMessage } from "./guard.js";
+/**
+ * Create a ReflectMessage.
+ */
 export function reflect(messageDesc, message, 
 // TODO either remove this option, or support it in reflect-list and reflect-map as well
 opt) {
-    message !== null && message !== void 0 ? message : (message = create(messageDesc));
-    const check = (opt === null || opt === void 0 ? void 0 : opt.disableFieldValueCheck) !== true;
-    let fieldsByNumber;
-    let sortedFields;
-    return {
-        message,
-        [unsafeLocal]: message,
-        desc: messageDesc,
-        fields: messageDesc.fields,
-        oneofs: messageDesc.oneofs,
-        members: messageDesc.members,
-        get sortedFields() {
-            return (sortedFields !== null && sortedFields !== void 0 ? sortedFields : (sortedFields = messageDesc.fields
-                .concat()
-                .sort((a, b) => a.number - b.number)));
-        },
-        findNumber(number) {
-            if (!fieldsByNumber) {
-                fieldsByNumber = new Map(messageDesc.fields.map((f) => [f.number, f]));
-            }
-            return fieldsByNumber.get(number);
-        },
-        oneofCase(oneof) {
-            assertOwn(message, oneof);
-            return unsafeOneofCase(message, oneof);
-        },
-        isSet(field) {
-            assertOwn(message, field);
-            return unsafeIsSet(message, field);
-        },
-        clear(field) {
-            assertOwn(message, field);
-            unsafeClear(message, field);
-        },
-        get(field) {
-            assertOwn(message, field);
-            let value = unsafeGet(message, field);
-            switch (field.fieldKind) {
-                case "list":
-                    return reflectList(field, value);
-                case "map":
-                    // TODO fix types
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-                    return reflectMap(field, value); // eslint-disable-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return
-                case "message":
-                    if (value !== undefined &&
-                        !field.oneof &&
-                        isWrapperDesc(field.message)) {
-                        value = {
-                            $typeName: field.message.typeName,
-                            value: longToReflect(field.message.fields[0], value),
-                        };
-                    }
-                    return reflect(field.message, value);
-                case "scalar":
-                    return longToReflect(field, value);
-                case "enum":
-                    return value;
-            }
-        },
-        set(field, value) {
-            assertOwn(message, field);
-            if (check) {
-                const err = checkField(field, value);
-                if (err) {
-                    return err;
+    return new ReflectMessageImpl(messageDesc, message, (opt === null || opt === void 0 ? void 0 : opt.disableFieldValueCheck) !== true);
+}
+class ReflectMessageImpl {
+    get sortedFields() {
+        var _a;
+        return ((_a = this._sortedFields) !== null && _a !== void 0 ? _a : (this._sortedFields = this.desc.fields
+            .concat()
+            .sort((a, b) => a.number - b.number)));
+    }
+    constructor(messageDesc, message, 
+    // TODO either remove this option, or support it in reflect-list and reflect-map as well
+    check = true) {
+        this.check = check;
+        this.desc = messageDesc;
+        this.message = this[unsafeLocal] = message !== null && message !== void 0 ? message : create(messageDesc);
+        this.fields = messageDesc.fields;
+        this.oneofs = messageDesc.oneofs;
+        this.members = messageDesc.members;
+    }
+    findNumber(number) {
+        if (!this._fieldsByNumber) {
+            this._fieldsByNumber = new Map(this.desc.fields.map((f) => [f.number, f]));
+        }
+        return this._fieldsByNumber.get(number);
+    }
+    oneofCase(oneof) {
+        assertOwn(this.message, oneof);
+        return unsafeOneofCase(this.message, oneof);
+    }
+    isSet(field) {
+        assertOwn(this.message, field);
+        return unsafeIsSet(this.message, field);
+    }
+    clear(field) {
+        assertOwn(this.message, field);
+        unsafeClear(this.message, field);
+    }
+    get(field) {
+        assertOwn(this.message, field);
+        let value = unsafeGet(this.message, field);
+        switch (field.fieldKind) {
+            case "list":
+                return new ReflectListImpl(field, value, this.check);
+            case "map":
+                // TODO fix types
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+                return reflectMap(field, value, this.check); // eslint-disable-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return
+            case "message":
+                if (value !== undefined &&
+                    !field.oneof &&
+                    isWrapperDesc(field.message)) {
+                    value = {
+                        $typeName: field.message.typeName,
+                        value: longToReflect(field.message.fields[0], value),
+                    };
                 }
+                return new ReflectMessageImpl(field.message, value, this.check);
+            case "scalar":
+                return (value === undefined
+                    ? scalarZeroValue(field.scalar, false)
+                    : longToReflect(field, value));
+            case "enum":
+                return (value !== null && value !== void 0 ? value : field.enum.values[0].number);
+        }
+    }
+    set(field, value) {
+        assertOwn(this.message, field);
+        if (this.check) {
+            const err = checkField(field, value);
+            if (err) {
+                return err;
             }
-            let local = value;
-            if (isReflectMap(value) || isReflectList(value)) {
-                local = value[unsafeLocal];
-            }
-            else if (isReflectMessage(value)) {
-                const msg = value.message;
-                local = !field.oneof && isWrapper(msg) ? msg.value : msg;
-            }
-            else {
-                local = longToLocal(field, value);
-            }
-            unsafeSet(message, field, local);
-            return undefined;
-        },
-        addListItem(field, value) {
-            assertOwn(message, field);
-            assertKind(field, "list");
-            if (check) {
-                if (checkListItem(field, 0, value)) {
-                    const arr = unsafeGet(message, field);
-                    return checkListItem(field, arr.length, value);
-                }
+        }
+        let local;
+        if (isReflectMap(value) || isReflectList(value)) {
+            local = value[unsafeLocal];
+        }
+        else if (isReflectMessage(value)) {
+            const msg = value.message;
+            local = !field.oneof && isWrapper(msg) ? msg.value : msg;
+        }
+        else {
+            local = longToLocal(field, value);
+        }
+        unsafeSet(this.message, field, local);
+        return undefined;
+    }
+    addListItem(field, value) {
+        assertOwn(this.message, field);
+        assertKind(field, "list");
+        if (this.check) {
+            if (checkListItem(field, 0, value)) {
+                const arr = unsafeGet(this.message, field);
+                return checkListItem(field, arr.length, value);
             }
-            unsafeAddListItem(message, field, listItemToLocal(field, value));
-            return undefined;
-        },
-        setMapEntry(field, key, value) {
-            assertOwn(message, field);
-            assertKind(field, "map");
-            if (check) {
-                const err = checkMapEntry(field, key, value);
-                if (err) {
-                    return err;
-                }
+        }
+        unsafeAddListItem(this.message, field, listItemToLocal(field, value));
+        return undefined;
+    }
+    setMapEntry(field, key, value) {
+        assertOwn(this.message, field);
+        assertKind(field, "map");
+        if (this.check) {
+            const err = checkMapEntry(field, key, value);
+            if (err) {
+                return err;
             }
-            unsafeSetMapEntry(message, field, mapKeyToLocal(key), mapValueToLocal(field, value));
-            return undefined;
-        },
-        getUnknown() {
-            return message.$unknown;
-        },
-        setUnknown(value) {
-            message.$unknown = value;
-        },
-    };
+        }
+        unsafeSetMapEntry(this.message, field, mapKeyToLocal(key), mapValueToLocal(field, value));
+        return undefined;
+    }
+    getUnknown() {
+        return this.message.$unknown;
+    }
+    setUnknown(value) {
+        this.message.$unknown = value;
+    }
 }
 function assertKind(field, kind) {
     if (field.fieldKind != kind) {
@@ -146,132 +154,154 @@ function assertOwn(owner, member) {
         throw new FieldError(member, `cannot use ${member.toString()} with message ${owner.$typeName}`, "ForeignFieldError");
     }
 }
-export function reflectList(field, unsafeInput) {
-    const arr = unsafeInput !== null && unsafeInput !== void 0 ? unsafeInput : [];
-    return {
-        [unsafeLocal]: arr,
-        field() {
-            return field;
-        },
-        get size() {
-            return arr.length;
-        },
-        get(index) {
-            const item = arr[index];
-            return item === undefined
-                ? undefined
-                : listItemToReflect(field, item);
-        },
-        set(index, item) {
-            if (index < 0 || index >= arr.length) {
-                return new FieldError(field, `list item #${index + 1}: out of range`);
-            }
-            const err = checkListItem(field, index, item);
-            if (!err) {
-                arr[index] = listItemToLocal(field, item);
-            }
-            return err;
-        },
-        add(...items) {
-            let err;
-            for (let i = 0; i < items.length && !err; i++) {
-                err = checkListItem(field, arr.length + i, items[i]);
+/**
+ * Create a ReflectList.
+ */
+export function reflectList(field, unsafeInput, check = true) {
+    return new ReflectListImpl(field, unsafeInput !== null && unsafeInput !== void 0 ? unsafeInput : [], check);
+}
+class ReflectListImpl {
+    field() {
+        return this._field;
+    }
+    get size() {
+        return this._arr.length;
+    }
+    constructor(field, unsafeInput, check) {
+        this._field = field;
+        this._arr = this[unsafeLocal] = unsafeInput;
+        this.check = check;
+    }
+    get(index) {
+        const item = this._arr[index];
+        return item === undefined
+            ? undefined
+            : listItemToReflect(this._field, item, this.check);
+    }
+    set(index, item) {
+        if (index < 0 || index >= this._arr.length) {
+            return new FieldError(this._field, `list item #${index + 1}: out of range`);
+        }
+        if (this.check) {
+            const err = checkListItem(this._field, index, item);
+            if (err) {
+                return err;
             }
-            if (!err) {
-                for (const item of items) {
-                    arr.push(listItemToLocal(field, item));
+        }
+        this._arr[index] = listItemToLocal(this._field, item);
+        return undefined;
+    }
+    add(...items) {
+        if (this.check) {
+            for (let i = 0; i < items.length; i++) {
+                const err = checkListItem(this._field, this._arr.length + i, items[i]);
+                if (err) {
+                    return err;
                 }
             }
-            return err;
-        },
-        clear() {
-            arr.splice(0, arr.length);
-        },
-        [Symbol.iterator]() {
-            return this.values();
-        },
-        keys() {
-            return arr.keys();
-        },
-        *values() {
-            for (const item of arr) {
-                yield listItemToReflect(field, item);
-            }
-        },
-        *entries() {
-            for (let i = 0; i < arr.length; i++) {
-                yield [i, listItemToReflect(field, arr[i])];
-            }
-        },
-    };
+        }
+        for (const item of items) {
+            this._arr.push(listItemToLocal(this._field, item));
+        }
+        return undefined;
+    }
+    clear() {
+        this._arr.splice(0, this._arr.length);
+    }
+    [Symbol.iterator]() {
+        return this.values();
+    }
+    keys() {
+        return this._arr.keys();
+    }
+    *values() {
+        for (const item of this._arr) {
+            yield listItemToReflect(this._field, item, this.check);
+        }
+    }
+    *entries() {
+        for (let i = 0; i < this._arr.length; i++) {
+            yield [i, listItemToReflect(this._field, this._arr[i], this.check)];
+        }
+    }
 }
-export function reflectMap(field, unsafeInput) {
-    const obj = unsafeInput !== null && unsafeInput !== void 0 ? unsafeInput : {};
-    return {
-        [unsafeLocal]: obj,
-        field() {
-            return field;
-        },
-        set(key, value) {
-            const err = checkMapEntry(field, key, value);
-            if (!err) {
-                obj[mapKeyToLocal(key)] = mapValueToLocal(field, value);
-            }
-            return err;
-        },
-        delete(key) {
-            const k = mapKeyToLocal(key);
-            const has = Object.prototype.hasOwnProperty.call(obj, k);
-            if (has) {
-                delete obj[k];
-            }
-            return has;
-        },
-        clear() {
-            for (const key of Object.keys(obj)) {
-                delete obj[key];
-            }
-        },
-        get(key) {
-            let val = obj[mapKeyToLocal(key)];
-            if (val !== undefined) {
-                val = mapValueToReflect(field, val);
-            }
-            return val;
-        },
-        has(key) {
-            return Object.prototype.hasOwnProperty.call(obj, mapKeyToLocal(key));
-        },
-        *keys() {
-            for (const objKey of Object.keys(obj)) {
-                yield mapKeyToReflect(objKey, field.mapKey);
-            }
-        },
-        *entries() {
-            for (const objEntry of Object.entries(obj)) {
-                yield [
-                    mapKeyToReflect(objEntry[0], field.mapKey),
-                    mapValueToReflect(field, objEntry[1]),
-                ];
-            }
-        },
-        [Symbol.iterator]() {
-            return this.entries();
-        },
-        get size() {
-            return Object.keys(obj).length;
-        },
-        *values() {
-            for (const val of Object.values(obj)) {
-                yield mapValueToReflect(field, val);
-            }
-        },
-        forEach(callbackfn, thisArg) {
-            for (const mapEntry of this.entries()) {
-                callbackfn.call(thisArg, mapEntry[1], mapEntry[0], this);
+/**
+ * Create a ReflectMap.
+ */
+export function reflectMap(field, unsafeInput, check = true) {
+    return new ReflectMapImpl(field, unsafeInput, check);
+}
+class ReflectMapImpl {
+    constructor(field, unsafeInput, check = true) {
+        this.obj = this[unsafeLocal] = unsafeInput !== null && unsafeInput !== void 0 ? unsafeInput : {};
+        this.check = check;
+        this._field = field;
+    }
+    field() {
+        return this._field;
+    }
+    set(key, value) {
+        if (this.check) {
+            const err = checkMapEntry(this._field, key, value);
+            if (err) {
+                return err;
             }
-        },
-    };
+        }
+        this.obj[mapKeyToLocal(key)] = mapValueToLocal(this._field, value);
+        return undefined;
+    }
+    delete(key) {
+        const k = mapKeyToLocal(key);
+        const has = Object.prototype.hasOwnProperty.call(this.obj, k);
+        if (has) {
+            delete this.obj[k];
+        }
+        return has;
+    }
+    clear() {
+        for (const key of Object.keys(this.obj)) {
+            delete this.obj[key];
+        }
+    }
+    get(key) {
+        let val = this.obj[mapKeyToLocal(key)];
+        if (val !== undefined) {
+            val = mapValueToReflect(this._field, val, this.check);
+        }
+        return val;
+    }
+    has(key) {
+        return Object.prototype.hasOwnProperty.call(this.obj, mapKeyToLocal(key));
+    }
+    *keys() {
+        for (const objKey of Object.keys(this.obj)) {
+            yield mapKeyToReflect(objKey, this._field.mapKey);
+        }
+    }
+    *entries() {
+        for (const objEntry of Object.entries(this.obj)) {
+            yield [
+                mapKeyToReflect(objEntry[0], this._field.mapKey),
+                mapValueToReflect(this._field, objEntry[1], this.check),
+            ];
+        }
+    }
+    [Symbol.iterator]() {
+        return this.entries();
+    }
+    get size() {
+        return Object.keys(this.obj).length;
+    }
+    *values() {
+        for (const val of Object.values(this.obj)) {
+            yield mapValueToReflect(this._field, val, this.check);
+        }
+    }
+    forEach(callbackfn, thisArg) {
+        for (const mapEntry of this.entries()) {
+            callbackfn.call(thisArg, mapEntry[1], mapEntry[0], this);
+        }
+    }
 }
 function listItemToLocal(field, value) {
     if (isReflectMessage(value)) {
@@ -279,9 +309,9 @@ function listItemToLocal(field, value) {
     }
     return longToLocal(field, value);
 }
-function listItemToReflect(field, value) {
+function listItemToReflect(field, value, check) {
     if (field.listKind == "message") {
-        return reflect(field.message, value);
+        return new ReflectMessageImpl(field.message, value, check);
     }
     return longToReflect(field, value);
 }
@@ -291,9 +321,9 @@ function mapValueToLocal(field, value) {
     }
     return longToLocal(field, value);
 }
-function mapValueToReflect(field, value) {
+function mapValueToReflect(field, value, check) {
     if (field.mapKind == "message") {
-        return reflect(field.message, value);
+        return new ReflectMessageImpl(field.message, value, check);
     }
     return value;
 }
@@ -350,54 +380,50 @@ function mapKeyToReflect(key, type) {
     return key;
 }
 function longToReflect(field, value) {
-    if (field.scalar !== undefined) {
-        // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
-        switch (field.scalar) {
-            case ScalarType.INT64:
-            case ScalarType.SFIXED64:
-            case ScalarType.SINT64:
-                if ("longType" in field &&
-                    field.longType == LongType.STRING &&
-                    typeof value == "string") {
-                    value = protoInt64.parse(value);
-                }
-                break;
-            case ScalarType.FIXED64:
-            case ScalarType.UINT64:
-                if ("longType" in field &&
-                    field.longType == LongType.STRING &&
-                    typeof value == "string") {
-                    value = protoInt64.uParse(value);
-                }
-                break;
-        }
+    // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
+    switch (field.scalar) {
+        case ScalarType.INT64:
+        case ScalarType.SFIXED64:
+        case ScalarType.SINT64:
+            if ("longAsString" in field &&
+                field.longAsString &&
+                typeof value == "string") {
+                value = protoInt64.parse(value);
+            }
+            break;
+        case ScalarType.FIXED64:
+        case ScalarType.UINT64:
+            if ("longAsString" in field &&
+                field.longAsString &&
+                typeof value == "string") {
+                value = protoInt64.uParse(value);
+            }
+            break;
     }
     return value;
 }
 function longToLocal(field, value) {
-    if (field.scalar !== undefined) {
-        // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
-        switch (field.scalar) {
-            case ScalarType.INT64:
-            case ScalarType.SFIXED64:
-            case ScalarType.SINT64:
-                if ("longType" in field && field.longType == LongType.STRING) {
-                    value = String(value);
-                }
-                else if (typeof value == "string" || typeof value == "number") {
-                    value = protoInt64.parse(value);
-                }
-                break;
-            case ScalarType.FIXED64:
-            case ScalarType.UINT64:
-                if ("longType" in field && field.longType == LongType.STRING) {
-                    value = String(value);
-                }
-                else if (typeof value == "string" || typeof value == "number") {
-                    value = protoInt64.uParse(value);
-                }
-                break;
-        }
+    // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
+    switch (field.scalar) {
+        case ScalarType.INT64:
+        case ScalarType.SFIXED64:
+        case ScalarType.SINT64:
+            if ("longAsString" in field && field.longAsString) {
+                value = String(value);
+            }
+            else if (typeof value == "string" || typeof value == "number") {
+                value = protoInt64.parse(value);
+            }
+            break;
+        case ScalarType.FIXED64:
+        case ScalarType.UINT64:
+            if ("longAsString" in field && field.longAsString) {
+                value = String(value);
+            }
+            else if (typeof value == "string" || typeof value == "number") {
+                value = protoInt64.uParse(value);
+            }
+            break;
     }
     return value;
 }