Move types into their own folder

hapijs · May 14, 2017 · 0464639 · 0464639
1 parent 78843fa
commit 0464639
Show file tree

Hide file tree

Showing 27 changed files with 69 additions and 69 deletions.
diff --git a/lib/cast.js b/lib/cast.js
@@ -12,20 +12,20 @@ const Ref = require('./ref');
 
 const internals = {
     any: null,
-    date: require('./date'),
-    string: require('./string'),
-    number: require('./number'),
-    boolean: require('./boolean'),
+    date: require('./types/date'),
+    string: require('./types/string'),
+    number: require('./types/number'),
+    boolean: require('./types/boolean'),
     alt: null,
     object: null
 };
 
 
 exports.schema = function (config) {
 
-    internals.any = internals.any || new (require('./any'))();
-    internals.alt = internals.alt || require('./alternatives');
-    internals.object = internals.object || require('./object');
+    internals.any = internals.any || new (require('./types/any'))();
+    internals.alt = internals.alt || require('./types/alternatives');
+    internals.object = internals.object || require('./types/object');
 
     if (config !== undefined && config !== null && typeof config === 'object') {
 

diff --git a/lib/index.js b/lib/index.js
@@ -3,24 +3,24 @@
 // Load modules
 
 const Hoek = require('hoek');
-const Any = require('./any');
+const Any = require('./types/any');
 const Cast = require('./cast');
 const Errors = require('./errors');
-const Lazy = require('./lazy');
+const Lazy = require('./types/lazy');
 const Ref = require('./ref');
 
 
 // Declare internals
 
 const internals = {
-    alternatives: require('./alternatives'),
-    array: require('./array'),
-    boolean: require('./boolean'),
-    binary: require('./binary'),
-    date: require('./date'),
-    number: require('./number'),
-    object: require('./object'),
-    string: require('./string')
+    alternatives: require('./types/alternatives'),
+    array: require('./types/array'),
+    boolean: require('./types/boolean'),
+    binary: require('./types/binary'),
+    date: require('./types/date'),
+    number: require('./types/number'),
+    object: require('./types/object'),
+    string: require('./types/string')
 };
 
 

diff --git a/lib/alternatives.js → lib/types/alternatives/index.js b/lib/alternatives.js → lib/types/alternatives/index.js
@@ -3,9 +3,9 @@
 // Load modules
 
 const Hoek = require('hoek');
-const Any = require('./any');
-const Cast = require('./cast');
-const Ref = require('./ref');
+const Any = require('../any');
+const Cast = require('../../cast');
+const Ref = require('../../ref');
 
 
 // Declare internals

diff --git a/lib/any.js → lib/types/any/index.js b/lib/any.js → lib/types/any/index.js
@@ -3,16 +3,16 @@
 // Load modules
 
 const Hoek = require('hoek');
-const Ref = require('./ref');
-const Errors = require('./errors');
+const Ref = require('../../ref');
+const Errors = require('../../errors');
 let Alternatives = null;                // Delay-loaded to prevent circular dependencies
 let Cast = null;
 
 
 // Declare internals
 
 const internals = {
-    Set: require('./set')
+    Set: require('../../set')
 };
 
 
@@ -35,7 +35,7 @@ module.exports = internals.Any = class {
 
     constructor() {
 
-        Cast = Cast || require('./cast');
+        Cast = Cast || require('../../cast');
 
         this.isJoi = true;
         this._type = 'any';
@@ -83,7 +83,7 @@ module.exports = internals.Any = class {
 
     checkOptions(options) {
 
-        const Schemas = require('./schemas');
+        const Schemas = require('../../schemas');
         const result = Schemas.options.validate(options);
         if (result.error) {
             throw new Error(result.error.details[0].message);
@@ -381,7 +381,7 @@ module.exports = internals.Any = class {
         const then = options.hasOwnProperty('then') ? this.concat(Cast.schema(options.then)) : undefined;
         const otherwise = options.hasOwnProperty('otherwise') ? this.concat(Cast.schema(options.otherwise)) : undefined;
 
-        Alternatives = Alternatives || require('./alternatives');
+        Alternatives = Alternatives || require('../alternatives');
         const obj = Alternatives.when(ref, { is: options.is, then, otherwise });
         obj._flags.presence = 'ignore';
         obj._baseType = this;

diff --git a/lib/array.js → lib/types/array/index.js b/lib/array.js → lib/types/array/index.js
@@ -2,8 +2,8 @@
 
 // Load modules
 
-const Any = require('./any');
-const Cast = require('./cast');
+const Any = require('../any');
+const Cast = require('../../cast');
 const Hoek = require('hoek');
 
 

diff --git a/lib/binary.js → lib/types/binary/index.js b/lib/binary.js → lib/types/binary/index.js
@@ -2,7 +2,7 @@
 
 // Load modules
 
-const Any = require('./any');
+const Any = require('../any');
 const Hoek = require('hoek');
 
 

diff --git a/lib/boolean.js → lib/types/boolean/index.js b/lib/boolean.js → lib/types/boolean/index.js
@@ -2,14 +2,14 @@
 
 // Load modules
 
-const Any = require('./any');
+const Any = require('../any');
 const Hoek = require('hoek');
 
 
 // Declare internals
 
 const internals = {
-    Set: require('./set')
+    Set: require('../../set')
 };
 
 

diff --git a/lib/date.js → lib/types/date/index.js b/lib/date.js → lib/types/date/index.js
@@ -2,8 +2,8 @@
 
 // Load modules
 
-const Any = require('./any');
-const Ref = require('./ref');
+const Any = require('../any');
+const Ref = require('../../ref');
 const Hoek = require('hoek');
 
 

diff --git a/lib/lazy.js → lib/types/lazy/index.js b/lib/lazy.js → lib/types/lazy/index.js
@@ -2,7 +2,7 @@
 
 // Load modules
 
-const Any = require('./any');
+const Any = require('../any');
 const Hoek = require('hoek');
 
 

diff --git a/lib/number.js → lib/types/number/index.js b/lib/number.js → lib/types/number/index.js
@@ -2,8 +2,8 @@
 
 // Load modules
 
-const Any = require('./any');
-const Ref = require('./ref');
+const Any = require('../any');
+const Ref = require('../../ref');
 const Hoek = require('hoek');
 
 

diff --git a/lib/object.js → lib/types/object/index.js b/lib/object.js → lib/types/object/index.js
@@ -4,10 +4,10 @@
 
 const Hoek = require('hoek');
 const Topo = require('topo');
-const Any = require('./any');
-const Errors = require('./errors');
-const Cast = require('./cast');
-const Ref = require('./ref');
+const Any = require('../any');
+const Errors = require('../../errors');
+const Cast = require('../../cast');
+const Ref = require('../../ref');
 
 
 // Declare internals

diff --git a/lib/string.js → lib/types/string/index.js b/lib/string.js → lib/types/string/index.js
@@ -5,11 +5,11 @@
 const Net = require('net');
 const Hoek = require('hoek');
 const Isemail = require('isemail');
-const Any = require('./any');
-const Ref = require('./ref');
-const JoiDate = require('./date');
-const Uri = require('./string/uri');
-const Ip = require('./string/ip');
+const Any = require('../any');
+const Ref = require('../../ref');
+const JoiDate = require('../date');
+const Uri = require('./uri');
+const Ip = require('./ip');
 
 // Declare internals
 

diff --git a/lib/string/ip.js → lib/types/string/ip.js b/lib/string/ip.js → lib/types/string/ip.js
diff --git a/lib/string/rfc3986.js → lib/types/string/rfc3986.js b/lib/string/rfc3986.js → lib/types/string/rfc3986.js
diff --git a/lib/string/uri.js → lib/types/string/uri.js b/lib/string/uri.js → lib/types/string/uri.js
diff --git a/test/index.js b/test/index.js
@@ -2810,7 +2810,7 @@ describe('Joi', () => {
                 name: 'myType'
             });
 
-            const Any = require('../lib/any');
+            const Any = require('../lib/types/any');
             expect(customJoi).to.be.an.instanceof(Any);
             done();
         });

diff --git a/test/alternatives.js → test/types/alternatives.js b/test/alternatives.js → test/types/alternatives.js
@@ -4,8 +4,8 @@
 
 const Lab = require('lab');
 const Code = require('code');
-const Joi = require('..');
-const Helper = require('./helper');
+const Joi = require('../..');
+const Helper = require('../helper');
 
 
 // Declare internals

diff --git a/test/any.js → test/types/any.js b/test/any.js → test/types/any.js
@@ -4,8 +4,8 @@
 
 const Lab = require('lab');
 const Code = require('code');
-const Joi = require('../lib');
-const Helper = require('./helper');
+const Joi = require('../..');
+const Helper = require('../helper');
 
 
 // Declare internals

diff --git a/test/array.js → test/types/array.js b/test/array.js → test/types/array.js
@@ -4,8 +4,8 @@
 
 const Lab = require('lab');
 const Code = require('code');
-const Joi = require('../lib');
-const Helper = require('./helper');
+const Joi = require('../..');
+const Helper = require('../helper');
 
 
 // Declare internals

diff --git a/test/binary.js → test/types/binary.js b/test/binary.js → test/types/binary.js
@@ -4,8 +4,8 @@
 
 const Lab = require('lab');
 const Code = require('code');
-const Joi = require('../lib');
-const Helper = require('./helper');
+const Joi = require('../..');
+const Helper = require('../helper');
 
 
 // Declare internals

diff --git a/test/boolean.js → test/types/boolean.js b/test/boolean.js → test/types/boolean.js
@@ -4,8 +4,8 @@
 
 const Lab = require('lab');
 const Code = require('code');
-const Joi = require('../lib');
-const Helper = require('./helper');
+const Joi = require('../..');
+const Helper = require('../helper');
 
 
 // Declare internals

diff --git a/test/date.js → test/types/date.js b/test/date.js → test/types/date.js
@@ -4,8 +4,8 @@
 
 const Lab = require('lab');
 const Code = require('code');
-const Joi = require('../lib');
-const Helper = require('./helper');
+const Joi = require('../..');
+const Helper = require('../helper');
 
 
 // Declare internals

diff --git a/test/function.js → test/types/function.js b/test/function.js → test/types/function.js
@@ -4,8 +4,8 @@
 
 const Code = require('code');
 const Lab = require('lab');
-const Joi = require('../lib');
-const Helper = require('./helper');
+const Joi = require('../..');
+const Helper = require('../helper');
 
 
 // Declare internals

diff --git a/test/lazy.js → test/types/lazy.js b/test/lazy.js → test/types/lazy.js
@@ -4,9 +4,9 @@
 
 const Lab = require('lab');
 const Code = require('code');
-const Joi = require('../lib');
-const Lazy = require('../lib/lazy');
-const Helper = require('./helper');
+const Joi = require('../..');
+const Lazy = require('../../lib/types/lazy/index');
+const Helper = require('../helper');
 
 
 // Declare internals

diff --git a/test/number.js → test/types/number.js b/test/number.js → test/types/number.js
@@ -4,8 +4,8 @@
 
 const Lab = require('lab');
 const Code = require('code');
-const Joi = require('../lib');
-const Helper = require('./helper');
+const Joi = require('../..');
+const Helper = require('../helper');
 
 
 // Declare internals

diff --git a/test/object.js → test/types/object.js b/test/object.js → test/types/object.js
@@ -4,8 +4,8 @@
 
 const Lab = require('lab');
 const Code = require('code');
-const Joi = require('../lib');
-const Helper = require('./helper');
+const Joi = require('../..');
+const Helper = require('../helper');
 
 
 // Declare internals

diff --git a/test/string.js → test/types/string.js b/test/string.js → test/types/string.js
@@ -4,8 +4,8 @@
 
 const Lab = require('lab');
 const Code = require('code');
-const Joi = require('../lib');
-const Helper = require('./helper');
+const Joi = require('../..');
+const Helper = require('../helper');
 
 
 // Declare internals