add AssistColorBlindEffectAction fromJson

Author: strausr

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

@@ -24,8 +24,9 @@ describe('effect.fromJson', () => {
       { actionType: 'vignette', level: 5 },
       { actionType: 'dither', type: 9 },
       { actionType: 'vectorize', numOfColors: 17, detailLevel: 100 },
-      { actionType: 'gradientFade', strength: 5, horizontalStartPoint: 10, verticalStartPoint: 20 }
-
+      { actionType: 'gradientFade', strength: 5, horizontalStartPoint: 10, verticalStartPoint: 20 },
+      { actionType: 'assistColorblind', type: 'stripes', stripesStrength: 20 },
+      { actionType: 'assistColorblind', type: 'xray' }
     ]);
 
     expect(transformation.toString()).toStrictEqual([
@@ -50,7 +51,9 @@ describe('effect.fromJson', () => {
       'e_vignette:5',
       'e_dither:9',
       'e_vectorize:colors:17:detail:100',
-      'e_gradient_fade:5,x_10,y_20'
+      'e_gradient_fade:5,x_10,y_20',
+      'e_assist_colorblind:20',
+      'e_assist_colorblind:xray'
     ].join('/'));
   });
 });

src/actions/effect/AssistColorBlind.ts

@@ -2,6 +2,7 @@ import {Action} from "../../internal/Action.js";
 import {QualifierValue} from "../../internal/qualifier/QualifierValue.js";
 import {Qualifier} from "../../internal/qualifier/Qualifier.js";
 import {IAssistColorBlindEffectModel} from "../../internal/models/IEffectActionModel.js";
+import {IActionModel} from "../../internal/models/IActionModel.js";
 
 /**
  * @description Applies stripes to the image to help people with common color-blind conditions to differentiate between colors that are similar for them.
@@ -34,9 +35,25 @@ class AssistColorBlindEffectAction extends Action {
    */
   stripesStrength(strength:number | string): this {
     this._actionModel.type = 'stripes';
-    this._actionModel.stripesStrength = strength;
+    this._actionModel.stripesStrength = strength as number;
     return this.addQualifier(new Qualifier('e', new QualifierValue(['assist_colorblind', strength]).setDelimiter(':')));
   }
+
+  static fromJson(actionModel: IActionModel): AssistColorBlindEffectAction {
+    const {actionType, type, stripesStrength} = (actionModel as IAssistColorBlindEffectModel);
+
+    // 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();
+    if (type === 'xray'){
+      result.xray();
+    }
+    if (type === 'stripes'){
+      stripesStrength && result.stripesStrength(stripesStrength);
+    }
+
+    return result;
+  }
 }
 
 export {AssistColorBlindEffectAction};

src/internal/fromJson.ts

@@ -33,6 +33,7 @@ import {MakeTransparentEffectAction} from "../actions/effect/leveled/MakeTranspa
 import {DitherEffectAction} from "../actions/effect/Dither.js";
 import {VectorizeEffectAction} from "../actions/effect/Vectorize.js";
 import {GradientFadeEffectAction} from "../actions/effect/GradientFade.js";
+import {AssistColorBlindEffectAction} from "../actions/effect/AssistColorBlind.js";
 
 const ActionModelMap: Record<string, IHasFromJson> = {
   scale: ResizeScaleAction,
@@ -71,8 +72,8 @@ const ActionModelMap: Record<string, IHasFromJson> = {
   vignette: EffectActionWithStrength,
   dither: DitherEffectAction,
   vectorize: VectorizeEffectAction,
-  gradientFade: GradientFadeEffectAction
-
+  gradientFade: GradientFadeEffectAction,
+  assistColorblind: AssistColorBlindEffectAction
 };
 
 /**

src/internal/models/IEffectActionModel.ts

@@ -57,6 +57,7 @@ interface IGradientFadeEffecModel extends IActionModel{
 
 interface IAssistColorBlindEffectModel extends IActionModel{
   type?: string;
+  stripesStrength?: number;
 }
 
 interface ISimulateColorBlindEffectModel extends IActionModel{