feat: config validater

Author: xiazeyu

package-lock.json

@@ -57,5 +57,8 @@
     "commitizen": {
       "path": "./node_modules/cz-conventional-changelog"
     }
+  },
+  "dependencies": {
+    "prop-types": "^15.6.0"
   }
 }

package.json

@@ -20,12 +20,12 @@ let currConfig = {};
  * @type {Object}
  */
 
-const defaultOptions = {
+const defaultConfig = {
   model: {
     jsonPath: '', // string
     hHeadPos: 0.5, // horizontalHeadPos
     vHeadPos: 0.618, // verticalHeadPos
-    myDefine: {},
+    myDefine: [],
   },
   display: {
     AA: 2, // antialiasing Grade 抗锯齿等级
@@ -73,7 +73,7 @@ function configApplyer(userConfig){
     });
   }
 
-  currConfig = _.defaultsDeep(userConfig, defaultOptions);
+  currConfig = _.defaultsDeep(userConfig, defaultConfig);
 
 }
 

src/config/configMgr.js

@@ -8,25 +8,51 @@
 'use strict';
 
 
-import _ from 'lodash';
+let PropTypes = require('prop-types');
+
+const configPropTypes = {
+  model: PropTypes.shape({
+    jsonPath: PropTypes.string,
+    hHeadPos: PropTypes.number,
+    vHeadPos: PropTypes.number,
+    myDefine: PropTypes.array,
+  }),
+  display: PropTypes.shape({
+    AA: PropTypes.number,
+    widght: PropTypes.number,
+    height: PropTypes.number,
+    scale: PropTypes.number,
+    position: PropTypes.oneOf(['left', 'right']),
+    hOffset: PropTypes.number, // horizontalOffset
+    vOffset: PropTypes.number, // verticalOffset
+  }),
+  mobile: PropTypes.shape({
+    show: PropTypes.bool,
+    scale: PropTypes.number,
+    motion: PropTypes.bool,
+  }),
+  name: PropTypes.shape({
+    canvas: PropTypes.string,
+    div: PropTypes.string,
+  }),
+  react: PropTypes.shape({
+    opacityDefault: PropTypes.number,
+    opacityOnHover: PropTypes.number,
+    myFunc: PropTypes.func,
+  }),
+  debug: PropTypes.shape({
+    log: PropTypes.bool,
+    mouseLog: PropTypes.bool,
+    mouseFunc: PropTypes.func,
+  }),
+}
 
 function configValidater(userConfig){
 
-  if (process.env.NODE_ENV === 'development') console.log('config: validating config...');
-
-  if(_.has(userConfig, 'model')){
-    if(_.has(userConfig.model, 'jsonPath')){
-      if(!_.isString(userConfig.model.jsonPath)){
-        throw 'userConfig.model.jsonPath should be a string.';
-      }
-    }
-    if(_.has(userConfig.model, 'hHeadPos')){
-
-    }
-  }
+  PropTypes.checkPropTypes(configPropTypes, userConfig, 'config', 'Live2D-widget');
 
 }
 
-export {
-  configValidater,
+module.exports = {
+  configValidater: configValidater,
 }

src/config/configValidater.js

@@ -28,7 +28,7 @@ function getCurrentPath(){
     // IE 10 +, Safari and Opera 9
 
     // console.log('Stage2');
-    // console.log(e);
+    console.log(e);
 
     let stack = e.stack || e.sourceURL || e.stacktrace,
     rExtractUri = /(file:\/{3}\w:)(\/[^\/]*){3}\//;