@uploadcare/file-uploader 1.17.2 → 1.17.3-alpha.0

package/blocks/Config/Config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["Config.js"],"names":[],"mappings":"AAcA;;;;;;;;;;;;;GAaG;AACH,gCAXU,CACT,UAAc,EACd,0BAA8B,EAC9B,gCAAoC,EACpC,gCAAoC,EACpC,kBAAsB,EACtB,gBAAoB,EACpB,sBAA0B,EAC1B,sBAA0B,CACvB,CAWF;qBAyNY,OAAO,2BAA2B,EAAE,UAAU,CAAC,OAAO,WAAW,EAAE,OAAO,aAAa,EAAE,UAAU,CAAC;AAAlH,6HAA6H;AAG7H,qBAAiC,MAAM,CAA4C;AA/LnF;IAkBE;;;;OAIG;IACH,+BAYC;IAED;;;;OAIG;IACH,2BAQC;IAED;;;;OAIG;IACH,kBAyBC;IAED;;;OAGG;IACH,kBAIC;IAED;;;;OAIG;IACH,wCAJW,MAAM,iBACN,OAAO,aACP,OAAO,QAoBjB;IA0CD;;;;OAIG;IACH,+BAJW,MAAM,OAAO,gBAAgB,UAC7B,MAAM,UACN,MAAM,QAahB;CACF;sBAjPqB,yBAAyB;AAwD/C,0CAA0C;AAC1C,gCAAoC,MAAM,CAAC,MAAM,OAAO,aAAa,EAAE,oBAAoB,EAAE,MAAM,CAAC,CAGjG"}
+{"version":3,"file":"Config.d.ts","sourceRoot":"","sources":["Config.js"],"names":[],"mappings":"AAcA;;;;;;;;;;;;;GAaG;AACH,gCAXU,CACT,UAAc,EACd,0BAA8B,EAC9B,gCAAoC,EACpC,gCAAoC,EACpC,kBAAsB,EACtB,gBAAoB,EACpB,sBAA0B,EAC1B,sBAA0B,CACvB,CAWF;qBA8NY,OAAO,2BAA2B,EAAE,UAAU,CAAC,OAAO,WAAW,EAAE,OAAO,aAAa,EAAE,UAAU,CAAC;AAAlH,6HAA6H;AAG7H,qBAAiC,MAAM,CAA4C;AApMnF;IAkBE;;;;OAIG;IACH,+BAYC;IAED;;;;OAIG;IACH,2BAQC;IAED;;;;OAIG;IACH,kBAwBC;IAED;;;OAGG;IACH,kBAIC;IAED;;;;OAIG;IACH,wCAJW,MAAM,iBACN,OAAO,aACP,OAAO,QAoBjB;IAgDD;;;;OAIG;IACH,+BAJW,MAAM,OAAO,gBAAgB,UAC7B,MAAM,UACN,MAAM,QAahB;CACF;sBAtPqB,yBAAyB;AAwD/C,0CAA0C;AAC1C,gCAAoC,MAAM,CAAC,MAAM,OAAO,aAAa,EAAE,oBAAoB,EAAE,MAAM,CAAC,CAGjG"}

package/blocks/Config/Config.js

@@ -142,7 +142,6 @@ class ConfigClass extends Block {
     runAssertions(this.cfg);
     runSideEffects({
       key,
-      value: normalizedValue ?? null,
       setValue: this._setValue.bind(this),
       getValue: this._getValue.bind(this),
     });
@@ -220,6 +219,12 @@ class ConfigClass extends Block {
           return this._getValue(key);
         },
       });
+
+      runSideEffects({
+        key,
+        setValue: this._setValue.bind(this),
+        getValue: this._getValue.bind(this),
+      });
     }
   }
 

package/blocks/Config/initialConfig.d.ts

