@uniformdev/canvas 18.1.2-alpha.7 → 18.2.0

package/dist/{chunk-RFV573P3.mjs → chunk-D45SO56S.mjs}

@@ -475,19 +475,17 @@ function createLimitPolicy({
 var nullLimitPolicy = async (func) => await func();
 
 // src/CanvasClient.ts
-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.canvasUrl = "/api/v1/canvas";
   }
   async getCompositionList(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(CANVAS_URL, { ...options, projectId });
+    const fetchUri = this.createUrl(this.canvasUrl, { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
   unstable_getCompositionByNodePath(options) {
@@ -509,20 +507,20 @@ var CanvasClient = class extends ApiClient {
     ...params
   }) {
     const { projectId } = this.options;
-    if (!resolveData) {
-      return this.apiClient(this.createUrl(CANVAS_URL, { ...params, projectId }));
+    const url = resolveData ? "/api/edge/v1/composition" : this.canvasUrl;
+    const dataResolutionParams = {};
+    if (resolveData) {
+      if (dynamicVariables) {
+        dataResolutionParams.dynamicVariables = JSON.stringify(dynamicVariables);
+      }
+      if (dataDiagnostics) {
+        dataResolutionParams.dataDiagnostics = "true";
+      }
     }
-    const edgeParams = {
-      ...params,
-      projectId,
-      ...dynamicVariables ? { dynamicVariables: JSON.stringify(dynamicVariables) } : {},
-      ...dataDiagnostics ? { dataDiagnostics: "true" } : {}
-    };
-    const edgeUrl = this.createUrl("/api/v1/composition", edgeParams, this.edgeApiHost);
-    return this.apiClient(edgeUrl);
+    return this.apiClient(this.createUrl(url, { ...params, ...dataResolutionParams, projectId }));
   }
   async updateComposition(body) {
-    const fetchUri = this.createUrl(CANVAS_URL);
+    const fetchUri = this.createUrl("/api/v1/canvas");
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -530,7 +528,7 @@ var CanvasClient = class extends ApiClient {
     });
   }
   async removeComposition(body) {
-    const fetchUri = this.createUrl(CANVAS_URL);
+    const fetchUri = this.createUrl("/api/v1/canvas");
     const { projectId } = this.options;
     await this.apiClient(fetchUri, {
       method: "DELETE",

package/dist/cli/cli.js

@@ -18094,15 +18094,10 @@ function withApiOptions(yargs) {
     demandOption: true,
     type: "string"
   }).option("apiHost", {
-    describe: "Uniform host. Defaults to UNIFORM_CLI_BASE_URL env var or https://uniform.app. Supports dotenv.",
+    describe: "Uniform host. Defaults to UNIFORM_CLI_BASE_URL env or https://uniform.app. Supports dotenv.",
     default: process.env.UNIFORM_CLI_BASE_URL || "https://uniform.app",
     demandOption: true,
     type: "string"
-  }).option("edgeApiHost", {
-    describe: "Uniform edge host. Defaults to UNIFORM_CLI_BASE_EDGE_URL env var or https://uniform.global. Supports dotenv.",
-    default: process.env.UNIFORM_CLI_BASE_EDGE_URL || "https://uniform.global",
-    demandOption: true,
-    type: "string"
   }).option("proxy", {
     describe: "HTTPS proxy to use for Uniform API calls. Defaults to HTTPS_PROXY, https_proxy, ALL_PROXY, or all_proxy env vars (in that order). Supports dotenv.",
     default: process.env.HTTPS_PROXY || process.env.https_proxy || process.env.ALL_PROXY || process.env.all_proxy,
@@ -18603,19 +18598,17 @@ function createLimitPolicy({
 }
 
 // src/CanvasClient.ts
-var CANVAS_URL = "/api/v1/canvas";
 var CanvasClient = class extends import_api.ApiClient {
   constructor(options) {
-    var _a2;
     if (!options.limitPolicy) {
       options.limitPolicy = createLimitPolicy({});
     }
     super(options);
-    this.edgeApiHost = (_a2 = options.edgeApiHost) != null ? _a2 : "https://uniform.global";
+    this.canvasUrl = "/api/v1/canvas";
   }
   async getCompositionList(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(CANVAS_URL, { ...options, projectId });
+    const fetchUri = this.createUrl(this.canvasUrl, { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
   unstable_getCompositionByNodePath(options) {
@@ -18637,20 +18630,20 @@ var CanvasClient = class extends import_api.ApiClient {
     ...params
   }) {
     const { projectId } = this.options;
-    if (!resolveData) {
-      return this.apiClient(this.createUrl(CANVAS_URL, { ...params, projectId }));
+    const url = resolveData ? "/api/edge/v1/composition" : this.canvasUrl;
+    const dataResolutionParams = {};
+    if (resolveData) {
+      if (dynamicVariables) {
+        dataResolutionParams.dynamicVariables = JSON.stringify(dynamicVariables);
+      }
+      if (dataDiagnostics) {
+        dataResolutionParams.dataDiagnostics = "true";
+      }
     }
-    const edgeParams = {
-      ...params,
-      projectId,
-      ...dynamicVariables ? { dynamicVariables: JSON.stringify(dynamicVariables) } : {},
-      ...dataDiagnostics ? { dataDiagnostics: "true" } : {}
-    };
-    const edgeUrl = this.createUrl("/api/v1/composition", edgeParams, this.edgeApiHost);
-    return this.apiClient(edgeUrl);
+    return this.apiClient(this.createUrl(url, { ...params, ...dataResolutionParams, projectId }));
   }
   async updateComposition(body) {
-    const fetchUri = this.createUrl(CANVAS_URL);
+    const fetchUri = this.createUrl("/api/v1/canvas");
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -18658,7 +18651,7 @@ var CanvasClient = class extends import_api.ApiClient {
     });
   }
   async removeComposition(body) {
-    const fetchUri = this.createUrl(CANVAS_URL);
+    const fetchUri = this.createUrl("/api/v1/canvas");
     const { projectId } = this.options;
     await this.apiClient(fetchUri, {
       method: "DELETE",
@@ -19153,7 +19146,6 @@ var CompositionGetModule = {
   ),
   handler: async ({
     apiHost,
-    edgeApiHost,
     apiKey,
     proxy,
     id,
@@ -19167,7 +19159,7 @@ var CompositionGetModule = {
     unstableDataDiagnostics
   }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedCanvasClient({ apiKey, edgeApiHost, apiHost, fetch: fetch2, projectId });
+    const client = new UncachedCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const res = prepCompositionForDisk(
       await client.getCompositionById({
         compositionId: id,

package/dist/cli/cli.mjs

@@ -14,7 +14,7 @@ import {
   __require,
   __toCommonJS,
   __toESM
-} from "../chunk-RFV573P3.mjs";
+} from "../chunk-D45SO56S.mjs";
 
 // ../../node_modules/.pnpm/ms@2.1.2/node_modules/ms/index.js
 var require_ms = __commonJS({
@@ -17813,15 +17813,10 @@ function withApiOptions(yargs) {
     demandOption: true,
     type: "string"
   }).option("apiHost", {
-    describe: "Uniform host. Defaults to UNIFORM_CLI_BASE_URL env var or https://uniform.app. Supports dotenv.",
+    describe: "Uniform host. Defaults to UNIFORM_CLI_BASE_URL env or https://uniform.app. Supports dotenv.",
     default: process.env.UNIFORM_CLI_BASE_URL || "https://uniform.app",
     demandOption: true,
     type: "string"
-  }).option("edgeApiHost", {
-    describe: "Uniform edge host. Defaults to UNIFORM_CLI_BASE_EDGE_URL env var or https://uniform.global. Supports dotenv.",
-    default: process.env.UNIFORM_CLI_BASE_EDGE_URL || "https://uniform.global",
-    demandOption: true,
-    type: "string"
   }).option("proxy", {
     describe: "HTTPS proxy to use for Uniform API calls. Defaults to HTTPS_PROXY, https_proxy, ALL_PROXY, or all_proxy env vars (in that order). Supports dotenv.",
     default: process.env.HTTPS_PROXY || process.env.https_proxy || process.env.ALL_PROXY || process.env.all_proxy,
@@ -18596,7 +18591,6 @@ var CompositionGetModule = {
   ),
   handler: async ({
     apiHost,
-    edgeApiHost,
     apiKey,
     proxy,
     id,
@@ -18610,7 +18604,7 @@ var CompositionGetModule = {
     unstableDataDiagnostics
   }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedCanvasClient({ apiKey, edgeApiHost, apiHost, fetch: fetch2, projectId });
+    const client = new UncachedCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
     const res = prepCompositionForDisk(
       await client.getCompositionById({
         compositionId: id,

package/dist/index.d.ts

@@ -7,12 +7,9 @@ import { Options } from 'p-throttle';
 import { PersonalizedVariant, TestVariant } from '@uniformdev/context';
 import 'pusher-js';
 
-type CanvasClientOptions = ClientOptions & {
-    edgeApiHost?: string;
-};
-declare class CanvasClient extends ApiClient<CanvasClientOptions> {
-    private edgeApiHost;
-    constructor(options: CanvasClientOptions);
+declare class CanvasClient extends ApiClient<ClientOptions> {
+    constructor(options: ClientOptions);
+    private canvasUrl;
     /** Fetches lists of Canvas compositions, optionally by type */
     getCompositionList(options?: Omit<CompositionGetParameters, 'projectId' | 'compositionId' | 'slug'>): Promise<{
         compositions: {
@@ -202,7 +199,7 @@ declare class CanvasClient extends ApiClient<CanvasClientOptions> {
     removeComponentDefinition(body: Omit<ComponentDefinitionDeleteParameters, 'projectId'>): Promise<void>;
 }
 declare class UncachedCanvasClient extends CanvasClient {
-    constructor(options: Omit<CanvasClientOptions, 'bypassCache'>);
+    constructor(options: Omit<ClientOptions, 'bypassCache'>);
 }
 
 type EnhancerContext = {

package/dist/index.esm.js

@@ -58,7 +58,7 @@ import {
   nullLimitPolicy,
   subscribeToComposition,
   walkComponentTree
-} from "./chunk-RFV573P3.mjs";
+} from "./chunk-D45SO56S.mjs";
 export {
   ApiClientError,
   BatchEntry,

package/dist/index.js

@@ -513,19 +513,17 @@ function createLimitPolicy({
 var nullLimitPolicy = async (func) => await func();
 
 // src/CanvasClient.ts
-var CANVAS_URL = "/api/v1/canvas";
 var CanvasClient = class extends import_api.ApiClient {
   constructor(options) {
-    var _a;
     if (!options.limitPolicy) {
       options.limitPolicy = createLimitPolicy({});
     }
     super(options);
-    this.edgeApiHost = (_a = options.edgeApiHost) != null ? _a : "https://uniform.global";
+    this.canvasUrl = "/api/v1/canvas";
   }
   async getCompositionList(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(CANVAS_URL, { ...options, projectId });
+    const fetchUri = this.createUrl(this.canvasUrl, { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
   unstable_getCompositionByNodePath(options) {
@@ -547,20 +545,20 @@ var CanvasClient = class extends import_api.ApiClient {
     ...params
   }) {
     const { projectId } = this.options;
-    if (!resolveData) {
-      return this.apiClient(this.createUrl(CANVAS_URL, { ...params, projectId }));
+    const url = resolveData ? "/api/edge/v1/composition" : this.canvasUrl;
+    const dataResolutionParams = {};
+    if (resolveData) {
+      if (dynamicVariables) {
+        dataResolutionParams.dynamicVariables = JSON.stringify(dynamicVariables);
+      }
+      if (dataDiagnostics) {
+        dataResolutionParams.dataDiagnostics = "true";
+      }
     }
-    const edgeParams = {
-      ...params,
-      projectId,
-      ...dynamicVariables ? { dynamicVariables: JSON.stringify(dynamicVariables) } : {},
-      ...dataDiagnostics ? { dataDiagnostics: "true" } : {}
-    };
-    const edgeUrl = this.createUrl("/api/v1/composition", edgeParams, this.edgeApiHost);
-    return this.apiClient(edgeUrl);
+    return this.apiClient(this.createUrl(url, { ...params, ...dataResolutionParams, projectId }));
   }
   async updateComposition(body) {
-    const fetchUri = this.createUrl(CANVAS_URL);
+    const fetchUri = this.createUrl("/api/v1/canvas");
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -568,7 +566,7 @@ var CanvasClient = class extends import_api.ApiClient {
     });
   }
   async removeComposition(body) {
-    const fetchUri = this.createUrl(CANVAS_URL);
+    const fetchUri = this.createUrl("/api/v1/canvas");
     const { projectId } = this.options;
     await this.apiClient(fetchUri, {
       method: "DELETE",

package/dist/index.mjs

@@ -58,7 +58,7 @@ import {
   nullLimitPolicy,
   subscribeToComposition,
   walkComponentTree
-} from "./chunk-RFV573P3.mjs";
+} from "./chunk-D45SO56S.mjs";
 export {
   ApiClientError,
   BatchEntry,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas",
-  "version": "18.1.2-alpha.7+682b9aac6",
+  "version": "18.2.0",
   "description": "Common functionality and types for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -49,7 +49,7 @@
   "devDependencies": {
     "@types/retry": "0.12.1",
     "@types/yargs": "17.0.20",
-    "@uniformdev/cli": "18.1.2-alpha.7+682b9aac6",
+    "@uniformdev/cli": "18.2.0",
     "p-limit": "4.0.0",
     "p-retry": "5.1.2",
     "p-throttle": "5.0.0",
@@ -57,7 +57,7 @@
     "yargs": "17.6.2"
   },
   "dependencies": {
-    "@uniformdev/context": "18.1.2-alpha.7+682b9aac6"
+    "@uniformdev/context": "18.2.0"
   },
   "files": [
     "/dist"
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "682b9aac6143d5f462a7126f4ceab55a7c7d0c09"
+  "gitHead": "946d96f5a3ebd69cfc1b4fcc003dea75af4480af"
 }