@mochabug/adapt-web 1.0.0-rc37 → 1.0.0-rc38

package/dist/umd/adapt-web.js

@@ -107,6 +107,7 @@ var MbAdapt = (() => {
                 let e2 = this.getAttribute("data-cap-api-endpoint");
                 if (!e2 && window?.CAP_CUSTOM_FETCH) e2 = "/";
                 else if (!e2) throw new Error("Missing API endpoint. Either custom fetch or an API endpoint must be provided.");
+                e2.endsWith("/") || (e2 += "/");
                 const { challenge: s2, token: i2 } = await (await t(`${e2}challenge`, { method: "POST" })).json();
                 let a = s2;
                 if (!Array.isArray(a)) {
@@ -2188,6 +2189,9 @@ var MbAdapt = (() => {
     }
     return b.join("");
   }
+  function protoSnakeCase(lowerCamelCase) {
+    return lowerCamelCase.replace(/[A-Z]/g, (letter) => "_" + letter.toLowerCase());
+  }
   var reservedObjectProperties = /* @__PURE__ */ new Set([
     // names reserved by JavaScript
     "constructor",
@@ -4153,8 +4157,8 @@ var MbAdapt = (() => {
   }
   function fieldMaskToJson(val) {
     return val.paths.map((p) => {
-      if (p.match(/_[0-9]?_/g) || p.match(/[A-Z]/g)) {
-        throw new Error(`cannot encode message ${val.$typeName} to JSON: lowerCamelCase of path name "` + p + '" is irreversible');
+      if (protoSnakeCase(protoCamelCase(p)) !== p) {
+        throw new Error(`cannot encode message ${val.$typeName} to JSON: lowerCamelCase of path name "${p}" is irreversible`);
       }
       return protoCamelCase(p);
     }).join(",");
@@ -4239,6 +4243,18 @@ var MbAdapt = (() => {
     }
     return msg.message;
   }
+  var messageJsonFields = /* @__PURE__ */ new WeakMap();
+  function getJsonField(desc, jsonKey) {
+    var _a;
+    if (!messageJsonFields.has(desc)) {
+      const jsonNames = /* @__PURE__ */ new Map();
+      for (const field of desc.fields) {
+        jsonNames.set(field.name, field).set(field.jsonName, field);
+      }
+      messageJsonFields.set(desc, jsonNames);
+    }
+    return (_a = messageJsonFields.get(desc)) === null || _a === void 0 ? void 0 : _a.get(jsonKey);
+  }
   function readMessage2(msg, json, opts) {
     var _a;
     if (tryWktFromJson(msg, json, opts)) {
@@ -4248,12 +4264,8 @@ var MbAdapt = (() => {
       throw new Error(`cannot decode ${msg.desc} from JSON: ${formatVal(json)}`);
     }
     const oneofSeen = /* @__PURE__ */ new Map();
-    const jsonNames = /* @__PURE__ */ new Map();
-    for (const field of msg.desc.fields) {
-      jsonNames.set(field.name, field).set(field.jsonName, field);
-    }
     for (const [jsonKey, jsonValue] of Object.entries(json)) {
-      const field = jsonNames.get(jsonKey);
+      const field = getJsonField(msg.desc, jsonKey);
       if (field) {
         if (field.oneof) {
           if (jsonValue === null && field.fieldKind == "scalar") {
@@ -4299,6 +4311,20 @@ var MbAdapt = (() => {
         break;
     }
   }
+  function readListOrMapItem(field, json, opts) {
+    if (field.scalar && json !== null) {
+      return scalarFromJson(field, json);
+    }
+    if (field.message && !isResetSentinelNullValue(field, json)) {
+      const msgValue = reflect(field.message);
+      readMessage2(msgValue, json, opts);
+      return msgValue;
+    }
+    if (field.enum && !isResetSentinelNullValue(field, json)) {
+      return readEnum(field.enum, json, opts.ignoreUnknownFields);
+    }
+    throw new FieldError(field, `${field.fieldKind === "list" ? "list item" : "map value"} must not be null`);
+  }
   function readMapField(map, json, opts) {
     if (json === null) {
       return;
@@ -4308,28 +4334,11 @@ var MbAdapt = (() => {
       throw new FieldError(field, "expected object, got " + formatVal(json));
     }
     for (const [jsonMapKey, jsonMapValue] of Object.entries(json)) {
-      if (jsonMapValue === null && !isSafeNullValueInListOrMap(field)) {
-        throw new FieldError(field, "map value must not be null");
-      }
-      let value;
-      switch (field.mapKind) {
-        case "message":
-          const msgValue = reflect(field.message);
-          readMessage2(msgValue, jsonMapValue, opts);
-          value = msgValue;
-          break;
-        case "enum":
-          value = readEnum(field.enum, jsonMapValue, opts.ignoreUnknownFields, true);
-          if (value === tokenIgnoredUnknownEnum) {
-            return;
-          }
-          break;
-        case "scalar":
-          value = scalarFromJson(field, jsonMapValue, true);
-          break;
-      }
       const key = mapKeyFromJson(field.mapKey, jsonMapKey);
-      map.set(key, value);
+      const value = readListOrMapItem(field, jsonMapValue, opts);
+      if (value !== tokenIgnoredUnknownEnum) {
+        map.set(key, value);
+      }
     }
   }
   function readListField2(list, json, opts) {
@@ -4341,33 +4350,14 @@ var MbAdapt = (() => {
       throw new FieldError(field, "expected Array, got " + formatVal(json));
     }
     for (const jsonItem of json) {
-      if (jsonItem === null && !isSafeNullValueInListOrMap(field)) {
-        throw new FieldError(field, "list item must not be null");
-      }
-      switch (field.listKind) {
-        case "message":
-          const msgValue = reflect(field.message);
-          readMessage2(msgValue, jsonItem, opts);
-          list.add(msgValue);
-          break;
-        case "enum":
-          const enumValue = readEnum(field.enum, jsonItem, opts.ignoreUnknownFields, true);
-          if (enumValue !== tokenIgnoredUnknownEnum) {
-            list.add(enumValue);
-          }
-          break;
-        case "scalar":
-          list.add(scalarFromJson(field, jsonItem, true));
-          break;
+      const value = readListOrMapItem(field, jsonItem, opts);
+      if (value !== tokenIgnoredUnknownEnum) {
+        list.add(value);
       }
     }
   }
-  function isSafeNullValueInListOrMap(field) {
-    var _a, _b;
-    return ((_a = field.message) === null || _a === void 0 ? void 0 : _a.typeName) == "google.protobuf.Value" || ((_b = field.enum) === null || _b === void 0 ? void 0 : _b.typeName) == "google.protobuf.NullValue";
-  }
   function readMessageField2(msg, field, json, opts) {
-    if (json === null && field.message.typeName != "google.protobuf.Value") {
+    if (isResetSentinelNullValue(field, json)) {
       msg.clear(field);
       return;
     }
@@ -4376,28 +4366,30 @@ var MbAdapt = (() => {
     msg.set(field, msgValue);
   }
   function readEnumField(msg, field, json, opts) {
-    const enumValue = readEnum(field.enum, json, opts.ignoreUnknownFields, false);
-    if (enumValue === tokenNull) {
+    if (isResetSentinelNullValue(field, json)) {
       msg.clear(field);
-    } else if (enumValue !== tokenIgnoredUnknownEnum) {
+      return;
+    }
+    const enumValue = readEnum(field.enum, json, opts.ignoreUnknownFields);
+    if (enumValue !== tokenIgnoredUnknownEnum) {
       msg.set(field, enumValue);
     }
   }
   function readScalarField(msg, field, json) {
-    const scalarValue = scalarFromJson(field, json, false);
-    if (scalarValue === tokenNull) {
+    if (json === null) {
       msg.clear(field);
     } else {
-      msg.set(field, scalarValue);
+      msg.set(field, scalarFromJson(field, json));
     }
   }
+  function isResetSentinelNullValue(field, json) {
+    var _a, _b;
+    return json === null && ((_a = field.message) === null || _a === void 0 ? void 0 : _a.typeName) != "google.protobuf.Value" && ((_b = field.enum) === null || _b === void 0 ? void 0 : _b.typeName) != "google.protobuf.NullValue";
+  }
   var tokenIgnoredUnknownEnum = /* @__PURE__ */ Symbol();
-  function readEnum(desc, json, ignoreUnknownFields, nullAsZeroValue) {
+  function readEnum(desc, json, ignoreUnknownFields) {
     if (json === null) {
-      if (desc.typeName == "google.protobuf.NullValue") {
-        return 0;
-      }
-      return nullAsZeroValue ? desc.values[0].number : tokenNull;
+      return desc.values[0].number;
     }
     switch (typeof json) {
       case "number":
@@ -4417,14 +4409,7 @@ var MbAdapt = (() => {
     }
     throw new Error(`cannot decode ${desc} from JSON: ${formatVal(json)}`);
   }
-  var tokenNull = /* @__PURE__ */ Symbol();
-  function scalarFromJson(field, json, nullAsZeroValue) {
-    if (json === null) {
-      if (nullAsZeroValue) {
-        return scalarZeroValue(field.scalar, false);
-      }
-      return tokenNull;
-    }
+  function scalarFromJson(field, json) {
     switch (field.scalar) {
       // float, double: JSON value will be a number or one of the special string values "NaN", "Infinity", and "-Infinity".
       // Either numbers or strings are accepted. Exponent notation is also accepted.
@@ -4484,24 +4469,24 @@ var MbAdapt = (() => {
     }
     return json;
   }
-  function mapKeyFromJson(type, json) {
+  function mapKeyFromJson(type, jsonString) {
     switch (type) {
       case ScalarType.BOOL:
-        switch (json) {
+        switch (jsonString) {
           case "true":
             return true;
           case "false":
             return false;
         }
-        return json;
+        return jsonString;
       case ScalarType.INT32:
       case ScalarType.FIXED32:
       case ScalarType.UINT32:
       case ScalarType.SFIXED32:
       case ScalarType.SINT32:
-        return int32FromJson(json);
+        return int32FromJson(jsonString);
       default:
-        return json;
+        return jsonString;
     }
   }
   function int32FromJson(json) {
@@ -4564,7 +4549,7 @@ var MbAdapt = (() => {
           if (jsonValue === null) {
             msg.clear(valueField);
           } else {
-            msg.set(valueField, scalarFromJson(valueField, jsonValue, true));
+            msg.set(valueField, scalarFromJson(valueField, jsonValue));
           }
           return true;
         }
@@ -4655,14 +4640,12 @@ var MbAdapt = (() => {
     if (json === "") {
       return;
     }
-    function camelToSnake(str) {
-      if (str.includes("_")) {
+    fieldMask.paths = json.split(",").map((path) => {
+      if (path.includes("_")) {
         throw new Error(`cannot decode message ${fieldMask.$typeName} from JSON: path names must be lowerCamelCase`);
       }
-      const sc = str.replace(/[A-Z]/g, (letter) => "_" + letter.toLowerCase());
-      return sc[0] === "_" ? sc.substring(1) : sc;
-    }
-    fieldMask.paths = json.split(",").map(camelToSnake);
+      return protoSnakeCase(path);
+    });
   }
   function structFromJson(struct, json) {
     if (typeof json != "object" || json == null || Array.isArray(json)) {
@@ -6899,7 +6882,7 @@ var MbAdapt = (() => {
   // src/index.ts
   if (typeof window !== "undefined" && true && !window.CAP_CUSTOM_WASM_URL) {
     window.CAP_CUSTOM_WASM_URL = new URL(
-      "https://cdn.mochabug.com/adapt/web/1.0.0-rc37/cap_wasm.js",
+      "https://cdn.mochabug.com/adapt/web/1.0.0-rc38/cap_wasm.js",
       window.location.href
     ).href;
   }