@@ -1,6 +1,7 @@
 export const DEFAULT_CDN_CNAME: "https://ucarecdn.com";
 export const DEFAULT_BASE_URL: "https://upload.uploadcare.com";
 export const DEFAULT_SOCIAL_BASE_URL: "https://social.uploadcare.com";
+export const DEFAULT_PREFIXED_CDN_BASE_DOMAIN: "https://ucarecd.net";
 /** @type {import('../../types/exported').ConfigType} */
 export const initialConfig: import("../../types/exported").ConfigType;
 //# sourceMappingURL=initialConfig.d.ts.map

package/blocks/Config/initialConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"initialConfig.d.ts","sourceRoot":"","sources":["initialConfig.js"],"names":[],"mappings":"AAKA,gCAAiC,sBAAsB,CAAC;AACxD,+BAAgC,+BAA+B,CAAC;AAChE,sCAAuC,+BAA+B,CAAC;AAEvE,wDAAwD;AACxD,4BADW,OAAO,sBAAsB,EAAE,UAAU,CA4ElD"}
+{"version":3,"file":"initialConfig.d.ts","sourceRoot":"","sources":["initialConfig.js"],"names":[],"mappings":"AAKA,gCAAiC,sBAAsB,CAAC;AACxD,+BAAgC,+BAA+B,CAAC;AAChE,sCAAuC,+BAA+B,CAAC;AACvE,+CAAgD,qBAAqB,CAAC;AAEtE,wDAAwD;AACxD,4BADW,OAAO,sBAAsB,EAAE,UAAU,CA4ElD"}

package/blocks/Config/initialConfig.js

@@ -6,6 +6,7 @@ import { serializeCsv } from '../utils/comma-separated.js';
 export const DEFAULT_CDN_CNAME = 'https://ucarecdn.com';
 export const DEFAULT_BASE_URL = 'https://upload.uploadcare.com';
 export const DEFAULT_SOCIAL_BASE_URL = 'https://social.uploadcare.com';
