add remove oxford comma working

spencermountain · Feb 29, 2020 · a32e5dc · a32e5dc
1 parent 8d12d7c
commit a32e5dc
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/scratch.js b/scratch.js
@@ -10,8 +10,8 @@ let txt = require('./scripts/test/speed/_sotu-text.js')
 // // console.log(doc._cache)
 // console.log(doc.has('#Person'))
 
-let doc = nlp('i saw red, blue and green.')
-doc.lists().remove('blue')
-console.log(doc.text())
+let doc = nlp('i saw red, blue, and green.')
 // doc.lists().addOxfordComma()
+doc.lists().removeOxfordComma()
+console.log(doc.text())
 // console.log(arr)
diff --git a/src/Subset/Lists.js b/src/Subset/Lists.js
@@ -49,9 +49,19 @@ const addMethod = function(Doc) {
       return this.filter(doc => parse(doc).hasOxford)
     }
     addOxfordComma() {
+      let items = this.items()
+      let needsComma = items.eq(items.length - 2)
+      if (needsComma.found && needsComma.has('@hasComma') === false) {
+        needsComma.post(', ')
+      }
       return this
     }
     removeOxfordComma() {
+      let items = this.items()
+      let needsComma = items.eq(items.length - 2)
+      if (needsComma.found && needsComma.has('@hasComma') === true) {
+        needsComma.post(' ')
+      }
       return this
     }
   }

diff --git a/tests/lists.test.js b/tests/lists.test.js
@@ -1,6 +1,26 @@
 const test = require('tape')
 const nlp = require('./_lib')
 
+test('comma-remove', function(t) {
+  let doc = nlp('i saw red, blue, and green.')
+  doc.lists().removeOxfordComma()
+  t.equal(doc.text(), 'i saw red, blue and green.', 'remove comma')
+
+  doc = nlp('i saw red, blue, and green.')
+  doc.lists().addOxfordComma()
+  t.equal(doc.text(), 'i saw red, blue, and green.', 'add comma')
+
+  doc.lists().addOxfordComma()
+  doc.lists().addOxfordComma()
+  doc.lists().addOxfordComma()
+  t.equal(doc.text(), 'i saw red, blue, and green.', 'just one comma')
+  doc.lists().removeOxfordComma()
+  doc.lists().removeOxfordComma()
+  doc.lists().removeOxfordComma()
+  t.equal(doc.text(), 'i saw red, blue and green.', 'still no commas')
+  t.end()
+})
+
 test('list-remove', function(t) {
   let doc = nlp('i saw red, blue and green.')
   doc.lists().remove('asdf')