Merge pull request #1314 from AndersDJohnson/patch-1

fix(ner): deserialize regex from JSON
axa-group · May 25, 2023 · 71e29e2 · 71e29e2
2 parents aa5735d + c12f55f
commit 71e29e2
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 5 deletions.
diff --git a/packages/ner/src/ner.js b/packages/ner/src/ner.js
@@ -546,11 +546,17 @@ class Ner extends Clonable {
       const entityKeys = Object.keys(json.rules[rKey]);
 
       entityKeys.forEach((eKey) => {
-        if (json.rules[rKey][eKey].type === 'regex') {
-          json.rules[rKey][eKey].rules = json.rules[rKey][eKey].rules.map(
-            (rule) => Ner.str2regex(rule)
-          );
-        }
+        json.rules[rKey][eKey].rules =
+          json.rules[rKey][eKey].type === 'regex'
+            ? json.rules[rKey][eKey].rules.map((rule) => Ner.str2regex(rule))
+            : json.rules[rKey][eKey].rules.map((rule) =>
+                typeof rule.regex === 'string'
+                  ? {
+                      ...rule,
+                      regex: Ner.str2regex(rule.regex),
+                    }
+                  : rule
+              );
       });
     });
 

diff --git a/packages/ner/test/ner.test.js b/packages/ner/test/ner.test.js
@@ -485,4 +485,29 @@ describe('NER', () => {
       ]);
     });
   });
+  describe('To & from JSON', () => {
+    test('It deserializes regular expressions', () => {
+      const instance = new Ner({ container });
+      instance.addBetweenCondition('en', 'test', 'from', 'to');
+      const json = JSON.stringify(instance.toJSON());
+      const instance2 = new Ner({ container });
+      instance2.fromJSON(JSON.parse(json));
+      const actual = instance2.getRules('en');
+      expect(actual).toEqual([
+        {
+          name: 'test',
+          rules: [
+            {
+              type: 'between',
+              leftWords: ['from'],
+              rightWords: ['to'],
+              regex: /(?<= from )(.*)(?= to )/gi,
+              options: {},
+            },
+          ],
+          type: 'trim',
+        },
+      ]);
+    });
+  });
 });