@uniformdev/next-app-router 20.72.3-alpha.3 → 20.72.3-alpha.45

package/dist/handler.js

@@ -417,6 +417,7 @@ var __accessCheck2 = (obj, member, msg) => member.has(obj) || __typeError2("Cann
 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(
@@ -432,6 +433,12 @@ var ApiClientError = class _ApiClientError extends Error {
     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) {
     __publicField2(this, "options");
@@ -465,7 +472,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
       } : {
@@ -501,9 +508,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,
@@ -1206,6 +1223,16 @@ function createLimitPolicy({
     return currentFunc();
   };
 }
+var ContentClientBase = class extends ApiClient {
+  constructor(options, defaultBypassCache) {
+    var _a, _b;
+    super({
+      ...options,
+      limitPolicy: (_a = options.limitPolicy) != null ? _a : createLimitPolicy({}),
+      bypassCache: (_b = options.bypassCache) != null ? _b : defaultBypassCache
+    });
+  }
+};
 var SELECT_QUERY_PREFIX = "select.";
 function appendCsv(out, key, values) {
   if (values === void 0) {
@@ -1250,130 +1277,94 @@ function projectionToQuery(spec) {
   }
   return out;
 }
-var CANVAS_URL = "/api/v1/canvas";
-var CanvasClient = class extends ApiClient {
-  constructor(options) {
-    var _a;
-    if (!options.limitPolicy) {
-      options.limitPolicy = createLimitPolicy({});
-    }
-    super(options);
-    this.edgeApiHost = (_a = options.edgeApiHost) != null ? _a : "https://uniform.global";
-    this.edgeApiRequestInit = options.disableSWR ? { headers: { "x-disable-swr": "true" } } : void 0;
-  }
-  /** Fetches lists of Canvas compositions, optionally by type */
-  async getCompositionList(params = {}) {
-    const { projectId } = this.options;
-    const { resolveData, filters, select, ...originParams } = params;
-    const rewrittenFilters = rewriteFiltersForApi(filters);
-    const rewrittenSelect = projectionToQuery(select);
-    if (!resolveData) {
-      const fetchUri = this.createUrl(CANVAS_URL, {
-        ...originParams,
-        projectId,
-        ...rewrittenFilters,
-        ...rewrittenSelect
-      });
-      return this.apiClient(fetchUri);
-    }
-    const edgeParams = {
-      ...originParams,
-      projectId,
-      diagnostics: typeof params.diagnostics === "boolean" ? params.diagnostics : params.diagnostics === "no-data" ? "no-data" : void 0,
-      ...rewrittenFilters,
-      ...rewrittenSelect
-    };
-    const edgeUrl = this.createUrl("/api/v1/compositions", edgeParams, this.edgeApiHost);
-    return this.apiClient(edgeUrl, this.edgeApiRequestInit);
-  }
-  getCompositionByNodePath(options) {
-    return this.getOneComposition(options);
-  }
-  getCompositionByNodeId(options) {
-    return this.getOneComposition(options);
-  }
-  getCompositionBySlug(options) {
-    return this.getOneComposition(options);
-  }
-  getCompositionById(options) {
-    return this.getOneComposition(options);
-  }
-  getCompositionDefaults(options) {
-    return this.getOneComposition(options);
-  }
-  /** Fetches historical versions of a composition or pattern */
-  async getCompositionHistory(options) {
-    const historyUrl = this.createUrl("/api/v1/canvas-history", {
-      ...options,
-      projectId: this.options.projectId
-    });
-    return this.apiClient(historyUrl);
-  }
-  getOneComposition({
-    skipDataResolution,
-    diagnostics,
-    ...params
-  }) {
-    const { projectId } = this.options;
-    if (skipDataResolution) {
-      return this.apiClient(this.createUrl(CANVAS_URL, { ...params, projectId }));
-    }
-    const edgeParams = {
-      ...params,
-      projectId,
-      diagnostics: typeof diagnostics === "boolean" ? diagnostics : diagnostics === "no-data" ? "no-data" : void 0
+var CANVAS_DRAFT_STATE = 0;
+var CANVAS_PUBLISHED_STATE = 64;
+var CANVAS_EDITOR_STATE = 63;
+var CANVAS_INTERNAL_PARAM_PREFIX = "$internal_";
+var CANVAS_COMPONENT_DISPLAY_NAME_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}displayName`;
+var CANVAS_HYPOTHESIS_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}hypothesis`;
+var SECRET_QUERY_STRING_PARAM = "secret";
+var IN_CONTEXT_EDITOR_QUERY_STRING_PARAM = "is_incontext_editing_mode";
+var IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM = "is_incontext_editing_playground";
+var EDGE_MAX_CACHE_TTL = 24 * 60 * 60;
+function resolveCompositionSelector(args) {
+  if ("compositionId" in args) {
+    const { compositionId, editionId, versionId, ...readOptions } = args;
+    return {
+      readOptions,
+      // raw mode matches on composition OR edition id via the compositionId param
+      compositionId: editionId != null ? editionId : compositionId,
+      versionId,
+      hasCompositionId: true,
+      pinnedEdition: editionId !== void 0
     };
-    const edgeUrl = this.createUrl("/api/v1/composition", edgeParams, this.edgeApiHost);
-    return this.apiClient(edgeUrl, this.edgeApiRequestInit);
   }
-  /** Updates or creates a Canvas component definition */
-  async updateComposition(body, options) {
-    const fetchUri = this.createUrl(CANVAS_URL);
-    const headers = {};
-    if (options == null ? void 0 : options.ifUnmodifiedSince) {
-      headers["x-if-unmodified-since"] = options.ifUnmodifiedSince;
-    }
-    const { response } = await this.apiClientWithResponse(fetchUri, {
-      method: "PUT",
-      body: JSON.stringify({ ...body, projectId: this.options.projectId }),
-      expectNoContent: true,
-      headers
-    });
-    return { modified: response.headers.get("x-modified-at") };
+  return { readOptions: args, hasCompositionId: false, pinnedEdition: false };
+}
+var DEFAULT_EDGE_API_HOST = "https://uniform.global";
+var DeliveryClientBase = class extends ContentClientBase {
+  constructor(options) {
+    var _a;
+    super(
+      options,
+      /* defaultBypassCache */
+      false
+    );
+    this.edgeApiHost = (_a = options.edgeApiHost) != null ? _a : DEFAULT_EDGE_API_HOST;
+    this.edgeRequestInit = options.disableSWR ? { headers: { "x-disable-swr": "true" } } : void 0;
   }
-  /** Deletes a Canvas component definition */
-  async removeComposition(body) {
-    const fetchUri = this.createUrl(CANVAS_URL);
-    const { projectId } = this.options;
-    await this.apiClient(fetchUri, {
-      method: "DELETE",
-      body: JSON.stringify({ ...body, projectId }),
-      expectNoContent: true
-    });
+  /** Coerces the `diagnostics` option into the shape the edge endpoints accept. */
+  coerceDiagnostics(diagnostics) {
+    return typeof diagnostics === "boolean" ? diagnostics : diagnostics === "no-data" ? "no-data" : void 0;
   }
-  /** Fetches all Canvas component definitions */
-  async getComponentDefinitions(options) {
-    const { projectId } = this.options;
-    const fetchUri = this.createUrl("/api/v1/canvas-definitions", { ...options, projectId });
-    return this.apiClient(fetchUri);
+};
+var EDGE_SINGLE_URL = "/api/v1/composition";
+var EDGE_LIST_URL = "/api/v1/compositions";
+var CompositionDeliveryClient = class extends DeliveryClientBase {
+  constructor(options) {
+    super(options);
   }
-  /** Updates or creates a Canvas component definition */
-  async updateComponentDefinition(body) {
-    const fetchUri = this.createUrl("/api/v1/canvas-definitions");
-    await this.apiClient(fetchUri, {
-      method: "PUT",
-      body: JSON.stringify({ ...body, projectId: this.options.projectId }),
-      expectNoContent: true
-    });
+  /** Fetches exactly one composition (throws `ApiClientError(404)` if absent). */
+  get(args) {
+    var _a;
+    const { diagnostics, select, ...rest } = args;
+    const { readOptions, compositionId, versionId, pinnedEdition } = resolveCompositionSelector(rest);
+    const url = this.createUrl(
+      EDGE_SINGLE_URL,
+      {
+        ...readOptions,
+        ...projectionToQuery(select),
+        // A pinned edition is folded into compositionId (raw matches edition or
+        // composition id); there is no editionId query param on this endpoint.
+        compositionId,
+        versionId,
+        projectId: this.options.projectId,
+        state: (_a = args.state) != null ? _a : CANVAS_PUBLISHED_STATE,
+        // editionId pins a specific edition for preview; otherwise locale-best.
+        editions: pinnedEdition ? "raw" : "auto",
+        diagnostics: this.coerceDiagnostics(diagnostics)
+      },
+      this.edgeApiHost
+    );
+    return this.apiClient(url, this.edgeRequestInit);
   }
-  /** Deletes a Canvas component definition */
-  async removeComponentDefinition(body) {
-    const fetchUri = this.createUrl("/api/v1/canvas-definitions");
-    await this.apiClient(fetchUri, {
-      method: "DELETE",
-      body: JSON.stringify({ ...body, projectId: this.options.projectId }),
-      expectNoContent: true
-    });
+  /** Fetches a list of compositions, optionally filtered. */
+  list(args = {}) {
+    var _a;
+    const { diagnostics, filters, select, ...rest } = args;
+    const url = this.createUrl(
+      EDGE_LIST_URL,
+      {
+        ...rest,
+        ...rewriteFiltersForApi(filters),
+        ...projectionToQuery(select),
+        projectId: this.options.projectId,
+        state: (_a = args.state) != null ? _a : CANVAS_PUBLISHED_STATE,
+        diagnostics: this.coerceDiagnostics(diagnostics)
+      },
+      this.edgeApiHost
+    );
+    return this.apiClient(url, this.edgeRequestInit);
   }
 };
 var _contentTypesUrl;
@@ -1482,14 +1473,18 @@ var _DataTypeClient = class _DataTypeClient2 extends ApiClient {
   constructor(options) {
     super(options);
   }
-  /** Fetches all DataTypes for a project */
-  async get(options) {
+  /** Fetches a list of DataTypes for a project */
+  async list(options) {
     const { projectId } = this.options;
     const fetchUri = this.createUrl(__privateGet3(_DataTypeClient2, _url8), { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
+  /** @deprecated Use {@link list} instead. */
+  async get(options) {
+    return this.list(options);
+  }
   /** Updates or creates (based on id) a DataType */
-  async upsert(body) {
+  async save(body) {
     const fetchUri = this.createUrl(__privateGet3(_DataTypeClient2, _url8));
     await this.apiClient(fetchUri, {
       method: "PUT",
@@ -1497,6 +1492,10 @@ var _DataTypeClient = class _DataTypeClient2 extends ApiClient {
       expectNoContent: true
     });
   }
+  /** @deprecated Use {@link save} instead. */
+  async upsert(body) {
+    return this.save(body);
+  }
   /** Deletes a DataType */
   async remove(body) {
     const fetchUri = this.createUrl(__privateGet3(_DataTypeClient2, _url8));
@@ -1509,15 +1508,6 @@ var _DataTypeClient = class _DataTypeClient2 extends ApiClient {
 };
 _url8 = /* @__PURE__ */ new WeakMap();
 __privateAdd3(_DataTypeClient, _url8, "/api/v1/data-types");
-var CANVAS_DRAFT_STATE = 0;
-var CANVAS_EDITOR_STATE = 63;
-var CANVAS_INTERNAL_PARAM_PREFIX = "$internal_";
-var CANVAS_COMPONENT_DISPLAY_NAME_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}displayName`;
-var CANVAS_HYPOTHESIS_PARAM = `${CANVAS_INTERNAL_PARAM_PREFIX}hypothesis`;
-var SECRET_QUERY_STRING_PARAM = "secret";
-var IN_CONTEXT_EDITOR_QUERY_STRING_PARAM = "is_incontext_editing_mode";
-var IN_CONTEXT_EDITOR_PLAYGROUND_QUERY_STRING_PARAM = "is_incontext_editing_playground";
-var EDGE_MAX_CACHE_TTL = 24 * 60 * 60;
 var escapeCharacter = "\\";
 var variablePrefix = "${";
 var variableSuffix = "}";
@@ -1528,9 +1518,9 @@ function parseVariableExpression(serialized, onToken) {
   let bufferStartIndex = 0;
   let bufferEndIndex = 0;
   let tokenCount = 0;
-  const handleToken = (token, type) => {
+  const handleToken = (token, type, offset) => {
     tokenCount++;
-    return onToken == null ? void 0 : onToken(token, type);
+    return onToken == null ? void 0 : onToken(token, type, offset);
   };
   let state = "text";
   for (let index = 0; index < serialized.length; index++) {
@@ -1541,7 +1531,7 @@ function parseVariableExpression(serialized, onToken) {
     if (char === variablePrefix[0] && serialized[index + 1] === variablePrefix[1]) {
       if (serialized[index - 1] === escapeCharacter) {
         bufferEndIndex -= escapeCharacter.length;
-        if (handleToken(serialized.substring(bufferStartIndex, bufferEndIndex), "text") === false) {
+        if (handleToken(serialized.substring(bufferStartIndex, bufferEndIndex), "text", bufferStartIndex) === false) {
           return tokenCount;
         }
         bufferStartIndex = index;
@@ -1550,12 +1540,12 @@ function parseVariableExpression(serialized, onToken) {
       }
       if (state === "variable") {
         const textStart = bufferStartIndex - variablePrefix.length;
-        if (handleToken(serialized.substring(textStart, bufferEndIndex), "text") === false) {
+        if (handleToken(serialized.substring(textStart, bufferEndIndex), "text", textStart) === false) {
           return tokenCount;
         }
         bufferStartIndex = bufferEndIndex;
       } else if (bufferEndIndex > bufferStartIndex) {
-        if (handleToken(serialized.substring(bufferStartIndex, bufferEndIndex), "text") === false) {
+        if (handleToken(serialized.substring(bufferStartIndex, bufferEndIndex), "text", bufferStartIndex) === false) {
           return tokenCount;
         }
         bufferStartIndex = bufferEndIndex;
@@ -1573,7 +1563,7 @@ function parseVariableExpression(serialized, onToken) {
       state = "text";
       if (bufferEndIndex > bufferStartIndex) {
         const unescapedVariableName = serialized.substring(bufferStartIndex, bufferEndIndex).replace(/\\([${}])/g, "$1");
-        if (handleToken(unescapedVariableName, "variable") === false) {
+        if (handleToken(unescapedVariableName, "variable", bufferStartIndex) === false) {
           return tokenCount;
         }
         bufferStartIndex = bufferEndIndex + variableSuffix.length;
@@ -1587,7 +1577,7 @@ function parseVariableExpression(serialized, onToken) {
     bufferStartIndex -= variablePrefix.length;
   }
   if (bufferStartIndex < serialized.length) {
-    handleToken(serialized.substring(bufferStartIndex), state);
+    handleToken(serialized.substring(bufferStartIndex), state, bufferStartIndex);
   }
   return tokenCount;
 }
@@ -1651,20 +1641,28 @@ var _ProjectClient = class _ProjectClient2 extends ApiClient {
    * When teamId is provided, returns a single team with its projects.
    * When omitted, returns all accessible teams and their projects.
    */
-  async getProjects(options) {
+  async list(options) {
     const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _projectsUrl), options ? { ...options } : {});
     return await this.apiClient(fetchUri);
   }
+  /** @deprecated Use {@link list} instead. */
+  async getProjects(options) {
+    return this.list(options);
+  }
   /** Updates or creates (based on id) a Project */
-  async upsert(body) {
+  async save(body) {
     const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _url22));
     return await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body })
     });
   }
+  /** @deprecated Use {@link save} instead. */
+  async upsert(body) {
+    return this.save(body);
+  }
   /** Deletes a Project */
-  async delete(body) {
+  async remove(body) {
     const fetchUri = this.createUrl(__privateGet3(_ProjectClient2, _url22));
     await this.apiClient(fetchUri, {
       method: "DELETE",
@@ -1672,13 +1670,19 @@ var _ProjectClient = class _ProjectClient2 extends ApiClient {
       expectNoContent: true
     });
   }
+  /** @deprecated Use {@link remove} instead. */
+  async delete(body) {
+    return this.remove(body);
+  }
 };
 _url22 = /* @__PURE__ */ new WeakMap();
 _projectsUrl = /* @__PURE__ */ new WeakMap();
 __privateAdd3(_ProjectClient, _url22, "/api/v1/project");
 __privateAdd3(_ProjectClient, _projectsUrl, "/api/v1/projects");
 var isAllowedReferrer = (referrer) => {
-  return Boolean(referrer == null ? void 0 : referrer.match(/(^https:\/\/|\.)(uniform.app|uniform.wtf|localhost:\d{4})\//));
+  return Boolean(
+    referrer == null ? void 0 : referrer.match(/(^https:\/\/|\.)(uniform.app|uniform.wtf|uniformcode.ai|localhost:\d{4})\//)
+  );
 };
 
 // src/handler/createPreviewGETRouteHandler.ts
@@ -2130,9 +2134,9 @@ function createLimitPolicy2({
 }
 
 // src/clients/canvas.ts
-var getCanvasClient = (options) => {
+var buildCanvasClientOptions = (options) => {
   const cache = resolveCanvasCache(options);
-  return new CanvasClient({
+  return {
     projectId: env.getProjectId(),
     apiHost: env.getApiHost(),
     apiKey: env.getApiKey(),
@@ -2180,7 +2184,10 @@ var getCanvasClient = (options) => {
         }
       });
     }
-  });
+  };
+};
+var getCompositionDeliveryClient = (options) => {
+  return new CompositionDeliveryClient(buildCanvasClientOptions(options));
 };
 
 // src/clients/projectMap.ts
@@ -2429,18 +2436,15 @@ var _Route = class _Route2 {
    */
   static splitFragment(path) {
     let fragmentIndex = -1;
-    let length = 0;
-    parseVariableExpression(path, (token, type) => {
+    parseVariableExpression(path, (token, type, offset) => {
       if (type === "variable") {
-        length += createVariableReference(token).length;
         return;
       }
       const hashOffset = token.indexOf("#");
       if (hashOffset === -1) {
-        length += token.length;
         return;
       }
-      fragmentIndex = length + hashOffset;
+      fragmentIndex = offset + hashOffset;
       return false;
     });
     if (fragmentIndex === -1) {
@@ -2579,13 +2583,13 @@ var processCompositionChange = async (compositionId) => {
   };
 };
 var getComposition = async ({ compositionId }) => {
-  const canvasClient = getCanvasClient({
+  const canvasClient = getCompositionDeliveryClient({
     cache: {
       type: "no-cache"
     }
   });
   try {
-    const composition = await canvasClient.getCompositionById({
+    const composition = await canvasClient.get({
       compositionId
     });
     return composition;