+export const DEFAULT_PREFIXED_CDN_BASE_DOMAIN = 'https://ucarecd.net';
 
 /** @type {import('../../types/exported').ConfigType} */
 export const initialConfig = {

package/blocks/Config/side-effects.d.ts

@@ -1,7 +1,11 @@
-export function runSideEffects<T extends keyof import("../../types").ConfigType>({ key, value, setValue, getValue }: {
+export function runSideEffects<T extends keyof import("../../types").ConfigType>({ key, setValue, getValue }: {
     key: T;
-    value: import("../../types").ConfigType[T];
-    setValue: (key: T, value: import("../../types").ConfigType[T]) => void;
-    getValue: (key: T) => import("../../types").ConfigType[T];
+    setValue: <TSetValue extends keyof import("../../types").ConfigType>(key: TSetValue, value: import("../../types").ConfigType[TSetValue]) => void;
+    getValue: <TGetValue extends keyof import("../../types").ConfigType>(key: TGetValue) => import("../../types").ConfigType[TGetValue];
 }): void;
+export type ComputedPropertyDeclaration<TKey extends keyof import("../../types").ConfigType, TDeps extends Exclude<keyof import("../../types").ConfigType, TKey>[]> = {
+    key: TKey;
+    deps: TDeps;
+    fn: (args: Record<TKey, import("../../types").ConfigType[TKey]> & { [K in TDeps[number]]: import("../../types").ConfigType[K]; }) => import("../../types").ConfigType[TKey] | Promise<import("../../types").ConfigType[TKey]>;
+};
 //# sourceMappingURL=side-effects.d.ts.map

package/blocks/Config/side-effects.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"side-effects.d.ts","sourceRoot":"","sources":["side-effects.js"],"names":[],"mappings":"AAWO,+BAR+C,CAAC,SAA1C,MAAO,OAAO,aAAa,EAAE,UAAW,sCAC1C;IACN,GAAG,EAAE,CAAC,CAAC;IACP,KAAK,EAAE,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC3C,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;IACvE,QAAQ,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;CAC3D,QAsBH"}
+{"version":3,"file":"side-effects.d.ts","sourceRoot":"","sources":["side-effects.js"],"names":[],"mappings":"AAsFO,+BAZ+C,CAAC,SAA1C,MAAO,OAAO,aAAa,EAAE,UAAW,+BAC1C;IACN,GAAG,EAAE,CAAC,CAAC;IACP,QAAQ,EAAE,CAAC,SAAS,SAAS,MAAM,OAAO,aAAa,EAAE,UAAU,EACjE,GAAG,EAAE,SAAS,EACd,KAAK,EAAE,OAAO,aAAa,EAAE,UAAU,CAAC,SAAS,CAAC,KAC/C,IAAI,CAAC;IACV,QAAQ,EAAE,CAAC,SAAS,SAAS,MAAM,OAAO,aAAa,EAAE,UAAU,EACjE,GAAG,EAAE,SAAS,KACX,OAAO,aAAa,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;CAClD,QAiCH;wCA9GqD,IAAI,SAA7C,MAAO,OAAO,aAAa,EAAE,UAAW,EACkB,KAAK,SAA9D,OAAO,CAAC,MAAM,OAAO,aAAa,EAAE,UAAU,EAAE,IAAI,CAAC,EAAG;SAExD,IAAI;UACJ,KAAK;QACL,CACT,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,aAAa,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,GAAG,GAC1D,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,OAAO,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,GAC1D,KACE,OAAO,aAAa,EAAE,UAAU,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,OAAO,aAAa,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC"}

package/blocks/Config/side-effects.js

@@ -1,32 +1,118 @@
+// @ts-check
+
+import { getPrefixedCdnBase } from '@uploadcare/cname-prefix';
 import { deserializeCsv, serializeCsv } from '../utils/comma-separated.js';
+import { DEFAULT_CDN_CNAME, DEFAULT_PREFIXED_CDN_BASE_DOMAIN } from './initialConfig.js';
+
+/**
+ * @template {keyof import('../../types').ConfigType} TKey
+ * @template {Exclude<keyof import('../../types').ConfigType, TKey>[]} TDeps
+ * @typedef {Object} ComputedPropertyDeclaration
+ * @property {TKey} key
+ * @property {TDeps} deps
+ * @property {(
+ *   args: Record<TKey, import('../../types').ConfigType[TKey]> & {
+ *     [K in TDeps[number]]: import('../../types').ConfigType[K];
+ *   },
+ * ) => import('../../types').ConfigType[TKey] | Promise<import('../../types').ConfigType[TKey]>} fn
+ */
+
+/**
+ * @template {keyof import('../../types').ConfigType} TKey
+ * @template {Exclude<keyof import('../../types').ConfigType, TKey>[]} TDeps
+ * @param {ComputedPropertyDeclaration<TKey, TDeps>} declaration
+ */
+function defineComputedProperty(declaration) {
+  return declaration;
+}
+
+const COMPUTED_PROPERTIES = [
+  defineComputedProperty({
+    key: 'cameraModes',
+    deps: ['enableVideoRecording'],
+    fn: ({ cameraModes, enableVideoRecording }) => {
+      if (enableVideoRecording === null) {
+        return cameraModes;
+      }
+      let cameraModesCsv = deserializeCsv(cameraModes);
+      if (enableVideoRecording && !cameraModesCsv.includes('video')) {
+        cameraModesCsv = cameraModesCsv.concat('video');
+      } else if (!enableVideoRecording) {
+        cameraModesCsv = cameraModesCsv.filter((mode) => mode !== 'video');
+      }
+      return serializeCsv(cameraModesCsv);
+    },
+  }),
+  defineComputedProperty({
+    key: 'cameraModes',
+    deps: ['defaultCameraMode'],
+    fn: ({ cameraModes, defaultCameraMode }) => {
+      if (defaultCameraMode === null) {
+        return cameraModes;
+      }
+      let cameraModesCsv = deserializeCsv(cameraModes);
+      cameraModesCsv = cameraModesCsv.sort((a, b) => {
+        if (a === defaultCameraMode) return -1;
+        if (b === defaultCameraMode) return 1;
+        return 0;
+      });
+      return serializeCsv(cameraModesCsv);
+    },
+  }),
+  defineComputedProperty({
+    key: 'cdnCname',
+    deps: ['pubkey'],
+    fn: ({ pubkey, cdnCname }) => {
+      if (cdnCname !== DEFAULT_CDN_CNAME) {
+        return cdnCname;
+      }
+      return getPrefixedCdnBase(pubkey, DEFAULT_PREFIXED_CDN_BASE_DOMAIN);
+    },
+  }),
+];
 
 /**
  * @template {keyof import('../../types').ConfigType} T
  * @param {{
  *   key: T;
- *   value: import('../../types').ConfigType[T];
- *   setValue: (key: T, value: import('../../types').ConfigType[T]) => void;
- *   getValue: (key: T) => import('../../types').ConfigType[T];
+ *   setValue: <TSetValue extends keyof import('../../types').ConfigType>(
+ *     key: TSetValue,
+ *     value: import('../../types').ConfigType[TSetValue],
+ *   ) => void;
+ *   getValue: <TGetValue extends keyof import('../../types').ConfigType>(
+ *     key: TGetValue,
+ *   ) => import('../../types').ConfigType[TGetValue];
  * }} options
  */
-export const runSideEffects = ({ key, value, setValue, getValue }) => {
-  if (key === 'enableVideoRecording' && value !== null) {
-    let cameraModes = deserializeCsv(getValue('cameraModes'));
-    if (value && !cameraModes.includes('video')) {
-      cameraModes = cameraModes.concat('video');
-    } else if (!value) {
-      cameraModes = cameraModes.filter((mode) => mode !== 'video');
+export const runSideEffects = ({ key, setValue, getValue }) => {
+  for (const computed of COMPUTED_PROPERTIES) {
+    if (computed.deps.includes(key)) {
+      const args = {
+        [computed.key]: getValue(computed.key),
+        ...computed.deps.reduce(
+          (acc, dep) => ({
+            ...acc,
+            [dep]: getValue(dep),
+          }),
+          /**
+           * @type {Record<typeof computed.key, import('../../types').ConfigType[typeof computed.key]> & {
+           *   [K in (typeof computed.deps)[number]]: import('../../types').ConfigType[K];
+           * }}
+           */ ({}),
+        ),
+      };
+      const result = computed.fn(args);
+      if (result instanceof Promise) {
+        // There could be a race condition here if the value is changed too frequently,
+        // but we assume that the async computed properties are not expected to change often
+        result
+          .then((resolvedValue) => setValue(computed.key, resolvedValue))
+          .catch((error) => {
+            console.error(`Failed to compute value for "${computed.key}"`, error);
+          });
+      } else {
+        setValue(computed.key, result);
+      }
     }
-    setValue('cameraModes', serializeCsv(cameraModes));
-  }
-
-  if (key === 'defaultCameraMode' && value !== null) {
-    let cameraModes = deserializeCsv(getValue('cameraModes'));
-    cameraModes = cameraModes.sort((a, b) => {
-      if (a === value) return -1;
-      if (b === value) return 1;
-      return 0;
-    });
-    setValue('cameraModes', serializeCsv(cameraModes));
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uploadcare/file-uploader",
-  "version": "1.17.2",
+  "version": "1.17.3-alpha.0",
   "description": "Building blocks for Uploadcare products integration",
   "keywords": [
     "web components",
@@ -141,6 +141,7 @@
   "license": "MIT",
   "dependencies": {
     "@symbiotejs/symbiote": "^1.11.7",
+    "@uploadcare/cname-prefix": "^6.15.2",
     "@uploadcare/image-shrink": "^6.14.1",
     "@uploadcare/upload-client": "^6.14.1",
     "keyux": "^0.7.1"