Merge tag '1.0.14' into develop

no message
Envisio · Jan 13, 2020 · 0dc7f99 · 0dc7f99
2 parents b398cdd + 37bf8c9
commit 0dc7f99
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 7 deletions.
diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/index.js.map b/lib/index.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sort-by-chapter",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "main": "./lib/index.js",
   "license": "MIT",
   "scripts": {

diff --git a/src/index.js b/src/index.js
@@ -24,15 +24,15 @@ module.exports = (arr, option) => {
 
   switch (typeof option) {
     case 'object':
-      if (option.attribute && arr.every((obj) => Object.prototype.hasOwnProperty.call(obj, option.attribute))) {
+      if (option.attribute && arr.every((obj) => Object.prototype.hasOwnProperty.call(obj, option.attribute) && typeof obj[option.attribute] === 'string')) {
         const { attribute: attr } = option;
 
         return JSON.parse(JSON.stringify(arr)).sort((a, b) => a[attr].match(/(\d+\.*)+/)[0].localeCompare(b[attr].match(/(\d+\.*)+/)[0], undefined, { numeric: true }));
       }
 
       return arr;
     case 'string':
-      if (arr.every((obj) => Object.prototype.hasOwnProperty.call(obj, option))) {
+      if (arr.every((obj) => Object.prototype.hasOwnProperty.call(obj, option) && obj[option])) {
         return JSON.parse(JSON.stringify(arr)).sort((a, b) => a[option].match(/(\d+\.*)+/)[0].localeCompare(b[option].match(/(\d+\.*)+/)[0], undefined, { numeric: true }));
       }
 

diff --git a/test/index.test.js b/test/index.test.js
@@ -16,6 +16,18 @@ const objArr = [
   { title: 'Activity 1.1.3' },
 ];
 
+const objArr2 = [
+  { title: 'Goal 1' },
+  { title: 'Goal 2' },
+  { title: 'Goal 3' },
+  { title: undefined },
+  { title: 'Strategy 1.2' },
+  { title: 'Strategy 1.3' },
+  { title: 'Activity 1.1.1' },
+  { title: 'Activity 1.1.2' },
+  { title: 'Activity 1.1.3' },
+];
+
 describe('Array', () => {
   const [first, , , , , , , , last] = sortByChapter(arr);
 
@@ -77,3 +89,15 @@ describe('Array of Object with Invalid Attribute Option', () => {
   it('First should be "Goal 1"', () => expect(first.title).to.equal('Goal 1'));
   it('Last should be "Activity 1.1.3"', () => expect(last.title).to.equal('Activity 1.1.3'));
 });
+
+describe('Array of Object with String Option and Invalid Attribute', () => {
+  const [first, , , , , , , , last] = sortByChapter(objArr2, 'title');
+  it('First should be "Goal 1"', () => expect(first.title).to.equal('Goal 1'));
+  it('Last should be "Activity 1.1.3"', () => expect(last.title).to.equal('Activity 1.1.3'));
+});
+
+describe('Array of Object with Object Option and Invalid Attribute', () => {
+  const [first, , , , , , , , last] = sortByChapter(objArr2, { attribute: 'title' });
+  it('First should be "Goal 1"', () => expect(first.title).to.equal('Goal 1'));
+  it('Last should be "Activity 1.1.3"', () => expect(last.title).to.equal('Activity 1.1.3'));
+});