Merge pull request #472 from cloudinary/feature/shadoweffect-tojson

Author: strausr

…TESTS__/unit/toJson/simpleEffect.test.ts …ESTS__/unit/toJson/effect.toJson.test.ts__TESTS__/unit/toJson/simpleEffect.test.ts renamed to __TESTS__/unit/toJson/effect.toJson.test.ts __TESTS__/unit/toJson/simpleEffect.test.ts renamed to __TESTS__/unit/toJson/effect.toJson.test.ts

@@ -1,7 +1,16 @@
 import {Transformation} from "../../../src";
 import {Effect} from "../../../src/actions/effect";
 
-describe('SimpleEffect.toJson()', () => {
+
+describe('Effect toJson()', () => {
+  it('effect.sepia', () => {
+    const transformation = new Transformation()
+      .addAction(Effect.sepia());
+    expect(transformation.toJson()).toStrictEqual( [
+      { actionType: 'sepia' }
+    ]);
+  });
+
   it('effect.boomerang', () => {
     const transformation = new Transformation()
       .addAction(Effect.boomerang());
@@ -57,4 +66,17 @@ describe('SimpleEffect.toJson()', () => {
       { actionType: 'transition' }
     ]);
   });
+
+  it('effect.shadow', () => {
+    const transformation = new Transformation()
+      .addAction(Effect.shadow(4).offsetX(5).offsetY(8).color('red'));
+    expect(transformation.toJson()).toStrictEqual( [
+      {
+        actionType: 'shadow',
+        offsetX: 5,
+        offsetY: 8,
+        color: 'red'
+      }
+    ]);
+  });
 });

__TESTS__/unit/toJson/levelEffect.test.ts

@@ -1,6 +1,6 @@
 import {SimpleEffectAction} from "./SimpleEffectAction.js";
 import {ExpressionQualifier} from "../../../qualifiers/expression/ExpressionQualifier.js";
-import {IEffectActionWithLevelModel} from "../../../internal/models/IEffectActionWithLevelModel.js";
+import {IEffectActionWithLevelModel} from "../../../internal/models/IEffectActionModel.js";
 
 /**
  * @description A base class for effects with a level, the extending class needs to implement a method that calls setLevel()

src/actions/effect/EffectActions/LeveledEffectAction.ts

@@ -3,7 +3,7 @@ import {QualifierValue} from "../../../internal/qualifier/QualifierValue.js";
 import {Qualifier} from "../../../internal/qualifier/Qualifier.js";
 import {ExpressionQualifier} from "../../../qualifiers/expression/ExpressionQualifier.js";
 import {EFFECT_MODE_TO_ACTION_TYPE_MAP} from "../../../internal/internalConstants.js";
-import {ISimpleEffectActionModel} from "../../../internal/models/ISimpleEffectActionModel.js";
+import {ISimpleEffectActionModel} from "../../../internal/models/IEffectActionModel.js";
 
 /**
  * @description A class that defines a simple effect of the type e_{effectName}

src/actions/effect/EffectActions/SimpleEffectAction.ts

@@ -4,6 +4,7 @@ import {Qualifier} from "../../internal/qualifier/Qualifier.js";
 import {prepareColor} from "../../internal/utils/prepareColor.js";
 import {SystemColors} from "../../qualifiers/color.js";
 import {ExpressionQualifier} from "../../qualifiers/expression/ExpressionQualifier.js";
+import {IShadowEffectActionModel} from "../../internal/models/IEffectActionModel.js";
 
 /**
  * @description Applies a shadow filter to the asset.
@@ -12,11 +13,12 @@ import {ExpressionQualifier} from "../../qualifiers/expression/ExpressionQualifi
  * @see Visit {@link Actions.Effect|Effect} for an example
  */
 class ShadowEffectAction extends Action {
+  protected _actionModel: IShadowEffectActionModel = {};
   private effectType: string;
 
   constructor(effectType: string, strength: number) {
     super();
-
+    this._actionModel.actionType = effectType;
     this.effectType = effectType;
     this.addQualifier(new Qualifier('e', new QualifierValue(['shadow', strength])));
   }
@@ -27,6 +29,7 @@ class ShadowEffectAction extends Action {
    * @return {this}
    */
   strength(strength: number): this {
+    this._actionModel.strength = strength;
     return this.addQualifier(new Qualifier('e', new QualifierValue(['shadow', strength])));
   }
 
@@ -36,6 +39,7 @@ class ShadowEffectAction extends Action {
    * @return {this}
    */
   offsetX(x:number | ExpressionQualifier): this {
+    this._actionModel.offsetX = x as number;
     return this.addQualifier(new Qualifier('x', new QualifierValue(x)));
   }
 
@@ -45,6 +49,7 @@ class ShadowEffectAction extends Action {
    * @return {this}
    */
   offsetY(y:number | ExpressionQualifier): this {
+    this._actionModel.offsetY = y as number;
     return this.addQualifier(new Qualifier('y', new QualifierValue(y)));
   }
 
@@ -54,6 +59,7 @@ class ShadowEffectAction extends Action {
    * @return {this}
    */
   color(color:SystemColors): this {
+    this._actionModel.color = color;
     return this.addQualifier(new Qualifier('co', new QualifierValue(prepareColor(color))));
   }
 }

src/actions/effect/Shadow.ts

@@ -0,0 +1,17 @@
+import {IActionModel} from "./IActionModel.js";
+
+interface IEffectActionWithLevelModel extends IActionModel{
+  level?: number;
+}
+
+interface ISimpleEffectActionModel extends IActionModel{
+
+}
+
+interface IShadowEffectActionModel extends IActionModel{
+  strength?: number;
+  offsetX?: string|number;
+  offsetY?: string|number;
+  color?: string
+}
+export {IEffectActionWithLevelModel, ISimpleEffectActionModel, IShadowEffectActionModel};