Merge pull request #1 from tuananh/feature/remove-lodash-and-hoek

dep: remove lodash and hoek, use core assert

Author: anhthang

README.md

@@ -6,13 +6,13 @@ Joi extensions for extra array rules.
 Usage is a two steps process. First, a schema is constructed using the provided types and constraints:
 
 ```js
-const BaseJoi = require('joi');
-const Extension = require('joi-date-extensions');
-const Joi = BaseJoi.extend(Extension);
+const BaseJoi = require('joi')
+const Extension = require('joi-array-extensions')
+const Joi = BaseJoi.extend(Extension)
 
 const schema = Joi.array().items({
     idx: Joi.number().integer()
-}).continuous('idx', 1);
+}).continuous('idx', 1)
 ```
 
 # API

lib/index.js

@@ -1,72 +1,89 @@
-'use strict';
+'use strict'
 
-const Joi = require('joi');
-const _ = require('lodash')
-const Hoek = require('hoek')
+const Joi = require('joi')
+const orderBy = require('lodash.orderby')
+const find = require('lodash.find')
+const map = require('lodash.map')
+const assert = require('assert')
 
-module.exports = [{
-    name: 'array',
-    base: Joi.array(),
-    language: {
-        continuous_from: 'must be start from {{startIndex}}',
-        continuous_broken: 'should be {{expectedValue}}'
-    },
-    coerce(value, state, options) {
-        const { comparator, startIndex } = this._flags
+module.exports = [
+    {
+        name: 'array',
+        base: Joi.array(),
+        language: {
+            continuous_from: 'must be start from {{startIndex}}',
+            continuous_broken: 'should be {{expectedValue}}'
+        },
+        coerce(value, state, options) {
+            const { comparator, startIndex } = this._flags
 
-        Hoek.assert(comparator === undefined ||
-            typeof comparator === 'function' ||
-            typeof comparator === 'string', 'comparator must be a function or a string');
+            assert.ok(
+                comparator === undefined ||
+                    typeof comparator === 'function' ||
+                    typeof comparator === 'string',
+                'comparator must be a function or a string'
+            )
 
-        if (comparator) {
-            const localState = {
-                key: state.key,
-                path: state.path.concat(comparator),
-                parent: state.parent,
-                reference: state.reference
-            };
+            if (comparator) {
+                const localState = {
+                    key: state.key,
+                    path: state.path.concat(comparator),
+                    parent: state.parent,
+                    reference: state.reference
+                }
 
-            const records = _.orderBy(_.map(value, comparator))
+                const records = orderBy(map(value, comparator))
 
-            if (records[0] !== startIndex) {
-                const context = { comparator, records, startIndex }
+                if (records[0] !== startIndex) {
+                    const context = { comparator, records, startIndex }
 
-                return this.createError('array.continuous_from', context, localState, options);
-            }
+                    return this.createError(
+                        'array.continuous_from',
+                        context,
+                        localState,
+                        options
+                    )
+                }
 
-            for (let idx = 1; idx < records.length; idx++) {
-                const diff = records[idx] - records[idx - 1];
+                for (let idx = 1; idx < records.length; idx++) {
+                    const diff = records[idx] - records[idx - 1]
 
-                if (diff !== 1) {
-                    const obj = _.find(value, i => i.idx === records[idx])
-                    const context = {
-                        comparator,
-                        value: obj,
-                        expectedValue: records[idx - 1] + 1
-                    }
+                    if (diff !== 1) {
+                        const obj = find(value, i => i.idx === records[idx])
+                        const context = {
+                            comparator,
+                            value: obj,
+                            expectedValue: records[idx - 1] + 1
+                        }
 
-                    return this.createError('array.continuous_broken', context, localState, options);
+                        return this.createError(
+                            'array.continuous_broken',
+                            context,
+                            localState,
+                            options
+                        )
+                    }
                 }
             }
-        }
 
-        return value;
-    },
-    rules: [
-        {
-            name: 'continuous',
-            params: {
-                comparator: Joi.any(),
-                startIndex: Joi.number().integer().optional(),
-            },
-            setup(params) {
-                this._flags.comparator = params.comparator;
-                this._flags.startIndex = params.startIndex || 0;
-            },
-            validate(params, value, state, options) {
-                // No-op just to enable description
-                return value;
+            return value
+        },
+        rules: [
+            {
+                name: 'continuous',
+                params: {
+                    comparator: Joi.any(),
+                    startIndex: Joi.number().integer().optional()
+                },
+                setup(params) {
+                    this._flags.comparator = params.comparator
+                    this._flags.startIndex = params.startIndex || 0
+                },
+                validate(params, value, state, options) {
+                    // No-op just to enable description
+                    return value
+                }
             }
-        }
-    ]
-}];
+        ]
+    }
+]

package-lock.json

@@ -28,8 +28,9 @@
   },
   "homepage": "https://github.com/buianhthang/joi-array-extensions#readme",
   "dependencies": {
-    "hoek": "^4.2.0",
-    "lodash": "^4.17.4"
+    "lodash.find": "^4.6.0",
+    "lodash.map": "^4.6.0",
+    "lodash.orderby": "^4.6.0"
   },
   "peerDependencies": {
     "joi": ">=10.x.x"