Merge pull request #944 from spencermountain/dev

Dev
spencermountain · Aug 3, 2022 · ab15882 · ab15882
2 parents 784b46f + 7a84c8f
commit ab15882
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 17 deletions.
diff --git a/builds/compromise.js b/builds/compromise.js
diff --git a/builds/one/compromise-one.cjs b/builds/one/compromise-one.cjs
diff --git a/builds/one/compromise-one.mjs b/builds/one/compromise-one.mjs
diff --git a/builds/three/compromise-three.cjs b/builds/three/compromise-three.cjs
diff --git a/builds/three/compromise-three.mjs b/builds/three/compromise-three.mjs
diff --git a/builds/two/compromise-two.cjs b/builds/two/compromise-two.cjs
diff --git a/builds/two/compromise-two.mjs b/builds/two/compromise-two.mjs
diff --git a/changelog.md b/changelog.md
@@ -8,6 +8,9 @@ While all _Major_ releases should be reviewed, our only _large_ releases are **v
 
 <!-- #### 14.5.0 [Unreleased]
 -->
+#### 14.4.4 [August 2022]
+- **[fix]** - support {root} matches without compromise/two
+
 #### 14.4.3 [August 2022]
 - **[fix]** - guard for toRoot methods in root match
 - **[update]** - compromise-stats

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Spencer Kelly <[email protected]> (http://spencermounta.in)",
   "name": "compromise",
   "description": "modest natural language processing",
-  "version": "14.4.3",
+  "version": "14.4.4",
   "main": "./src/three.js",
   "unpkg": "./builds/compromise.js",
   "type": "module",
@@ -114,4 +114,4 @@
     "_tests/**"
   ],
   "license": "MIT"
-}
+}
diff --git a/src/1-one/match/methods/parseMatch/04-inflect-root.js b/src/1-one/match/methods/parseMatch/04-inflect-root.js
@@ -33,10 +33,11 @@ const addAdjective = function (token, world) {
 // turn '{walk}' into 'walking', 'walked', etc
 const inflectRoot = function (regs, world) {
   // do we have compromise/two?
-  if (world.methods.two && world.methods.two.transform) {
-    regs = regs.map(token => {
-      // a reg to convert '{foo}'
-      if (token.root) {
+  regs = regs.map(token => {
+    // a reg to convert '{foo}'
+    if (token.root) {
+      // check if compromise/two is loaded
+      if (world.methods.two && world.methods.two.transform && world.methods.two.transform.verbConjugate) {
         let choices = []
         if (!token.pos || token.pos === 'Verb') {
           choices = choices.concat(addVerbs(token, world))
@@ -53,10 +54,16 @@ const inflectRoot = function (regs, world) {
           token.operator = 'or'
           token.fastOr = new Set(choices)
         }
+      } else {
+        // if no compromise/two, drop down into 'machine' lookup
+        token.machine = token.root
+        delete token.id
+        delete token.root
       }
-      return token
-    })
-  }
+    }
+    return token
+  })
+
   return regs
 }
 export default inflectRoot
diff --git a/src/_version.js b/src/_version.js
@@ -1 +1 @@
-export default '14.4.3'
+export default '14.4.4'