@uniformdev/canvas 18.2.2 → 18.3.1-alpha.21

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

@@ -475,17 +475,19 @@ 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.canvasUrl = "/api/v1/canvas";
+    this.edgeApiHost = (_a = options.edgeApiHost) != null ? _a : "https://uniform.global";
   }
   async getCompositionList(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(this.canvasUrl, { ...options, projectId });
+    const fetchUri = this.createUrl(CANVAS_URL, { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
   unstable_getCompositionByNodePath(options) {
@@ -507,20 +509,20 @@ var CanvasClient = class extends ApiClient {
     ...params
   }) {
     const { projectId } = this.options;
-    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";
-      }
+    if (!resolveData) {
+      return this.apiClient(this.createUrl(CANVAS_URL, { ...params, projectId }));
     }
-    return this.apiClient(this.createUrl(url, { ...params, ...dataResolutionParams, projectId }));
+    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);
   }
   async updateComposition(body) {
-    const fetchUri = this.createUrl("/api/v1/canvas");
+    const fetchUri = this.createUrl(CANVAS_URL);
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -528,7 +530,7 @@ var CanvasClient = class extends ApiClient {
     });
   }
   async removeComposition(body) {
-    const fetchUri = this.createUrl("/api/v1/canvas");
+    const fetchUri = this.createUrl(CANVAS_URL);
     const { projectId } = this.options;
     await this.apiClient(fetchUri, {
       method: "DELETE",

package/dist/cli/cli.d.ts

@@ -1,6 +1,6 @@
 import { UniformCLIPlugin } from '@uniformdev/cli';
 import { UniformPackage } from '@uniformdev/cli/sync';
-import { a1 as CanvasDefinitions } from '../createEventBus-bd2e0a92.js';
+import { a1 as CanvasDefinitions } from '../createEventBus-db0afea5.js';
 import 'pusher-js';
 
 type CanvasPackage = UniformPackage & CanvasDefinitions;

package/dist/cli/cli.js

@@ -18087,17 +18087,22 @@ async function createArraySyncEngineDataSource({
 }
 var import_chalk = __toESM2(require_source());
 function withApiOptions(yargs) {
-  var _a2, _b2;
+  var _a2, _b2, _c2;
   return yargs.option("apiKey", {
-    describe: "Uniform API key. Defaults to CANVAS_CLI_API_KEY or UNIFORM_API_KEY env. Supports dotenv.",
-    default: (_b2 = (_a2 = process.env.CANVAS_CLI_API_KEY) != null ? _a2 : process.env.UPM_CLI_API_KEY) != null ? _b2 : process.env.UNIFORM_API_KEY,
+    describe: "Uniform API key. Defaults to UNIFORM_CLI_API_KEY or UNIFORM_API_KEY env. Supports dotenv.",
+    default: (_c2 = (_b2 = (_a2 = process.env.UNIFORM_CLI_API_KEY) != null ? _a2 : process.env.CANVAS_CLI_API_KEY) != null ? _b2 : process.env.UPM_CLI_API_KEY) != null ? _c2 : process.env.UNIFORM_API_KEY,
     demandOption: true,
     type: "string"
   }).option("apiHost", {
-    describe: "Uniform host. Defaults to UNIFORM_CLI_BASE_URL env or https://uniform.app. Supports dotenv.",
+    describe: "Uniform host. Defaults to UNIFORM_CLI_BASE_URL env var 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,
@@ -18598,17 +18603,19 @@ 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.canvasUrl = "/api/v1/canvas";
+    this.edgeApiHost = (_a2 = options.edgeApiHost) != null ? _a2 : "https://uniform.global";
   }
   async getCompositionList(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(this.canvasUrl, { ...options, projectId });
+    const fetchUri = this.createUrl(CANVAS_URL, { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
   unstable_getCompositionByNodePath(options) {
@@ -18630,20 +18637,20 @@ var CanvasClient = class extends import_api.ApiClient {
     ...params
   }) {
     const { projectId } = this.options;
-    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";
-      }
+    if (!resolveData) {
+      return this.apiClient(this.createUrl(CANVAS_URL, { ...params, projectId }));
     }
-    return this.apiClient(this.createUrl(url, { ...params, ...dataResolutionParams, projectId }));
+    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);
   }
   async updateComposition(body) {
-    const fetchUri = this.createUrl("/api/v1/canvas");
+    const fetchUri = this.createUrl(CANVAS_URL);
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -18651,7 +18658,7 @@ var CanvasClient = class extends import_api.ApiClient {
     });
   }
   async removeComposition(body) {
-    const fetchUri = this.createUrl("/api/v1/canvas");
+    const fetchUri = this.createUrl(CANVAS_URL);
     const { projectId } = this.options;
     await this.apiClient(fetchUri, {
       method: "DELETE",
@@ -19146,6 +19153,7 @@ var CompositionGetModule = {
   ),
   handler: async ({
     apiHost,
+    edgeApiHost,
     apiKey,
     proxy,
     id,
@@ -19159,7 +19167,7 @@ var CompositionGetModule = {
     unstableDataDiagnostics
   }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new UncachedCanvasClient({ apiKey, edgeApiHost, 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-D45SO56S.mjs";
+} from "../chunk-RFV573P3.mjs";
 
 // ../../node_modules/.pnpm/ms@2.1.2/node_modules/ms/index.js
 var require_ms = __commonJS({
@@ -17806,17 +17806,22 @@ async function createArraySyncEngineDataSource({
 }
 var import_chalk = __toESM2(require_source());
 function withApiOptions(yargs) {
-  var _a2, _b2;
+  var _a2, _b2, _c2;
   return yargs.option("apiKey", {
-    describe: "Uniform API key. Defaults to CANVAS_CLI_API_KEY or UNIFORM_API_KEY env. Supports dotenv.",
-    default: (_b2 = (_a2 = process.env.CANVAS_CLI_API_KEY) != null ? _a2 : process.env.UPM_CLI_API_KEY) != null ? _b2 : process.env.UNIFORM_API_KEY,
+    describe: "Uniform API key. Defaults to UNIFORM_CLI_API_KEY or UNIFORM_API_KEY env. Supports dotenv.",
+    default: (_c2 = (_b2 = (_a2 = process.env.UNIFORM_CLI_API_KEY) != null ? _a2 : process.env.CANVAS_CLI_API_KEY) != null ? _b2 : process.env.UPM_CLI_API_KEY) != null ? _c2 : process.env.UNIFORM_API_KEY,
     demandOption: true,
     type: "string"
   }).option("apiHost", {
-    describe: "Uniform host. Defaults to UNIFORM_CLI_BASE_URL env or https://uniform.app. Supports dotenv.",
+    describe: "Uniform host. Defaults to UNIFORM_CLI_BASE_URL env var 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,
@@ -18591,6 +18596,7 @@ var CompositionGetModule = {
   ),
   handler: async ({
     apiHost,
+    edgeApiHost,
     apiKey,
     proxy,
     id,
@@ -18604,7 +18610,7 @@ var CompositionGetModule = {
     unstableDataDiagnostics
   }) => {
     const fetch2 = nodeFetchProxy(proxy);
-    const client = new UncachedCanvasClient({ apiKey, apiHost, fetch: fetch2, projectId });
+    const client = new UncachedCanvasClient({ apiKey, edgeApiHost, apiHost, fetch: fetch2, projectId });
     const res = prepCompositionForDisk(
       await client.getCompositionById({
         compositionId: id,

package/dist/{createEventBus-bd2e0a92.d.ts → createEventBus-db0afea5.d.ts}

@@ -198,6 +198,8 @@ interface components$2 {
             };
             /** @description Public ID of alternate visual appearance for this component, if any selected */
             variant?: string;
+            /** @description Project map nodes associated with this component.  Must pass withProjectMapNodes parameter to be populated. */
+            projectMapNodes?: components$2["schemas"]["CompositionProjectMapNodeInfo"][];
             /** @description Slots containing any child components */
             slots?: {
                 [key: string]: components$2["schemas"]["ComponentInstance"][];
@@ -350,6 +352,21 @@ interface components$2 {
         DataResourceVariables: {
             [key: string]: string;
         };
+        /** @description Project map node information related to a component. */
+        CompositionProjectMapNodeInfo: {
+            /**
+             * Format: uuid
+             * @description Unique identifier for the project map node
+             */
+            id: string;
+            /** @description Path of the project map node */
+            path: string;
+            /**
+             * Format: uuid
+             * @description Unique identifier for the project map that this node belongs to.
+             */
+            projectMapId: string;
+        };
     };
 }
 
@@ -692,6 +709,8 @@ interface external$5 {
                     };
                     /** @description Public ID of alternate visual appearance for this component, if any selected */
                     variant?: string;
+                    /** @description Project map nodes associated with this component.  Must pass withProjectMapNodes parameter to be populated. */
+                    projectMapNodes?: external$5["uniform-canvas-types.swagger.yml"]["components"]["schemas"]["CompositionProjectMapNodeInfo"][];
                     /** @description Slots containing any child components */
                     slots?: {
                         [key: string]: external$5["uniform-canvas-types.swagger.yml"]["components"]["schemas"]["ComponentInstance"][];
@@ -844,6 +863,21 @@ interface external$5 {
                 DataResourceVariables: {
                     [key: string]: string;
                 };
+                /** @description Project map node information related to a component. */
+                CompositionProjectMapNodeInfo: {
+                    /**
+                     * Format: uuid
+                     * @description Unique identifier for the project map node
+                     */
+                    id: string;
+                    /** @description Path of the project map node */
+                    path: string;
+                    /**
+                     * Format: uuid
+                     * @description Unique identifier for the project map that this node belongs to.
+                     */
+                    projectMapId: string;
+                };
             };
         };
         operations: {};
@@ -968,6 +1002,8 @@ interface paths$3 {
                      * This internal status is subject to change without notice, and is thus marked deprecated to discourage use of internal data.
                      */
                     withUIStatus?: components$1["parameters"]["withUIStatus"];
+                    /** Includes project map node information in the composition results */
+                    withProjectMapNodes?: components$1["parameters"]["withProjectMapNodes"];
                 };
             };
             responses: {
@@ -1169,6 +1205,8 @@ interface components$1 {
          * This internal status is subject to change without notice, and is thus marked deprecated to discourage use of internal data.
          */
         uiStatus: ("Draft" | "Modified" | "Published" | "Orphan")[];
+        /** @description Includes project map node information in the composition results */
+        withProjectMapNodes: boolean;
         /** @description Filters composition lists by the user who created them. The user is specified by their identity subject. */
         createdBy: string;
         /** @description Filters composition lists by the user who last updated them. The user is specified by their identity subject. */
@@ -1423,6 +1461,8 @@ interface external$4 {
                     };
                     /** @description Public ID of alternate visual appearance for this component, if any selected */
                     variant?: string;
+                    /** @description Project map nodes associated with this component.  Must pass withProjectMapNodes parameter to be populated. */
+                    projectMapNodes?: external$4["uniform-canvas-types.swagger.yml"]["components"]["schemas"]["CompositionProjectMapNodeInfo"][];
                     /** @description Slots containing any child components */
                     slots?: {
                         [key: string]: external$4["uniform-canvas-types.swagger.yml"]["components"]["schemas"]["ComponentInstance"][];
@@ -1575,6 +1615,21 @@ interface external$4 {
                 DataResourceVariables: {
                     [key: string]: string;
                 };
+                /** @description Project map node information related to a component. */
+                CompositionProjectMapNodeInfo: {
+                    /**
+                     * Format: uuid
+                     * @description Unique identifier for the project map node
+                     */
+                    id: string;
+                    /** @description Path of the project map node */
+                    path: string;
+                    /**
+                     * Format: uuid
+                     * @description Unique identifier for the project map that this node belongs to.
+                     */
+                    projectMapId: string;
+                };
             };
         };
         operations: {};
@@ -1934,6 +1989,8 @@ interface external$3 {
                     };
                     /** @description Public ID of alternate visual appearance for this component, if any selected */
                     variant?: string;
+                    /** @description Project map nodes associated with this component.  Must pass withProjectMapNodes parameter to be populated. */
+                    projectMapNodes?: external$3["../../../lambda/functions/uniform-canvas-types.swagger.yml"]["components"]["schemas"]["CompositionProjectMapNodeInfo"][];
                     /** @description Slots containing any child components */
                     slots?: {
                         [key: string]: external$3["../../../lambda/functions/uniform-canvas-types.swagger.yml"]["components"]["schemas"]["ComponentInstance"][];
@@ -2086,6 +2143,21 @@ interface external$3 {
                 DataResourceVariables: {
                     [key: string]: string;
                 };
+                /** @description Project map node information related to a component. */
+                CompositionProjectMapNodeInfo: {
+                    /**
+                     * Format: uuid
+                     * @description Unique identifier for the project map node
+                     */
+                    id: string;
+                    /** @description Path of the project map node */
+                    path: string;
+                    /**
+                     * Format: uuid
+                     * @description Unique identifier for the project map that this node belongs to.
+                     */
+                    projectMapId: string;
+                };
             };
         };
         operations: {};
@@ -2170,6 +2242,8 @@ interface external$3 {
                              * This internal status is subject to change without notice, and is thus marked deprecated to discourage use of internal data.
                              */
                             withUIStatus?: external$3["../../../lambda/functions/v1-canvas.swagger.yml"]["components"]["parameters"]["withUIStatus"];
+                            /** Includes project map node information in the composition results */
+                            withProjectMapNodes?: external$3["../../../lambda/functions/v1-canvas.swagger.yml"]["components"]["parameters"]["withProjectMapNodes"];
                         };
                     };
                     responses: {
@@ -2371,6 +2445,8 @@ interface external$3 {
                  * This internal status is subject to change without notice, and is thus marked deprecated to discourage use of internal data.
                  */
                 uiStatus: ("Draft" | "Modified" | "Published" | "Orphan")[];
+                /** @description Includes project map node information in the composition results */
+                withProjectMapNodes: boolean;
                 /** @description Filters composition lists by the user who created them. The user is specified by their identity subject. */
                 createdBy: string;
                 /** @description Filters composition lists by the user who last updated them. The user is specified by their identity subject. */
@@ -2568,8 +2644,14 @@ interface paths$2 {
                         data: external$2["uniform-canvas-types.swagger.yml"]["components"]["schemas"]["DataSource"];
                         /** Format: uuid */
                         projectId: string;
-                        /** Format: uuid */
-                        integrationId: string;
+                        /**
+                         * Format: uuid
+                         * @deprecated
+                         * @description Do not use. Will be removed in future.
+                         */
+                        integrationId?: string;
+                        /** @description The integration type that the data source is attached to. Must be installed in the project. */
+                        integrationType?: string;
                     };
                 };
             };
@@ -2839,6 +2921,8 @@ interface external$2 {
                     };
                     /** @description Public ID of alternate visual appearance for this component, if any selected */
                     variant?: string;
+                    /** @description Project map nodes associated with this component.  Must pass withProjectMapNodes parameter to be populated. */
+                    projectMapNodes?: external$2["uniform-canvas-types.swagger.yml"]["components"]["schemas"]["CompositionProjectMapNodeInfo"][];
                     /** @description Slots containing any child components */
                     slots?: {
                         [key: string]: external$2["uniform-canvas-types.swagger.yml"]["components"]["schemas"]["ComponentInstance"][];
@@ -2991,6 +3075,21 @@ interface external$2 {
                 DataResourceVariables: {
                     [key: string]: string;
                 };
+                /** @description Project map node information related to a component. */
+                CompositionProjectMapNodeInfo: {
+                    /**
+                     * Format: uuid
+                     * @description Unique identifier for the project map node
+                     */
+                    id: string;
+                    /** @description Path of the project map node */
+                    path: string;
+                    /**
+                     * Format: uuid
+                     * @description Unique identifier for the project map that this node belongs to.
+                     */
+                    projectMapId: string;
+                };
             };
         };
         operations: {};
@@ -3275,6 +3374,8 @@ interface external$1 {
                     };
                     /** @description Public ID of alternate visual appearance for this component, if any selected */
                     variant?: string;
+                    /** @description Project map nodes associated with this component.  Must pass withProjectMapNodes parameter to be populated. */
+                    projectMapNodes?: external$1["uniform-canvas-types.swagger.yml"]["components"]["schemas"]["CompositionProjectMapNodeInfo"][];
                     /** @description Slots containing any child components */
                     slots?: {
                         [key: string]: external$1["uniform-canvas-types.swagger.yml"]["components"]["schemas"]["ComponentInstance"][];
@@ -3427,6 +3528,21 @@ interface external$1 {
                 DataResourceVariables: {
                     [key: string]: string;
                 };
+                /** @description Project map node information related to a component. */
+                CompositionProjectMapNodeInfo: {
+                    /**
+                     * Format: uuid
+                     * @description Unique identifier for the project map node
+                     */
+                    id: string;
+                    /** @description Path of the project map node */
+                    path: string;
+                    /**
+                     * Format: uuid
+                     * @description Unique identifier for the project map that this node belongs to.
+                     */
+                    projectMapId: string;
+                };
             };
         };
         operations: {};
@@ -3746,6 +3862,8 @@ interface external {
                     };
                     /** @description Public ID of alternate visual appearance for this component, if any selected */
                     variant?: string;
+                    /** @description Project map nodes associated with this component.  Must pass withProjectMapNodes parameter to be populated. */
+                    projectMapNodes?: external["uniform-canvas-types.swagger.yml"]["components"]["schemas"]["CompositionProjectMapNodeInfo"][];
                     /** @description Slots containing any child components */
                     slots?: {
                         [key: string]: external["uniform-canvas-types.swagger.yml"]["components"]["schemas"]["ComponentInstance"][];
@@ -3898,6 +4016,21 @@ interface external {
                 DataResourceVariables: {
                     [key: string]: string;
                 };
+                /** @description Project map node information related to a component. */
+                CompositionProjectMapNodeInfo: {
+                    /**
+                     * Format: uuid
+                     * @description Unique identifier for the project map node
+                     */
+                    id: string;
+                    /** @description Path of the project map node */
+                    path: string;
+                    /**
+                     * Format: uuid
+                     * @description Unique identifier for the project map that this node belongs to.
+                     */
+                    projectMapId: string;
+                };
             };
         };
         operations: {};

package/dist/index.d.ts

@@ -1,15 +1,18 @@
 import { ApiClient, ClientOptions, ExceptProject, ApiClientError } from '@uniformdev/context/api';
 export { ApiClientError } from '@uniformdev/context/api';
-import { C as CompositionGetParameters, a as CompositionGetByNodePathParameters, D as DataResolutionOptionNegative, b as CompositionGetResponse, c as DataResolutionOptionPositive, d as DataResolutionParameters, e as CompositionResolvedGetResponse, f as CompositionGetValidResponses, g as DataResolutionOption, h as CompositionGetByNodeIdParameters, i as CompositionGetBySlugParameters, j as CompositionGetByIdParameters, k as CompositionPutParameters, l as CompositionDeleteParameters, m as ComponentDefinitionGetParameters, n as ComponentDefinitionPutParameters, o as ComponentDefinitionDeleteParameters, p as ComponentInstance, q as ComponentParameter, r as components, s as DataSourceGetParameters, t as DataSourcesGetParameters, u as DataSourcePutParameters, v as DataSourceDeleteParameters, w as DataTypeGetParameters, x as DataTypeGetResponse, y as DataTypePutParameters, z as DataTypeDeleteParameters, R as RootComponentInstance, P as PreviewEventBus } from './createEventBus-bd2e0a92.js';
-export { a1 as CanvasDefinitions, A as ChannelSubscription, O as ComponentDefinition, H as ComponentDefinitionAPIDeleteRequest, G as ComponentDefinitionAPIPutRequest, F as ComponentDefinitionAPIResponse, o as ComponentDefinitionDeleteParameters, m as ComponentDefinitionGetParameters, E as ComponentDefinitionGetResponse, I as ComponentDefinitionListAPIOptions, J as ComponentDefinitionParameter, N as ComponentDefinitionPermission, n as ComponentDefinitionPutParameters, M as ComponentDefinitionSlot, L as ComponentDefinitionSlugSettings, K as ComponentDefinitionVariant, p as ComponentInstance, q as ComponentParameter, W as CompositionAPIDeleteRequest, Y as CompositionAPIOptions, V as CompositionAPIResponse, a8 as CompositionDataDiagnostic, l as CompositionDeleteParameters, j as CompositionGetByIdParameters, h as CompositionGetByNodeIdParameters, a as CompositionGetByNodePathParameters, i as CompositionGetBySlugParameters, U as CompositionGetListResponse, S as CompositionGetOrderBy, C as CompositionGetParameters, b as CompositionGetResponse, f as CompositionGetValidResponses, a2 as CompositionIssue, X as CompositionListAPIResponse, a3 as CompositionPatternIssue, k as CompositionPutParameters, e as CompositionResolvedGetResponse, T as CompositionUIStatus, Q as CreatingComponentDefinition, a4 as DataElementBindingIssue, Z as DataElementConnectionDefinition, a7 as DataResolutionConfigIssue, g as DataResolutionOption, D as DataResolutionOptionNegative, c as DataResolutionOptionPositive, d as DataResolutionParameters, a0 as DataResourceDefinition, $ as DataResourceDefinitions, a5 as DataResourceIssue, a6 as DataResourceVariableIssue, _ as DataResourceVariables, ac as DataSource, v as DataSourceDeleteParameters, s as DataSourceGetParameters, a9 as DataSourceGetResponse, u as DataSourcePutParameters, t as DataSourcesGetParameters, aa as DataSourcesGetResponse, ab as DataType, z as DataTypeDeleteParameters, w as DataTypeGetParameters, x as DataTypeGetResponse, y as DataTypePutParameters, ad as DataVariableDefinition, P as PreviewEventBus, R as RootComponentInstance, B as createEventBus } from './createEventBus-bd2e0a92.js';
+import { C as CompositionGetParameters, a as CompositionGetByNodePathParameters, D as DataResolutionOptionNegative, b as CompositionGetResponse, c as DataResolutionOptionPositive, d as DataResolutionParameters, e as CompositionResolvedGetResponse, f as CompositionGetValidResponses, g as DataResolutionOption, h as CompositionGetByNodeIdParameters, i as CompositionGetBySlugParameters, j as CompositionGetByIdParameters, k as CompositionPutParameters, l as CompositionDeleteParameters, m as ComponentDefinitionGetParameters, n as ComponentDefinitionPutParameters, o as ComponentDefinitionDeleteParameters, p as ComponentInstance, q as ComponentParameter, r as components, s as DataSourceGetParameters, t as DataSourcesGetParameters, u as DataSourcePutParameters, v as DataSourceDeleteParameters, w as DataTypeGetParameters, x as DataTypeGetResponse, y as DataTypePutParameters, z as DataTypeDeleteParameters, R as RootComponentInstance, P as PreviewEventBus } from './createEventBus-db0afea5.js';
+export { a1 as CanvasDefinitions, A as ChannelSubscription, O as ComponentDefinition, H as ComponentDefinitionAPIDeleteRequest, G as ComponentDefinitionAPIPutRequest, F as ComponentDefinitionAPIResponse, o as ComponentDefinitionDeleteParameters, m as ComponentDefinitionGetParameters, E as ComponentDefinitionGetResponse, I as ComponentDefinitionListAPIOptions, J as ComponentDefinitionParameter, N as ComponentDefinitionPermission, n as ComponentDefinitionPutParameters, M as ComponentDefinitionSlot, L as ComponentDefinitionSlugSettings, K as ComponentDefinitionVariant, p as ComponentInstance, q as ComponentParameter, W as CompositionAPIDeleteRequest, Y as CompositionAPIOptions, V as CompositionAPIResponse, a8 as CompositionDataDiagnostic, l as CompositionDeleteParameters, j as CompositionGetByIdParameters, h as CompositionGetByNodeIdParameters, a as CompositionGetByNodePathParameters, i as CompositionGetBySlugParameters, U as CompositionGetListResponse, S as CompositionGetOrderBy, C as CompositionGetParameters, b as CompositionGetResponse, f as CompositionGetValidResponses, a2 as CompositionIssue, X as CompositionListAPIResponse, a3 as CompositionPatternIssue, k as CompositionPutParameters, e as CompositionResolvedGetResponse, T as CompositionUIStatus, Q as CreatingComponentDefinition, a4 as DataElementBindingIssue, Z as DataElementConnectionDefinition, a7 as DataResolutionConfigIssue, g as DataResolutionOption, D as DataResolutionOptionNegative, c as DataResolutionOptionPositive, d as DataResolutionParameters, a0 as DataResourceDefinition, $ as DataResourceDefinitions, a5 as DataResourceIssue, a6 as DataResourceVariableIssue, _ as DataResourceVariables, ac as DataSource, v as DataSourceDeleteParameters, s as DataSourceGetParameters, a9 as DataSourceGetResponse, u as DataSourcePutParameters, t as DataSourcesGetParameters, aa as DataSourcesGetResponse, ab as DataType, z as DataTypeDeleteParameters, w as DataTypeGetParameters, x as DataTypeGetResponse, y as DataTypePutParameters, ad as DataVariableDefinition, P as PreviewEventBus, R as RootComponentInstance, B as createEventBus } from './createEventBus-db0afea5.js';
 import { Options as Options$1 } from 'p-retry';
 import { Options } from 'p-throttle';
 import { PersonalizedVariant, TestVariant } from '@uniformdev/context';
 import 'pusher-js';
 
-declare class CanvasClient extends ApiClient<ClientOptions> {
-    constructor(options: ClientOptions);
-    private canvasUrl;
+type CanvasClientOptions = ClientOptions & {
+    edgeApiHost?: string;
+};
+declare class CanvasClient extends ApiClient<CanvasClientOptions> {
+    private edgeApiHost;
+    constructor(options: CanvasClientOptions);
     /** Fetches lists of Canvas compositions, optionally by type */
     getCompositionList(options?: Omit<CompositionGetParameters, 'projectId' | 'compositionId' | 'slug'>): Promise<{
         compositions: {
@@ -33,6 +36,11 @@ declare class CanvasClient extends ApiClient<ClientOptions> {
                     };
                 } | undefined;
                 variant?: string | undefined;
+                projectMapNodes?: {
+                    id: string;
+                    path: string;
+                    projectMapId: string;
+                }[] | undefined;
                 slots?: {
                     [key: string]: {
                         type: string;
@@ -199,7 +207,7 @@ declare class CanvasClient extends ApiClient<ClientOptions> {
     removeComponentDefinition(body: Omit<ComponentDefinitionDeleteParameters, 'projectId'>): Promise<void>;
 }
 declare class UncachedCanvasClient extends CanvasClient {
-    constructor(options: Omit<ClientOptions, 'bypassCache'>);
+    constructor(options: Omit<CanvasClientOptions, 'bypassCache'>);
 }
 
 type EnhancerContext = {
@@ -704,6 +712,11 @@ declare const createUniformApiEnhancer: ({ apiUrl }: {
         };
     } | undefined;
     variant?: string | undefined;
+    projectMapNodes?: {
+        id: string;
+        path: string;
+        projectMapId: string;
+    }[] | undefined;
     slots?: {
         [key: string]: {
             type: string;

package/dist/index.esm.js

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

package/dist/index.js

@@ -513,17 +513,19 @@ 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.canvasUrl = "/api/v1/canvas";
+    this.edgeApiHost = (_a = options.edgeApiHost) != null ? _a : "https://uniform.global";
   }
   async getCompositionList(options) {
     const { projectId } = this.options;
-    const fetchUri = this.createUrl(this.canvasUrl, { ...options, projectId });
+    const fetchUri = this.createUrl(CANVAS_URL, { ...options, projectId });
     return await this.apiClient(fetchUri);
   }
   unstable_getCompositionByNodePath(options) {
@@ -545,20 +547,20 @@ var CanvasClient = class extends import_api.ApiClient {
     ...params
   }) {
     const { projectId } = this.options;
-    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";
-      }
+    if (!resolveData) {
+      return this.apiClient(this.createUrl(CANVAS_URL, { ...params, projectId }));
     }
-    return this.apiClient(this.createUrl(url, { ...params, ...dataResolutionParams, projectId }));
+    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);
   }
   async updateComposition(body) {
-    const fetchUri = this.createUrl("/api/v1/canvas");
+    const fetchUri = this.createUrl(CANVAS_URL);
     await this.apiClient(fetchUri, {
       method: "PUT",
       body: JSON.stringify({ ...body, projectId: this.options.projectId }),
@@ -566,7 +568,7 @@ var CanvasClient = class extends import_api.ApiClient {
     });
   }
   async removeComposition(body) {
-    const fetchUri = this.createUrl("/api/v1/canvas");
+    const fetchUri = this.createUrl(CANVAS_URL);
     const { projectId } = this.options;
     await this.apiClient(fetchUri, {
       method: "DELETE",

package/dist/index.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas",
-  "version": "18.2.2",
+  "version": "18.3.1-alpha.21+5789df064",
   "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.2.2",
+    "@uniformdev/cli": "18.3.1-alpha.21+5789df064",
     "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.2.2"
+    "@uniformdev/context": "18.3.1-alpha.21+5789df064"
   },
   "files": [
     "/dist"
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eb69f934f799579fdd71d5dc7dba0375bbb5c265"
+  "gitHead": "5789df064396b6ab274cdaf44743d48bc1542dc4"
 }