@evfrenkel/decap-cms-core 3.13.0-image-conversions.0 → 3.13.0-image-conversions.1

package/dist/esm/bootstrap.js

@@ -49,8 +49,8 @@ function bootstrap(opts = {}) {
   /**
    * Log the version number.
    */
-  if (typeof "3.13.0-image-conversions.0" === 'string') {
-    console.log(`decap-cms-core ${"3.13.0-image-conversions.0"}`);
+  if (typeof "3.13.0-image-conversions.1" === 'string') {
+    console.log(`decap-cms-core ${"3.13.0-image-conversions.1"}`);
   }
 
   /**

package/dist/esm/components/UI/ErrorBoundary.js

@@ -42,8 +42,8 @@ function buildIssueTemplate({
   let version = '';
   if (typeof DECAP_CMS_VERSION === 'string') {
     version = `decap-cms@${DECAP_CMS_VERSION}`;
-  } else if (typeof "3.12.2-image-conversions.0" === 'string') {
-    version = `decap-cms-app@${"3.12.2-image-conversions.0"}`;
+  } else if (typeof "3.12.2-image-conversions.1" === 'string') {
+    version = `decap-cms-app@${"3.12.2-image-conversions.1"}`;
   }
   const template = getIssueTemplate({
     version,

package/dist/esm/lib/imageTransformations.js

@@ -2,8 +2,11 @@ import { join } from 'path';
 import { basename, fileExtension, fileExtensionWithSeparator } from 'decap-cms-lib-util';
 const TRANSFORMATIONS_FOLDER = '_transformations';
 const SUPPORTED_OUTPUT_FORMATS = ['jpg', 'jpeg', 'png', 'webp'];
+function hasImageTransformationsGetter(field) {
+  return typeof field?.get === 'function';
+}
 function getFieldImageTransformations(field) {
-  const imageTransformations = field?.get('image_transformations');
+  const imageTransformations = hasImageTransformationsGetter(field) ? field.get('image_transformations') : field?.image_transformations;
   return imageTransformations?.toJS ? imageTransformations.toJS() : imageTransformations;
 }
 function normalizeVariant(variant) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@evfrenkel/decap-cms-core",
   "description": "Decap CMS core application, see decap-cms package for the main distribution.",
-  "version": "3.13.0-image-conversions.0",
+  "version": "3.13.0-image-conversions.1",
   "module": "dist/esm/index.js",
   "main": "dist/decap-cms-core.js",
   "files": [

package/src/lib/__tests__/imageTransformations.spec.ts

@@ -50,6 +50,17 @@ describe('imageTransformations', () => {
         variants: [{ name: 'field', width: 200 }],
       });
     });
+
+    it('supports plain object field config from media upload options', () => {
+      const field = {
+        image_transformations: [{ name: 'field', width: 200 }],
+      };
+
+      expect(getImageTransformationsConfig({}, field)).toEqual({
+        keepOriginal: true,
+        variants: [{ name: 'field', width: 200 }],
+      });
+    });
   });
 
   describe('shouldTransformImage', () => {

package/src/lib/imageTransformations.ts

@@ -28,11 +28,29 @@ export type ImageTransformationFile = {
   original?: boolean;
 };
 
+type PlainFieldImageTransformations = {
+  image_transformations?: CmsImageTransformations;
+};
+
+type FieldImageTransformationsGetter = {
+  get: (key: 'image_transformations') => CmsImageTransformations | undefined;
+};
+
 const TRANSFORMATIONS_FOLDER = '_transformations';
 const SUPPORTED_OUTPUT_FORMATS = ['jpg', 'jpeg', 'png', 'webp'];
 
-function getFieldImageTransformations(field?: EntryField) {
-  const imageTransformations = field?.get('image_transformations') as
+function hasImageTransformationsGetter(
+  field: EntryField | PlainFieldImageTransformations | undefined,
+): field is EntryField & FieldImageTransformationsGetter {
+  return typeof (field as FieldImageTransformationsGetter | undefined)?.get === 'function';
+}
+
+function getFieldImageTransformations(field?: EntryField | PlainFieldImageTransformations) {
+  const imageTransformations = (
+    hasImageTransformationsGetter(field)
+      ? field.get('image_transformations')
+      : (field as PlainFieldImageTransformations | undefined)?.image_transformations
+  ) as
     | (CmsImageTransformations & { toJS?: () => CmsImageTransformations })
     | undefined;