@makeswift/runtime 0.29.3-canary.1 → 0.29.3-canary.2

package/dist/cjs/api/graphql-api-client.js

@@ -27,7 +27,7 @@ class MakeswiftGraphQLApiClient {
   graphqlClient;
   constructor({ endpoint }) {
     this.graphqlClient = new import_client.GraphQLClient(endpoint, {
-      "makeswift-runtime-version": "0.29.3-canary.1"
+      "makeswift-runtime-version": "0.29.3-canary.2"
     });
   }
   async getUnversionedResources({

package/dist/cjs/api/rest-api-client.js

@@ -257,7 +257,7 @@ class MakeswiftRestAPIClient {
     const requestHeaders = new Headers({
       "x-api-key": this.apiKey,
       "makeswift-site-api-key": this.apiKey,
-      "makeswift-runtime-version": "0.29.3-canary.1"
+      "makeswift-runtime-version": "0.29.3-canary.2"
     });
     if (siteVersion?.token) {
       requestUrl.searchParams.set("version", siteVersion.version);

package/dist/cjs/api-handler/handlers/manifest.js

@@ -28,7 +28,7 @@ async function manifestHandler(req, { apiKey, manifest }) {
     return import_request_response.ApiResponse.json({ message: "Unauthorized" }, { status: 401 });
   }
   return import_request_response.ApiResponse.json({
-    version: "0.29.3-canary.1",
+    version: "0.29.3-canary.2",
     interactionMode: true,
     clientSideNavigation: false,
     elementFromPoint: false,

package/dist/cjs/next/components/tests/controls/color-control/fixtures.js

@@ -19,11 +19,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var fixtures_exports = {};
 __export(fixtures_exports, {
   cacheData: () => cacheData,
+  inlineValue: () => inlineValue,
   swatch: () => swatch,
   swatchId: () => swatchId,
+  toDataV0: () => toDataV0,
+  toDataV1: () => toDataV1,
   value: () => value
 });
 module.exports = __toCommonJS(fixtures_exports);
+var import_controls = require("@makeswift/controls");
 var import_api = require("../../../../../api");
 const swatchId = "[swatch-test-id]";
 const swatch = {
@@ -33,9 +37,21 @@ const swatch = {
   lightness: 49
 };
 const value = {
+  type: "swatch",
   swatchId,
   alpha: 0.5
 };
+const inlineValue = {
+  type: "inline",
+  hue: 238,
+  saturation: 87,
+  lightness: 49,
+  alpha: 0.5
+};
+const v0Definition = new import_controls.ColorDefinition({}, void 0);
+const v1Definition = new import_controls.ColorDefinition({}, 1);
+const toDataV0 = (value2) => v0Definition.toData(value2);
+const toDataV1 = (value2) => v1Definition.toData(value2);
 const cacheData = (swatch2) => ({
   apiResources: {
     Swatch: [{ id: swatchId, value: swatch2 == null ? null : { id: swatchId, ...swatch2 } }]
@@ -44,8 +60,11 @@ const cacheData = (swatch2) => ({
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   cacheData,
+  inlineValue,
   swatch,
   swatchId,
+  toDataV0,
+  toDataV1,
   value
 });
 //# sourceMappingURL=fixtures.js.map

package/dist/cjs/next/components/tests/controls/color-control/fixtures.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../src/next/components/tests/controls/color-control/fixtures.ts"],"sourcesContent":["import { type ValueType } from '@makeswift/controls'\nimport { ColorDefinition } from '@makeswift/controls'\n\nimport { APIResourceType, type Swatch } from '../../../../../api'\nimport { type CacheData } from '../../../../../api/api-resources-client'\n\ntype SwatchData = Omit<Swatch, 'id'>\n\nexport const swatchId = '[swatch-test-id]'\nexport const swatch: SwatchData = {\n  __typename: APIResourceType.Swatch,\n  hue: 238,\n  saturation: 87,\n  lightness: 49,\n}\n\nexport const value: ValueType<ColorDefinition> = {\n  swatchId,\n  alpha: 0.5,\n}\n\nexport const cacheData = (swatch: SwatchData | null): Partial<CacheData> => ({\n  apiResources: {\n    Swatch: [{ id: swatchId, value: swatch == null ? null : { id: swatchId, ...swatch } }],\n  },\n})\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGA,iBAA6C;AAKtC,MAAM,WAAW;AACjB,MAAM,SAAqB;AAAA,EAChC,YAAY,2BAAgB;AAAA,EAC5B,KAAK;AAAA,EACL,YAAY;AAAA,EACZ,WAAW;AACb;AAEO,MAAM,QAAoC;AAAA,EAC/C;AAAA,EACA,OAAO;AACT;AAEO,MAAM,YAAY,CAACA,aAAmD;AAAA,EAC3E,cAAc;AAAA,IACZ,QAAQ,CAAC,EAAE,IAAI,UAAU,OAAOA,WAAU,OAAO,OAAO,EAAE,IAAI,UAAU,GAAGA,QAAO,EAAE,CAAC;AAAA,EACvF;AACF;","names":["swatch"]}
+{"version":3,"sources":["../../../../../../../src/next/components/tests/controls/color-control/fixtures.ts"],"sourcesContent":["import { ColorDefinition, type ValueType } from '@makeswift/controls'\n\nimport { APIResourceType, type Swatch } from '../../../../../api'\nimport { type CacheData } from '../../../../../api/api-resources-client'\n\ntype SwatchData = Omit<Swatch, 'id'>\n\nexport const swatchId = '[swatch-test-id]'\nexport const swatch: SwatchData = {\n  __typename: APIResourceType.Swatch,\n  hue: 238,\n  saturation: 87,\n  lightness: 49,\n}\n\nexport const value: ValueType<ColorDefinition> = {\n  type: 'swatch',\n  swatchId,\n  alpha: 0.5,\n}\n\nexport const inlineValue: ValueType<ColorDefinition> = {\n  type: 'inline',\n  hue: 238,\n  saturation: 87,\n  lightness: 49,\n  alpha: 0.5,\n}\n\n// Writers for data produced by older versions of the control\nconst v0Definition = new ColorDefinition({}, undefined)\nconst v1Definition = new ColorDefinition({}, 1)\n\nexport const toDataV0 = (value: ValueType<ColorDefinition>) => v0Definition.toData(value)\nexport const toDataV1 = (value: ValueType<ColorDefinition>) => v1Definition.toData(value)\n\nexport const cacheData = (swatch: SwatchData | null): Partial<CacheData> => ({\n  apiResources: {\n    Swatch: [{ id: swatchId, value: swatch == null ? null : { id: swatchId, ...swatch } }],\n  },\n})\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,sBAAgD;AAEhD,iBAA6C;AAKtC,MAAM,WAAW;AACjB,MAAM,SAAqB;AAAA,EAChC,YAAY,2BAAgB;AAAA,EAC5B,KAAK;AAAA,EACL,YAAY;AAAA,EACZ,WAAW;AACb;AAEO,MAAM,QAAoC;AAAA,EAC/C,MAAM;AAAA,EACN;AAAA,EACA,OAAO;AACT;AAEO,MAAM,cAA0C;AAAA,EACrD,MAAM;AAAA,EACN,KAAK;AAAA,EACL,YAAY;AAAA,EACZ,WAAW;AAAA,EACX,OAAO;AACT;AAGA,MAAM,eAAe,IAAI,gCAAgB,CAAC,GAAG,MAAS;AACtD,MAAM,eAAe,IAAI,gCAAgB,CAAC,GAAG,CAAC;AAEvC,MAAM,WAAW,CAACA,WAAsC,aAAa,OAAOA,MAAK;AACjF,MAAM,WAAW,CAACA,WAAsC,aAAa,OAAOA,MAAK;AAEjF,MAAM,YAAY,CAACC,aAAmD;AAAA,EAC3E,cAAc;AAAA,IACZ,QAAQ,CAAC,EAAE,IAAI,UAAU,OAAOA,WAAU,OAAO,OAAO,EAAE,IAAI,UAAU,GAAGA,QAAO,EAAE,CAAC;AAAA,EACvF;AACF;","names":["value","swatch"]}

package/dist/esm/api/graphql-api-client.js

@@ -4,7 +4,7 @@ class MakeswiftGraphQLApiClient {
   graphqlClient;
   constructor({ endpoint }) {
     this.graphqlClient = new GraphQLClient(endpoint, {
-      "makeswift-runtime-version": "0.29.3-canary.1"
+      "makeswift-runtime-version": "0.29.3-canary.2"
     });
   }
   async getUnversionedResources({

package/dist/esm/api/rest-api-client.js

@@ -222,7 +222,7 @@ class MakeswiftRestAPIClient {
     const requestHeaders = new Headers({
       "x-api-key": this.apiKey,
       "makeswift-site-api-key": this.apiKey,
-      "makeswift-runtime-version": "0.29.3-canary.1"
+      "makeswift-runtime-version": "0.29.3-canary.2"
     });
     if (siteVersion?.token) {
       requestUrl.searchParams.set("version", siteVersion.version);

package/dist/esm/api-handler/handlers/manifest.js

@@ -8,7 +8,7 @@ async function manifestHandler(req, { apiKey, manifest }) {
     return ApiResponse.json({ message: "Unauthorized" }, { status: 401 });
   }
   return ApiResponse.json({
-    version: "0.29.3-canary.1",
+    version: "0.29.3-canary.2",
     interactionMode: true,
     clientSideNavigation: false,
     elementFromPoint: false,

package/dist/esm/next/components/tests/controls/color-control/fixtures.js

@@ -1,3 +1,4 @@
+import { ColorDefinition } from "@makeswift/controls";
 import { APIResourceType } from "../../../../../api";
 const swatchId = "[swatch-test-id]";
 const swatch = {
@@ -7,9 +8,21 @@ const swatch = {
   lightness: 49
 };
 const value = {
+  type: "swatch",
   swatchId,
   alpha: 0.5
 };
+const inlineValue = {
+  type: "inline",
+  hue: 238,
+  saturation: 87,
+  lightness: 49,
+  alpha: 0.5
+};
+const v0Definition = new ColorDefinition({}, void 0);
+const v1Definition = new ColorDefinition({}, 1);
+const toDataV0 = (value2) => v0Definition.toData(value2);
+const toDataV1 = (value2) => v1Definition.toData(value2);
 const cacheData = (swatch2) => ({
   apiResources: {
     Swatch: [{ id: swatchId, value: swatch2 == null ? null : { id: swatchId, ...swatch2 } }]
@@ -17,8 +30,11 @@ const cacheData = (swatch2) => ({
 });
 export {
   cacheData,
+  inlineValue,
   swatch,
   swatchId,
+  toDataV0,
+  toDataV1,
   value
 };
 //# sourceMappingURL=fixtures.js.map

package/dist/esm/next/components/tests/controls/color-control/fixtures.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../../src/next/components/tests/controls/color-control/fixtures.ts"],"sourcesContent":["import { type ValueType } from '@makeswift/controls'\nimport { ColorDefinition } from '@makeswift/controls'\n\nimport { APIResourceType, type Swatch } from '../../../../../api'\nimport { type CacheData } from '../../../../../api/api-resources-client'\n\ntype SwatchData = Omit<Swatch, 'id'>\n\nexport const swatchId = '[swatch-test-id]'\nexport const swatch: SwatchData = {\n  __typename: APIResourceType.Swatch,\n  hue: 238,\n  saturation: 87,\n  lightness: 49,\n}\n\nexport const value: ValueType<ColorDefinition> = {\n  swatchId,\n  alpha: 0.5,\n}\n\nexport const cacheData = (swatch: SwatchData | null): Partial<CacheData> => ({\n  apiResources: {\n    Swatch: [{ id: swatchId, value: swatch == null ? null : { id: swatchId, ...swatch } }],\n  },\n})\n"],"mappings":"AAGA,SAAS,uBAAoC;AAKtC,MAAM,WAAW;AACjB,MAAM,SAAqB;AAAA,EAChC,YAAY,gBAAgB;AAAA,EAC5B,KAAK;AAAA,EACL,YAAY;AAAA,EACZ,WAAW;AACb;AAEO,MAAM,QAAoC;AAAA,EAC/C;AAAA,EACA,OAAO;AACT;AAEO,MAAM,YAAY,CAACA,aAAmD;AAAA,EAC3E,cAAc;AAAA,IACZ,QAAQ,CAAC,EAAE,IAAI,UAAU,OAAOA,WAAU,OAAO,OAAO,EAAE,IAAI,UAAU,GAAGA,QAAO,EAAE,CAAC;AAAA,EACvF;AACF;","names":["swatch"]}
+{"version":3,"sources":["../../../../../../../src/next/components/tests/controls/color-control/fixtures.ts"],"sourcesContent":["import { ColorDefinition, type ValueType } from '@makeswift/controls'\n\nimport { APIResourceType, type Swatch } from '../../../../../api'\nimport { type CacheData } from '../../../../../api/api-resources-client'\n\ntype SwatchData = Omit<Swatch, 'id'>\n\nexport const swatchId = '[swatch-test-id]'\nexport const swatch: SwatchData = {\n  __typename: APIResourceType.Swatch,\n  hue: 238,\n  saturation: 87,\n  lightness: 49,\n}\n\nexport const value: ValueType<ColorDefinition> = {\n  type: 'swatch',\n  swatchId,\n  alpha: 0.5,\n}\n\nexport const inlineValue: ValueType<ColorDefinition> = {\n  type: 'inline',\n  hue: 238,\n  saturation: 87,\n  lightness: 49,\n  alpha: 0.5,\n}\n\n// Writers for data produced by older versions of the control\nconst v0Definition = new ColorDefinition({}, undefined)\nconst v1Definition = new ColorDefinition({}, 1)\n\nexport const toDataV0 = (value: ValueType<ColorDefinition>) => v0Definition.toData(value)\nexport const toDataV1 = (value: ValueType<ColorDefinition>) => v1Definition.toData(value)\n\nexport const cacheData = (swatch: SwatchData | null): Partial<CacheData> => ({\n  apiResources: {\n    Swatch: [{ id: swatchId, value: swatch == null ? null : { id: swatchId, ...swatch } }],\n  },\n})\n"],"mappings":"AAAA,SAAS,uBAAuC;AAEhD,SAAS,uBAAoC;AAKtC,MAAM,WAAW;AACjB,MAAM,SAAqB;AAAA,EAChC,YAAY,gBAAgB;AAAA,EAC5B,KAAK;AAAA,EACL,YAAY;AAAA,EACZ,WAAW;AACb;AAEO,MAAM,QAAoC;AAAA,EAC/C,MAAM;AAAA,EACN;AAAA,EACA,OAAO;AACT;AAEO,MAAM,cAA0C;AAAA,EACrD,MAAM;AAAA,EACN,KAAK;AAAA,EACL,YAAY;AAAA,EACZ,WAAW;AAAA,EACX,OAAO;AACT;AAGA,MAAM,eAAe,IAAI,gBAAgB,CAAC,GAAG,MAAS;AACtD,MAAM,eAAe,IAAI,gBAAgB,CAAC,GAAG,CAAC;AAEvC,MAAM,WAAW,CAACA,WAAsC,aAAa,OAAOA,MAAK;AACjF,MAAM,WAAW,CAACA,WAAsC,aAAa,OAAOA,MAAK;AAEjF,MAAM,YAAY,CAACC,aAAmD;AAAA,EAC3E,cAAc;AAAA,IACZ,QAAQ,CAAC,EAAE,IAAI,UAAU,OAAOA,WAAU,OAAO,OAAO,EAAE,IAAI,UAAU,GAAGA,QAAO,EAAE,CAAC;AAAA,EACvF;AACF;","names":["value","swatch"]}

package/dist/types/controls/rich-text-v2/rich-text-v2.d.ts

@@ -732,7 +732,7 @@ declare class Definition extends BaseRichTextDefinition<ReactNode, Config, Insta
             }>>>;
             data: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
         }, "strip", z.ZodTypeAny, {
-            object?: "value" | "text" | "block" | "inline" | "document" | "leaf" | "selection" | "mark" | "range" | "decoration" | "annotation" | "point" | "operation" | undefined;
+            object?: "value" | "text" | "inline" | "block" | "document" | "leaf" | "selection" | "mark" | "range" | "decoration" | "annotation" | "point" | "operation" | undefined;
             document?: {
                 object?: "document" | undefined;
                 nodes?: (any | {
@@ -854,7 +854,7 @@ declare class Definition extends BaseRichTextDefinition<ReactNode, Config, Insta
             }> | undefined;
             data?: Record<string, any> | undefined;
         }, {
-            object?: "value" | "text" | "block" | "inline" | "document" | "leaf" | "selection" | "mark" | "range" | "decoration" | "annotation" | "point" | "operation" | undefined;
+            object?: "value" | "text" | "inline" | "block" | "document" | "leaf" | "selection" | "mark" | "range" | "decoration" | "annotation" | "point" | "operation" | undefined;
             document?: {
                 object?: "document" | undefined;
                 nodes?: (any | {
@@ -1230,7 +1230,7 @@ declare class Definition extends BaseRichTextDefinition<ReactNode, Config, Insta
             }>>>;
             data: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
         }, "strip", z.ZodTypeAny, {
-            object?: "value" | "text" | "block" | "inline" | "document" | "leaf" | "selection" | "mark" | "range" | "decoration" | "annotation" | "point" | "operation" | undefined;
+            object?: "value" | "text" | "inline" | "block" | "document" | "leaf" | "selection" | "mark" | "range" | "decoration" | "annotation" | "point" | "operation" | undefined;
             document?: {
                 object?: "document" | undefined;
                 nodes?: (any | {
@@ -1352,7 +1352,7 @@ declare class Definition extends BaseRichTextDefinition<ReactNode, Config, Insta
             }> | undefined;
             data?: Record<string, any> | undefined;
         }, {
-            object?: "value" | "text" | "block" | "inline" | "document" | "leaf" | "selection" | "mark" | "range" | "decoration" | "annotation" | "point" | "operation" | undefined;
+            object?: "value" | "text" | "inline" | "block" | "document" | "leaf" | "selection" | "mark" | "range" | "decoration" | "annotation" | "point" | "operation" | undefined;
             document?: {
                 object?: "document" | undefined;
                 nodes?: (any | {

package/dist/types/next/components/tests/controls/color-control/fixtures.d.ts

@@ -1,11 +1,45 @@
-import { type ValueType } from '@makeswift/controls';
-import { ColorDefinition } from '@makeswift/controls';
+import { ColorDefinition, type ValueType } from '@makeswift/controls';
 import { type Swatch } from '../../../../../api';
 import { type CacheData } from '../../../../../api/api-resources-client';
 type SwatchData = Omit<Swatch, 'id'>;
 export declare const swatchId = "[swatch-test-id]";
 export declare const swatch: SwatchData;
 export declare const value: ValueType<ColorDefinition>;
+export declare const inlineValue: ValueType<ColorDefinition>;
+export declare const toDataV0: (value: ValueType<ColorDefinition>) => {
+    type: "swatch";
+    "@@makeswift/type": "color::v2";
+    swatchId: string;
+    alpha: number;
+} | {
+    type: "inline";
+    "@@makeswift/type": "color::v2";
+    hue: number;
+    saturation: number;
+    lightness: number;
+    alpha: number;
+} | {
+    swatchId: string;
+    alpha: number;
+    "@@makeswift/type"?: "color::v1" | undefined;
+};
+export declare const toDataV1: (value: ValueType<ColorDefinition>) => {
+    type: "swatch";
+    "@@makeswift/type": "color::v2";
+    swatchId: string;
+    alpha: number;
+} | {
+    type: "inline";
+    "@@makeswift/type": "color::v2";
+    hue: number;
+    saturation: number;
+    lightness: number;
+    alpha: number;
+} | {
+    swatchId: string;
+    alpha: number;
+    "@@makeswift/type"?: "color::v1" | undefined;
+};
 export declare const cacheData: (swatch: SwatchData | null) => Partial<CacheData>;
 export {};
 //# sourceMappingURL=fixtures.d.ts.map

package/dist/types/next/components/tests/controls/color-control/fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../../../../../../src/next/components/tests/controls/color-control/fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,OAAO,EAAmB,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,yCAAyC,CAAA;AAExE,KAAK,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AAEpC,eAAO,MAAM,QAAQ,qBAAqB,CAAA;AAC1C,eAAO,MAAM,MAAM,EAAE,UAKpB,CAAA;AAED,eAAO,MAAM,KAAK,EAAE,SAAS,CAAC,eAAe,CAG5C,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,QAAQ,UAAU,GAAG,IAAI,KAAG,OAAO,CAAC,SAAS,CAIrE,CAAA"}
+{"version":3,"file":"fixtures.d.ts","sourceRoot":"","sources":["../../../../../../../src/next/components/tests/controls/color-control/fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,KAAK,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAErE,OAAO,EAAmB,KAAK,MAAM,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,yCAAyC,CAAA;AAExE,KAAK,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;AAEpC,eAAO,MAAM,QAAQ,qBAAqB,CAAA;AAC1C,eAAO,MAAM,MAAM,EAAE,UAKpB,CAAA;AAED,eAAO,MAAM,KAAK,EAAE,SAAS,CAAC,eAAe,CAI5C,CAAA;AAED,eAAO,MAAM,WAAW,EAAE,SAAS,CAAC,eAAe,CAMlD,CAAA;AAMD,eAAO,MAAM,QAAQ,GAAI,OAAO,SAAS,CAAC,eAAe,CAAC;;;;;;;;;;;;;;;;CAA+B,CAAA;AACzF,eAAO,MAAM,QAAQ,GAAI,OAAO,SAAS,CAAC,eAAe,CAAC;;;;;;;;;;;;;;;;CAA+B,CAAA;AAEzF,eAAO,MAAM,SAAS,GAAI,QAAQ,UAAU,GAAG,IAAI,KAAG,OAAO,CAAC,SAAS,CAIrE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@makeswift/runtime",
-  "version": "0.29.3-canary.1",
+  "version": "0.29.3-canary.2",
   "license": "MIT",
   "repository": {
     "url": "makeswift/makeswift",
@@ -242,9 +242,9 @@
     "use-sync-external-store": "^1.5.0",
     "uuid": "^9.0.0",
     "zod": "^3.21.4",
-    "@makeswift/controls": "0.1.23",
+    "@makeswift/controls": "0.1.24-canary.0",
     "@makeswift/next-plugin": "0.6.1",
-    "@makeswift/prop-controllers": "0.4.17"
+    "@makeswift/prop-controllers": "0.4.18-canary.0"
   },
   "devDependencies": {
     "@graphql-codegen/add": "^3.1.0",