Objectの型検証及び値取得をconfigureからcommonに分離

h-sugawara · Nov 21, 2023 · 7ece962 · 7ece962
1 parent 53e0ce7
commit 7ece962
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/lib/common.js b/lib/common.js
@@ -4,6 +4,14 @@ function hasProperty(obj, key) {
     return obj && Object.hasOwnProperty.call(obj, key);
 }
 
+function hasTypeOfProperty(obj, key, type) {
+    return hasProperty(obj, key) && typeof obj[key] === type;
+}
+
+function getObjectValueFrom(obj, key, type, defaultValue) {
+    return hasTypeOfProperty(obj, key, type) ? obj[key] || defaultValue : defaultValue;
+}
+
 function stringLength(text) {
     if (typeof text !== 'string') {
         throw new Error('text is not string type.');
@@ -49,6 +57,8 @@ function stringSlice(text, start, end) {
 
 module.exports = {
     hasProperty,
+    hasTypeOfProperty,
+    getObjectValueFrom,
     stringLength,
     stringSlice,
 };
diff --git a/lib/configure.js b/lib/configure.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { hasProperty } = require('./common');
+const { hasProperty, hasTypeOfProperty, getObjectValueFrom } = require('./common');
 
 const ANCHOR_LINK_CLASS_NAME = 'link-preview';
 const DESCRIPTION_LENGTH = 140;
@@ -12,9 +12,7 @@ function getClassName(classNameFromHexoCfg, defaultAnchorLink) {
     if (typeof classNameFromHexoCfg === 'string') {
         obj.anchor_link = classNameFromHexoCfg || obj.anchor_link;
     } else if (typeof classNameFromHexoCfg === 'object') {
-        if (hasProperty(classNameFromHexoCfg, 'anchor_link') && typeof classNameFromHexoCfg.anchor_link === 'string') {
-            obj.anchor_link = classNameFromHexoCfg.anchor_link || obj.anchor_link;
-        }
+        obj.anchor_link = getObjectValueFrom(classNameFromHexoCfg, 'anchor_link', 'string', obj.anchor_link);
 
         if (hasProperty(classNameFromHexoCfg, 'image') && classNameFromHexoCfg.image !== '') {
             obj.image = classNameFromHexoCfg.image;
@@ -40,10 +38,10 @@ module.exports = hexoCfg => {
     if (hasProperty(hexoCfgLinkPreview, 'class_name')) {
         config.class_name = getClassName(hexoCfgLinkPreview.class_name, config.class_name.anchor_link);
     }
-    if (hasProperty(hexoCfgLinkPreview, 'description_length') && typeof hexoCfgLinkPreview.description_length === 'number') {
-        config.description_length = hexoCfgLinkPreview.description_length || config.description_length;
-    }
-    if (hasProperty(hexoCfgLinkPreview, 'disguise_crawler') && typeof hexoCfgLinkPreview.disguise_crawler === 'boolean') {
+
+    config.description_length = getObjectValueFrom(hexoCfgLinkPreview, 'description_length', 'number', config.description_length);
+
+    if (hasTypeOfProperty(hexoCfgLinkPreview, 'disguise_crawler', 'boolean')) {
         config.disguise_crawler = hexoCfgLinkPreview.disguise_crawler;
     }
 

diff --git a/test/configure.test.js b/test/configure.test.js
@@ -18,15 +18,15 @@ describe('configure', () => {
     it('Specify all values', () => {
         const hexoCfg = {
             link_preview: {
-                class_name: { anchor_link: 'link-preview', image: 'not-gallery-item' },
+                class_name: { anchor_link: 'link-preview-2', image: 'not-gallery-item' },
                 description_length: 100,
                 disguise_crawler: false,
             },
         };
 
         expect(getConfig(hexoCfg)).toEqual(
             {
-                class_name: { anchor_link: 'link-preview', image: 'not-gallery-item' },
+                class_name: { anchor_link: 'link-preview-2', image: 'not-gallery-item' },
                 description_length: 100,
                 disguise_crawler: false,
             }
@@ -36,13 +36,13 @@ describe('configure', () => {
     it('Specify a valid string value at class_name', () => {
         const hexoCfg = {
             link_preview: {
-                class_name: 'link-preview',
+                class_name: 'link-preview-2',
             },
         };
 
         expect(getConfig(hexoCfg)).toEqual(
             {
-                class_name: { anchor_link: 'link-preview' },
+                class_name: { anchor_link: 'link-preview-2' },
                 description_length: 140,
                 disguise_crawler: true,
             }
@@ -68,14 +68,14 @@ describe('configure', () => {
     it('Specify a object which has valid anchor_link only at class_name', () => {
         const hexoCfg = {
             link_preview: {
-                class_name: { anchor_link: 'link-preview' },
+                class_name: { anchor_link: 'link-preview-2' },
             },
         };
 
         expect(getConfig(hexoCfg)).toEqual(
             {
                 class_name: {
-                    anchor_link: 'link-preview',
+                    anchor_link: 'link-preview-2',
                 },
                 description_length: 140,
                 disguise_crawler: true,