@salesforce/lds-runtime-webruntime 1.428.0-dev4 → 1.428.0-dev6

package/dist/ldsWebruntimeOneStoreInit.js

@@ -3379,7 +3379,7 @@ function buildServiceDescriptor$9(luvio) {
         },
     };
 }
-// version: 1.428.0-dev4-42af22299b
+// version: 1.428.0-dev6-f96161ab92
 
 /**
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -3405,7 +3405,7 @@ function buildServiceDescriptor$8(notifyRecordUpdateAvailable, getNormalizedLuvi
         },
     };
 }
-// version: 1.428.0-dev4-42af22299b
+// version: 1.428.0-dev6-f96161ab92
 
 /*!
  * Copyright (c) 2022, Salesforce, Inc.,
@@ -3492,6 +3492,9 @@ function invalidSchemaResponseWithError(error) {
   return err$1([error]);
 }
 function validateJsonSchema(data, schema, path = "$", document = schema) {
+  return validateJsonSchemaInternal(data, schema, path, document, /* @__PURE__ */ new Map());
+}
+function validateJsonSchemaInternal(data, schema, path, document, visited) {
   if (schema === true) return validSchemaResponse();
   if (schema === false)
     return invalidSchemaResponseWithError(
@@ -3500,22 +3503,22 @@ function validateJsonSchema(data, schema, path = "$", document = schema) {
   const dataType = data === null ? "null" : Array.isArray(data) ? "array" : typeof data;
   const errorCollector = new JsonSchemaErrorCollector();
   if ("anyOf" in schema) {
-    errorCollector.append(validateAnyOf(data, schema, path, document));
+    errorCollector.append(validateAnyOf(data, schema, path, document, visited));
   } else if ("oneOf" in schema) {
-    errorCollector.append(validateOneOf(data, schema, path, document));
+    errorCollector.append(validateOneOf(data, schema, path, document, visited));
   } else if ("allOf" in schema) {
-    errorCollector.append(validateAllOf(data, schema, path, document));
+    errorCollector.append(validateAllOf(data, schema, path, document, visited));
   } else if ("not" in schema) {
-    errorCollector.append(validateNot(data, schema, path, document));
+    errorCollector.append(validateNot(data, schema, path, document, visited));
   } else if ("$ref" in schema) {
-    errorCollector.append(validateRef(data, schema, path, document));
+    errorCollector.append(validateRef(data, schema, path, document, visited));
   } else if ("type" in schema) {
     if (schema.type === "object") {
       if (dataType !== "object") {
         errorCollector.add(incorrectTypeError("object", dataType, path));
       } else {
         errorCollector.append(
-          validateObject(data, schema, path, document)
+          validateObject(data, schema, path, document, visited)
         );
       }
     } else if (schema.type === "array") {
@@ -3523,7 +3526,7 @@ function validateJsonSchema(data, schema, path = "$", document = schema) {
         errorCollector.add(incorrectTypeError("array", dataType, path));
       } else {
         errorCollector.append(
-          validateArray(data, schema, path, document)
+          validateArray(data, schema, path, document, visited)
         );
       }
     } else {
@@ -3540,16 +3543,17 @@ function validateJsonSchema(data, schema, path = "$", document = schema) {
   }
   return errorCollector.toValidationResponse();
 }
-function validateAnyOf(data, schema, path, document) {
+function validateAnyOf(data, schema, path, document, visited) {
   let isValid = false;
   const errorCollector = new JsonSchemaErrorCollector();
   for (let i = 0, { length } = schema.anyOf; i < length; i++) {
     const element = schema.anyOf[i];
-    const validationResponse = validateJsonSchema(
+    const validationResponse = validateJsonSchemaInternal(
       data,
       element,
       `${path}.anyOf[${i}]`,
-      document
+      document,
+      visited
     );
     if (validationResponse.isOk()) {
       isValid = true;
@@ -3566,13 +3570,22 @@ function validateAnyOf(data, schema, path, document) {
   }
   return validSchemaResponse();
 }
-function validateOneOf(data, schema, path, document) {
+function validateOneOf(data, schema, path, document, visited) {
+  if (schema.discriminator !== void 0) {
+    return validateDiscriminatedOneOf(data, schema.discriminator, path, document, visited);
+  }
   let validSubShemaPaths = [];
   const errorCollector = new JsonSchemaErrorCollector();
   for (let i = 0, { length } = schema.oneOf; i < length; i++) {
     const element = schema.oneOf[i];
     const oneOfPath = `${path}.oneOf[${i}]`;
-    const validationResponse = validateJsonSchema(data, element, oneOfPath, document);
+    const validationResponse = validateJsonSchemaInternal(
+      data,
+      element,
+      oneOfPath,
+      document,
+      visited
+    );
     if (validationResponse.isOk()) {
       validSubShemaPaths.push(oneOfPath);
     } else {
@@ -3594,16 +3607,45 @@ function validateOneOf(data, schema, path, document) {
   }
   return validSchemaResponse();
 }
-function validateAllOf(data, schema, path, document) {
+function validateDiscriminatedOneOf(data, discriminator, path, document, visited) {
+  if (data === null || typeof data !== "object" || Array.isArray(data)) {
+    return invalidSchemaResponseWithError(incorrectTypeError("object", typeof data, path));
+  }
+  const { propertyName, mapping } = discriminator;
+  const discriminatorValue = data[propertyName];
+  if (discriminatorValue === void 0) {
+    return invalidSchemaResponseWithError(
+      new MissingRequiredPropertyError(
+        `Object at path '${path}' is missing required discriminator property '${propertyName}'.`
+      )
+    );
+  }
+  if (typeof discriminatorValue !== "string") {
+    return invalidSchemaResponseWithError(
+      incorrectTypeError("string", typeof discriminatorValue, `${path}.${propertyName}`)
+    );
+  }
+  const targetRef = mapping[discriminatorValue];
+  if (targetRef === void 0) {
+    return invalidSchemaResponseWithError(
+      new JsonSchemaViolationError(
+        `Discriminator value '${discriminatorValue}' at '${path}.${propertyName}' is not in the mapping. Expected one of: [${Object.keys(mapping).join(", ")}].`
+      )
+    );
+  }
+  return validateJsonSchemaInternal(data, { $ref: targetRef }, path, document, visited);
+}
+function validateAllOf(data, schema, path, document, visited) {
   let isValid = true;
   const errorCollector = new JsonSchemaErrorCollector();
   for (let i = 0, { length } = schema.allOf; i < length; i++) {
     const element = schema.allOf[i];
-    const validationResponse = validateJsonSchema(
+    const validationResponse = validateJsonSchemaInternal(
       data,
       element,
       `${path}.allOf[${i}]`,
-      document
+      document,
+      visited
     );
     if (!validationResponse.isOk()) {
       errorCollector.append(validationResponse);
@@ -3617,8 +3659,14 @@ function validateAllOf(data, schema, path, document) {
   }
   return errorCollector.toValidationResponse();
 }
-function validateNot(data, schema, path, document) {
-  const validationResponse = validateJsonSchema(data, schema.not, path, document);
+function validateNot(data, schema, path, document, visited) {
+  const validationResponse = validateJsonSchemaInternal(
+    data,
+    schema.not,
+    path,
+    document,
+    visited
+  );
   if (validationResponse.isOk()) {
     return invalidSchemaResponseWithError(
       new JsonSchemaViolationError(
@@ -3628,7 +3676,7 @@ function validateNot(data, schema, path, document) {
   }
   return validSchemaResponse();
 }
-function validateObject(data, schema, path, document) {
+function validateObject(data, schema, path, document, visited) {
   const schemaKeys = Object.keys(schema.properties);
   const requiredKeys = new Set(schema.required);
   const schemaKeySet = new Set(schemaKeys);
@@ -3636,11 +3684,12 @@ function validateObject(data, schema, path, document) {
   Object.keys(data).forEach((key) => {
     if (!schemaKeySet.has(key)) {
       errorCollector.append(
-        validateJsonSchema(
+        validateJsonSchemaInternal(
           data[key],
           schema.additionalProperties,
           `${path}.additionalProperties[${key}]`,
-          document
+          document,
+          visited
         )
       );
     }
@@ -3657,18 +3706,19 @@ function validateObject(data, schema, path, document) {
     }
     if (keyInData) {
       errorCollector.append(
-        validateJsonSchema(
+        validateJsonSchemaInternal(
           data[key],
           schema.properties[key],
           `${path}.${key}`,
-          document
+          document,
+          visited
         )
       );
     }
   }
   return errorCollector.toValidationResponse();
 }
-function validateArray(data, schema, path, document) {
+function validateArray(data, schema, path, document, visited) {
   if (schema.minItems !== void 0 && data.length < schema.minItems) {
     return invalidSchemaResponseWithError(
       new MinItemsViolationError(
@@ -3686,7 +3736,13 @@ function validateArray(data, schema, path, document) {
   const errorCollector = new JsonSchemaErrorCollector();
   data.forEach(
     (element, index) => errorCollector.append(
-      validateJsonSchema(element, schema.items, `${path}[${index}]`, document)
+      validateJsonSchemaInternal(
+        element,
+        schema.items,
+        `${path}[${index}]`,
+        document,
+        visited
+      )
     )
   );
   return errorCollector.toValidationResponse();
@@ -3721,7 +3777,7 @@ function validateScalar(data, schema, path) {
   }
   return validSchemaResponse();
 }
-function validateRef(data, schema, path, document) {
+function validateRef(data, schema, path, document, visited) {
   if (!schema.$ref.startsWith("#")) {
     return invalidSchemaResponseWithError(
       new InvalidRefError(
@@ -3729,11 +3785,23 @@ function validateRef(data, schema, path, document) {
       )
     );
   }
+  let refsForData = visited.get(data);
+  if (refsForData !== void 0 && refsForData.has(schema.$ref)) {
+    return validSchemaResponse();
+  }
+  if (refsForData === void 0) {
+    refsForData = /* @__PURE__ */ new Set();
+    visited.set(data, refsForData);
+  }
+  refsForData.add(schema.$ref);
   try {
     const schemaToValidate = findSchemaAtPath(document, schema.$ref);
-    return validateJsonSchema(data, schemaToValidate, path, document);
+    return validateJsonSchemaInternal(data, schemaToValidate, path, document, visited);
   } catch (e) {
     return invalidSchemaResponseWithError(e);
+  } finally {
+    refsForData.delete(schema.$ref);
+    if (refsForData.size === 0) visited.delete(data);
   }
 }
 function validateEnum(data, enumValue, path) {
@@ -5261,4 +5329,4 @@ withDefaultLuvio((luvio) => {
     ];
     setServices(services);
 });
-// version: 1.428.0-dev4-fee7d2eeee
+// version: 1.428.0-dev6-7d0a2d506f

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-runtime-webruntime",
-    "version": "1.428.0-dev4",
+    "version": "1.428.0-dev6",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS engine for Webruntime runtime",
     "main": "dist/ldsWebruntimeOneStoreInit.js",
@@ -35,46 +35,46 @@
         "ready": "yarn build && jest --collectCoverage && yarn test:size && yarn release:corejar"
     },
     "devDependencies": {
-        "@conduit-client/service-provisioner": "3.18.1-dev1",
-        "@conduit-client/tools-core": "3.18.1-dev1",
+        "@conduit-client/service-provisioner": "3.18.1-dev2",
+        "@conduit-client/tools-core": "3.18.1-dev2",
         "jwt-encode": "1.0.1"
     },
     "dependencies": {
-        "@conduit-client/command-aura-network": "3.18.1-dev1",
-        "@conduit-client/command-aura-normalized-cache-control": "3.18.1-dev1",
-        "@conduit-client/command-aura-resource-cache-control": "3.18.1-dev1",
-        "@conduit-client/command-fetch-network": "3.18.1-dev1",
-        "@conduit-client/command-http-normalized-cache-control": "3.18.1-dev1",
-        "@conduit-client/command-ndjson": "3.18.1-dev1",
-        "@conduit-client/command-network": "3.18.1-dev1",
-        "@conduit-client/command-sse": "3.18.1-dev1",
-        "@conduit-client/command-streaming": "3.18.1-dev1",
-        "@conduit-client/jwt-manager": "3.18.1-dev1",
-        "@conduit-client/service-aura-network": "3.18.1-dev1",
-        "@conduit-client/service-bindings-imperative": "3.18.1-dev1",
-        "@conduit-client/service-bindings-lwc": "3.18.1-dev1",
-        "@conduit-client/service-cache": "3.18.1-dev1",
-        "@conduit-client/service-cache-control": "3.18.1-dev1",
-        "@conduit-client/service-cache-inclusion-policy": "3.18.1-dev1",
-        "@conduit-client/service-fetch-network": "3.18.1-dev1",
-        "@conduit-client/service-instrument-command": "3.18.1-dev1",
-        "@conduit-client/service-pubsub": "3.18.1-dev1",
-        "@conduit-client/service-store": "3.18.1-dev1",
-        "@conduit-client/utils": "3.18.1-dev1",
+        "@conduit-client/command-aura-network": "3.18.1-dev2",
+        "@conduit-client/command-aura-normalized-cache-control": "3.18.1-dev2",
+        "@conduit-client/command-aura-resource-cache-control": "3.18.1-dev2",
+        "@conduit-client/command-fetch-network": "3.18.1-dev2",
+        "@conduit-client/command-http-normalized-cache-control": "3.18.1-dev2",
+        "@conduit-client/command-ndjson": "3.18.1-dev2",
+        "@conduit-client/command-network": "3.18.1-dev2",
+        "@conduit-client/command-sse": "3.18.1-dev2",
+        "@conduit-client/command-streaming": "3.18.1-dev2",
+        "@conduit-client/jwt-manager": "3.18.1-dev2",
+        "@conduit-client/service-aura-network": "3.18.1-dev2",
+        "@conduit-client/service-bindings-imperative": "3.18.1-dev2",
+        "@conduit-client/service-bindings-lwc": "3.18.1-dev2",
+        "@conduit-client/service-cache": "3.18.1-dev2",
+        "@conduit-client/service-cache-control": "3.18.1-dev2",
+        "@conduit-client/service-cache-inclusion-policy": "3.18.1-dev2",
+        "@conduit-client/service-fetch-network": "3.18.1-dev2",
+        "@conduit-client/service-instrument-command": "3.18.1-dev2",
+        "@conduit-client/service-pubsub": "3.18.1-dev2",
+        "@conduit-client/service-store": "3.18.1-dev2",
+        "@conduit-client/utils": "3.18.1-dev2",
         "@luvio/network-adapter-composable": "0.160.3",
         "@luvio/network-adapter-fetch": "0.160.3",
         "@salesforce/lds-adapters-uiapi-lex": "^1.415.0",
-        "@salesforce/lds-default-luvio": "^1.428.0-dev4",
-        "@salesforce/lds-luvio-service": "^1.428.0-dev4",
-        "@salesforce/lds-luvio-uiapi-records-service": "^1.428.0-dev4"
+        "@salesforce/lds-default-luvio": "^1.428.0-dev6",
+        "@salesforce/lds-luvio-service": "^1.428.0-dev6",
+        "@salesforce/lds-luvio-uiapi-records-service": "^1.428.0-dev6"
     },
     "luvioBundlesize": [
         {
             "path": "./dist/ldsWebruntimeOneStoreInit.js",
             "maxSize": {
-                "none": "160.25 kB",
+                "none": "165.00 kB",
                 "min": "85 kB",
-                "compressed": "25 kB"
+                "compressed": "25.50 kB"
             }
         }
     ],