@uniformdev/next-app-router 20.49.2 → 20.49.3-alpha.47

package/dist/cache.js

@@ -5,6 +5,10 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __typeError = (msg) => {
+  throw TypeError(msg);
+};
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __commonJS = (cb, mod) => function __require() {
   return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
@@ -29,12 +33,25 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
+var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
+var __privateWrapper = (obj, member, setter, getter) => ({
+  set _(value) {
+    __privateSet(obj, member, value, setter);
+  },
+  get _() {
+    return __privateGet(obj, member, getter);
+  }
+});
 
 // ../../node_modules/.pnpm/yocto-queue@0.1.0/node_modules/yocto-queue/index.js
 var require_yocto_queue = __commonJS({
   "../../node_modules/.pnpm/yocto-queue@0.1.0/node_modules/yocto-queue/index.js"(exports2, module2) {
     "use strict";
-    var Node = class {
+    var Node2 = class {
       /// value;
       /// next;
       constructor(value) {
@@ -42,7 +59,7 @@ var require_yocto_queue = __commonJS({
         this.next = void 0;
       }
     };
-    var Queue = class {
+    var Queue2 = class {
       // TODO: Use private class fields when targeting Node.js 12.
       // #_head;
       // #_tail;
@@ -51,7 +68,7 @@ var require_yocto_queue = __commonJS({
         this.clear();
       }
       enqueue(value) {
-        const node = new Node(value);
+        const node = new Node2(value);
         if (this._head) {
           this._tail.next = node;
           this._tail = node;
@@ -86,7 +103,7 @@ var require_yocto_queue = __commonJS({
         }
       }
     };
-    module2.exports = Queue;
+    module2.exports = Queue2;
   }
 });
 
@@ -94,12 +111,12 @@ var require_yocto_queue = __commonJS({
 var require_p_limit = __commonJS({
   "../../node_modules/.pnpm/p-limit@3.1.0/node_modules/p-limit/index.js"(exports2, module2) {
     "use strict";
-    var Queue = require_yocto_queue();
-    var pLimit2 = (concurrency) => {
+    var Queue2 = require_yocto_queue();
+    var pLimit3 = (concurrency) => {
       if (!((Number.isInteger(concurrency) || concurrency === Infinity) && concurrency > 0)) {
         throw new TypeError("Expected `concurrency` to be a number from 1 and up");
       }
-      const queue = new Queue();
+      const queue = new Queue2();
       let activeCount = 0;
       const next = () => {
         activeCount--;
@@ -144,7 +161,238 @@ var require_p_limit = __commonJS({
       });
       return generator;
     };
-    module2.exports = pLimit2;
+    module2.exports = pLimit3;
+  }
+});
+
+// ../../node_modules/.pnpm/retry@0.13.1/node_modules/retry/lib/retry_operation.js
+var require_retry_operation = __commonJS({
+  "../../node_modules/.pnpm/retry@0.13.1/node_modules/retry/lib/retry_operation.js"(exports2, module2) {
+    "use strict";
+    function RetryOperation(timeouts, options) {
+      if (typeof options === "boolean") {
+        options = { forever: options };
+      }
+      this._originalTimeouts = JSON.parse(JSON.stringify(timeouts));
+      this._timeouts = timeouts;
+      this._options = options || {};
+      this._maxRetryTime = options && options.maxRetryTime || Infinity;
+      this._fn = null;
+      this._errors = [];
+      this._attempts = 1;
+      this._operationTimeout = null;
+      this._operationTimeoutCb = null;
+      this._timeout = null;
+      this._operationStart = null;
+      this._timer = null;
+      if (this._options.forever) {
+        this._cachedTimeouts = this._timeouts.slice(0);
+      }
+    }
+    module2.exports = RetryOperation;
+    RetryOperation.prototype.reset = function() {
+      this._attempts = 1;
+      this._timeouts = this._originalTimeouts.slice(0);
+    };
+    RetryOperation.prototype.stop = function() {
+      if (this._timeout) {
+        clearTimeout(this._timeout);
+      }
+      if (this._timer) {
+        clearTimeout(this._timer);
+      }
+      this._timeouts = [];
+      this._cachedTimeouts = null;
+    };
+    RetryOperation.prototype.retry = function(err) {
+      if (this._timeout) {
+        clearTimeout(this._timeout);
+      }
+      if (!err) {
+        return false;
+      }
+      var currentTime = (/* @__PURE__ */ new Date()).getTime();
+      if (err && currentTime - this._operationStart >= this._maxRetryTime) {
+        this._errors.push(err);
+        this._errors.unshift(new Error("RetryOperation timeout occurred"));
+        return false;
+      }
+      this._errors.push(err);
+      var timeout = this._timeouts.shift();
+      if (timeout === void 0) {
+        if (this._cachedTimeouts) {
+          this._errors.splice(0, this._errors.length - 1);
+          timeout = this._cachedTimeouts.slice(-1);
+        } else {
+          return false;
+        }
+      }
+      var self = this;
+      this._timer = setTimeout(function() {
+        self._attempts++;
+        if (self._operationTimeoutCb) {
+          self._timeout = setTimeout(function() {
+            self._operationTimeoutCb(self._attempts);
+          }, self._operationTimeout);
+          if (self._options.unref) {
+            self._timeout.unref();
+          }
+        }
+        self._fn(self._attempts);
+      }, timeout);
+      if (this._options.unref) {
+        this._timer.unref();
+      }
+      return true;
+    };
+    RetryOperation.prototype.attempt = function(fn, timeoutOps) {
+      this._fn = fn;
+      if (timeoutOps) {
+        if (timeoutOps.timeout) {
+          this._operationTimeout = timeoutOps.timeout;
+        }
+        if (timeoutOps.cb) {
+          this._operationTimeoutCb = timeoutOps.cb;
+        }
+      }
+      var self = this;
+      if (this._operationTimeoutCb) {
+        this._timeout = setTimeout(function() {
+          self._operationTimeoutCb();
+        }, self._operationTimeout);
+      }
+      this._operationStart = (/* @__PURE__ */ new Date()).getTime();
+      this._fn(this._attempts);
+    };
+    RetryOperation.prototype.try = function(fn) {
+      console.log("Using RetryOperation.try() is deprecated");
+      this.attempt(fn);
+    };
+    RetryOperation.prototype.start = function(fn) {
+      console.log("Using RetryOperation.start() is deprecated");
+      this.attempt(fn);
+    };
+    RetryOperation.prototype.start = RetryOperation.prototype.try;
+    RetryOperation.prototype.errors = function() {
+      return this._errors;
+    };
+    RetryOperation.prototype.attempts = function() {
+      return this._attempts;
+    };
+    RetryOperation.prototype.mainError = function() {
+      if (this._errors.length === 0) {
+        return null;
+      }
+      var counts = {};
+      var mainError = null;
+      var mainErrorCount = 0;
+      for (var i = 0; i < this._errors.length; i++) {
+        var error = this._errors[i];
+        var message = error.message;
+        var count = (counts[message] || 0) + 1;
+        counts[message] = count;
+        if (count >= mainErrorCount) {
+          mainError = error;
+          mainErrorCount = count;
+        }
+      }
+      return mainError;
+    };
+  }
+});
+
+// ../../node_modules/.pnpm/retry@0.13.1/node_modules/retry/lib/retry.js
+var require_retry = __commonJS({
+  "../../node_modules/.pnpm/retry@0.13.1/node_modules/retry/lib/retry.js"(exports2) {
+    "use strict";
+    var RetryOperation = require_retry_operation();
+    exports2.operation = function(options) {
+      var timeouts = exports2.timeouts(options);
+      return new RetryOperation(timeouts, {
+        forever: options && (options.forever || options.retries === Infinity),
+        unref: options && options.unref,
+        maxRetryTime: options && options.maxRetryTime
+      });
+    };
+    exports2.timeouts = function(options) {
+      if (options instanceof Array) {
+        return [].concat(options);
+      }
+      var opts = {
+        retries: 10,
+        factor: 2,
+        minTimeout: 1 * 1e3,
+        maxTimeout: Infinity,
+        randomize: false
+      };
+      for (var key in options) {
+        opts[key] = options[key];
+      }
+      if (opts.minTimeout > opts.maxTimeout) {
+        throw new Error("minTimeout is greater than maxTimeout");
+      }
+      var timeouts = [];
+      for (var i = 0; i < opts.retries; i++) {
+        timeouts.push(this.createTimeout(i, opts));
+      }
+      if (options && options.forever && !timeouts.length) {
+        timeouts.push(this.createTimeout(i, opts));
+      }
+      timeouts.sort(function(a, b) {
+        return a - b;
+      });
+      return timeouts;
+    };
+    exports2.createTimeout = function(attempt, opts) {
+      var random = opts.randomize ? Math.random() + 1 : 1;
+      var timeout = Math.round(random * Math.max(opts.minTimeout, 1) * Math.pow(opts.factor, attempt));
+      timeout = Math.min(timeout, opts.maxTimeout);
+      return timeout;
+    };
+    exports2.wrap = function(obj, options, methods) {
+      if (options instanceof Array) {
+        methods = options;
+        options = null;
+      }
+      if (!methods) {
+        methods = [];
+        for (var key in obj) {
+          if (typeof obj[key] === "function") {
+            methods.push(key);
+          }
+        }
+      }
+      for (var i = 0; i < methods.length; i++) {
+        var method = methods[i];
+        var original = obj[method];
+        obj[method] = function retryWrapper(original2) {
+          var op = exports2.operation(options);
+          var args = Array.prototype.slice.call(arguments, 1);
+          var callback = args.pop();
+          args.push(function(err) {
+            if (op.retry(err)) {
+              return;
+            }
+            if (err) {
+              arguments[0] = op.mainError();
+            }
+            callback.apply(this, arguments);
+          });
+          op.attempt(function() {
+            original2.apply(obj, args);
+          });
+        }.bind(obj, original);
+        obj[method].options = options;
+      }
+    };
+  }
+});
+
+// ../../node_modules/.pnpm/retry@0.13.1/node_modules/retry/index.js
+var require_retry2 = __commonJS({
+  "../../node_modules/.pnpm/retry@0.13.1/node_modules/retry/index.js"(exports2, module2) {
+    "use strict";
+    module2.exports = require_retry();
   }
 });
 
@@ -161,33 +409,40 @@ var import_next_app_router_shared = require("@uniformdev/next-app-router-shared"
 // ../context/dist/api/api.mjs
 var import_p_limit = __toESM(require_p_limit(), 1);
 var __defProp2 = Object.defineProperty;
-var __typeError = (msg) => {
+var __typeError2 = (msg) => {
   throw TypeError(msg);
 };
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __defNormalProp2 = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField2 = (obj, key, value) => __defNormalProp2(obj, typeof key !== "symbol" ? key + "" : key, value);
+var __accessCheck2 = (obj, member, msg) => member.has(obj) || __typeError2("Cannot " + msg);
+var __privateGet2 = (obj, member, getter) => (__accessCheck2(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd2 = (obj, member, value) => member.has(obj) ? __typeError2("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var defaultLimitPolicy = (0, import_p_limit.default)(6);
+var UNIFORM_BEARER_TOKEN_NOT_VALID_OR_EXPIRED_MESSAGE = "Bearer token not valid or expired";
 var ApiClientError = class _ApiClientError extends Error {
   constructor(errorMessage, fetchMethod, fetchUri, statusCode, statusText, requestId) {
     super(
       `${errorMessage}
  ${statusCode}${statusText ? " " + statusText : ""} (${fetchMethod} ${fetchUri}${requestId ? ` Request ID: ${requestId}` : ""})`
     );
-    this.errorMessage = errorMessage;
-    this.fetchMethod = fetchMethod;
-    this.fetchUri = fetchUri;
-    this.statusCode = statusCode;
-    this.statusText = statusText;
-    this.requestId = requestId;
+    __publicField2(this, "errorMessage", errorMessage);
+    __publicField2(this, "fetchMethod", fetchMethod);
+    __publicField2(this, "fetchUri", fetchUri);
+    __publicField2(this, "statusCode", statusCode);
+    __publicField2(this, "statusText", statusText);
+    __publicField2(this, "requestId", requestId);
     Object.setPrototypeOf(this, _ApiClientError.prototype);
   }
 };
+var BearerTokenNotValidOrExpiredError = class _BearerTokenNotValidOrExpiredError extends ApiClientError {
+  constructor(errorMessage, fetchMethod, fetchUri, statusCode, statusText, requestId) {
+    super(errorMessage, fetchMethod, fetchUri, statusCode, statusText, requestId);
+    Object.setPrototypeOf(this, _BearerTokenNotValidOrExpiredError.prototype);
+  }
+};
 var ApiClient = class _ApiClient {
   constructor(options) {
-    __publicField(this, "options");
+    __publicField2(this, "options");
     var _a, _b, _c, _d, _e;
     if (!options.apiKey && !options.bearerToken) {
       throw new Error("You must provide an API key or a bearer token");
@@ -218,7 +473,7 @@ var ApiClient = class _ApiClient {
   }
   async apiClientWithResponse(fetchUri, options) {
     return this.options.limitPolicy(async () => {
-      var _a;
+      var _a, _b;
       const coreHeaders = this.options.apiKey ? {
         "x-api-key": this.options.apiKey
       } : {
@@ -254,9 +509,19 @@ var ApiClient = class _ApiClient {
         } catch (e) {
           message = `General error`;
         }
+        if (apiResponse.status === 401 && message === UNIFORM_BEARER_TOKEN_NOT_VALID_OR_EXPIRED_MESSAGE) {
+          throw new BearerTokenNotValidOrExpiredError(
+            message,
+            (_a = options == null ? void 0 : options.method) != null ? _a : "GET",
+            fetchUri.toString(),
+            apiResponse.status,
+            apiResponse.statusText,
+            _ApiClient.getRequestId(apiResponse)
+          );
+        }
         throw new ApiClientError(
           message,
-          (_a = options == null ? void 0 : options.method) != null ? _a : "GET",
+          (_b = options == null ? void 0 : options.method) != null ? _b : "GET",
           fetchUri.toString(),
           apiResponse.status,
           apiResponse.statusText,
@@ -330,25 +595,39 @@ async function handleRateLimits(callApi) {
     }
     const base = Math.pow(2, backoffRetries - backoffRetriesLeft) * 333;
     const backoffWait = base + Math.round(Math.random() * (base / 2)) * (Math.random() > 0.5 ? 1 : -1);
-    await new Promise((resolve) => setTimeout(resolve, resetWait + backoffWait));
+    await new Promise((resolve) => setTimeout(resolve, Math.max(0, resetWait + backoffWait)));
     backoffRetriesLeft -= 1;
   }
   return response;
 }
-var _url;
-var _AggregateClient = class _AggregateClient2 extends ApiClient {
-  constructor(options) {
-    super(options);
-  }
-  /** Fetches all aggregates for a project */
-  async get(options) {
+var isPlainObject = (obj) => typeof obj === "object" && obj !== null && !Array.isArray(obj);
+function rewriteFiltersForApi(filters) {
+  return Object.entries(filters != null ? filters : {}).reduce(
+    (acc, [key, value]) => {
+      const lhs = `filters.${key}` + (isPlainObject(value) ? `[${Object.keys(value)[0]}]` : "");
+      const rhs = isPlainObject(value) ? Object.values(value)[0] : value;
+      return {
+        ...acc,
+        [lhs]: Array.isArray(rhs) ? rhs.map((v) => `${v}`.trim()).join(",") : `${rhs}`.trim()
+      };
+    },
+    {}
+  );
+}
+var _url;
+var _AggregateClient = class _AggregateClient2 extends ApiClient {
+  constructor(options) {
+    super(options);
+  }
+  /** Fetches all aggregates for a project */
+  async get(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(__privateGet(_AggregateClient2, _url), { ...options, projectId });
+    const fetchUri = this.createUrl(__privateGet2(_AggregateClient2, _url), { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
   /** Updates or creates (based on id) an Aggregate */
   async upsert(body) {
-    const fetchUri = this.createUrl(__privateGet(_AggregateClient2, _url));
+    const fetchUri = this.createUrl(__privateGet2(_AggregateClient2, _url));
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -357,7 +636,7 @@ var _AggregateClient = class _AggregateClient2 extends ApiClient {
   }
   /** Deletes an Aggregate */
   async remove(body) {
-    const fetchUri = this.createUrl(__privateGet(_AggregateClient2, _url));
+    const fetchUri = this.createUrl(__privateGet2(_AggregateClient2, _url));
     await this.apiClient(fetchUri, {
       method: "DELETE",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -366,7 +645,7 @@ var _AggregateClient = class _AggregateClient2 extends ApiClient {
   }
 };
 _url = /* @__PURE__ */ new WeakMap();
-__privateAdd(_AggregateClient, _url, "/api/v2/aggregate");
+__privateAdd2(_AggregateClient, _url, "/api/v2/aggregate");
 var _url2;
 var _DimensionClient = class _DimensionClient2 extends ApiClient {
   constructor(options) {
@@ -375,12 +654,12 @@ var _DimensionClient = class _DimensionClient2 extends ApiClient {
   /** Fetches the known score dimensions for a project */
   async get(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(__privateGet(_DimensionClient2, _url2), { ...options, projectId });
+    const fetchUri = this.createUrl(__privateGet2(_DimensionClient2, _url2), { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
 };
 _url2 = /* @__PURE__ */ new WeakMap();
-__privateAdd(_DimensionClient, _url2, "/api/v2/dimension");
+__privateAdd2(_DimensionClient, _url2, "/api/v2/dimension");
 var _url3;
 var _valueUrl;
 var _EnrichmentClient = class _EnrichmentClient2 extends ApiClient {
@@ -390,12 +669,12 @@ var _EnrichmentClient = class _EnrichmentClient2 extends ApiClient {
   /** Fetches all enrichments and values for a project, grouped by category */
   async get(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(__privateGet(_EnrichmentClient2, _url3), { ...options, projectId });
+    const fetchUri = this.createUrl(__privateGet2(_EnrichmentClient2, _url3), { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
   /** Updates or creates (based on id) an enrichment category */
   async upsertCategory(body) {
-    const fetchUri = this.createUrl(__privateGet(_EnrichmentClient2, _url3));
+    const fetchUri = this.createUrl(__privateGet2(_EnrichmentClient2, _url3));
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -404,7 +683,7 @@ var _EnrichmentClient = class _EnrichmentClient2 extends ApiClient {
   }
   /** Deletes an enrichment category */
   async removeCategory(body) {
-    const fetchUri = this.createUrl(__privateGet(_EnrichmentClient2, _url3));
+    const fetchUri = this.createUrl(__privateGet2(_EnrichmentClient2, _url3));
     await this.apiClient(fetchUri, {
       method: "DELETE",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -413,7 +692,7 @@ var _EnrichmentClient = class _EnrichmentClient2 extends ApiClient {
   }
   /** Updates or creates (based on id) an enrichment value within an enrichment category */
   async upsertValue(body) {
-    const fetchUri = this.createUrl(__privateGet(_EnrichmentClient2, _valueUrl));
+    const fetchUri = this.createUrl(__privateGet2(_EnrichmentClient2, _valueUrl));
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -422,7 +701,7 @@ var _EnrichmentClient = class _EnrichmentClient2 extends ApiClient {
   }
   /** Deletes an enrichment value within an enrichment category. The category is left alone. */
   async removeValue(body) {
-    const fetchUri = this.createUrl(__privateGet(_EnrichmentClient2, _valueUrl));
+    const fetchUri = this.createUrl(__privateGet2(_EnrichmentClient2, _valueUrl));
     await this.apiClient(fetchUri, {
       method: "DELETE",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -432,8 +711,8 @@ var _EnrichmentClient = class _EnrichmentClient2 extends ApiClient {
 };
 _url3 = /* @__PURE__ */ new WeakMap();
 _valueUrl = /* @__PURE__ */ new WeakMap();
-__privateAdd(_EnrichmentClient, _url3, "/api/v1/enrichments");
-__privateAdd(_EnrichmentClient, _valueUrl, "/api/v1/enrichment-values");
+__privateAdd2(_EnrichmentClient, _url3, "/api/v1/enrichments");
+__privateAdd2(_EnrichmentClient, _valueUrl, "/api/v1/enrichment-values");
 var _url4;
 var _ManifestClient = class _ManifestClient2 extends ApiClient {
   constructor(options) {
@@ -442,7 +721,7 @@ var _ManifestClient = class _ManifestClient2 extends ApiClient {
   /** Fetches the Context manifest for a project */
   async get(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(__privateGet(_ManifestClient2, _url4), { ...options, projectId });
+    const fetchUri = this.createUrl(__privateGet2(_ManifestClient2, _url4), { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
   /** Publishes the Context manifest for a project */
@@ -456,7 +735,7 @@ var _ManifestClient = class _ManifestClient2 extends ApiClient {
   }
 };
 _url4 = /* @__PURE__ */ new WeakMap();
-__privateAdd(_ManifestClient, _url4, "/api/v2/manifest");
+__privateAdd2(_ManifestClient, _url4, "/api/v2/manifest");
 var ManifestClient = _ManifestClient;
 var _url5;
 var _QuirkClient = class _QuirkClient2 extends ApiClient {
@@ -466,12 +745,12 @@ var _QuirkClient = class _QuirkClient2 extends ApiClient {
   /** Fetches all Quirks for a project */
   async get(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(__privateGet(_QuirkClient2, _url5), { ...options, projectId });
+    const fetchUri = this.createUrl(__privateGet2(_QuirkClient2, _url5), { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
   /** Updates or creates (based on id) a Quirk */
   async upsert(body) {
-    const fetchUri = this.createUrl(__privateGet(_QuirkClient2, _url5));
+    const fetchUri = this.createUrl(__privateGet2(_QuirkClient2, _url5));
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -480,7 +759,7 @@ var _QuirkClient = class _QuirkClient2 extends ApiClient {
   }
   /** Deletes a Quirk */
   async remove(body) {
-    const fetchUri = this.createUrl(__privateGet(_QuirkClient2, _url5));
+    const fetchUri = this.createUrl(__privateGet2(_QuirkClient2, _url5));
     await this.apiClient(fetchUri, {
       method: "DELETE",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -489,457 +768,258 @@ var _QuirkClient = class _QuirkClient2 extends ApiClient {
   }
 };
 _url5 = /* @__PURE__ */ new WeakMap();
-__privateAdd(_QuirkClient, _url5, "/api/v2/quirk");
+__privateAdd2(_QuirkClient, _url5, "/api/v2/quirk");
 var _url6;
 var _SignalClient = class _SignalClient2 extends ApiClient {
   constructor(options) {
     super(options);
   }
-  /** Fetches all Signals for a project */
-  async get(options) {
-    const { projectId } = this.options;
-    const fetchUri = this.createUrl(__privateGet(_SignalClient2, _url6), { ...options, projectId });
-    return await this.apiClient(fetchUri);
-  }
-  /** Updates or creates (based on id) a Signal */
-  async upsert(body) {
-    const fetchUri = this.createUrl(__privateGet(_SignalClient2, _url6));
-    await this.apiClient(fetchUri, {
-      method: "PUT",
-      body: JSON.stringify({ ...body, projectId: this.options.projectId }),
-      expectNoContent: true
-    });
-  }
-  /** Deletes a Signal */
-  async remove(body) {
-    const fetchUri = this.createUrl(__privateGet(_SignalClient2, _url6));
-    await this.apiClient(fetchUri, {
-      method: "DELETE",
-      body: JSON.stringify({ ...body, projectId: this.options.projectId }),
-      expectNoContent: true
-    });
-  }
-};
-_url6 = /* @__PURE__ */ new WeakMap();
-__privateAdd(_SignalClient, _url6, "/api/v2/signal");
-var _url7;
-var _TestClient = class _TestClient2 extends ApiClient {
-  constructor(options) {
-    super(options);
-  }
-  /** Fetches all Tests for a project */
-  async get(options) {
-    const { projectId } = this.options;
-    const fetchUri = this.createUrl(__privateGet(_TestClient2, _url7), { ...options, projectId });
-    return await this.apiClient(fetchUri);
-  }
-  /** Updates or creates (based on id) a Test */
-  async upsert(body) {
-    const fetchUri = this.createUrl(__privateGet(_TestClient2, _url7));
-    await this.apiClient(fetchUri, {
-      method: "PUT",
-      body: JSON.stringify({ ...body, projectId: this.options.projectId }),
-      expectNoContent: true
-    });
-  }
-  /** Deletes a Test */
-  async remove(body) {
-    const fetchUri = this.createUrl(__privateGet(_TestClient2, _url7));
-    await this.apiClient(fetchUri, {
-      method: "DELETE",
-      body: JSON.stringify({ ...body, projectId: this.options.projectId }),
-      expectNoContent: true
-    });
-  }
-};
-_url7 = /* @__PURE__ */ new WeakMap();
-__privateAdd(_TestClient, _url7, "/api/v2/test");
-
-// ../canvas/dist/index.mjs
-var __create2 = Object.create;
-var __defProp3 = Object.defineProperty;
-var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames2 = Object.getOwnPropertyNames;
-var __getProtoOf2 = Object.getPrototypeOf;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __typeError2 = (msg) => {
-  throw TypeError(msg);
-};
-var __commonJS2 = (cb, mod) => function __require() {
-  return mod || (0, cb[__getOwnPropNames2(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
-};
-var __copyProps2 = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames2(from))
-      if (!__hasOwnProp2.call(to, key) && key !== except)
-        __defProp3(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM2 = (mod, isNodeMode, target) => (target = mod != null ? __create2(__getProtoOf2(mod)) : {}, __copyProps2(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp3(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __accessCheck2 = (obj, member, msg) => member.has(obj) || __typeError2("Cannot " + msg);
-var __privateGet2 = (obj, member, getter) => (__accessCheck2(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd2 = (obj, member, value) => member.has(obj) ? __typeError2("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var require_yocto_queue2 = __commonJS2({
-  "../../node_modules/.pnpm/yocto-queue@0.1.0/node_modules/yocto-queue/index.js"(exports2, module2) {
-    "use strict";
-    var Node = class {
-      /// value;
-      /// next;
-      constructor(value) {
-        this.value = value;
-        this.next = void 0;
-      }
-    };
-    var Queue = class {
-      // TODO: Use private class fields when targeting Node.js 12.
-      // #_head;
-      // #_tail;
-      // #_size;
-      constructor() {
-        this.clear();
-      }
-      enqueue(value) {
-        const node = new Node(value);
-        if (this._head) {
-          this._tail.next = node;
-          this._tail = node;
-        } else {
-          this._head = node;
-          this._tail = node;
-        }
-        this._size++;
-      }
-      dequeue() {
-        const current = this._head;
-        if (!current) {
-          return;
-        }
-        this._head = this._head.next;
-        this._size--;
-        return current.value;
-      }
-      clear() {
-        this._head = void 0;
-        this._tail = void 0;
-        this._size = 0;
-      }
-      get size() {
-        return this._size;
-      }
-      *[Symbol.iterator]() {
-        let current = this._head;
-        while (current) {
-          yield current.value;
-          current = current.next;
-        }
-      }
-    };
-    module2.exports = Queue;
-  }
-});
-var require_p_limit2 = __commonJS2({
-  "../../node_modules/.pnpm/p-limit@3.1.0/node_modules/p-limit/index.js"(exports2, module2) {
-    "use strict";
-    var Queue = require_yocto_queue2();
-    var pLimit2 = (concurrency) => {
-      if (!((Number.isInteger(concurrency) || concurrency === Infinity) && concurrency > 0)) {
-        throw new TypeError("Expected `concurrency` to be a number from 1 and up");
-      }
-      const queue = new Queue();
-      let activeCount = 0;
-      const next = () => {
-        activeCount--;
-        if (queue.size > 0) {
-          queue.dequeue()();
-        }
-      };
-      const run = async (fn, resolve, ...args) => {
-        activeCount++;
-        const result = (async () => fn(...args))();
-        resolve(result);
-        try {
-          await result;
-        } catch (e) {
-        }
-        next();
-      };
-      const enqueue = (fn, resolve, ...args) => {
-        queue.enqueue(run.bind(null, fn, resolve, ...args));
-        (async () => {
-          await Promise.resolve();
-          if (activeCount < concurrency && queue.size > 0) {
-            queue.dequeue()();
-          }
-        })();
-      };
-      const generator = (fn, ...args) => new Promise((resolve) => {
-        enqueue(fn, resolve, ...args);
-      });
-      Object.defineProperties(generator, {
-        activeCount: {
-          get: () => activeCount
-        },
-        pendingCount: {
-          get: () => queue.size
-        },
-        clearQueue: {
-          value: () => {
-            queue.clear();
-          }
-        }
-      });
-      return generator;
-    };
-    module2.exports = pLimit2;
-  }
-});
-var require_retry_operation = __commonJS2({
-  "../../node_modules/.pnpm/retry@0.13.1/node_modules/retry/lib/retry_operation.js"(exports2, module2) {
-    "use strict";
-    function RetryOperation(timeouts, options) {
-      if (typeof options === "boolean") {
-        options = { forever: options };
-      }
-      this._originalTimeouts = JSON.parse(JSON.stringify(timeouts));
-      this._timeouts = timeouts;
-      this._options = options || {};
-      this._maxRetryTime = options && options.maxRetryTime || Infinity;
-      this._fn = null;
-      this._errors = [];
-      this._attempts = 1;
-      this._operationTimeout = null;
-      this._operationTimeoutCb = null;
-      this._timeout = null;
-      this._operationStart = null;
-      this._timer = null;
-      if (this._options.forever) {
-        this._cachedTimeouts = this._timeouts.slice(0);
-      }
-    }
-    module2.exports = RetryOperation;
-    RetryOperation.prototype.reset = function() {
-      this._attempts = 1;
-      this._timeouts = this._originalTimeouts.slice(0);
-    };
-    RetryOperation.prototype.stop = function() {
-      if (this._timeout) {
-        clearTimeout(this._timeout);
-      }
-      if (this._timer) {
-        clearTimeout(this._timer);
-      }
-      this._timeouts = [];
-      this._cachedTimeouts = null;
-    };
-    RetryOperation.prototype.retry = function(err) {
-      if (this._timeout) {
-        clearTimeout(this._timeout);
-      }
-      if (!err) {
-        return false;
-      }
-      var currentTime = (/* @__PURE__ */ new Date()).getTime();
-      if (err && currentTime - this._operationStart >= this._maxRetryTime) {
-        this._errors.push(err);
-        this._errors.unshift(new Error("RetryOperation timeout occurred"));
-        return false;
-      }
-      this._errors.push(err);
-      var timeout = this._timeouts.shift();
-      if (timeout === void 0) {
-        if (this._cachedTimeouts) {
-          this._errors.splice(0, this._errors.length - 1);
-          timeout = this._cachedTimeouts.slice(-1);
-        } else {
-          return false;
-        }
-      }
-      var self = this;
-      this._timer = setTimeout(function() {
-        self._attempts++;
-        if (self._operationTimeoutCb) {
-          self._timeout = setTimeout(function() {
-            self._operationTimeoutCb(self._attempts);
-          }, self._operationTimeout);
-          if (self._options.unref) {
-            self._timeout.unref();
-          }
-        }
-        self._fn(self._attempts);
-      }, timeout);
-      if (this._options.unref) {
-        this._timer.unref();
-      }
-      return true;
-    };
-    RetryOperation.prototype.attempt = function(fn, timeoutOps) {
-      this._fn = fn;
-      if (timeoutOps) {
-        if (timeoutOps.timeout) {
-          this._operationTimeout = timeoutOps.timeout;
-        }
-        if (timeoutOps.cb) {
-          this._operationTimeoutCb = timeoutOps.cb;
-        }
-      }
-      var self = this;
-      if (this._operationTimeoutCb) {
-        this._timeout = setTimeout(function() {
-          self._operationTimeoutCb();
-        }, self._operationTimeout);
-      }
-      this._operationStart = (/* @__PURE__ */ new Date()).getTime();
-      this._fn(this._attempts);
-    };
-    RetryOperation.prototype.try = function(fn) {
-      console.log("Using RetryOperation.try() is deprecated");
-      this.attempt(fn);
-    };
-    RetryOperation.prototype.start = function(fn) {
-      console.log("Using RetryOperation.start() is deprecated");
-      this.attempt(fn);
-    };
-    RetryOperation.prototype.start = RetryOperation.prototype.try;
-    RetryOperation.prototype.errors = function() {
-      return this._errors;
-    };
-    RetryOperation.prototype.attempts = function() {
-      return this._attempts;
-    };
-    RetryOperation.prototype.mainError = function() {
-      if (this._errors.length === 0) {
-        return null;
-      }
-      var counts = {};
-      var mainError = null;
-      var mainErrorCount = 0;
-      for (var i = 0; i < this._errors.length; i++) {
-        var error = this._errors[i];
-        var message = error.message;
-        var count = (counts[message] || 0) + 1;
-        counts[message] = count;
-        if (count >= mainErrorCount) {
-          mainError = error;
-          mainErrorCount = count;
-        }
-      }
-      return mainError;
-    };
+  /** Fetches all Signals for a project */
+  async get(options) {
+    const { projectId } = this.options;
+    const fetchUri = this.createUrl(__privateGet2(_SignalClient2, _url6), { ...options, projectId });
+    return await this.apiClient(fetchUri);
   }
-});
-var require_retry = __commonJS2({
-  "../../node_modules/.pnpm/retry@0.13.1/node_modules/retry/lib/retry.js"(exports2) {
-    "use strict";
-    var RetryOperation = require_retry_operation();
-    exports2.operation = function(options) {
-      var timeouts = exports2.timeouts(options);
-      return new RetryOperation(timeouts, {
-        forever: options && (options.forever || options.retries === Infinity),
-        unref: options && options.unref,
-        maxRetryTime: options && options.maxRetryTime
-      });
-    };
-    exports2.timeouts = function(options) {
-      if (options instanceof Array) {
-        return [].concat(options);
-      }
-      var opts = {
-        retries: 10,
-        factor: 2,
-        minTimeout: 1 * 1e3,
-        maxTimeout: Infinity,
-        randomize: false
-      };
-      for (var key in options) {
-        opts[key] = options[key];
-      }
-      if (opts.minTimeout > opts.maxTimeout) {
-        throw new Error("minTimeout is greater than maxTimeout");
-      }
-      var timeouts = [];
-      for (var i = 0; i < opts.retries; i++) {
-        timeouts.push(this.createTimeout(i, opts));
-      }
-      if (options && options.forever && !timeouts.length) {
-        timeouts.push(this.createTimeout(i, opts));
+  /** Updates or creates (based on id) a Signal */
+  async upsert(body) {
+    const fetchUri = this.createUrl(__privateGet2(_SignalClient2, _url6));
+    await this.apiClient(fetchUri, {
+      method: "PUT",
+      body: JSON.stringify({ ...body, projectId: this.options.projectId }),
+      expectNoContent: true
+    });
+  }
+  /** Deletes a Signal */
+  async remove(body) {
+    const fetchUri = this.createUrl(__privateGet2(_SignalClient2, _url6));
+    await this.apiClient(fetchUri, {
+      method: "DELETE",
+      body: JSON.stringify({ ...body, projectId: this.options.projectId }),
+      expectNoContent: true
+    });
+  }
+};
+_url6 = /* @__PURE__ */ new WeakMap();
+__privateAdd2(_SignalClient, _url6, "/api/v2/signal");
+var _url7;
+var _TestClient = class _TestClient2 extends ApiClient {
+  constructor(options) {
+    super(options);
+  }
+  /** Fetches all Tests for a project */
+  async get(options) {
+    const { projectId } = this.options;
+    const fetchUri = this.createUrl(__privateGet2(_TestClient2, _url7), { ...options, projectId });
+    return await this.apiClient(fetchUri);
+  }
+  /** Updates or creates (based on id) a Test */
+  async upsert(body) {
+    const fetchUri = this.createUrl(__privateGet2(_TestClient2, _url7));
+    await this.apiClient(fetchUri, {
+      method: "PUT",
+      body: JSON.stringify({ ...body, projectId: this.options.projectId }),
+      expectNoContent: true
+    });
+  }
+  /** Deletes a Test */
+  async remove(body) {
+    const fetchUri = this.createUrl(__privateGet2(_TestClient2, _url7));
+    await this.apiClient(fetchUri, {
+      method: "DELETE",
+      body: JSON.stringify({ ...body, projectId: this.options.projectId }),
+      expectNoContent: true
+    });
+  }
+};
+_url7 = /* @__PURE__ */ new WeakMap();
+__privateAdd2(_TestClient, _url7, "/api/v2/test");
+
+// ../../node_modules/.pnpm/yocto-queue@1.2.2/node_modules/yocto-queue/index.js
+var Node = class {
+  constructor(value) {
+    __publicField(this, "value");
+    __publicField(this, "next");
+    this.value = value;
+  }
+};
+var _head, _tail, _size;
+var Queue = class {
+  constructor() {
+    __privateAdd(this, _head);
+    __privateAdd(this, _tail);
+    __privateAdd(this, _size);
+    this.clear();
+  }
+  enqueue(value) {
+    const node = new Node(value);
+    if (__privateGet(this, _head)) {
+      __privateGet(this, _tail).next = node;
+      __privateSet(this, _tail, node);
+    } else {
+      __privateSet(this, _head, node);
+      __privateSet(this, _tail, node);
+    }
+    __privateWrapper(this, _size)._++;
+  }
+  dequeue() {
+    const current = __privateGet(this, _head);
+    if (!current) {
+      return;
+    }
+    __privateSet(this, _head, __privateGet(this, _head).next);
+    __privateWrapper(this, _size)._--;
+    if (!__privateGet(this, _head)) {
+      __privateSet(this, _tail, void 0);
+    }
+    return current.value;
+  }
+  peek() {
+    if (!__privateGet(this, _head)) {
+      return;
+    }
+    return __privateGet(this, _head).value;
+  }
+  clear() {
+    __privateSet(this, _head, void 0);
+    __privateSet(this, _tail, void 0);
+    __privateSet(this, _size, 0);
+  }
+  get size() {
+    return __privateGet(this, _size);
+  }
+  *[Symbol.iterator]() {
+    let current = __privateGet(this, _head);
+    while (current) {
+      yield current.value;
+      current = current.next;
+    }
+  }
+  *drain() {
+    while (__privateGet(this, _head)) {
+      yield this.dequeue();
+    }
+  }
+};
+_head = new WeakMap();
+_tail = new WeakMap();
+_size = new WeakMap();
+
+// ../../node_modules/.pnpm/p-limit@6.2.0/node_modules/p-limit/index.js
+function pLimit2(concurrency) {
+  validateConcurrency(concurrency);
+  const queue = new Queue();
+  let activeCount = 0;
+  const resumeNext = () => {
+    if (activeCount < concurrency && queue.size > 0) {
+      queue.dequeue()();
+      activeCount++;
+    }
+  };
+  const next = () => {
+    activeCount--;
+    resumeNext();
+  };
+  const run = async (function_, resolve, arguments_) => {
+    const result = (async () => function_(...arguments_))();
+    resolve(result);
+    try {
+      await result;
+    } catch (e) {
+    }
+    next();
+  };
+  const enqueue = (function_, resolve, arguments_) => {
+    new Promise((internalResolve) => {
+      queue.enqueue(internalResolve);
+    }).then(
+      run.bind(void 0, function_, resolve, arguments_)
+    );
+    (async () => {
+      await Promise.resolve();
+      if (activeCount < concurrency) {
+        resumeNext();
       }
-      timeouts.sort(function(a, b) {
-        return a - b;
-      });
-      return timeouts;
-    };
-    exports2.createTimeout = function(attempt, opts) {
-      var random = opts.randomize ? Math.random() + 1 : 1;
-      var timeout = Math.round(random * Math.max(opts.minTimeout, 1) * Math.pow(opts.factor, attempt));
-      timeout = Math.min(timeout, opts.maxTimeout);
-      return timeout;
-    };
-    exports2.wrap = function(obj, options, methods) {
-      if (options instanceof Array) {
-        methods = options;
-        options = null;
+    })();
+  };
+  const generator = (function_, ...arguments_) => new Promise((resolve) => {
+    enqueue(function_, resolve, arguments_);
+  });
+  Object.defineProperties(generator, {
+    activeCount: {
+      get: () => activeCount
+    },
+    pendingCount: {
+      get: () => queue.size
+    },
+    clearQueue: {
+      value() {
+        queue.clear();
       }
-      if (!methods) {
-        methods = [];
-        for (var key in obj) {
-          if (typeof obj[key] === "function") {
-            methods.push(key);
+    },
+    concurrency: {
+      get: () => concurrency,
+      set(newConcurrency) {
+        validateConcurrency(newConcurrency);
+        concurrency = newConcurrency;
+        queueMicrotask(() => {
+          while (activeCount < concurrency && queue.size > 0) {
+            resumeNext();
           }
-        }
-      }
-      for (var i = 0; i < methods.length; i++) {
-        var method = methods[i];
-        var original = obj[method];
-        obj[method] = function retryWrapper(original2) {
-          var op = exports2.operation(options);
-          var args = Array.prototype.slice.call(arguments, 1);
-          var callback = args.pop();
-          args.push(function(err) {
-            if (op.retry(err)) {
-              return;
-            }
-            if (err) {
-              arguments[0] = op.mainError();
-            }
-            callback.apply(this, arguments);
-          });
-          op.attempt(function() {
-            original2.apply(obj, args);
-          });
-        }.bind(obj, original);
-        obj[method].options = options;
+        });
       }
-    };
-  }
-});
-var require_retry2 = __commonJS2({
-  "../../node_modules/.pnpm/retry@0.13.1/node_modules/retry/index.js"(exports2, module2) {
-    "use strict";
-    module2.exports = require_retry();
+    }
+  });
+  return generator;
+}
+function validateConcurrency(concurrency) {
+  if (!((Number.isInteger(concurrency) || concurrency === Number.POSITIVE_INFINITY) && concurrency > 0)) {
+    throw new TypeError("Expected `concurrency` to be a number from 1 and up");
   }
-});
-var import_p_limit2 = __toESM2(require_p_limit2());
-var import_retry = __toESM2(require_retry2(), 1);
-var networkErrorMsgs = /* @__PURE__ */ new Set([
-  "Failed to fetch",
+}
+
+// ../../node_modules/.pnpm/p-retry@6.2.1/node_modules/p-retry/index.js
+var import_retry = __toESM(require_retry2(), 1);
+
+// ../../node_modules/.pnpm/is-network-error@1.3.2/node_modules/is-network-error/index.js
+var objectToString = Object.prototype.toString;
+var isError = (value) => objectToString.call(value) === "[object Error]";
+var errorMessages = /* @__PURE__ */ new Set([
+  "network error",
   // Chrome
   "NetworkError when attempting to fetch resource.",
   // Firefox
   "The Internet connection appears to be offline.",
-  // Safari
+  // Safari 16
   "Network request failed",
   // `cross-fetch`
-  "fetch failed"
+  "fetch failed",
+  // Undici (Node.js)
+  "terminated",
   // Undici (Node.js)
+  " A network error occurred.",
+  // Bun (WebKit)
+  "Network connection lost"
+  // Cloudflare Workers (fetch)
 ]);
+function isNetworkError(error) {
+  const isValid = error && isError(error) && error.name === "TypeError" && typeof error.message === "string";
+  if (!isValid) {
+    return false;
+  }
+  const { message, stack } = error;
+  if (message === "Load failed" || message.startsWith("Load failed (") && message.endsWith(")")) {
+    return stack === void 0 || "__sentry_captured__" in error;
+  }
+  if (message.startsWith("error sending request for url")) {
+    return true;
+  }
+  if (message === "Failed to fetch" || message.startsWith("Failed to fetch (") && message.endsWith(")")) {
+    return true;
+  }
+  return errorMessages.has(message);
+}
+
+// ../../node_modules/.pnpm/p-retry@6.2.1/node_modules/p-retry/index.js
 var AbortError = class extends Error {
   constructor(message) {
     super();
@@ -960,63 +1040,71 @@ var decorateErrorWithCounts = (error, attemptNumber, options) => {
   error.retriesLeft = retriesLeft;
   return error;
 };
-var isNetworkError = (errorMessage) => networkErrorMsgs.has(errorMessage);
-var getDOMException = (errorMessage) => globalThis.DOMException === void 0 ? new Error(errorMessage) : new DOMException(errorMessage);
 async function pRetry(input, options) {
   return new Promise((resolve, reject) => {
-    options = {
-      onFailedAttempt() {
-      },
-      retries: 10,
-      ...options
+    var _a, _b, _c;
+    options = { ...options };
+    (_a = options.onFailedAttempt) != null ? _a : options.onFailedAttempt = () => {
     };
+    (_b = options.shouldRetry) != null ? _b : options.shouldRetry = () => true;
+    (_c = options.retries) != null ? _c : options.retries = 10;
     const operation = import_retry.default.operation(options);
+    const abortHandler = () => {
+      var _a2;
+      operation.stop();
+      reject((_a2 = options.signal) == null ? void 0 : _a2.reason);
+    };
+    if (options.signal && !options.signal.aborted) {
+      options.signal.addEventListener("abort", abortHandler, { once: true });
+    }
+    const cleanUp = () => {
+      var _a2;
+      (_a2 = options.signal) == null ? void 0 : _a2.removeEventListener("abort", abortHandler);
+      operation.stop();
+    };
     operation.attempt(async (attemptNumber) => {
       try {
-        resolve(await input(attemptNumber));
+        const result = await input(attemptNumber);
+        cleanUp();
+        resolve(result);
       } catch (error) {
-        if (!(error instanceof Error)) {
-          reject(new TypeError(`Non-error was thrown: "${error}". You should only throw errors.`));
-          return;
-        }
-        if (error instanceof AbortError) {
-          operation.stop();
-          reject(error.originalError);
-        } else if (error instanceof TypeError && !isNetworkError(error.message)) {
-          operation.stop();
-          reject(error);
-        } else {
+        try {
+          if (!(error instanceof Error)) {
+            throw new TypeError(`Non-error was thrown: "${error}". You should only throw errors.`);
+          }
+          if (error instanceof AbortError) {
+            throw error.originalError;
+          }
+          if (error instanceof TypeError && !isNetworkError(error)) {
+            throw error;
+          }
           decorateErrorWithCounts(error, attemptNumber, options);
-          try {
-            await options.onFailedAttempt(error);
-          } catch (error2) {
-            reject(error2);
-            return;
+          if (!await options.shouldRetry(error)) {
+            operation.stop();
+            reject(error);
           }
+          await options.onFailedAttempt(error);
           if (!operation.retry(error)) {
-            reject(operation.mainError());
+            throw operation.mainError();
           }
+        } catch (finalError) {
+          decorateErrorWithCounts(finalError, attemptNumber, options);
+          cleanUp();
+          reject(finalError);
         }
       }
     });
-    if (options.signal && !options.signal.aborted) {
-      options.signal.addEventListener("abort", () => {
-        operation.stop();
-        const reason = options.signal.reason === void 0 ? getDOMException("The operation was aborted.") : options.signal.reason;
-        reject(reason instanceof Error ? reason : getDOMException(reason));
-      }, {
-        once: true
-      });
-    }
   });
 }
+
+// ../../node_modules/.pnpm/p-throttle@6.2.0/node_modules/p-throttle/index.js
 var AbortError2 = class extends Error {
   constructor() {
     super("Throttled function aborted");
     this.name = "AbortError";
   }
 };
-function pThrottle({ limit, interval, strict }) {
+function pThrottle({ limit, interval, strict, onDelay }) {
   if (!Number.isFinite(limit)) {
     throw new TypeError("Expected `limit` to be a finite number");
   }
@@ -1044,32 +1132,38 @@ function pThrottle({ limit, interval, strict }) {
   const strictTicks = [];
   function strictDelay() {
     const now = Date.now();
-    if (strictTicks.length < limit) {
-      strictTicks.push(now);
-      return 0;
+    if (strictTicks.length > 0 && now - strictTicks.at(-1) > interval) {
+      strictTicks.length = 0;
     }
-    const earliestTime = strictTicks.shift() + interval;
-    if (now >= earliestTime) {
+    if (strictTicks.length < limit) {
       strictTicks.push(now);
       return 0;
     }
-    strictTicks.push(earliestTime);
-    return earliestTime - now;
+    const nextExecutionTime = strictTicks[0] + interval;
+    strictTicks.shift();
+    strictTicks.push(nextExecutionTime);
+    return Math.max(0, nextExecutionTime - now);
   }
   const getDelay = strict ? strictDelay : windowedDelay;
   return (function_) => {
-    const throttled = function(...args) {
+    const throttled = function(...arguments_) {
       if (!throttled.isEnabled) {
-        return (async () => function_.apply(this, args))();
+        return (async () => function_.apply(this, arguments_))();
       }
-      let timeout;
+      let timeoutId;
       return new Promise((resolve, reject) => {
         const execute = () => {
-          resolve(function_.apply(this, args));
-          queue.delete(timeout);
+          resolve(function_.apply(this, arguments_));
+          queue.delete(timeoutId);
         };
-        timeout = setTimeout(execute, getDelay());
-        queue.set(timeout, reject);
+        const delay = getDelay();
+        if (delay > 0) {
+          timeoutId = setTimeout(execute, delay);
+          queue.set(timeoutId, reject);
+          onDelay == null ? void 0 : onDelay(...arguments_);
+        } else {
+          execute();
+        }
       });
     };
     throttled.abort = () => {
@@ -1081,16 +1175,29 @@ function pThrottle({ limit, interval, strict }) {
       strictTicks.splice(0, strictTicks.length);
     };
     throttled.isEnabled = true;
+    Object.defineProperty(throttled, "queueSize", {
+      get() {
+        return queue.size;
+      }
+    });
     return throttled;
   };
 }
+
+// ../canvas/dist/index.mjs
+var __typeError3 = (msg) => {
+  throw TypeError(msg);
+};
+var __accessCheck3 = (obj, member, msg) => member.has(obj) || __typeError3("Cannot " + msg);
+var __privateGet3 = (obj, member, getter) => (__accessCheck3(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
+var __privateAdd3 = (obj, member, value) => member.has(obj) ? __typeError3("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 function createLimitPolicy({
   throttle = { interval: 1e3, limit: 10 },
-  retry: retry2 = { retries: 1, factor: 1.66 },
+  retry: retry3 = { retries: 1, factor: 1.66 },
   limit = 10
 }) {
   const throttler = throttle ? pThrottle(throttle) : null;
-  const limiter = limit ? (0, import_p_limit2.default)(limit) : null;
+  const limiter = limit ? pLimit2(limit) : null;
   return function limitPolicy(func) {
     let currentFunc = async () => await func();
     if (throttler) {
@@ -1101,13 +1208,13 @@ function createLimitPolicy({
       const limitFunc = currentFunc;
       currentFunc = () => limiter(limitFunc);
     }
-    if (retry2) {
+    if (retry3) {
       const retryFunc = currentFunc;
       currentFunc = () => pRetry(retryFunc, {
-        ...retry2,
+        ...retry3,
         onFailedAttempt: async (error) => {
-          if (retry2.onFailedAttempt) {
-            await retry2.onFailedAttempt(error);
+          if (retry3.onFailedAttempt) {
+            await retry3.onFailedAttempt(error);
           }
           if (error instanceof ApiClientError && typeof error.statusCode === "number" && error.statusCode >= 400 && error.statusCode < 500 && error.statusCode !== 429 && error.statusCode !== 408) {
             throw error;
@@ -1118,19 +1225,49 @@ function createLimitPolicy({
     return currentFunc();
   };
 }
-var isPlainObject = (obj) => typeof obj === "object" && obj !== null && !Array.isArray(obj);
-function rewriteFilters(filters) {
-  return Object.entries(filters != null ? filters : {}).reduce(
-    (acc, [key, value]) => {
-      const lhs = `filters.${key}` + (isPlainObject(value) ? `[${Object.keys(value)[0]}]` : "");
-      const rhs = isPlainObject(value) ? Object.values(value)[0] : value;
-      return {
-        ...acc,
-        [lhs]: Array.isArray(rhs) ? rhs.map((v) => `${v}`.trim()).join(",") : `${rhs}`.trim()
-      };
-    },
-    {}
-  );
+var SELECT_QUERY_PREFIX = "select.";
+function appendCsv(out, key, values) {
+  if (values === void 0) {
+    return;
+  }
+  out[key] = values.join(",");
+}
+function projectionToQuery(spec) {
+  const out = {};
+  if (!spec) {
+    return out;
+  }
+  const { fields, fieldTypes, slots } = spec;
+  const p = SELECT_QUERY_PREFIX;
+  if (fields) {
+    appendCsv(out, `${p}fields[only]`, fields.only);
+    appendCsv(out, `${p}fields[except]`, fields.except);
+    appendCsv(out, `${p}fields[locales]`, fields.locales);
+    if (fields.blockDepth === "preserveAll" || typeof fields.blockDepth === "number") {
+      out[`${p}fields[blockDepth]`] = String(fields.blockDepth);
+    }
+  }
+  if (fieldTypes) {
+    appendCsv(out, `${p}fieldTypes[only]`, fieldTypes.only);
+    appendCsv(out, `${p}fieldTypes[except]`, fieldTypes.except);
+  }
+  if (slots) {
+    appendCsv(out, `${p}slots[only]`, slots.only);
+    appendCsv(out, `${p}slots[except]`, slots.except);
+    if (typeof slots.depth === "number") {
+      out[`${p}slots[depth]`] = String(slots.depth);
+    }
+    if (slots.named) {
+      const slotNames = Object.keys(slots.named).sort();
+      for (const slotName of slotNames) {
+        const named = slots.named[slotName];
+        if (named && typeof named.depth === "number") {
+          out[`${p}slots.${slotName}[depth]`] = String(named.depth);
+        }
+      }
+    }
+  }
+  return out;
 }
 var _contentTypesUrl;
 var _entriesUrl;
@@ -1142,20 +1279,26 @@ var _ContentClient = class _ContentClient2 extends ApiClient {
   }
   getContentTypes(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(__privateGet2(_ContentClient2, _contentTypesUrl), { ...options, projectId });
+    const fetchUri = this.createUrl(__privateGet3(_ContentClient2, _contentTypesUrl), { ...options, projectId });
     return this.apiClient(fetchUri);
   }
   getEntries(options) {
     const { projectId } = this.options;
-    const { skipDataResolution, filters, ...params } = options;
-    const rewrittenFilters = rewriteFilters(filters);
+    const { skipDataResolution, filters, select, ...params } = options;
+    const rewrittenFilters = rewriteFiltersForApi(filters);
+    const rewrittenSelect = projectionToQuery(select);
     if (skipDataResolution) {
-      const url = this.createUrl(__privateGet2(_ContentClient2, _entriesUrl), { ...params, ...rewrittenFilters, projectId });
+      const url = this.createUrl(__privateGet3(_ContentClient2, _entriesUrl), {
+        ...params,
+        ...rewrittenFilters,
+        ...rewrittenSelect,
+        projectId
+      });
       return this.apiClient(url);
     }
     const edgeUrl = this.createUrl(
-      __privateGet2(_ContentClient2, _entriesUrl),
-      { ...this.getEdgeOptions(params), ...rewrittenFilters },
+      __privateGet3(_ContentClient2, _entriesUrl),
+      { ...this.getEdgeOptions(params), ...rewrittenFilters, ...rewrittenSelect },
       this.edgeApiHost
     );
     return this.apiClient(
@@ -1172,7 +1315,7 @@ var _ContentClient = class _ContentClient2 extends ApiClient {
     return this.apiClient(historyUrl);
   }
   async upsertContentType(body, opts = {}) {
-    const fetchUri = this.createUrl(__privateGet2(_ContentClient2, _contentTypesUrl));
+    const fetchUri = this.createUrl(__privateGet3(_ContentClient2, _contentTypesUrl));
     if (typeof body.contentType.slugSettings === "object" && body.contentType.slugSettings !== null && Object.keys(body.contentType.slugSettings).length === 0) {
       delete body.contentType.slugSettings;
     }
@@ -1184,7 +1327,7 @@ var _ContentClient = class _ContentClient2 extends ApiClient {
     });
   }
   async upsertEntry(body, options) {
-    const fetchUri = this.createUrl(__privateGet2(_ContentClient2, _entriesUrl));
+    const fetchUri = this.createUrl(__privateGet3(_ContentClient2, _entriesUrl));
     const headers = {};
     if (options == null ? void 0 : options.ifUnmodifiedSince) {
       headers["x-if-unmodified-since"] = options.ifUnmodifiedSince;
@@ -1198,7 +1341,7 @@ var _ContentClient = class _ContentClient2 extends ApiClient {
     return { modified: response.headers.get("x-modified-at") };
   }
   async deleteContentType(body) {
-    const fetchUri = this.createUrl(__privateGet2(_ContentClient2, _contentTypesUrl));
+    const fetchUri = this.createUrl(__privateGet3(_ContentClient2, _contentTypesUrl));
     await this.apiClient(fetchUri, {
       method: "DELETE",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -1206,7 +1349,7 @@ var _ContentClient = class _ContentClient2 extends ApiClient {
     });
   }
   async deleteEntry(body) {
-    const fetchUri = this.createUrl(__privateGet2(_ContentClient2, _entriesUrl));
+    const fetchUri = this.createUrl(__privateGet3(_ContentClient2, _entriesUrl));
     await this.apiClient(fetchUri, {
       method: "DELETE",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -1225,8 +1368,8 @@ var _ContentClient = class _ContentClient2 extends ApiClient {
 };
 _contentTypesUrl = /* @__PURE__ */ new WeakMap();
 _entriesUrl = /* @__PURE__ */ new WeakMap();
-__privateAdd2(_ContentClient, _contentTypesUrl, "/api/v1/content-types");
-__privateAdd2(_ContentClient, _entriesUrl, "/api/v1/entries");
+__privateAdd3(_ContentClient, _contentTypesUrl, "/api/v1/content-types");
+__privateAdd3(_ContentClient, _entriesUrl, "/api/v1/entries");
 var _url8;
 var _DataTypeClient = class _DataTypeClient2 extends ApiClient {
   constructor(options) {
@@ -1235,12 +1378,12 @@ var _DataTypeClient = class _DataTypeClient2 extends ApiClient {
   /** Fetches all DataTypes for a project */
   async get(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(__privateGet2(_DataTypeClient2, _url8), { ...options, projectId });
+    const fetchUri = this.createUrl(__privateGet3(_DataTypeClient2, _url8), { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
   /** Updates or creates (based on id) a DataType */
   async upsert(body) {
-    const fetchUri = this.createUrl(__privateGet2(_DataTypeClient2, _url8));
+    const fetchUri = this.createUrl(__privateGet3(_DataTypeClient2, _url8));
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -1249,7 +1392,7 @@ var _DataTypeClient = class _DataTypeClient2 extends ApiClient {
   }
   /** Deletes a DataType */
   async remove(body) {
-    const fetchUri = this.createUrl(__privateGet2(_DataTypeClient2, _url8));
+    const fetchUri = this.createUrl(__privateGet3(_DataTypeClient2, _url8));
     await this.apiClient(fetchUri, {
       method: "DELETE",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -1258,7 +1401,7 @@ var _DataTypeClient = class _DataTypeClient2 extends ApiClient {
   }
 };
 _url8 = /* @__PURE__ */ new WeakMap();
-__privateAdd2(_DataTypeClient, _url8, "/api/v1/data-types");
+__privateAdd3(_DataTypeClient, _url8, "/api/v1/data-types");
 var CANVAS_DRAFT_STATE = 0;
 var CANVAS_PUBLISHED_STATE = 64;
 var CANVAS_EDITOR_STATE = 63;
@@ -1277,7 +1420,7 @@ var _IntegrationPropertyEditorsClient = class _IntegrationPropertyEditorsClient2
    * Gets a list of property type and hook names for the current team, including public integrations' hooks.
    */
   get(options) {
-    const fetchUri = this.createUrl(__privateGet2(_IntegrationPropertyEditorsClient2, _baseUrl), {
+    const fetchUri = this.createUrl(__privateGet3(_IntegrationPropertyEditorsClient2, _baseUrl), {
       ...options,
       teamId: this.teamId
     });
@@ -1287,7 +1430,7 @@ var _IntegrationPropertyEditorsClient = class _IntegrationPropertyEditorsClient2
    * Creates or updates a custom AI property editor on a Mesh app.
    */
   async deploy(body) {
-    const fetchUri = this.createUrl(__privateGet2(_IntegrationPropertyEditorsClient2, _baseUrl));
+    const fetchUri = this.createUrl(__privateGet3(_IntegrationPropertyEditorsClient2, _baseUrl));
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, teamId: this.teamId }),
@@ -1298,7 +1441,7 @@ var _IntegrationPropertyEditorsClient = class _IntegrationPropertyEditorsClient2
    * Removes a custom AI property editor from a Mesh app.
    */
   async delete(body) {
-    const fetchUri = this.createUrl(__privateGet2(_IntegrationPropertyEditorsClient2, _baseUrl));
+    const fetchUri = this.createUrl(__privateGet3(_IntegrationPropertyEditorsClient2, _baseUrl));
     await this.apiClient(fetchUri, {
       method: "DELETE",
       body: JSON.stringify({ ...body, teamId: this.teamId }),
@@ -1307,20 +1450,30 @@ var _IntegrationPropertyEditorsClient = class _IntegrationPropertyEditorsClient2
   }
 };
 _baseUrl = /* @__PURE__ */ new WeakMap();
-__privateAdd2(_IntegrationPropertyEditorsClient, _baseUrl, "/api/v1/integration-property-editors");
+__privateAdd3(_IntegrationPropertyEditorsClient, _baseUrl, "/api/v1/integration-property-editors");
 var _url22;
+var _projectsUrl;
 var _ProjectClient = class _ProjectClient2 extends ApiClient {
   constructor(options) {
     super({ ...options, bypassCache: true });
   }
   /** Fetches single Project */
   async get(options) {
-    const fetchUri = this.createUrl(__privateGet2(_ProjectClient2, _url22), { ...options });
+    const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _url22), { ...options });
+    return await this.apiClient(fetchUri);
+  }
+  /**
+   * Fetches projects grouped by team.
+   * When teamId is provided, returns a single team with its projects.
+   * When omitted, returns all accessible teams and their projects.
+   */
+  async getProjects(options) {
+    const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _projectsUrl), options ? { ...options } : {});
     return await this.apiClient(fetchUri);
   }
   /** Updates or creates (based on id) a Project */
   async upsert(body) {
-    const fetchUri = this.createUrl(__privateGet2(_ProjectClient2, _url22));
+    const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _url22));
     return await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body })
@@ -1328,7 +1481,7 @@ var _ProjectClient = class _ProjectClient2 extends ApiClient {
   }
   /** Deletes a Project */
   async delete(body) {
-    const fetchUri = this.createUrl(__privateGet2(_ProjectClient2, _url22));
+    const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _url22));
     await this.apiClient(fetchUri, {
       method: "DELETE",
       body: JSON.stringify({ ...body }),
@@ -1337,7 +1490,9 @@ var _ProjectClient = class _ProjectClient2 extends ApiClient {
   }
 };
 _url22 = /* @__PURE__ */ new WeakMap();
-__privateAdd2(_ProjectClient, _url22, "/api/v1/project");
+_projectsUrl = /* @__PURE__ */ new WeakMap();
+__privateAdd3(_ProjectClient, _url22, "/api/v1/project");
+__privateAdd3(_ProjectClient, _projectsUrl, "/api/v1/projects");
 var ROUTE_URL = "/api/v1/route";
 var RouteClient = class extends ApiClient {
   constructor(options) {
@@ -1351,13 +1506,26 @@ var RouteClient = class extends ApiClient {
   /** Fetches lists of Canvas compositions, optionally by type */
   async getRoute(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(ROUTE_URL, { ...options, projectId }, this.edgeApiHost);
+    const { select, ...rest } = options != null ? options : {};
+    const rewrittenSelect = projectionToQuery(select);
+    const fetchUri = this.createUrl(ROUTE_URL, { ...rest, projectId, ...rewrittenSelect }, this.edgeApiHost);
     return await this.apiClient(
       fetchUri,
       this.options.disableSWR ? { headers: { "x-disable-swr": "true" } } : void 0
     );
   }
 };
+var getDataSourceVariantFromRouteGetParams = (params, defaultPreviewState) => {
+  var _a, _b;
+  const dataSourceVariant = (
+    // support explicit 'undefined' as a way to opt out of data resources variant
+    "dataSourceVariant" in params ? params.dataSourceVariant : (
+      // in case of DRAFT state we still want to fetch unpublished data
+      ((_b = (_a = params == null ? void 0 : params.state) != null ? _a : defaultPreviewState) != null ? _b : CANVAS_PUBLISHED_STATE) !== CANVAS_PUBLISHED_STATE ? "unpublished" : void 0
+    )
+  );
+  return dataSourceVariant;
+};
 
 // src/data/client.ts
 var import_functions = require("@vercel/functions");
@@ -1400,8 +1568,15 @@ var isIncontextEditingEnabled = ({
 var isDevelopmentEnvironment = () => {
   return process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test";
 };
+var shouldIgnoreRedirects = ({ state }) => {
+  const isNotPublished = state !== CANVAS_PUBLISHED_STATE;
+  return isNotPublished ? true : void 0;
+};
 
 // src/clients/cache.ts
+var isSpecificCacheMode = (options) => {
+  return "cache" in options;
+};
 var isStateCacheMode = (options) => {
   return "state" in options;
 };
@@ -1423,7 +1598,9 @@ var resolveCache = ({
 }) => {
   let cache = void 0;
   if (options) {
-    if (isStateCacheMode(options)) {
+    if (isSpecificCacheMode(options)) {
+      cache = options.cache;
+    } else if (isStateCacheMode(options)) {
       if (options.state === CANVAS_DRAFT_STATE || options.state === CANVAS_EDITOR_STATE) {
         cache = {
           type: "no-cache",
@@ -1542,7 +1719,7 @@ function createLimiter(concurrency) {
     });
   };
 }
-async function retry(fn, options) {
+async function retry2(fn, options) {
   let lastError;
   let delay = 1e3;
   for (let attempt = 1; attempt <= options.retries + 1; attempt++) {
@@ -1582,7 +1759,7 @@ function createLimitPolicy2({
     }
     if (retryOptions) {
       const retryFunc = currentFunc;
-      currentFunc = () => retry(retryFunc, {
+      currentFunc = () => retry2(retryFunc, {
         ...retryOptions,
         onFailedAttempt: async (error) => {
           if (retryOptions.onFailedAttempt) {
@@ -1715,6 +1892,9 @@ var getRouteClient = (options) => {
 // src/config/helpers.ts
 var import_resolved = __toESM(require("@uniformdev/next-app-router/config/resolved"));
 var getMiddlewareRuntimeCache = () => {
+  if (process.env.NODE_ENV === "development" && !process.env.RUNTIME_CACHE_ENDPOINT) {
+    return false;
+  }
   if (typeof import_resolved.default.middlewareRuntimeCache === "boolean") {
     return import_resolved.default.middlewareRuntimeCache;
   }
@@ -1740,7 +1920,10 @@ var DefaultDataClient = class {
       }
     }
     const manifest = await getManifest({
-      cache: {
+      cache: isDevelopmentEnvironment() ? {
+        type: "no-cache",
+        bypassCache: true
+      } : {
         type: "force-cache"
       }
     });
@@ -1843,20 +2026,23 @@ var DefaultDataClient = class {
     };
   }
   async getRoutePageState(options) {
+    const shouldBypassCache = options.pageState.compositionState !== CANVAS_PUBLISHED_STATE || isDevelopmentEnvironment();
     const routeClient = getRouteClient({
-      cache: options.pageState.compositionState === CANVAS_PUBLISHED_STATE ? {
-        type: "force-cache"
-      } : {
+      cache: shouldBypassCache ? {
         type: "no-cache",
         bypassCache: true
+      } : {
+        type: "force-cache"
       }
     });
     const originalRoute = {
       path: options.pageState.routePath,
       state: options.pageState.compositionState,
+      dataSourceVariant: getDataSourceVariantFromRouteGetParams({}, options.pageState.compositionState),
       withComponentIDs: true,
       releaseId: options.pageState.releaseId,
-      locale: options.pageState.locale
+      locale: options.pageState.locale,
+      ignoreRedirects: shouldIgnoreRedirects({ state: options.pageState.compositionState })
     };
     const resolvedRoute = await this.getRouteFromApi({
       source: "pageState",