gen fill, gen bg replace - prevent decode with percentage char (#64)

Author: lisa-kuzmina

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

@@ -51,12 +51,14 @@ describe('effect.fromJson', () => {
       { actionType: 'enhance' },
       { actionType: 'generativeBackgroundReplace', prompt: 'dog' },
       { actionType: 'generativeBackgroundReplace', prompt: 'dog, dog (dog)' },
+      { actionType: 'generativeBackgroundReplace', prompt: '!@#$%^&*()_+{}|":?><' },
       { actionType: 'generativeBackgroundReplace'},
       { actionType: 'extract', 'prompts': 'blue sky' },
       { actionType: 'extract', 'prompts': ['blue sky', 'yellow sun'], detectMultiple: true },
       { actionType: 'extract', 'prompts': ['green grass'], mode: 'mask', invert: true },
       { actionType: 'extract', 'prompts': ['yellow sun', 'green grass'], mode: 'content' },
       { actionType: 'pad', 'dimensions': { width: 100, height: 200 }, 'background': { backgroundType: 'generativeFill', prompt: 'some; test (123!)'} },
+      { actionType: 'pad', 'dimensions': { width: 140, height: 240 }, 'background': { backgroundType: 'generativeFill', prompt: 'some%test ? (123/)'} },
     ]});
 
     expect(transformation.toString().split('/')).toStrictEqual([
@@ -108,12 +110,14 @@ describe('effect.fromJson', () => {
       'e_enhance',
       'e_gen_background_replace:prompt_dog',
       'e_gen_background_replace:prompt_dog%2C dog %28dog%29',
+      'e_gen_background_replace:prompt_%21%40%23%24%25%5E%26%2A%28%29%5F%2B%7B%7D%7C%22%3A%3F%3E%3C',
       'e_gen_background_replace',
       'e_extract:prompt_blue sky',
       'e_extract:prompt_(blue sky;yellow sun);multiple_true',
       'e_extract:prompt_green grass;mode_mask;invert_true',
       'e_extract:prompt_(yellow sun;green grass);mode_content',
       'b_gen_fill:prompt_some%3B test %28123%21%29,c_pad,h_200,w_100',
+      'b_gen_fill:prompt_some%25test %3F %28123%2F%29,c_pad,h_240,w_140',
     ]);
   });
 });

__TESTS__/unit/toJson/effect.toJson.test.ts

@@ -490,6 +490,7 @@ describe('Effect toJson()', () => {
     const transformation = new Transformation()
       .addAction(Effect.generativeBackgroundReplace().prompt('dog'))
       .addAction(Effect.generativeBackgroundReplace().prompt('test%2C test %28test%21%40%23%3F%29'))
+      .addAction(Effect.generativeBackgroundReplace().prompt('%21%40%23%24%25%5E%26%2A%28%29%5F%2B%7D%7B%3A%22%7C%3F%3E%3C%7E'))
       .addAction(Effect.generativeBackgroundReplace());
 
     expect(transformation.toJson()).toStrictEqual({
@@ -502,6 +503,10 @@ describe('Effect toJson()', () => {
           actionType: 'generativeBackgroundReplace',
           prompt: 'test, test (test!@#?)',
         },
+        {
+          actionType: 'generativeBackgroundReplace',
+          prompt: '!@#$%^&*()_+}{:"|?><~',
+        },
         {
           actionType: 'generativeBackgroundReplace',
         },

__TESTS__/unit/toJson/resize.toJson.test.ts

@@ -450,6 +450,7 @@ describe('resize.toJson()', () => {
     const transformation = new Transformation()
       .addAction(Resize.pad(400).background(Background.generativeFill()))
       .addAction(Resize.pad(200).background(Background.generativeFill().prompt('strawberry donuts')))
+      .addAction(Resize.pad(500).background(Background.generativeFill().prompt('%21%40%23%24%25%5E%26%2A%28%29%5F%2B%7D%7B%3A%22%7C%3F%3E%3C%7E')))
       .addAction(Resize.pad(300).background(Background.generativeFill().prompt('donuts %28strawberry%29%2C with jam')));
 
 
@@ -476,6 +477,16 @@ describe('resize.toJson()', () => {
             prompt: 'strawberry donuts'
           }
         },
+        {
+          actionType: 'pad',
+          dimensions: {
+            width: 500
+          },
+          background: {
+            backgroundType: 'generativeFill',
+            prompt: '!@#$%^&*()_+}{:"|?><~'
+          }
+        },
         {
           actionType: 'pad',
           dimensions: {

src/actions/effect/GenerativeBackgroundReplace.ts

@@ -18,9 +18,13 @@ class GenerativeBackgroundReplace extends Action {
   }
 
   prompt(value: string): GenerativeBackgroundReplace {
+    try {
+      this._actionModel.prompt = decodeURIComponent(value);
+    } catch {
+      this._actionModel.prompt = value;
+    }
+  
     this._prompt = value;
-    this._actionModel.prompt = decodeURIComponent(value);
-
     return this;
   }
 

src/qualifiers/background/shared/BackgroundGenerativeFillQualifier.ts

@@ -16,7 +16,12 @@ class BackgroundGenerativeFillQualifier extends BackgroundQualifier {
   }
 
   prompt(prompt: string): BackgroundGenerativeFillQualifier {
-    this._prompt = decodeURIComponent(prompt);
+    try {
+      this._prompt = decodeURIComponent(prompt);
+    } catch {
+      this._prompt = prompt;
+    }
+
     return this;
   }