add deshake fromJson

Author: strausr

__TESTS__/unit/fromJson/effect.fromJson.test.ts

@@ -27,7 +27,8 @@ describe('effect.fromJson', () => {
       { actionType: 'gradientFade', strength: 5, horizontalStartPoint: 10, verticalStartPoint: 20 },
       { actionType: 'assistColorblind', type: 'stripes', stripesStrength: 20 },
       { actionType: 'assistColorblind', type: 'xray' },
-      { actionType: 'simulateColorblind', condition: 'rod_monochromacy' }
+      { actionType: 'simulateColorblind', condition: 'rod_monochromacy' },
+      { actionType: 'deshake', pixels: 16 }
     ]);
 
     expect(transformation.toString()).toStrictEqual([
@@ -55,7 +56,8 @@ describe('effect.fromJson', () => {
       'e_gradient_fade:5,x_10,y_20',
       'e_assist_colorblind:20',
       'e_assist_colorblind:xray',
-      'e_simulate_colorblind:rod_monochromacy'
+      'e_simulate_colorblind:rod_monochromacy',
+      'e_deshake:16'
     ].join('/'));
   });
 });

src/actions/effect/leveled/Deshake.ts

@@ -1,7 +1,9 @@
 import {LeveledEffectAction} from "../EffectActions/LeveledEffectAction.js";
 import {ExpressionQualifier} from "../../../qualifiers/expression/ExpressionQualifier.js";
 import {IDeshakeEffectModel} from "../../../internal/models/IEffectActionModel.js";
+import {IActionModel} from "../../../internal/models/IActionModel.js";
 
+type pixels = 16 | 32 | 48 | 64;
 /**
  * @description Removes small motion shifts from the video. with a maximum extent of movement in the horizontal and vertical direction of 32 pixels
  * @extends LeveledEffectAction
@@ -14,12 +16,22 @@ class DeshakeEffectAction extends LeveledEffectAction {
    * The maximum number of pixels in the horizontal and vertical direction that will be addressed. (Possible values: 16, 32, 48, 64. Server default: 16)
    * @param value Possible values: 16, 32, 48, 64.  Server default: 16.
    */
-  shakeStrength(value: 16 | 32 | 48 | 64 | string | ExpressionQualifier): this {
-    this._actionModel.pixels = value as number;
+  shakeStrength(value: pixels | string | ExpressionQualifier): this {
+    this._actionModel.pixels = value as pixels;
     const qualifierEffect = this.createEffectQualifier(this.effectType, value);
     this.addQualifier(qualifierEffect);
     return this;
   }
+
+  static fromJson(actionModel: IActionModel): DeshakeEffectAction {
+    const {actionType, pixels} = (actionModel as IDeshakeEffectModel);
+
+    // We are using this() to allow inheriting classes to use super.fromJson.apply(this, [actionModel])
+    // This allows the inheriting classes to determine the class to be created
+    const result = new this(actionType, pixels);
+
+    return result;
+  }
 }
 
 

src/internal/fromJson.ts

@@ -35,6 +35,7 @@ import {VectorizeEffectAction} from "../actions/effect/Vectorize.js";
 import {GradientFadeEffectAction} from "../actions/effect/GradientFade.js";
 import {AssistColorBlindEffectAction} from "../actions/effect/AssistColorBlind.js";
 import {SimulateColorBlindEffectAction} from "../actions/effect/SimulateColorBlind.js";
+import {DeshakeEffectAction} from "../actions/effect/leveled/Deshake.js";
 
 const ActionModelMap: Record<string, IHasFromJson> = {
   scale: ResizeScaleAction,
@@ -75,7 +76,8 @@ const ActionModelMap: Record<string, IHasFromJson> = {
   vectorize: VectorizeEffectAction,
   gradientFade: GradientFadeEffectAction,
   assistColorblind: AssistColorBlindEffectAction,
-  simulateColorblind: SimulateColorBlindEffectAction
+  simulateColorblind: SimulateColorBlindEffectAction,
+  deshake: DeshakeEffectAction
 };
 
 /**

src/internal/models/IEffectActionModel.ts

@@ -1,4 +1,5 @@
 import {IActionModel} from "./IActionModel.js";
+import {ExpressionQualifier} from "../../qualifiers/expression/ExpressionQualifier.js";
 
 interface IEffectActionWithLevelModel extends IActionModel{
   level?: number;
@@ -65,7 +66,7 @@ interface ISimulateColorBlindEffectModel extends IActionModel{
 }
 
 interface IDeshakeEffectModel extends IActionModel{
-  pixels?: number;
+  pixels?: 16 | 32 | 48 | 64;
 }
 
 interface IPixelateModel extends IActionModel{