Update code to new packages

shouldjs · Aug 10, 2016 · 5091f9c · 5091f9c
1 parent b792457
commit 5091f9c
Show file tree

Hide file tree

Showing 14 changed files with 844 additions and 1,130 deletions.
diff --git a/lib/assertion-error.js b/lib/assertion-error.js
@@ -4,7 +4,8 @@
  * Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
  * MIT Licensed
  */
-import { merge, functionName } from './util';
+import { merge } from 'should-util';
+import { functionName } from './util';
 import { format } from './format';
 
 /**

diff --git a/lib/config.js b/lib/config.js
@@ -6,11 +6,11 @@
  */
 
 import format from 'should-format';
-import { defaultTypeAdaptorStorage } from './iterator';
+import { defaultTypeAdaptorStorage } from 'should-type-adaptors';
 
 var config = {
   typeAdaptors: defaultTypeAdaptorStorage,
-  
+
   getFormatter: function(opts) {
     return new format.Formatter(opts || config);
   }

diff --git a/lib/ext/assert.js b/lib/ext/assert.js
@@ -5,7 +5,7 @@
  * MIT Licensed
  */
 
-import { merge } from '../util';
+import { merge } from 'should-util';
 import assert from './_assert';
 import AssertionError from '../assertion-error';
 

diff --git a/lib/ext/contain.js b/lib/ext/contain.js
@@ -5,7 +5,7 @@
  * MIT Licensed
  */
 
-import { isIterable, some, isEmpty, forEach, iterator } from '../iterator';
+import { isIterable, some, isEmpty, forEach, iterator } from 'should-type-adaptors';
 
 import eql from 'should-equal';
 

diff --git a/lib/ext/eql.js b/lib/ext/eql.js
@@ -8,7 +8,7 @@
 import eql from 'should-equal';
 import getType from 'should-type';
 import { formatProp, format } from '../format';
-import { forEach } from '../iterator';
+import { forEach } from 'should-type-adaptors';
 
 function formatEqlResult(r, a, b) {
   return ((r.path.length > 0 ? 'at ' + r.path.map(formatProp).join(' -> ') : '') +

diff --git a/lib/ext/error.js b/lib/ext/error.js
@@ -4,7 +4,8 @@
  * Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
  * MIT Licensed
  */
-import { functionName, isIterator, isGeneratorFunction } from '../util';
+import { isIterator, isGeneratorFunction } from 'should-util';
+import { functionName } from '../util';
 
 export default function(should, Assertion) {
   var i = should.format;

diff --git a/lib/ext/match.js b/lib/ext/match.js
@@ -6,7 +6,7 @@
  */
 
 import { formatProp } from '../format';
-import { some, forEach } from '../iterator';
+import { some, forEach } from 'should-type-adaptors';
 import eql from 'should-equal';
 
 export default function(should, Assertion) {

diff --git a/lib/ext/property.js b/lib/ext/property.js
@@ -5,9 +5,10 @@
  * MIT Licensed
  */
 
-import { convertPropertyName, hasOwnProperty } from '../util';
+import { convertPropertyName } from '../util';
+import { hasOwnProperty } from 'should-util';
 import { formatProp } from '../format';
-import { isEmpty, has as hasKey, get as getValue, size } from '../iterator';
+import { isEmpty, has as hasKey, get as getValue, size } from 'should-type-adaptors';
 import eql from 'should-equal';
 
 var aSlice = Array.prototype.slice;

diff --git a/lib/format.js b/lib/format.js
@@ -1,10 +1,11 @@
-
+import sformat from 'should-format';
 import config from './config';
 
 export function format(value, opts) {
   return config.getFormatter(opts).format(value);
 }
 
 export function formatProp(value) {
-  return config.getFormatter().formatPropertyName(String(value));
+  var formatter = config.getFormatter();
+  return sformat.formatPlainObjectKey.call(formatter, value);
 }
diff --git a/lib/iterator.js b/lib/iterator.js
diff --git a/lib/should.js b/lib/should.js
@@ -4,7 +4,9 @@
  * Copyright(c) 2013-2016 Denis Bardadym <bardadymchik@gmail.com>
  * MIT Licensed
  */
-
+import t from 'should-type';
+import eq from 'should-equal';
+import defaultFormat from 'should-format';
 
 import { isWrapperType }  from './util';
 import { format } from './format';
@@ -42,6 +44,12 @@ function should(obj) {
 should.AssertionError = AssertionError;
 should.Assertion = Assertion;
 
+// exposing modules dirty way
+should.modules = {
+  format: defaultFormat,
+  type: t,
+  equal: eq
+};
 should.format = format;
 
 /**