deps: remove nano-prop dependency

evanlucas · evanlucas · commit f6d797ced2b5 · 2018-02-19T09:30:57.000-06:00
This is now built in to help-gen.
diff --git a/lib/validator/index.js b/lib/validator/index.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Builder = require('@helpdotcom/build-ast')
-const Prop = require('@helpdotcom/nano-prop')
+const Prop = require('../prop')
 const utils = require('../utils')
 const toCode = require('../to-code')
 const Validator = require('./validator')
diff --git a/lib/validator/types/index.js b/lib/validator/types/index.js
@@ -3,7 +3,7 @@
 // Define first since ArrayType and ObjectType have circular dependencies on it.
 exports.getCheck = getCheck
 
-const Prop = require('@helpdotcom/nano-prop')
+const Prop = require('../../prop')
 const ArrayType = require('./array')
 const BaseType = require('./base')
 const EmailType = require('./email')
diff --git a/lib/validator/types/object.js b/lib/validator/types/object.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Builder = require('@helpdotcom/build-ast')
-const Prop = require('@helpdotcom/nano-prop')
+const Prop = require('../../prop')
 const Base = require('./base')
 const utils = require('../../utils')
 const OP = Builder.objectPath
diff --git a/lib/validator/validator.js b/lib/validator/validator.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const Builder = require('@helpdotcom/build-ast')
-const Prop = require('@helpdotcom/nano-prop')
+const Prop = require('../prop')
 const utils = require('../utils')
 const is = require('../is-helper')
 const TYPES = require('./types')
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -15,7 +15,6 @@
   },
   "dependencies": {
     "@helpdotcom/build-ast": "^2.3.1",
-    "@helpdotcom/nano-prop": "^6.6.2",
     "acorn": "~2.7.0",
     "escodegen": "~1.8.0",
     "github-slugger": "~1.0.1",
diff --git a/test/common.js b/test/common.js
@@ -10,8 +10,7 @@ if (require.main === module) {
 const assert = require('assert')
 const path = require('path')
 const Module = require('module').Module
-const Prop = require('@helpdotcom/nano-prop')
-const {ModelManager, Validator} = require('../')
+const {ModelManager, Validator, Prop} = require('../')
 const dir = __dirname
 var count = 0
 
diff --git a/test/model/manager.js b/test/model/manager.js
@@ -1,8 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
-const {ModelManager} = require('../../')
+const {ModelManager, Prop} = require('../../')
 
 const ALREADY_DEFINED_ERROR = 'Model "Visitor" has already been defined'
 const INVALID_NAME_ERROR = 'name is required and must be a valid identifier'
diff --git a/test/model/types/array.js b/test/model/types/array.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const test = require('tap').test
 const common = require('../../common')
 const compile = common.compileManager
diff --git a/test/model/types/object.js b/test/model/types/object.js
@@ -1,6 +1,6 @@
 'use strict'
 
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const test = require('tap').test
 const common = require('../../common')
 const compile = common.compileManager
diff --git a/test/model/types/ref.js b/test/model/types/ref.js
@@ -5,7 +5,7 @@ const path = require('path')
 const mkdirp = require('mkdirp')
 const rimraf = require('rimraf')
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const Manager = require('../../../').ModelManager
 const TMP = path.join(__dirname, 'fixtures')
 
diff --git a/test/tree.js b/test/tree.js
@@ -1,8 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
-const { Validator } = require('../')
+const {Prop, Validator} = require('../')
 const { propSort } = require('../lib/utils')
 
 function flattenTreeForValidator(opts) {
diff --git a/test/utils.js b/test/utils.js
@@ -2,7 +2,7 @@
 
 const test = require('tap').test
 const utils = require('../lib/utils')
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../')
 
 test('isValidIdentifier', (t) => {
   const v = utils.isValidIdentifier
diff --git a/test/validator/generation-warnings.js b/test/validator/generation-warnings.js
@@ -1,9 +1,8 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
 const { Log } = require('kittie')
-const Validator = require('../../').Validator
+const {Prop, Validator} = require('../../')
 
 function shim(object, method, replacer) {
   const old = object[method]
diff --git a/test/validator/modes/fail-on-extra-props.js b/test/validator/modes/fail-on-extra-props.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const { compileValidator } = require('../../common')
 
 test('validator - always fail on extraneous properties', {
diff --git a/test/validator/modes/optional-props-without-undefined.js b/test/validator/modes/optional-props-without-undefined.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const { compileValidator } = require('../../common')
 
 test('validator - missing props become undefined', {
diff --git a/test/validator/modes/strip-extra-props.js b/test/validator/modes/strip-extra-props.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const { compileValidator } = require('../../common')
 
 test('validator - always strip extraneous properties', {
diff --git a/test/validator/modes/sync-manual-result.js b/test/validator/modes/sync-manual-result.js
@@ -1,8 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
-const Validator = require('../../../').Validator
+const {Prop, Validator} = require('../../../')
 const { createModule } = require('../../common')
 
 test('validator - can store the result in a specific variable and work sync', {
diff --git a/test/validator/modes/undefined-optional-props.js b/test/validator/modes/undefined-optional-props.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const { compileValidator } = require('../../common')
 
 test('validator - is desired, optional properties may be `undefined`', (t) => {
diff --git a/test/validator/targeted-cloning.js b/test/validator/targeted-cloning.js
@@ -2,9 +2,8 @@
 
 const test = require('tap').test
 const toCode = require('../../lib/to-code')
-const Prop = require('@helpdotcom/nano-prop')
 const Builder = require('@helpdotcom/build-ast')
-const Validator = require('../../').Validator
+const {Prop, Validator} = require('../../')
 
 test('validators can clone onto an existing object', (t) => {
   const input = {
diff --git a/test/validator/top-level-var-merge.js b/test/validator/top-level-var-merge.js
@@ -1,8 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
-const Validator = require('../../').Validator
+const {Prop, Validator} = require('../../')
 
 test('top level vars - can merge the vars of multiple generate calls', (t) => {
   const input1 = {
diff --git a/test/validator/types/array.js b/test/validator/types/array.js
@@ -2,7 +2,7 @@
 
 const test = require('tap').test
 const common = require('../../common')
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 
 const fn = common.compileValidator({
   name: 'list_visitors_response'
diff --git a/test/validator/types/object.js b/test/validator/types/object.js
@@ -3,10 +3,9 @@
 const test = require('tap').test
 const common = require('../../common')
 const vm = require('vm')
-const Prop = require('@helpdotcom/nano-prop')
 const Builder = require('@helpdotcom/build-ast')
 const toCode = require('../../../lib/to-code')
-const Validator = require('../../../').Validator
+const {Prop, Validator} = require('../../../')
 
 const fn = common.compileValidator({
   name: 'list_visitors_response'
diff --git a/test/validator/types/ref.js b/test/validator/types/ref.js
@@ -2,7 +2,7 @@
 
 const test = require('tap').test
 const common = require('../../common')
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 
 class DummyModel {
   constructor(obj) {
diff --git a/test/validator/validators/array-allow-null-no-props.js b/test/validator/validators/array-allow-null-no-props.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const { compileValidator } = require('../../common')
 
 test('validator - array allowNull', (t) => {
diff --git a/test/validator/validators/array-allow-null.js b/test/validator/validators/array-allow-null.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const { compileValidator } = require('../../common')
 
 test('validator - array allowNull', (t) => {
diff --git a/test/validator/validators/array-with-optional-child.js b/test/validator/validators/array-with-optional-child.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const { compileValidator } = require('../../common')
 
 test('validator - array with optional child', (t) => {
diff --git a/test/validator/validators/complicated-object.js b/test/validator/validators/complicated-object.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const common = require('../../common')
 const compileValidator = common.compileValidator
 
diff --git a/test/validator/validators/generic-object.js b/test/validator/validators/generic-object.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const { compileValidator } = require('../../common')
 
 test('validator - object without props', (t) => {
diff --git a/test/validator/validators/multi-simple.js b/test/validator/validators/multi-simple.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const { compileValidator } = require('../../common')
 
 const DATE = new Date().toISOString()
diff --git a/test/validator/validators/nested-arrays.js b/test/validator/validators/nested-arrays.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const { compileValidator } = require('../../common')
 
 test('validator - nested arrays', (t) => {
diff --git a/test/validator/validators/single-nested.js b/test/validator/validators/single-nested.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const { compileValidator } = require('../../common')
 
 const DATE = new Date().toISOString()
diff --git a/test/validator/validators/single-simple.js b/test/validator/validators/single-simple.js
@@ -1,7 +1,7 @@
 'use strict'
 
 const test = require('tap').test
-const Prop = require('@helpdotcom/nano-prop')
+const {Prop} = require('../../../')
 const { compileValidator } = require('../../common')
 
 const DATE = new Date().toISOString()
