diff --git a/.travis.yml b/.travis.yml
index 10bd436..5d01e71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
language: node_js
node_js:
-#- stable
+- stable
- 8
- 6
sudo: required
@@ -8,7 +8,7 @@ services:
- docker
env:
matrix:
- - POSTGRES_Skip=0 POSTGRES_Host=localhost POSTGRES_Port=5432 POSTGRES_Username=postgres
+ - POSTGRES_Skip=1 POSTGRES_Host=localhost POSTGRES_Port=5432 POSTGRES_Username=postgres
POSTGRES_Password=!Passw0rd POSTGRES_Database=typeorm_mg POSTGRES_SSL=0 MYSQL_Skip=0
MYSQL_Host=localhost MYSQL_Port=3306 MYSQL_Username=root MYSQL_Password=!Passw0rd
MYSQL_Database=typeorm_mg MYSQL_SSL=1 MARIADB_Skip=0 MARIADB_Host=localhost MARIADB_Port=3307
@@ -33,17 +33,21 @@ before_install:
- if [ -z "$DOCKER_USERNAME" ]; then mv docker-compose-without-login.yml docker-compose.yml; fi
- if [ -z "$DOCKER_USERNAME" ]; then export ORACLE_Skip=1; fi
- docker-compose up -d
-- mkdir /opt/oracle
-- if [ -n "$DOCKER_USERNAME" ]; then docker cp typeorm-mg-oracle-client:/usr/lib/oracle/12.2/client64/lib /opt/oracle/instantclient_12_2; fi
-- export LD_LIBRARY_PATH=/opt/oracle/instantclient_12_2:$LD_LIBRARY_PATH
- npm install -g npm@5
- npm install -g greenkeeper-lockfile@1
+- mkdir /opt/oracle
+install:
+- case $TRAVIS_BRANCH in greenkeeper*) npm i;; *) npm ci;; esac;
before_script:
+- if [ -n "$DOCKER_USERNAME" ]; then npm i oracledb --no-save; docker cp typeorm-mg-oracle-client:/usr/lib/oracle/12.2/client64/lib /opt/oracle/instantclient_12_2; fi
+- export LD_LIBRARY_PATH=/opt/oracle/instantclient_12_2:$LD_LIBRARY_PATH
- greenkeeper-lockfile-update
- typings install
- npm link typescript
- tsc
- sleep 180
+- docker logs typeorm-mg-postgres
+
after_script:
- greenkeeper-lockfile-upload
dd:
diff --git a/README.md b/README.md
index 02221aa..3ccb0bc 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,9 @@ To install module globally simply type `npm i -g typeorm-model-generator` in you
### Npx way
Thanks to npx you can use npm modules without polluting global installs. So nothing to do here :)
>To use `npx` you need to use npm at version at least 5.2.0. Try updating your npm by `npm i -g npm`
+### Database drivers
+All database drivers except oracle are installed by default. To use typeorm-model-generator with oracle databese you need to install driver with `npm i oracledb` and configure [oracle install client](http://www.oracle.com/technetwork/database/database-technologies/instant-client/overview/index.html) on your machine.
+
## Usage
```shell
@@ -53,6 +56,8 @@ Options:
--cp, --case-property Convert property names to specified case
[choices: "pascal", "camel", "none"] [default: "none"]
--lazy Generate lazy relations [boolean] [default: false]
+ --namingStrategy Use custom naming strategy
+ --relationIds Generate RelationId fields [boolean] [default: false]
--generateConstructor Generate constructor allowing partial initialization
[boolean] [default: false]
```
@@ -85,3 +90,7 @@ Options:
```
npx typeorm-model-generator -d "Z:\sqlite.db" -e sqlite -o .
````
+## Naming strategy
+If you want to generate custom names for properties in generated entities you need to use custom naming strategy. You need to create your own version of [NamingStrategy](https://github.com/Kononnable/typeorm-model-generator/blob/master/src/NamingStrategy.ts) and pass it as command parameter.
+
+```typeorm-model-generator -d typeorm_mg --namingStrategy=./NamingStrategy -e sqlite -db /tmp/sqliteto.db```
diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..042c8c5
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,9 @@
+# Changelog
+
+
+## 0.2.17
+
+* added support for relationId fields
+* added support for custom naming entity fields
+* removed oracledb from dependencies
+* generating nullable column types for nullable columns
diff --git a/gulpfile.js b/gulpfile.js
index 5e795ba..d8dac98 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -24,6 +24,7 @@ gulp.task('clean', function () {
gulp.task('prettier', function () {
return gulp.src('.prettierrc')
.pipe(shell(['prettier ./src/**/*.ts --write']))
+ .pipe(shell(['prettier ./src/*.ts --write']))
});
gulp.task('pre-commit', ['prettier'], function () {
diff --git a/package-lock.json b/package-lock.json
index 23ffa04..bfe218a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "typeorm-model-generator",
- "version": "0.2.16",
+ "version": "0.2.17",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -19,9 +19,9 @@
"integrity": "sha512-r4snW6Q8ICL3Y8hGzYJRvyG/+sc+kvkewXNedG9tQjoHmUFMwMSv/o45GWQUQswevGnWghiGkpRPivFfOuMsOA==",
"dev": true,
"requires": {
- "chalk": "2.3.0",
- "esutils": "2.0.2",
- "js-tokens": "3.0.2"
+ "chalk": "^2.0.0",
+ "esutils": "^2.0.2",
+ "js-tokens": "^3.0.0"
}
},
"@gulp-sourcemaps/identity-map": {
@@ -30,11 +30,11 @@
"integrity": "sha1-z6I7xYQPkQTOMqZedNt+epdLvuE=",
"dev": true,
"requires": {
- "acorn": "5.4.1",
- "css": "2.2.1",
- "normalize-path": "2.1.1",
- "source-map": "0.5.7",
- "through2": "2.0.3"
+ "acorn": "^5.0.3",
+ "css": "^2.2.1",
+ "normalize-path": "^2.1.1",
+ "source-map": "^0.5.6",
+ "through2": "^2.0.3"
},
"dependencies": {
"normalize-path": {
@@ -43,7 +43,7 @@
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"dev": true,
"requires": {
- "remove-trailing-separator": "1.1.0"
+ "remove-trailing-separator": "^1.0.1"
}
},
"source-map": {
@@ -58,8 +58,8 @@
"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
"dev": true,
"requires": {
- "readable-stream": "2.3.3",
- "xtend": "4.0.1"
+ "readable-stream": "^2.1.5",
+ "xtend": "~4.0.1"
}
}
}
@@ -70,8 +70,8 @@
"integrity": "sha1-iQrnxdjId/bThIYCFazp1+yUW9o=",
"dev": true,
"requires": {
- "normalize-path": "2.1.1",
- "through2": "2.0.3"
+ "normalize-path": "^2.0.1",
+ "through2": "^2.0.3"
},
"dependencies": {
"normalize-path": {
@@ -80,7 +80,7 @@
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"dev": true,
"requires": {
- "remove-trailing-separator": "1.1.0"
+ "remove-trailing-separator": "^1.0.1"
}
},
"through2": {
@@ -89,8 +89,8 @@
"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
"dev": true,
"requires": {
- "readable-stream": "2.3.3",
- "xtend": "4.0.1"
+ "readable-stream": "^2.1.5",
+ "xtend": "~4.0.1"
}
}
}
@@ -116,7 +116,7 @@
"integrity": "sha512-MFiW54UOSt+f2bRw8J7LgQeIvE/9b4oGvwU7XW30S9QGAiHGnU/fmiOprsyMkdmH2rl8xSPc0/yrQw8juXU6bQ==",
"dev": true,
"requires": {
- "@types/chai": "4.1.3"
+ "@types/chai": "*"
}
},
"@types/chai-subset": {
@@ -125,7 +125,7 @@
"integrity": "sha512-Aof+FLfWzBPzDgJ2uuBuPNOBHVx9Siyw4vmOcsMgsuxX1nfUWSlzpq4pdvQiaBgGjGS7vP/Oft5dpJbX4krT1A==",
"dev": true,
"requires": {
- "@types/chai": "4.1.3"
+ "@types/chai": "*"
}
},
"@types/events": {
@@ -140,7 +140,7 @@
"integrity": "sha512-Q3FWsbdmkQd1ib11A4XNWQvRD//5KpPoGawA8aB2DR7pWKoW9XQv3+dGxD/Z1eVFze23Okdo27ZQytVFlweKvQ==",
"dev": true,
"requires": {
- "@types/node": "10.0.1"
+ "@types/node": "*"
}
},
"@types/handlebars": {
@@ -161,8 +161,8 @@
"integrity": "sha512-N06zogdWXWrI9Giqz+5M3xM9B4FZ68lwsRgIbVwaijHrhY4XuLy0BVNhyMUqDYlUsBJk++k2NtpFiuhr861BkQ==",
"dev": true,
"requires": {
- "@types/events": "1.2.0",
- "@types/node": "10.0.1"
+ "@types/events": "*",
+ "@types/node": "*"
}
},
"@types/mysql": {
@@ -171,7 +171,7 @@
"integrity": "sha512-qjiJUk8vPIuTtvIPx5sAtwVwProXAQm6t6+fvJOIfL0bO8Pj0ap8PEFJ3df5MVyjYzTKRxLudidhoCk642RoZQ==",
"dev": true,
"requires": {
- "@types/node": "10.0.1"
+ "@types/node": "*"
}
},
"@types/node": {
@@ -185,7 +185,7 @@
"integrity": "sha512-7cgZaKEfYcPPTScxxCoYoLxmmhM/PBobGBfxE3RGzRJl8YKhkyGKyExFu8fTOpF2cPgdfh83NGKBVX7prWzb+Q==",
"dev": true,
"requires": {
- "@types/node": "10.0.1"
+ "@types/node": "*"
}
},
"@types/pg": {
@@ -194,9 +194,9 @@
"integrity": "sha512-naSYLMOIBU+/BddUlQUyQuba9reG5yN0MR7g4EcN/AEt3zll48fGozX8s7xjaXuKmFOS1qqOrr/ZeF6SSOjKCw==",
"dev": true,
"requires": {
- "@types/events": "1.2.0",
- "@types/node": "10.0.1",
- "@types/pg-types": "1.11.4"
+ "@types/events": "*",
+ "@types/node": "*",
+ "@types/pg-types": "*"
}
},
"@types/pg-types": {
@@ -205,7 +205,7 @@
"integrity": "sha512-WdIiQmE347LGc1Vq3Ki8sk3iyCuLgnccqVzgxek6gEHp2H0p3MQ3jniIHt+bRODXKju4kNQ+mp53lmP5+/9moQ==",
"dev": true,
"requires": {
- "moment": "2.22.1"
+ "moment": ">=2.14.0"
}
},
"@types/sinon": {
@@ -238,7 +238,7 @@
"integrity": "sha512-KjZwU26uG3u6eZcfGbTULzFcsoz6pegNKtHPksZPOUsiKo5bUmiBPa38FuHZ/Eun+XYh/JCCkS9AS3Lu4McQOQ==",
"dev": true,
"requires": {
- "acorn": "5.4.1"
+ "acorn": "^5.0.0"
}
},
"agent-base": {
@@ -247,8 +247,8 @@
"integrity": "sha1-1t4Q1a9hMtW9aSQn1G/FOFOQlMc=",
"dev": true,
"requires": {
- "extend": "3.0.1",
- "semver": "5.0.3"
+ "extend": "~3.0.0",
+ "semver": "~5.0.1"
},
"dependencies": {
"semver": {
@@ -265,10 +265,10 @@
"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
"dev": true,
"requires": {
- "co": "4.6.0",
- "fast-deep-equal": "1.1.0",
- "fast-json-stable-stringify": "2.0.0",
- "json-schema-traverse": "0.3.1"
+ "co": "^4.6.0",
+ "fast-deep-equal": "^1.0.0",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.3.0"
}
},
"align-text": {
@@ -276,9 +276,9 @@
"resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
"requires": {
- "kind-of": "3.2.2",
- "longest": "1.0.1",
- "repeat-string": "1.6.1"
+ "kind-of": "^3.0.2",
+ "longest": "^1.0.1",
+ "repeat-string": "^1.5.2"
}
},
"amdefine": {
@@ -292,7 +292,7 @@
"integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=",
"dev": true,
"requires": {
- "string-width": "2.1.1"
+ "string-width": "^2.0.0"
}
},
"ansi-colors": {
@@ -301,7 +301,7 @@
"integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
"dev": true,
"requires": {
- "ansi-wrap": "0.1.0"
+ "ansi-wrap": "^0.1.0"
}
},
"ansi-cyan": {
@@ -347,7 +347,7 @@
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
"integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
"requires": {
- "color-convert": "1.9.1"
+ "color-convert": "^1.9.0"
}
},
"ansi-wrap": {
@@ -378,7 +378,7 @@
"integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
"dev": true,
"requires": {
- "buffer-equal": "1.0.0"
+ "buffer-equal": "^1.0.0"
}
},
"archy": {
@@ -392,7 +392,7 @@
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz",
"integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=",
"requires": {
- "sprintf-js": "1.0.3"
+ "sprintf-js": "~1.0.2"
}
},
"argv": {
@@ -407,8 +407,8 @@
"integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
"dev": true,
"requires": {
- "arr-flatten": "1.1.0",
- "array-slice": "0.2.3"
+ "arr-flatten": "^1.0.1",
+ "array-slice": "^0.2.3"
}
},
"arr-flatten": {
@@ -523,8 +523,8 @@
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
"requires": {
- "core-js": "2.5.3",
- "regenerator-runtime": "0.11.1"
+ "core-js": "^2.4.0",
+ "regenerator-runtime": "^0.11.0"
}
},
"balanced-match": {
@@ -538,13 +538,13 @@
"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
"dev": true,
"requires": {
- "cache-base": "1.0.1",
- "class-utils": "0.3.6",
- "component-emitter": "1.2.1",
- "define-property": "1.0.0",
- "isobject": "3.0.1",
- "mixin-deep": "1.3.1",
- "pascalcase": "0.1.1"
+ "cache-base": "^1.0.1",
+ "class-utils": "^0.3.5",
+ "component-emitter": "^1.2.1",
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.1",
+ "mixin-deep": "^1.2.0",
+ "pascalcase": "^0.1.1"
},
"dependencies": {
"define-property": {
@@ -553,7 +553,7 @@
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
"dev": true,
"requires": {
- "is-descriptor": "1.0.2"
+ "is-descriptor": "^1.0.0"
}
}
}
@@ -570,7 +570,7 @@
"dev": true,
"optional": true,
"requires": {
- "tweetnacl": "0.14.5"
+ "tweetnacl": "^0.14.3"
}
},
"beeper": {
@@ -594,7 +594,7 @@
"resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz",
"integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=",
"requires": {
- "readable-stream": "2.3.3"
+ "readable-stream": "^2.0.5"
}
},
"bluebird": {
@@ -609,7 +609,7 @@
"integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
"dev": true,
"requires": {
- "hoek": "4.2.1"
+ "hoek": "4.x.x"
}
},
"boxen": {
@@ -618,13 +618,13 @@
"integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==",
"dev": true,
"requires": {
- "ansi-align": "2.0.0",
- "camelcase": "4.1.0",
- "chalk": "2.3.0",
- "cli-boxes": "1.0.0",
- "string-width": "2.1.1",
- "term-size": "1.2.0",
- "widest-line": "2.0.0"
+ "ansi-align": "^2.0.0",
+ "camelcase": "^4.0.0",
+ "chalk": "^2.0.1",
+ "cli-boxes": "^1.0.0",
+ "string-width": "^2.0.0",
+ "term-size": "^1.2.0",
+ "widest-line": "^2.0.0"
},
"dependencies": {
"camelcase": {
@@ -640,7 +640,7 @@
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
"integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
"requires": {
- "balanced-match": "1.0.0",
+ "balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
@@ -650,9 +650,9 @@
"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
"dev": true,
"requires": {
- "expand-range": "1.8.2",
- "preserve": "0.2.0",
- "repeat-element": "1.1.2"
+ "expand-range": "^1.8.1",
+ "preserve": "^0.2.0",
+ "repeat-element": "^1.1.2"
}
},
"browser-process-hrtime": {
@@ -681,8 +681,8 @@
"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz",
"integrity": "sha512-YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw==",
"requires": {
- "base64-js": "1.3.0",
- "ieee754": "1.1.11"
+ "base64-js": "^1.0.2",
+ "ieee754": "^1.1.4"
}
},
"buffer-equal": {
@@ -708,15 +708,15 @@
"integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
"dev": true,
"requires": {
- "collection-visit": "1.0.0",
- "component-emitter": "1.2.1",
- "get-value": "2.0.6",
- "has-value": "1.0.0",
- "isobject": "3.0.1",
- "set-value": "2.0.0",
- "to-object-path": "0.3.0",
- "union-value": "1.0.0",
- "unset-value": "1.0.0"
+ "collection-visit": "^1.0.0",
+ "component-emitter": "^1.2.1",
+ "get-value": "^2.0.6",
+ "has-value": "^1.0.0",
+ "isobject": "^3.0.1",
+ "set-value": "^2.0.0",
+ "to-object-path": "^0.3.0",
+ "union-value": "^1.0.0",
+ "unset-value": "^1.0.0"
}
},
"callsites": {
@@ -730,8 +730,8 @@
"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz",
"integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=",
"requires": {
- "no-case": "2.3.2",
- "upper-case": "1.1.3"
+ "no-case": "^2.2.0",
+ "upper-case": "^1.1.1"
}
},
"camelcase": {
@@ -758,8 +758,8 @@
"integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=",
"optional": true,
"requires": {
- "align-text": "0.1.4",
- "lazy-cache": "1.0.4"
+ "align-text": "^0.1.3",
+ "lazy-cache": "^1.0.3"
}
},
"chai": {
@@ -768,12 +768,12 @@
"integrity": "sha1-D2RYS6ZC8PKs4oBiefTwbKI61zw=",
"dev": true,
"requires": {
- "assertion-error": "1.1.0",
- "check-error": "1.0.2",
- "deep-eql": "3.0.1",
- "get-func-name": "2.0.0",
- "pathval": "1.1.0",
- "type-detect": "4.0.6"
+ "assertion-error": "^1.0.1",
+ "check-error": "^1.0.1",
+ "deep-eql": "^3.0.0",
+ "get-func-name": "^2.0.0",
+ "pathval": "^1.0.0",
+ "type-detect": "^4.0.0"
}
},
"chai-as-promised": {
@@ -782,7 +782,7 @@
"integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==",
"dev": true,
"requires": {
- "check-error": "1.0.2"
+ "check-error": "^1.0.2"
}
},
"chai-subset": {
@@ -796,9 +796,9 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz",
"integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==",
"requires": {
- "ansi-styles": "3.2.0",
- "escape-string-regexp": "1.0.5",
- "supports-color": "4.5.0"
+ "ansi-styles": "^3.1.0",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^4.0.0"
}
},
"change-case": {
@@ -806,24 +806,24 @@
"resolved": "https://registry.npmjs.org/change-case/-/change-case-3.0.2.tgz",
"integrity": "sha512-Mww+SLF6MZ0U6kdg11algyKd5BARbyM4TbFBepwowYSR5ClfQGCGtxNXgykpN0uF/bstWeaGDT4JWaDh8zWAHA==",
"requires": {
- "camel-case": "3.0.0",
- "constant-case": "2.0.0",
- "dot-case": "2.1.1",
- "header-case": "1.0.1",
- "is-lower-case": "1.1.3",
- "is-upper-case": "1.1.2",
- "lower-case": "1.1.4",
- "lower-case-first": "1.0.2",
- "no-case": "2.3.2",
- "param-case": "2.1.1",
- "pascal-case": "2.0.1",
- "path-case": "2.1.1",
- "sentence-case": "2.1.1",
- "snake-case": "2.1.0",
- "swap-case": "1.1.2",
- "title-case": "2.1.1",
- "upper-case": "1.1.3",
- "upper-case-first": "1.1.2"
+ "camel-case": "^3.0.0",
+ "constant-case": "^2.0.0",
+ "dot-case": "^2.1.0",
+ "header-case": "^1.0.0",
+ "is-lower-case": "^1.1.0",
+ "is-upper-case": "^1.1.0",
+ "lower-case": "^1.1.1",
+ "lower-case-first": "^1.0.0",
+ "no-case": "^2.3.2",
+ "param-case": "^2.1.0",
+ "pascal-case": "^2.0.0",
+ "path-case": "^2.1.0",
+ "sentence-case": "^2.1.0",
+ "snake-case": "^2.1.0",
+ "swap-case": "^1.1.0",
+ "title-case": "^2.1.0",
+ "upper-case": "^1.1.1",
+ "upper-case-first": "^1.1.0"
}
},
"check-error": {
@@ -844,10 +844,10 @@
"integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
"dev": true,
"requires": {
- "arr-union": "3.1.0",
- "define-property": "0.2.5",
- "isobject": "3.0.1",
- "static-extend": "0.1.2"
+ "arr-union": "^3.1.0",
+ "define-property": "^0.2.5",
+ "isobject": "^3.0.0",
+ "static-extend": "^0.1.1"
},
"dependencies": {
"arr-union": {
@@ -862,7 +862,7 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
},
"is-accessor-descriptor": {
@@ -871,7 +871,7 @@
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -880,7 +880,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -891,7 +891,7 @@
"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -900,7 +900,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -911,9 +911,9 @@
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "0.1.6",
- "is-data-descriptor": "0.1.4",
- "kind-of": "5.1.0"
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
}
},
"kind-of": {
@@ -936,7 +936,7 @@
"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
"dev": true,
"requires": {
- "restore-cursor": "1.0.1"
+ "restore-cursor": "^1.0.1"
}
},
"cli-highlight": {
@@ -944,11 +944,11 @@
"resolved": "https://registry.npmjs.org/cli-highlight/-/cli-highlight-1.2.3.tgz",
"integrity": "sha512-cmc4Y2kJuEpT2KZd9pgWWskpDMMfJu2roIcY1Ya/aIItufF5FKsV/NtA6vvdhSUllR8KJfvQDNmIcskU+MKLDg==",
"requires": {
- "chalk": "2.3.0",
- "highlight.js": "9.12.0",
- "mz": "2.7.0",
- "parse5": "3.0.3",
- "yargs": "10.1.2"
+ "chalk": "^2.3.0",
+ "highlight.js": "^9.6.0",
+ "mz": "^2.4.0",
+ "parse5": "^3.0.3",
+ "yargs": "^10.0.3"
},
"dependencies": {
"camelcase": {
@@ -961,9 +961,9 @@
"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
"requires": {
- "string-width": "2.1.1",
- "strip-ansi": "4.0.0",
- "wrap-ansi": "2.1.0"
+ "string-width": "^2.1.1",
+ "strip-ansi": "^4.0.0",
+ "wrap-ansi": "^2.0.0"
}
},
"yargs": {
@@ -971,18 +971,18 @@
"resolved": "https://registry.npmjs.org/yargs/-/yargs-10.1.2.tgz",
"integrity": "sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==",
"requires": {
- "cliui": "4.1.0",
- "decamelize": "1.2.0",
- "find-up": "2.1.0",
- "get-caller-file": "1.0.2",
- "os-locale": "2.1.0",
- "require-directory": "2.1.1",
- "require-main-filename": "1.0.1",
- "set-blocking": "2.0.0",
- "string-width": "2.1.1",
- "which-module": "2.0.0",
- "y18n": "3.2.1",
- "yargs-parser": "8.1.0"
+ "cliui": "^4.0.0",
+ "decamelize": "^1.1.1",
+ "find-up": "^2.1.0",
+ "get-caller-file": "^1.0.1",
+ "os-locale": "^2.0.0",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^1.0.1",
+ "set-blocking": "^2.0.0",
+ "string-width": "^2.0.0",
+ "which-module": "^2.0.0",
+ "y18n": "^3.2.1",
+ "yargs-parser": "^8.1.0"
}
},
"yargs-parser": {
@@ -990,7 +990,7 @@
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz",
"integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==",
"requires": {
- "camelcase": "4.1.0"
+ "camelcase": "^4.1.0"
}
}
}
@@ -1007,8 +1007,8 @@
"integrity": "sha512-bAtZo0u82gCfaAGfSNxUdTI9mNyza7D8w4CVCcaOsy7sgwDzvx6ekr6cuWJqY3UGzgnQ1+4wgENup5eIhgxEYA==",
"dev": true,
"requires": {
- "slice-ansi": "1.0.0",
- "string-width": "2.1.1"
+ "slice-ansi": "^1.0.0",
+ "string-width": "^2.0.0"
}
},
"cliui": {
@@ -1017,8 +1017,8 @@
"integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=",
"optional": true,
"requires": {
- "center-align": "0.1.3",
- "right-align": "0.1.3",
+ "center-align": "^0.1.1",
+ "right-align": "^0.1.1",
"wordwrap": "0.0.2"
},
"dependencies": {
@@ -1054,9 +1054,9 @@
"integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "process-nextick-args": "2.0.0",
- "readable-stream": "2.3.5"
+ "inherits": "^2.0.1",
+ "process-nextick-args": "^2.0.0",
+ "readable-stream": "^2.3.5"
},
"dependencies": {
"process-nextick-args": {
@@ -1071,13 +1071,13 @@
"integrity": "sha512-tK0yDhrkygt/knjowCUiWP9YdV7c5R+8cR0r/kt9ZhBU906Fs6RpQJCEilamRJj1Nx2rWI6LkW9gKqjTkshhEw==",
"dev": true,
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "2.0.0",
- "safe-buffer": "5.1.1",
- "string_decoder": "1.0.3",
- "util-deprecate": "1.0.2"
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.0.3",
+ "util-deprecate": "~1.0.1"
}
}
}
@@ -1100,7 +1100,7 @@
"dev": true,
"requires": {
"argv": "0.0.2",
- "request": "2.85.0",
+ "request": "^2.81.0",
"urlgrey": "0.4.4"
}
},
@@ -1110,8 +1110,8 @@
"integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
"dev": true,
"requires": {
- "map-visit": "1.0.0",
- "object-visit": "1.0.1"
+ "map-visit": "^1.0.0",
+ "object-visit": "^1.0.0"
}
},
"color-convert": {
@@ -1119,7 +1119,7 @@
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
"integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
"requires": {
- "color-name": "1.1.3"
+ "color-name": "^1.1.1"
}
},
"color-name": {
@@ -1139,8 +1139,8 @@
"integrity": "sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=",
"dev": true,
"requires": {
- "strip-ansi": "3.0.1",
- "wcwidth": "1.0.1"
+ "strip-ansi": "^3.0.0",
+ "wcwidth": "^1.0.0"
},
"dependencies": {
"ansi-regex": {
@@ -1155,7 +1155,7 @@
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
}
}
@@ -1166,7 +1166,7 @@
"integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=",
"dev": true,
"requires": {
- "delayed-stream": "1.0.0"
+ "delayed-stream": "~1.0.0"
}
},
"commander": {
@@ -1192,9 +1192,9 @@
"integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "readable-stream": "2.3.3",
- "typedarray": "0.0.6"
+ "inherits": "^2.0.3",
+ "readable-stream": "^2.2.2",
+ "typedarray": "^0.0.6"
}
},
"configstore": {
@@ -1203,12 +1203,12 @@
"integrity": "sha512-5oNkD/L++l0O6xGXxb1EWS7SivtjfGQlRyxJsYgE0Z495/L81e2h4/d3r969hoPXuFItzNOKMtsXgYG4c7dYvw==",
"dev": true,
"requires": {
- "dot-prop": "4.2.0",
- "graceful-fs": "4.1.11",
- "make-dir": "1.1.0",
- "unique-string": "1.0.0",
- "write-file-atomic": "2.3.0",
- "xdg-basedir": "3.0.0"
+ "dot-prop": "^4.1.0",
+ "graceful-fs": "^4.1.2",
+ "make-dir": "^1.0.0",
+ "unique-string": "^1.0.0",
+ "write-file-atomic": "^2.0.0",
+ "xdg-basedir": "^3.0.0"
}
},
"constant-case": {
@@ -1216,8 +1216,8 @@
"resolved": "https://registry.npmjs.org/constant-case/-/constant-case-2.0.0.tgz",
"integrity": "sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=",
"requires": {
- "snake-case": "2.1.0",
- "upper-case": "1.1.3"
+ "snake-case": "^2.1.0",
+ "upper-case": "^1.1.1"
}
},
"convert-source-map": {
@@ -1248,10 +1248,10 @@
"integrity": "sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==",
"dev": true,
"requires": {
- "is-directory": "0.3.1",
- "js-yaml": "3.10.0",
- "parse-json": "4.0.0",
- "require-from-string": "2.0.2"
+ "is-directory": "^0.3.1",
+ "js-yaml": "^3.9.0",
+ "parse-json": "^4.0.0",
+ "require-from-string": "^2.0.1"
},
"dependencies": {
"parse-json": {
@@ -1260,8 +1260,8 @@
"integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
"dev": true,
"requires": {
- "error-ex": "1.3.1",
- "json-parse-better-errors": "1.0.2"
+ "error-ex": "^1.3.1",
+ "json-parse-better-errors": "^1.0.1"
}
}
}
@@ -1272,7 +1272,7 @@
"integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=",
"dev": true,
"requires": {
- "capture-stack-trace": "1.0.0"
+ "capture-stack-trace": "^1.0.0"
}
},
"cross-spawn": {
@@ -1280,9 +1280,9 @@
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
"integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
"requires": {
- "lru-cache": "4.1.1",
- "shebang-command": "1.2.0",
- "which": "1.3.0"
+ "lru-cache": "^4.0.1",
+ "shebang-command": "^1.2.0",
+ "which": "^1.2.9"
}
},
"cryptiles": {
@@ -1291,7 +1291,7 @@
"integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
"dev": true,
"requires": {
- "boom": "5.2.0"
+ "boom": "5.x.x"
},
"dependencies": {
"boom": {
@@ -1300,7 +1300,7 @@
"integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
"dev": true,
"requires": {
- "hoek": "4.2.1"
+ "hoek": "4.x.x"
}
}
}
@@ -1317,10 +1317,10 @@
"integrity": "sha1-c6TIHehdtmTU7mdPfUcIXjstVdw=",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "source-map": "0.1.43",
- "source-map-resolve": "0.3.1",
- "urix": "0.1.0"
+ "inherits": "^2.0.1",
+ "source-map": "^0.1.38",
+ "source-map-resolve": "^0.3.0",
+ "urix": "^0.1.0"
},
"dependencies": {
"atob": {
@@ -1335,7 +1335,7 @@
"integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
"dev": true,
"requires": {
- "amdefine": "1.0.1"
+ "amdefine": ">=0.0.4"
}
},
"source-map-resolve": {
@@ -1344,10 +1344,10 @@
"integrity": "sha1-YQ9hIqRFuN1RU1oqcbeD38Ekh2E=",
"dev": true,
"requires": {
- "atob": "1.1.3",
- "resolve-url": "0.2.1",
- "source-map-url": "0.3.0",
- "urix": "0.1.0"
+ "atob": "~1.1.0",
+ "resolve-url": "~0.2.1",
+ "source-map-url": "~0.3.0",
+ "urix": "~0.1.0"
}
},
"source-map-url": {
@@ -1370,7 +1370,7 @@
"integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=",
"dev": true,
"requires": {
- "cssom": "0.3.2"
+ "cssom": "0.3.x"
}
},
"d": {
@@ -1379,7 +1379,7 @@
"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
"dev": true,
"requires": {
- "es5-ext": "0.10.41"
+ "es5-ext": "^0.10.9"
}
},
"dargs": {
@@ -1394,7 +1394,7 @@
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"dev": true,
"requires": {
- "assert-plus": "1.0.0"
+ "assert-plus": "^1.0.0"
}
},
"data-urls": {
@@ -1403,9 +1403,9 @@
"integrity": "sha512-ai40PPQR0Fn1lD2PPie79CibnlMN2AYiDhwFX/rZHVsxbs5kNJSjegqXIprhouGXlRdEnfybva7kqRGnB6mypA==",
"dev": true,
"requires": {
- "abab": "1.0.4",
- "whatwg-mimetype": "2.1.0",
- "whatwg-url": "6.4.1"
+ "abab": "^1.0.4",
+ "whatwg-mimetype": "^2.0.0",
+ "whatwg-url": "^6.4.0"
}
},
"date-fns": {
@@ -1434,9 +1434,9 @@
"integrity": "sha512-dsd50qQ1atDeurcxL7XOjPp4nZCGZzWIONDujDXzl1atSyC3hMbZD+v6440etw+Vt0Pr8ce4TQzHfX3KZM05Mw==",
"dev": true,
"requires": {
- "debug": "3.1.0",
- "memoizee": "0.4.12",
- "object-assign": "4.1.1"
+ "debug": "3.X",
+ "memoizee": "0.4.X",
+ "object-assign": "4.X"
},
"dependencies": {
"debug": {
@@ -1473,7 +1473,7 @@
"integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==",
"dev": true,
"requires": {
- "type-detect": "4.0.6"
+ "type-detect": "^4.0.0"
}
},
"deep-extend": {
@@ -1494,7 +1494,7 @@
"integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
"dev": true,
"requires": {
- "clone": "1.0.3"
+ "clone": "^1.0.2"
}
},
"define-properties": {
@@ -1503,8 +1503,8 @@
"integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
"dev": true,
"requires": {
- "foreach": "2.0.5",
- "object-keys": "1.0.11"
+ "foreach": "^2.0.5",
+ "object-keys": "^1.0.8"
}
},
"define-property": {
@@ -1513,8 +1513,8 @@
"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
"dev": true,
"requires": {
- "is-descriptor": "1.0.2",
- "isobject": "3.0.1"
+ "is-descriptor": "^1.0.2",
+ "isobject": "^3.0.1"
}
},
"delayed-stream": {
@@ -1559,7 +1559,7 @@
"integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==",
"dev": true,
"requires": {
- "webidl-conversions": "4.0.2"
+ "webidl-conversions": "^4.0.2"
}
},
"dot-case": {
@@ -1567,7 +1567,7 @@
"resolved": "https://registry.npmjs.org/dot-case/-/dot-case-2.1.1.tgz",
"integrity": "sha1-NNzzf1Co6TwrO8qLt/uRVcfaO+4=",
"requires": {
- "no-case": "2.3.2"
+ "no-case": "^2.2.0"
}
},
"dot-prop": {
@@ -1576,7 +1576,7 @@
"integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
"dev": true,
"requires": {
- "is-obj": "1.0.1"
+ "is-obj": "^1.0.0"
}
},
"dotenv": {
@@ -1590,7 +1590,7 @@
"integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=",
"dev": true,
"requires": {
- "readable-stream": "1.1.14"
+ "readable-stream": "~1.1.9"
},
"dependencies": {
"isarray": {
@@ -1605,10 +1605,10 @@
"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
"dev": true,
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
"isarray": "0.0.1",
- "string_decoder": "0.10.31"
+ "string_decoder": "~0.10.x"
}
},
"string_decoder": {
@@ -1631,10 +1631,10 @@
"integrity": "sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA==",
"dev": true,
"requires": {
- "end-of-stream": "1.4.1",
- "inherits": "2.0.3",
- "readable-stream": "2.3.3",
- "stream-shift": "1.0.0"
+ "end-of-stream": "^1.0.0",
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.0",
+ "stream-shift": "^1.0.0"
},
"dependencies": {
"end-of-stream": {
@@ -1643,7 +1643,7 @@
"integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
"dev": true,
"requires": {
- "once": "1.4.0"
+ "once": "^1.4.0"
}
}
}
@@ -1655,7 +1655,7 @@
"dev": true,
"optional": true,
"requires": {
- "jsbn": "0.1.1"
+ "jsbn": "~0.1.0"
}
},
"elegant-spinner": {
@@ -1670,7 +1670,7 @@
"integrity": "sha1-jhdyBsPICDfYVjLouTWd/osvbq8=",
"dev": true,
"requires": {
- "once": "1.3.3"
+ "once": "~1.3.0"
},
"dependencies": {
"once": {
@@ -1679,7 +1679,7 @@
"integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
"dev": true,
"requires": {
- "wrappy": "1.0.2"
+ "wrappy": "1"
}
}
}
@@ -1690,7 +1690,7 @@
"integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=",
"dev": true,
"requires": {
- "is-arrayish": "0.2.1"
+ "is-arrayish": "^0.2.1"
}
},
"es5-ext": {
@@ -1699,9 +1699,9 @@
"integrity": "sha512-MYK02wXfwTMie5TEJWPolgOsXEmz7wKCQaGzgmRjZOoV6VLG8I5dSv2bn6AOClXhK64gnSQTQ9W9MKvx87J4gw==",
"dev": true,
"requires": {
- "es6-iterator": "2.0.3",
- "es6-symbol": "3.1.1",
- "next-tick": "1.0.0"
+ "es6-iterator": "~2.0.3",
+ "es6-symbol": "~3.1.1",
+ "next-tick": "1"
}
},
"es6-iterator": {
@@ -1710,9 +1710,9 @@
"integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
"dev": true,
"requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.41",
- "es6-symbol": "3.1.1"
+ "d": "1",
+ "es5-ext": "^0.10.35",
+ "es6-symbol": "^3.1.1"
}
},
"es6-symbol": {
@@ -1721,8 +1721,8 @@
"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
"dev": true,
"requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.41"
+ "d": "1",
+ "es5-ext": "~0.10.14"
}
},
"es6-weak-map": {
@@ -1731,10 +1731,10 @@
"integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
"dev": true,
"requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.41",
- "es6-iterator": "2.0.3",
- "es6-symbol": "3.1.1"
+ "d": "1",
+ "es5-ext": "^0.10.14",
+ "es6-iterator": "^2.0.1",
+ "es6-symbol": "^3.1.1"
}
},
"escape-string-regexp": {
@@ -1748,11 +1748,11 @@
"integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
"dev": true,
"requires": {
- "esprima": "2.7.3",
- "estraverse": "1.9.3",
- "esutils": "2.0.2",
- "optionator": "0.8.2",
- "source-map": "0.2.0"
+ "esprima": "^2.7.1",
+ "estraverse": "^1.9.1",
+ "esutils": "^2.0.2",
+ "optionator": "^0.8.1",
+ "source-map": "~0.2.0"
},
"dependencies": {
"esprima": {
@@ -1768,7 +1768,7 @@
"dev": true,
"optional": true,
"requires": {
- "amdefine": "1.0.1"
+ "amdefine": ">=0.0.4"
}
}
}
@@ -1796,8 +1796,8 @@
"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
"dev": true,
"requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.41"
+ "d": "1",
+ "es5-ext": "~0.10.14"
}
},
"execa": {
@@ -1805,13 +1805,13 @@
"resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
"integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
"requires": {
- "cross-spawn": "5.1.0",
- "get-stream": "3.0.0",
- "is-stream": "1.1.0",
- "npm-run-path": "2.0.2",
- "p-finally": "1.0.0",
- "signal-exit": "3.0.2",
- "strip-eof": "1.0.0"
+ "cross-spawn": "^5.0.1",
+ "get-stream": "^3.0.0",
+ "is-stream": "^1.1.0",
+ "npm-run-path": "^2.0.0",
+ "p-finally": "^1.0.0",
+ "signal-exit": "^3.0.0",
+ "strip-eof": "^1.0.0"
}
},
"exit-hook": {
@@ -1826,7 +1826,7 @@
"integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
"dev": true,
"requires": {
- "is-posix-bracket": "0.1.1"
+ "is-posix-bracket": "^0.1.0"
}
},
"expand-range": {
@@ -1835,7 +1835,7 @@
"integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
"dev": true,
"requires": {
- "fill-range": "2.2.3"
+ "fill-range": "^2.1.0"
}
},
"expand-tilde": {
@@ -1844,7 +1844,7 @@
"integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
"dev": true,
"requires": {
- "homedir-polyfill": "1.0.1"
+ "homedir-polyfill": "^1.0.1"
}
},
"expect": {
@@ -1853,12 +1853,12 @@
"integrity": "sha512-XcNXEPehqn8b/jm8FYotdX0YrXn36qp4HWlrVT4ktwQas1l1LPxiVWncYnnL2eyMtKAmVIaG0XAp0QlrqJaxaA==",
"dev": true,
"requires": {
- "ansi-styles": "3.2.0",
- "jest-diff": "22.4.3",
- "jest-get-type": "22.4.3",
- "jest-matcher-utils": "22.4.3",
- "jest-message-util": "22.4.3",
- "jest-regex-util": "22.4.3"
+ "ansi-styles": "^3.2.0",
+ "jest-diff": "^22.4.3",
+ "jest-get-type": "^22.4.3",
+ "jest-matcher-utils": "^22.4.3",
+ "jest-message-util": "^22.4.3",
+ "jest-regex-util": "^22.4.3"
}
},
"extend": {
@@ -1873,7 +1873,7 @@
"integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
"dev": true,
"requires": {
- "kind-of": "1.1.0"
+ "kind-of": "^1.1.0"
},
"dependencies": {
"kind-of": {
@@ -1890,7 +1890,7 @@
"integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
"dev": true,
"requires": {
- "is-extglob": "1.0.0"
+ "is-extglob": "^1.0.0"
},
"dependencies": {
"is-extglob": {
@@ -1913,9 +1913,9 @@
"integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=",
"dev": true,
"requires": {
- "ansi-gray": "0.1.1",
- "color-support": "1.1.3",
- "time-stamp": "1.1.0"
+ "ansi-gray": "^0.1.1",
+ "color-support": "^1.1.3",
+ "time-stamp": "^1.0.0"
}
},
"fast-deep-equal": {
@@ -1947,8 +1947,8 @@
"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
"dev": true,
"requires": {
- "escape-string-regexp": "1.0.5",
- "object-assign": "4.1.1"
+ "escape-string-regexp": "^1.0.5",
+ "object-assign": "^4.1.0"
}
},
"filename-regex": {
@@ -1963,11 +1963,11 @@
"integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=",
"dev": true,
"requires": {
- "is-number": "2.1.0",
- "isobject": "2.1.0",
- "randomatic": "1.1.7",
- "repeat-element": "1.1.2",
- "repeat-string": "1.6.1"
+ "is-number": "^2.1.0",
+ "isobject": "^2.0.0",
+ "randomatic": "^1.1.3",
+ "repeat-element": "^1.1.2",
+ "repeat-string": "^1.5.2"
},
"dependencies": {
"isobject": {
@@ -1998,7 +1998,7 @@
"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"requires": {
- "locate-path": "2.0.0"
+ "locate-path": "^2.0.0"
}
},
"findup-sync": {
@@ -2007,21 +2007,10 @@
"integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
"dev": true,
"requires": {
- "detect-file": "1.0.0",
- "is-glob": "3.1.0",
- "micromatch": "3.1.8",
- "resolve-dir": "1.0.1"
- },
- "dependencies": {
- "is-glob": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
- "dev": true,
- "requires": {
- "is-extglob": "2.1.1"
- }
- }
+ "detect-file": "^1.0.0",
+ "is-glob": "^3.1.0",
+ "micromatch": "^3.0.4",
+ "resolve-dir": "^1.0.1"
}
},
"fined": {
@@ -2030,11 +2019,11 @@
"integrity": "sha1-s33IRLdqL15wgeiE98CuNE8VNHY=",
"dev": true,
"requires": {
- "expand-tilde": "2.0.2",
- "is-plain-object": "2.0.4",
- "object.defaults": "1.1.0",
- "object.pick": "1.3.0",
- "parse-filepath": "1.0.2"
+ "expand-tilde": "^2.0.2",
+ "is-plain-object": "^2.0.3",
+ "object.defaults": "^1.1.0",
+ "object.pick": "^1.2.0",
+ "parse-filepath": "^1.0.1"
}
},
"first-chunk-stream": {
@@ -2055,8 +2044,8 @@
"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
"dev": true,
"requires": {
- "inherits": "2.0.3",
- "readable-stream": "2.3.3"
+ "inherits": "^2.0.1",
+ "readable-stream": "^2.0.4"
}
},
"for-in": {
@@ -2071,7 +2060,7 @@
"integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
"dev": true,
"requires": {
- "for-in": "1.0.2"
+ "for-in": "^1.0.1"
}
},
"foreach": {
@@ -2092,9 +2081,9 @@
"integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
"dev": true,
"requires": {
- "asynckit": "0.4.0",
- "combined-stream": "1.0.5",
- "mime-types": "2.1.17"
+ "asynckit": "^0.4.0",
+ "combined-stream": "^1.0.5",
+ "mime-types": "^2.1.12"
}
},
"fragment-cache": {
@@ -2103,7 +2092,7 @@
"integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
"dev": true,
"requires": {
- "map-cache": "0.2.2"
+ "map-cache": "^0.2.2"
}
},
"fs-extra": {
@@ -2112,9 +2101,9 @@
"integrity": "sha512-lk2cUCo8QzbiEWEbt7Cw3m27WMiRG321xsssbcIpfMhpRjrlC08WBOVQqj1/nQYYNnPtyIhP1oqLO3QwT2tPCw==",
"dev": true,
"requires": {
- "graceful-fs": "4.1.11",
- "jsonfile": "4.0.0",
- "universalify": "0.1.1"
+ "graceful-fs": "^4.1.2",
+ "jsonfile": "^4.0.0",
+ "universalify": "^0.1.0"
}
},
"fs-mkdirp-stream": {
@@ -2123,8 +2112,8 @@
"integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
"dev": true,
"requires": {
- "graceful-fs": "4.1.11",
- "through2": "2.0.3"
+ "graceful-fs": "^4.1.11",
+ "through2": "^2.0.3"
},
"dependencies": {
"through2": {
@@ -2133,8 +2122,8 @@
"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
"dev": true,
"requires": {
- "readable-stream": "2.3.3",
- "xtend": "4.0.1"
+ "readable-stream": "^2.1.5",
+ "xtend": "~4.0.1"
}
}
}
@@ -2156,7 +2145,7 @@
"integrity": "sha1-QLcJU30k0dRXZ9takIaJ3+aaxE8=",
"dev": true,
"requires": {
- "globule": "0.1.0"
+ "globule": "~0.1.0"
}
},
"generic-pool": {
@@ -2198,7 +2187,7 @@
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"dev": true,
"requires": {
- "assert-plus": "1.0.0"
+ "assert-plus": "^1.0.0"
}
},
"glob": {
@@ -2206,12 +2195,12 @@
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
},
"glob-base": {
@@ -2220,8 +2209,8 @@
"integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
"dev": true,
"requires": {
- "glob-parent": "2.0.0",
- "is-glob": "2.0.1"
+ "glob-parent": "^2.0.0",
+ "is-glob": "^2.0.0"
},
"dependencies": {
"glob-parent": {
@@ -2230,7 +2219,7 @@
"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
"dev": true,
"requires": {
- "is-glob": "2.0.1"
+ "is-glob": "^2.0.0"
}
},
"is-extglob": {
@@ -2245,7 +2234,7 @@
"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
"dev": true,
"requires": {
- "is-extglob": "1.0.0"
+ "is-extglob": "^1.0.0"
}
}
}
@@ -2256,8 +2245,8 @@
"integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
"dev": true,
"requires": {
- "is-glob": "3.1.0",
- "path-dirname": "1.0.2"
+ "is-glob": "^3.1.0",
+ "path-dirname": "^1.0.0"
}
},
"glob-stream": {
@@ -2266,12 +2255,12 @@
"integrity": "sha1-kXCl8St5Awb9/lmPMT+PeVT9FDs=",
"dev": true,
"requires": {
- "glob": "4.5.3",
- "glob2base": "0.0.12",
- "minimatch": "2.0.10",
- "ordered-read-streams": "0.1.0",
- "through2": "0.6.5",
- "unique-stream": "1.0.0"
+ "glob": "^4.3.1",
+ "glob2base": "^0.0.12",
+ "minimatch": "^2.0.1",
+ "ordered-read-streams": "^0.1.0",
+ "through2": "^0.6.1",
+ "unique-stream": "^1.0.0"
},
"dependencies": {
"glob": {
@@ -2280,10 +2269,10 @@
"integrity": "sha1-xstz0yJsHv7wTePFbQEvAzd+4V8=",
"dev": true,
"requires": {
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "2.0.10",
- "once": "1.4.0"
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^2.0.1",
+ "once": "^1.3.0"
}
},
"isarray": {
@@ -2298,7 +2287,7 @@
"integrity": "sha1-jQh8OcazjAAbl/ynzm0OHoCvusc=",
"dev": true,
"requires": {
- "brace-expansion": "1.1.8"
+ "brace-expansion": "^1.0.0"
}
},
"readable-stream": {
@@ -2307,10 +2296,10 @@
"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
"dev": true,
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
"isarray": "0.0.1",
- "string_decoder": "0.10.31"
+ "string_decoder": "~0.10.x"
}
},
"string_decoder": {
@@ -2325,8 +2314,8 @@
"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
"dev": true,
"requires": {
- "readable-stream": "1.0.34",
- "xtend": "4.0.1"
+ "readable-stream": ">=1.0.33-1 <1.1.0-0",
+ "xtend": ">=4.0.0 <4.1.0-0"
}
}
}
@@ -2337,7 +2326,7 @@
"integrity": "sha1-uVtKjfdLOcgymLDAXJeLTZo7cQs=",
"dev": true,
"requires": {
- "gaze": "0.5.2"
+ "gaze": "^0.5.1"
}
},
"glob2base": {
@@ -2346,7 +2335,7 @@
"integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=",
"dev": true,
"requires": {
- "find-index": "0.1.1"
+ "find-index": "^0.1.1"
}
},
"global-dirs": {
@@ -2355,7 +2344,7 @@
"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
"dev": true,
"requires": {
- "ini": "1.3.5"
+ "ini": "^1.3.4"
}
},
"global-modules": {
@@ -2364,9 +2353,9 @@
"integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
"dev": true,
"requires": {
- "global-prefix": "1.0.2",
- "is-windows": "1.0.2",
- "resolve-dir": "1.0.1"
+ "global-prefix": "^1.0.1",
+ "is-windows": "^1.0.1",
+ "resolve-dir": "^1.0.0"
},
"dependencies": {
"is-windows": {
@@ -2383,11 +2372,11 @@
"integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
"dev": true,
"requires": {
- "expand-tilde": "2.0.2",
- "homedir-polyfill": "1.0.1",
- "ini": "1.3.5",
- "is-windows": "1.0.2",
- "which": "1.3.0"
+ "expand-tilde": "^2.0.2",
+ "homedir-polyfill": "^1.0.1",
+ "ini": "^1.3.4",
+ "is-windows": "^1.0.1",
+ "which": "^1.2.14"
},
"dependencies": {
"is-windows": {
@@ -2404,9 +2393,9 @@
"integrity": "sha1-2cjt3h2nnRJaFRt5UzuXhnY0auU=",
"dev": true,
"requires": {
- "glob": "3.1.21",
- "lodash": "1.0.2",
- "minimatch": "0.2.14"
+ "glob": "~3.1.21",
+ "lodash": "~1.0.1",
+ "minimatch": "~0.2.11"
},
"dependencies": {
"glob": {
@@ -2415,9 +2404,9 @@
"integrity": "sha1-0p4KBV3qUTj00H7UDomC6DwgZs0=",
"dev": true,
"requires": {
- "graceful-fs": "1.2.3",
- "inherits": "1.0.2",
- "minimatch": "0.2.14"
+ "graceful-fs": "~1.2.0",
+ "inherits": "1",
+ "minimatch": "~0.2.11"
}
},
"graceful-fs": {
@@ -2450,8 +2439,8 @@
"integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
"dev": true,
"requires": {
- "lru-cache": "2.7.3",
- "sigmund": "1.0.1"
+ "lru-cache": "2",
+ "sigmund": "~1.0.0"
}
}
}
@@ -2462,7 +2451,7 @@
"integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==",
"dev": true,
"requires": {
- "sparkles": "1.0.0"
+ "sparkles": "^1.0.0"
}
},
"got": {
@@ -2471,17 +2460,17 @@
"integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=",
"dev": true,
"requires": {
- "create-error-class": "3.0.2",
- "duplexer3": "0.1.4",
- "get-stream": "3.0.0",
- "is-redirect": "1.0.0",
- "is-retry-allowed": "1.1.0",
- "is-stream": "1.1.0",
- "lowercase-keys": "1.0.0",
- "safe-buffer": "5.1.1",
- "timed-out": "4.0.1",
- "unzip-response": "2.0.1",
- "url-parse-lax": "1.0.0"
+ "create-error-class": "^3.0.0",
+ "duplexer3": "^0.1.4",
+ "get-stream": "^3.0.0",
+ "is-redirect": "^1.0.0",
+ "is-retry-allowed": "^1.0.0",
+ "is-stream": "^1.0.0",
+ "lowercase-keys": "^1.0.0",
+ "safe-buffer": "^5.0.1",
+ "timed-out": "^4.0.0",
+ "unzip-response": "^2.0.1",
+ "url-parse-lax": "^1.0.0"
}
},
"graceful-fs": {
@@ -2502,19 +2491,19 @@
"integrity": "sha1-VxzkWSjdQK9lFPxAEYZgFsE4RbQ=",
"dev": true,
"requires": {
- "archy": "1.0.0",
- "chalk": "1.1.3",
- "deprecated": "0.0.1",
- "gulp-util": "3.0.8",
- "interpret": "1.1.0",
- "liftoff": "2.5.0",
- "minimist": "1.2.0",
- "orchestrator": "0.3.8",
- "pretty-hrtime": "1.0.3",
- "semver": "4.3.2",
- "tildify": "1.2.0",
- "v8flags": "2.1.1",
- "vinyl-fs": "0.3.14"
+ "archy": "^1.0.0",
+ "chalk": "^1.0.0",
+ "deprecated": "^0.0.1",
+ "gulp-util": "^3.0.0",
+ "interpret": "^1.0.0",
+ "liftoff": "^2.1.0",
+ "minimist": "^1.1.0",
+ "orchestrator": "^0.3.0",
+ "pretty-hrtime": "^1.0.0",
+ "semver": "^4.1.0",
+ "tildify": "^1.0.0",
+ "v8flags": "^2.0.2",
+ "vinyl-fs": "^0.3.0"
},
"dependencies": {
"ansi-regex": {
@@ -2535,11 +2524,11 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
- "ansi-styles": "2.2.1",
- "escape-string-regexp": "1.0.5",
- "has-ansi": "2.0.0",
- "strip-ansi": "3.0.1",
- "supports-color": "2.0.0"
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
}
},
"minimist": {
@@ -2554,7 +2543,7 @@
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"supports-color": {
@@ -2571,11 +2560,11 @@
"integrity": "sha512-DARK8rNMo4lHOFLGTiHEJdf19GuoBDHqGUaypz+fOhrvOs3iFO7ntdYtdpNxv+AzSJBx/JfypF0yEj9ks1IStQ==",
"dev": true,
"requires": {
- "fancy-log": "1.3.2",
- "plugin-error": "0.1.2",
- "rimraf": "2.6.2",
- "through2": "2.0.3",
- "vinyl": "2.1.0"
+ "fancy-log": "^1.3.2",
+ "plugin-error": "^0.1.2",
+ "rimraf": "^2.6.2",
+ "through2": "^2.0.3",
+ "vinyl": "^2.1.0"
},
"dependencies": {
"clone": {
@@ -2602,8 +2591,8 @@
"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
"dev": true,
"requires": {
- "readable-stream": "2.3.3",
- "xtend": "4.0.1"
+ "readable-stream": "^2.1.5",
+ "xtend": "~4.0.1"
}
},
"vinyl": {
@@ -2612,12 +2601,12 @@
"integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
"dev": true,
"requires": {
- "clone": "2.1.1",
- "clone-buffer": "1.0.0",
- "clone-stats": "1.0.0",
- "cloneable-readable": "1.1.2",
- "remove-trailing-separator": "1.1.0",
- "replace-ext": "1.0.0"
+ "clone": "^2.1.1",
+ "clone-buffer": "^1.0.0",
+ "clone-stats": "^1.0.0",
+ "cloneable-readable": "^1.0.0",
+ "remove-trailing-separator": "^1.0.1",
+ "replace-ext": "^1.0.0"
}
}
}
@@ -2628,12 +2617,12 @@
"integrity": "sha512-uMLSdqPDnBAV/B9rNyOgVMgrVC1tPbe+5GH6P13UOyxbRDT/w4sKYHWftPMA8j9om+NFvfeRlqpDXL2fixFWNA==",
"dev": true,
"requires": {
- "istanbul": "0.4.5",
- "istanbul-threshold-checker": "0.2.1",
- "lodash": "4.17.5",
- "plugin-error": "0.1.2",
- "through2": "2.0.1",
- "vinyl-sourcemaps-apply": "0.2.1"
+ "istanbul": "^0.4.0",
+ "istanbul-threshold-checker": "^0.2.1",
+ "lodash": "^4.0.0",
+ "plugin-error": "^0.1.2",
+ "through2": "^2.0.0",
+ "vinyl-sourcemaps-apply": "^0.2.1"
}
},
"gulp-mocha": {
@@ -2795,13 +2784,13 @@
"integrity": "sha512-f3m1WcS0o2B72/PGj1Jbv9zYR9rynBh/EQJv64n01xQUo7j7anols0eww9GG/WtDTzGVQLrupVDYkifRFnj5Zg==",
"dev": true,
"requires": {
- "async": "2.6.0",
- "chalk": "2.3.0",
- "fancy-log": "1.3.2",
- "lodash": "4.17.5",
- "lodash.template": "4.4.0",
- "plugin-error": "0.1.2",
- "through2": "2.0.3"
+ "async": "^2.1.5",
+ "chalk": "^2.3.0",
+ "fancy-log": "^1.3.2",
+ "lodash": "^4.17.4",
+ "lodash.template": "^4.4.0",
+ "plugin-error": "^0.1.2",
+ "through2": "^2.0.3"
},
"dependencies": {
"async": {
@@ -2810,7 +2799,7 @@
"integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
"dev": true,
"requires": {
- "lodash": "4.17.5"
+ "lodash": "^4.14.0"
}
},
"lodash.template": {
@@ -2819,8 +2808,8 @@
"integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=",
"dev": true,
"requires": {
- "lodash._reinterpolate": "3.0.0",
- "lodash.templatesettings": "4.1.0"
+ "lodash._reinterpolate": "~3.0.0",
+ "lodash.templatesettings": "^4.0.0"
}
},
"lodash.templatesettings": {
@@ -2829,7 +2818,7 @@
"integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=",
"dev": true,
"requires": {
- "lodash._reinterpolate": "3.0.0"
+ "lodash._reinterpolate": "~3.0.0"
}
},
"through2": {
@@ -2838,8 +2827,8 @@
"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
"dev": true,
"requires": {
- "readable-stream": "2.3.3",
- "xtend": "4.0.1"
+ "readable-stream": "^2.1.5",
+ "xtend": "~4.0.1"
}
}
}
@@ -2850,17 +2839,17 @@
"integrity": "sha1-y7IAhFCxvM5s0jv5gze+dRv24wo=",
"dev": true,
"requires": {
- "@gulp-sourcemaps/identity-map": "1.0.1",
- "@gulp-sourcemaps/map-sources": "1.0.0",
- "acorn": "5.4.1",
- "convert-source-map": "1.5.1",
- "css": "2.2.1",
- "debug-fabulous": "1.0.0",
- "detect-newline": "2.1.0",
- "graceful-fs": "4.1.11",
- "source-map": "0.6.1",
- "strip-bom-string": "1.0.0",
- "through2": "2.0.1"
+ "@gulp-sourcemaps/identity-map": "1.X",
+ "@gulp-sourcemaps/map-sources": "1.X",
+ "acorn": "5.X",
+ "convert-source-map": "1.X",
+ "css": "2.X",
+ "debug-fabulous": "1.X",
+ "detect-newline": "2.X",
+ "graceful-fs": "4.X",
+ "source-map": "~0.6.0",
+ "strip-bom-string": "1.X",
+ "through2": "2.X"
},
"dependencies": {
"source-map": {
@@ -2877,12 +2866,12 @@
"integrity": "sha512-Hhbn5Aa2l3T+tnn0KqsG6RRJmcYEsr3byTL2nBpNBeAK8pqug9Od4AwddU4JEI+hRw7mzZyjRbB8DDWR6paGVA==",
"dev": true,
"requires": {
- "ansi-colors": "1.1.0",
- "plugin-error": "0.1.2",
- "source-map": "0.6.1",
- "through2": "2.0.3",
- "vinyl": "2.1.0",
- "vinyl-fs": "3.0.2"
+ "ansi-colors": "^1.0.1",
+ "plugin-error": "^0.1.2",
+ "source-map": "^0.6.1",
+ "through2": "^2.0.3",
+ "vinyl": "^2.1.0",
+ "vinyl-fs": "^3.0.0"
},
"dependencies": {
"clone": {
@@ -2903,16 +2892,16 @@
"integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
"dev": true,
"requires": {
- "extend": "3.0.1",
- "glob": "7.1.2",
- "glob-parent": "3.1.0",
- "is-negated-glob": "1.0.0",
- "ordered-read-streams": "1.0.1",
- "pumpify": "1.4.0",
- "readable-stream": "2.3.3",
- "remove-trailing-separator": "1.1.0",
- "to-absolute-glob": "2.0.2",
- "unique-stream": "2.2.1"
+ "extend": "^3.0.0",
+ "glob": "^7.1.1",
+ "glob-parent": "^3.1.0",
+ "is-negated-glob": "^1.0.0",
+ "ordered-read-streams": "^1.0.0",
+ "pumpify": "^1.3.5",
+ "readable-stream": "^2.1.5",
+ "remove-trailing-separator": "^1.0.1",
+ "to-absolute-glob": "^2.0.0",
+ "unique-stream": "^2.0.2"
}
},
"ordered-read-streams": {
@@ -2921,7 +2910,7 @@
"integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
"dev": true,
"requires": {
- "readable-stream": "2.3.3"
+ "readable-stream": "^2.0.1"
}
},
"replace-ext": {
@@ -2942,8 +2931,8 @@
"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
"dev": true,
"requires": {
- "readable-stream": "2.3.3",
- "xtend": "4.0.1"
+ "readable-stream": "^2.1.5",
+ "xtend": "~4.0.1"
}
},
"unique-stream": {
@@ -2952,8 +2941,8 @@
"integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=",
"dev": true,
"requires": {
- "json-stable-stringify": "1.0.1",
- "through2-filter": "2.0.0"
+ "json-stable-stringify": "^1.0.0",
+ "through2-filter": "^2.0.0"
}
},
"vinyl": {
@@ -2962,12 +2951,12 @@
"integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
"dev": true,
"requires": {
- "clone": "2.1.1",
- "clone-buffer": "1.0.0",
- "clone-stats": "1.0.0",
- "cloneable-readable": "1.1.2",
- "remove-trailing-separator": "1.1.0",
- "replace-ext": "1.0.0"
+ "clone": "^2.1.1",
+ "clone-buffer": "^1.0.0",
+ "clone-stats": "^1.0.0",
+ "cloneable-readable": "^1.0.0",
+ "remove-trailing-separator": "^1.0.1",
+ "replace-ext": "^1.0.0"
}
},
"vinyl-fs": {
@@ -2976,23 +2965,23 @@
"integrity": "sha512-AUSFda1OukBwuLPBTbyuO4IRWgfXmqC4UTW0f8xrCa8Hkv9oyIU+NSqBlgfOLZRoUt7cHdo75hKQghCywpIyIw==",
"dev": true,
"requires": {
- "fs-mkdirp-stream": "1.0.0",
- "glob-stream": "6.1.0",
- "graceful-fs": "4.1.11",
- "is-valid-glob": "1.0.0",
- "lazystream": "1.0.0",
- "lead": "1.0.0",
- "object.assign": "4.1.0",
- "pumpify": "1.4.0",
- "readable-stream": "2.3.3",
- "remove-bom-buffer": "3.0.0",
- "remove-bom-stream": "1.2.0",
- "resolve-options": "1.1.0",
- "through2": "2.0.3",
- "to-through": "2.0.0",
- "value-or-function": "3.0.0",
- "vinyl": "2.1.0",
- "vinyl-sourcemap": "1.1.0"
+ "fs-mkdirp-stream": "^1.0.0",
+ "glob-stream": "^6.1.0",
+ "graceful-fs": "^4.0.0",
+ "is-valid-glob": "^1.0.0",
+ "lazystream": "^1.0.0",
+ "lead": "^1.0.0",
+ "object.assign": "^4.0.4",
+ "pumpify": "^1.3.5",
+ "readable-stream": "^2.3.3",
+ "remove-bom-buffer": "^3.0.0",
+ "remove-bom-stream": "^1.2.0",
+ "resolve-options": "^1.1.0",
+ "through2": "^2.0.0",
+ "to-through": "^2.0.0",
+ "value-or-function": "^3.0.0",
+ "vinyl": "^2.0.0",
+ "vinyl-sourcemap": "^1.1.0"
}
}
}
@@ -3003,24 +2992,24 @@
"integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=",
"dev": true,
"requires": {
- "array-differ": "1.0.0",
- "array-uniq": "1.0.3",
- "beeper": "1.1.1",
- "chalk": "1.1.3",
- "dateformat": "2.2.0",
- "fancy-log": "1.3.2",
- "gulplog": "1.0.0",
- "has-gulplog": "0.1.0",
- "lodash._reescape": "3.0.0",
- "lodash._reevaluate": "3.0.0",
- "lodash._reinterpolate": "3.0.0",
- "lodash.template": "3.6.2",
- "minimist": "1.2.0",
- "multipipe": "0.1.2",
- "object-assign": "3.0.0",
+ "array-differ": "^1.0.0",
+ "array-uniq": "^1.0.2",
+ "beeper": "^1.0.0",
+ "chalk": "^1.0.0",
+ "dateformat": "^2.0.0",
+ "fancy-log": "^1.1.0",
+ "gulplog": "^1.0.0",
+ "has-gulplog": "^0.1.0",
+ "lodash._reescape": "^3.0.0",
+ "lodash._reevaluate": "^3.0.0",
+ "lodash._reinterpolate": "^3.0.0",
+ "lodash.template": "^3.0.0",
+ "minimist": "^1.1.0",
+ "multipipe": "^0.1.2",
+ "object-assign": "^3.0.0",
"replace-ext": "0.0.1",
- "through2": "2.0.1",
- "vinyl": "0.5.3"
+ "through2": "^2.0.0",
+ "vinyl": "^0.5.0"
},
"dependencies": {
"ansi-regex": {
@@ -3041,11 +3030,11 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
- "ansi-styles": "2.2.1",
- "escape-string-regexp": "1.0.5",
- "has-ansi": "2.0.0",
- "strip-ansi": "3.0.1",
- "supports-color": "2.0.0"
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
}
},
"minimist": {
@@ -3066,7 +3055,7 @@
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"supports-color": {
@@ -3083,7 +3072,7 @@
"integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
"dev": true,
"requires": {
- "glogg": "1.0.1"
+ "glogg": "^1.0.0"
}
},
"handlebars": {
@@ -3091,10 +3080,10 @@
"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.11.tgz",
"integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=",
"requires": {
- "async": "1.5.2",
- "optimist": "0.6.1",
- "source-map": "0.4.4",
- "uglify-js": "2.8.29"
+ "async": "^1.4.0",
+ "optimist": "^0.6.1",
+ "source-map": "^0.4.4",
+ "uglify-js": "^2.6"
}
},
"har-schema": {
@@ -3109,8 +3098,8 @@
"integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
"dev": true,
"requires": {
- "ajv": "5.5.2",
- "har-schema": "2.0.0"
+ "ajv": "^5.1.0",
+ "har-schema": "^2.0.0"
}
},
"has": {
@@ -3119,7 +3108,7 @@
"integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
"dev": true,
"requires": {
- "function-bind": "1.1.1"
+ "function-bind": "^1.0.2"
}
},
"has-ansi": {
@@ -3127,7 +3116,7 @@
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
},
"dependencies": {
"ansi-regex": {
@@ -3148,7 +3137,7 @@
"integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=",
"dev": true,
"requires": {
- "sparkles": "1.0.0"
+ "sparkles": "^1.0.0"
}
},
"has-symbols": {
@@ -3169,9 +3158,9 @@
"integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
"dev": true,
"requires": {
- "get-value": "2.0.6",
- "has-values": "1.0.0",
- "isobject": "3.0.1"
+ "get-value": "^2.0.6",
+ "has-values": "^1.0.0",
+ "isobject": "^3.0.0"
}
},
"has-values": {
@@ -3180,8 +3169,8 @@
"integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
"dev": true,
"requires": {
- "is-number": "3.0.0",
- "kind-of": "4.0.0"
+ "is-number": "^3.0.0",
+ "kind-of": "^4.0.0"
},
"dependencies": {
"is-number": {
@@ -3190,7 +3179,7 @@
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -3199,7 +3188,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -3210,7 +3199,7 @@
"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -3221,10 +3210,10 @@
"integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
"dev": true,
"requires": {
- "boom": "4.3.1",
- "cryptiles": "3.1.2",
- "hoek": "4.2.1",
- "sntp": "2.1.0"
+ "boom": "4.x.x",
+ "cryptiles": "3.x.x",
+ "hoek": "4.x.x",
+ "sntp": "2.x.x"
}
},
"he": {
@@ -3238,8 +3227,8 @@
"resolved": "https://registry.npmjs.org/header-case/-/header-case-1.0.1.tgz",
"integrity": "sha1-lTWXMZfBRLCWE81l0xfvGZY70C0=",
"requires": {
- "no-case": "2.3.2",
- "upper-case": "1.1.3"
+ "no-case": "^2.2.0",
+ "upper-case": "^1.1.3"
}
},
"highlight.js": {
@@ -3259,7 +3248,7 @@
"integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=",
"dev": true,
"requires": {
- "parse-passwd": "1.0.0"
+ "parse-passwd": "^1.0.0"
}
},
"html-encoding-sniffer": {
@@ -3268,7 +3257,7 @@
"integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==",
"dev": true,
"requires": {
- "whatwg-encoding": "1.0.3"
+ "whatwg-encoding": "^1.0.1"
}
},
"http-proxy-agent": {
@@ -3277,9 +3266,9 @@
"integrity": "sha1-zBzjjkU7+YSg93AtLdWcc9CBKEo=",
"dev": true,
"requires": {
- "agent-base": "2.1.1",
- "debug": "2.6.9",
- "extend": "3.0.1"
+ "agent-base": "2",
+ "debug": "2",
+ "extend": "3"
}
},
"http-signature": {
@@ -3288,9 +3277,9 @@
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"dev": true,
"requires": {
- "assert-plus": "1.0.0",
- "jsprim": "1.4.1",
- "sshpk": "1.14.1"
+ "assert-plus": "^1.0.0",
+ "jsprim": "^1.2.2",
+ "sshpk": "^1.7.0"
}
},
"https-proxy-agent": {
@@ -3299,9 +3288,9 @@
"integrity": "sha1-NffabEjOTdv6JkiRrFk+5f+GceY=",
"dev": true,
"requires": {
- "agent-base": "2.1.1",
- "debug": "2.6.9",
- "extend": "3.0.1"
+ "agent-base": "2",
+ "debug": "2",
+ "extend": "3"
}
},
"husky": {
@@ -3310,9 +3299,9 @@
"integrity": "sha512-e21wivqHpstpoiWA/Yi8eFti8E+sQDSS53cpJsPptPs295QTOQR0ZwnHo2TXy1XOpZFD9rPOd3NpmqTK6uMLJA==",
"dev": true,
"requires": {
- "is-ci": "1.1.0",
- "normalize-path": "1.0.0",
- "strip-indent": "2.0.0"
+ "is-ci": "^1.0.10",
+ "normalize-path": "^1.0.0",
+ "strip-indent": "^2.0.0"
}
},
"iconv-lite": {
@@ -3343,7 +3332,7 @@
"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
"dev": true,
"requires": {
- "repeating": "2.0.1"
+ "repeating": "^2.0.0"
}
},
"inflight": {
@@ -3351,8 +3340,8 @@
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"requires": {
- "once": "1.4.0",
- "wrappy": "1.0.2"
+ "once": "^1.3.0",
+ "wrappy": "1"
}
},
"inherits": {
@@ -3378,7 +3367,7 @@
"integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=",
"dev": true,
"requires": {
- "loose-envify": "1.3.1"
+ "loose-envify": "^1.0.0"
}
},
"invert-kv": {
@@ -3392,8 +3381,8 @@
"integrity": "sha1-IN5p89uULvLYe5wto28XIjWxtes=",
"dev": true,
"requires": {
- "is-relative": "0.2.1",
- "is-windows": "0.2.0"
+ "is-relative": "^0.2.1",
+ "is-windows": "^0.2.0"
}
},
"is-accessor-descriptor": {
@@ -3402,7 +3391,7 @@
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
"dev": true,
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.0"
},
"dependencies": {
"kind-of": {
@@ -3430,7 +3419,7 @@
"integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==",
"dev": true,
"requires": {
- "ci-info": "1.1.2"
+ "ci-info": "^1.0.0"
}
},
"is-data-descriptor": {
@@ -3439,7 +3428,7 @@
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
"dev": true,
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.0"
},
"dependencies": {
"kind-of": {
@@ -3456,9 +3445,9 @@
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "1.0.0",
- "is-data-descriptor": "1.0.0",
- "kind-of": "6.0.2"
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
},
"dependencies": {
"kind-of": {
@@ -3487,7 +3476,7 @@
"integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
"dev": true,
"requires": {
- "is-primitive": "2.0.0"
+ "is-primitive": "^2.0.0"
}
},
"is-extendable": {
@@ -3508,7 +3497,7 @@
"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
"dev": true,
"requires": {
- "number-is-nan": "1.0.1"
+ "number-is-nan": "^1.0.0"
}
},
"is-fullwidth-code-point": {
@@ -3528,7 +3517,7 @@
"integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
"dev": true,
"requires": {
- "is-extglob": "2.1.1"
+ "is-extglob": "^2.1.0"
}
},
"is-installed-globally": {
@@ -3537,8 +3526,8 @@
"integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
"dev": true,
"requires": {
- "global-dirs": "0.1.1",
- "is-path-inside": "1.0.1"
+ "global-dirs": "^0.1.0",
+ "is-path-inside": "^1.0.0"
}
},
"is-lower-case": {
@@ -3546,7 +3535,7 @@
"resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-1.1.3.tgz",
"integrity": "sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=",
"requires": {
- "lower-case": "1.1.4"
+ "lower-case": "^1.1.0"
}
},
"is-negated-glob": {
@@ -3567,7 +3556,7 @@
"integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
}
},
"is-obj": {
@@ -3582,7 +3571,7 @@
"integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=",
"dev": true,
"requires": {
- "symbol-observable": "0.2.4"
+ "symbol-observable": "^0.2.2"
}
},
"is-odd": {
@@ -3591,7 +3580,7 @@
"integrity": "sha512-OTiixgpZAT1M4NHgS5IguFp/Vz2VI3U7Goh4/HA1adtwyLtSBrxYlcSYkhpAE07s4fKEcjrFxyvtQBND4vFQyQ==",
"dev": true,
"requires": {
- "is-number": "4.0.0"
+ "is-number": "^4.0.0"
},
"dependencies": {
"is-number": {
@@ -3608,7 +3597,7 @@
"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
"dev": true,
"requires": {
- "path-is-inside": "1.0.2"
+ "path-is-inside": "^1.0.1"
}
},
"is-plain-obj": {
@@ -3623,7 +3612,7 @@
"integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
"dev": true,
"requires": {
- "isobject": "3.0.1"
+ "isobject": "^3.0.1"
}
},
"is-posix-bracket": {
@@ -3662,7 +3651,7 @@
"integrity": "sha1-0n9MfVFtF1+2ENuEu+7yPDvJeqU=",
"dev": true,
"requires": {
- "is-unc-path": "0.1.2"
+ "is-unc-path": "^0.1.1"
}
},
"is-retry-allowed": {
@@ -3688,7 +3677,7 @@
"integrity": "sha1-arBTpyVzwQJQ/0FqOBTDUXivObk=",
"dev": true,
"requires": {
- "unc-path-regex": "0.1.2"
+ "unc-path-regex": "^0.1.0"
}
},
"is-upper-case": {
@@ -3696,7 +3685,7 @@
"resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-1.1.2.tgz",
"integrity": "sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=",
"requires": {
- "upper-case": "1.1.3"
+ "upper-case": "^1.1.0"
}
},
"is-utf8": {
@@ -3745,20 +3734,20 @@
"integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
"dev": true,
"requires": {
- "abbrev": "1.0.9",
- "async": "1.5.2",
- "escodegen": "1.8.1",
- "esprima": "2.7.3",
- "glob": "5.0.15",
- "handlebars": "4.0.11",
- "js-yaml": "3.10.0",
- "mkdirp": "0.5.1",
- "nopt": "3.0.6",
- "once": "1.4.0",
- "resolve": "1.1.7",
- "supports-color": "3.2.3",
- "which": "1.3.0",
- "wordwrap": "1.0.0"
+ "abbrev": "1.0.x",
+ "async": "1.x",
+ "escodegen": "1.8.x",
+ "esprima": "2.7.x",
+ "glob": "^5.0.15",
+ "handlebars": "^4.0.1",
+ "js-yaml": "3.x",
+ "mkdirp": "0.5.x",
+ "nopt": "3.x",
+ "once": "1.x",
+ "resolve": "1.1.x",
+ "supports-color": "^3.1.0",
+ "which": "^1.1.1",
+ "wordwrap": "^1.0.0"
},
"dependencies": {
"esprima": {
@@ -3773,11 +3762,11 @@
"integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
"dev": true,
"requires": {
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "2 || 3",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
},
"has-flag": {
@@ -3792,7 +3781,7 @@
"integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
"dev": true,
"requires": {
- "has-flag": "1.0.0"
+ "has-flag": "^1.0.0"
}
},
"wordwrap": {
@@ -3809,8 +3798,8 @@
"integrity": "sha1-xdyU6PLMXNP/0zVFL4S1U8QkgzE=",
"dev": true,
"requires": {
- "istanbul": "0.4.5",
- "lodash": "4.17.5"
+ "istanbul": "~0.4.5",
+ "lodash": "~4.17.2"
}
},
"jest-config": {
@@ -3819,17 +3808,17 @@
"integrity": "sha512-KSg3EOToCgkX+lIvenKY7J8s426h6ahXxaUFJxvGoEk0562Z6inWj1TnKoGycTASwiLD+6kSYFALcjdosq9KIQ==",
"dev": true,
"requires": {
- "chalk": "2.3.0",
- "glob": "7.1.2",
- "jest-environment-jsdom": "22.4.3",
- "jest-environment-node": "22.4.3",
- "jest-get-type": "22.4.3",
- "jest-jasmine2": "22.4.3",
- "jest-regex-util": "22.4.3",
- "jest-resolve": "22.4.3",
- "jest-util": "22.4.3",
- "jest-validate": "22.4.3",
- "pretty-format": "22.4.3"
+ "chalk": "^2.0.1",
+ "glob": "^7.1.1",
+ "jest-environment-jsdom": "^22.4.3",
+ "jest-environment-node": "^22.4.3",
+ "jest-get-type": "^22.4.3",
+ "jest-jasmine2": "^22.4.3",
+ "jest-regex-util": "^22.4.3",
+ "jest-resolve": "^22.4.3",
+ "jest-util": "^22.4.3",
+ "jest-validate": "^22.4.3",
+ "pretty-format": "^22.4.3"
}
},
"jest-diff": {
@@ -3838,10 +3827,10 @@
"integrity": "sha512-/QqGvCDP5oZOF6PebDuLwrB2BMD8ffJv6TAGAdEVuDx1+uEgrHpSFrfrOiMRx2eJ1hgNjlQrOQEHetVwij90KA==",
"dev": true,
"requires": {
- "chalk": "2.3.0",
- "diff": "3.5.0",
- "jest-get-type": "22.4.3",
- "pretty-format": "22.4.3"
+ "chalk": "^2.0.1",
+ "diff": "^3.2.0",
+ "jest-get-type": "^22.4.3",
+ "pretty-format": "^22.4.3"
}
},
"jest-environment-jsdom": {
@@ -3850,9 +3839,9 @@
"integrity": "sha512-FviwfR+VyT3Datf13+ULjIMO5CSeajlayhhYQwpzgunswoaLIPutdbrnfUHEMyJCwvqQFaVtTmn9+Y8WCt6n1w==",
"dev": true,
"requires": {
- "jest-mock": "22.4.3",
- "jest-util": "22.4.3",
- "jsdom": "11.10.0"
+ "jest-mock": "^22.4.3",
+ "jest-util": "^22.4.3",
+ "jsdom": "^11.5.1"
}
},
"jest-environment-node": {
@@ -3861,8 +3850,8 @@
"integrity": "sha512-reZl8XF6t/lMEuPWwo9OLfttyC26A5AMgDyEQ6DBgZuyfyeNUzYT8BFo6uxCCP/Av/b7eb9fTi3sIHFPBzmlRA==",
"dev": true,
"requires": {
- "jest-mock": "22.4.3",
- "jest-util": "22.4.3"
+ "jest-mock": "^22.4.3",
+ "jest-util": "^22.4.3"
}
},
"jest-get-type": {
@@ -3877,17 +3866,17 @@
"integrity": "sha512-yZCPCJUcEY6R5KJB/VReo1AYI2b+5Ky+C+JA1v34jndJsRcLpU4IZX4rFJn7yDTtdNbO/nNqg+3SDIPNH2ecnw==",
"dev": true,
"requires": {
- "chalk": "2.3.0",
- "co": "4.6.0",
- "expect": "22.4.3",
- "graceful-fs": "4.1.11",
- "is-generator-fn": "1.0.0",
- "jest-diff": "22.4.3",
- "jest-matcher-utils": "22.4.3",
- "jest-message-util": "22.4.3",
- "jest-snapshot": "22.4.3",
- "jest-util": "22.4.3",
- "source-map-support": "0.5.5"
+ "chalk": "^2.0.1",
+ "co": "^4.6.0",
+ "expect": "^22.4.3",
+ "graceful-fs": "^4.1.11",
+ "is-generator-fn": "^1.0.0",
+ "jest-diff": "^22.4.3",
+ "jest-matcher-utils": "^22.4.3",
+ "jest-message-util": "^22.4.3",
+ "jest-snapshot": "^22.4.3",
+ "jest-util": "^22.4.3",
+ "source-map-support": "^0.5.0"
}
},
"jest-matcher-utils": {
@@ -3896,9 +3885,9 @@
"integrity": "sha512-lsEHVaTnKzdAPR5t4B6OcxXo9Vy4K+kRRbG5gtddY8lBEC+Mlpvm1CJcsMESRjzUhzkz568exMV1hTB76nAKbA==",
"dev": true,
"requires": {
- "chalk": "2.3.0",
- "jest-get-type": "22.4.3",
- "pretty-format": "22.4.3"
+ "chalk": "^2.0.1",
+ "jest-get-type": "^22.4.3",
+ "pretty-format": "^22.4.3"
}
},
"jest-message-util": {
@@ -3907,11 +3896,11 @@
"integrity": "sha512-iAMeKxhB3Se5xkSjU0NndLLCHtP4n+GtCqV0bISKA5dmOXQfEbdEmYiu2qpnWBDCQdEafNDDU6Q+l6oBMd/+BA==",
"dev": true,
"requires": {
- "@babel/code-frame": "7.0.0-beta.46",
- "chalk": "2.3.0",
- "micromatch": "2.3.11",
- "slash": "1.0.0",
- "stack-utils": "1.0.1"
+ "@babel/code-frame": "^7.0.0-beta.35",
+ "chalk": "^2.0.1",
+ "micromatch": "^2.3.11",
+ "slash": "^1.0.0",
+ "stack-utils": "^1.0.1"
},
"dependencies": {
"arr-diff": {
@@ -3920,7 +3909,7 @@
"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
"dev": true,
"requires": {
- "arr-flatten": "1.1.0"
+ "arr-flatten": "^1.0.1"
}
},
"is-extglob": {
@@ -3935,7 +3924,7 @@
"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
"dev": true,
"requires": {
- "is-extglob": "1.0.0"
+ "is-extglob": "^1.0.0"
}
},
"micromatch": {
@@ -3944,19 +3933,19 @@
"integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
"dev": true,
"requires": {
- "arr-diff": "2.0.0",
- "array-unique": "0.2.1",
- "braces": "1.8.5",
- "expand-brackets": "0.1.5",
- "extglob": "0.3.2",
- "filename-regex": "2.0.1",
- "is-extglob": "1.0.0",
- "is-glob": "2.0.1",
- "kind-of": "3.2.2",
- "normalize-path": "2.1.1",
- "object.omit": "2.0.1",
- "parse-glob": "3.0.4",
- "regex-cache": "0.4.4"
+ "arr-diff": "^2.0.0",
+ "array-unique": "^0.2.1",
+ "braces": "^1.8.2",
+ "expand-brackets": "^0.1.4",
+ "extglob": "^0.3.1",
+ "filename-regex": "^2.0.0",
+ "is-extglob": "^1.0.0",
+ "is-glob": "^2.0.1",
+ "kind-of": "^3.0.2",
+ "normalize-path": "^2.0.1",
+ "object.omit": "^2.0.0",
+ "parse-glob": "^3.0.4",
+ "regex-cache": "^0.4.2"
}
},
"normalize-path": {
@@ -3965,7 +3954,7 @@
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"dev": true,
"requires": {
- "remove-trailing-separator": "1.1.0"
+ "remove-trailing-separator": "^1.0.1"
}
}
}
@@ -3988,8 +3977,8 @@
"integrity": "sha512-u3BkD/MQBmwrOJDzDIaxpyqTxYH+XqAXzVJP51gt29H8jpj3QgKof5GGO2uPGKGeA1yTMlpbMs1gIQ6U4vcRhw==",
"dev": true,
"requires": {
- "browser-resolve": "1.11.2",
- "chalk": "2.3.0"
+ "browser-resolve": "^1.11.2",
+ "chalk": "^2.0.1"
}
},
"jest-snapshot": {
@@ -3998,12 +3987,12 @@
"integrity": "sha512-JXA0gVs5YL0HtLDCGa9YxcmmV2LZbwJ+0MfyXBBc5qpgkEYITQFJP7XNhcHFbUvRiniRpRbGVfJrOoYhhGE0RQ==",
"dev": true,
"requires": {
- "chalk": "2.3.0",
- "jest-diff": "22.4.3",
- "jest-matcher-utils": "22.4.3",
- "mkdirp": "0.5.1",
- "natural-compare": "1.4.0",
- "pretty-format": "22.4.3"
+ "chalk": "^2.0.1",
+ "jest-diff": "^22.4.3",
+ "jest-matcher-utils": "^22.4.3",
+ "mkdirp": "^0.5.1",
+ "natural-compare": "^1.4.0",
+ "pretty-format": "^22.4.3"
}
},
"jest-util": {
@@ -4012,13 +4001,13 @@
"integrity": "sha512-rfDfG8wyC5pDPNdcnAlZgwKnzHvZDu8Td2NJI/jAGKEGxJPYiE4F0ss/gSAkG4778Y23Hvbz+0GMrDJTeo7RjQ==",
"dev": true,
"requires": {
- "callsites": "2.0.0",
- "chalk": "2.3.0",
- "graceful-fs": "4.1.11",
- "is-ci": "1.1.0",
- "jest-message-util": "22.4.3",
- "mkdirp": "0.5.1",
- "source-map": "0.6.1"
+ "callsites": "^2.0.0",
+ "chalk": "^2.0.1",
+ "graceful-fs": "^4.1.11",
+ "is-ci": "^1.0.10",
+ "jest-message-util": "^22.4.3",
+ "mkdirp": "^0.5.1",
+ "source-map": "^0.6.0"
},
"dependencies": {
"source-map": {
@@ -4035,11 +4024,11 @@
"integrity": "sha512-CfFM18W3GSP/xgmA4UouIx0ljdtfD2mjeBC6c89Gg17E44D4tQhAcTrZmf9djvipwU30kSTnk6CzcxdCCeSXfA==",
"dev": true,
"requires": {
- "chalk": "2.3.0",
- "jest-config": "22.4.3",
- "jest-get-type": "22.4.3",
- "leven": "2.1.0",
- "pretty-format": "22.4.3"
+ "chalk": "^2.0.1",
+ "jest-config": "^22.4.3",
+ "jest-get-type": "^22.4.3",
+ "leven": "^2.1.0",
+ "pretty-format": "^22.4.3"
}
},
"js-string-escape": {
@@ -4059,8 +4048,8 @@
"integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==",
"dev": true,
"requires": {
- "argparse": "1.0.9",
- "esprima": "4.0.0"
+ "argparse": "^1.0.7",
+ "esprima": "^4.0.0"
}
},
"jsbn": {
@@ -4076,32 +4065,32 @@
"integrity": "sha512-x5No5FpJgBg3j5aBwA8ka6eGuS5IxbC8FOkmyccKvObtFT0bDMict/LOxINZsZGZSfGdNomLZ/qRV9Bpq/GIBA==",
"dev": true,
"requires": {
- "abab": "1.0.4",
- "acorn": "5.4.1",
- "acorn-globals": "4.1.0",
- "array-equal": "1.0.0",
- "cssom": "0.3.2",
- "cssstyle": "0.2.37",
- "data-urls": "1.0.0",
- "domexception": "1.0.1",
- "escodegen": "1.9.1",
- "html-encoding-sniffer": "1.0.2",
- "left-pad": "1.3.0",
- "nwmatcher": "1.4.4",
+ "abab": "^1.0.4",
+ "acorn": "^5.3.0",
+ "acorn-globals": "^4.1.0",
+ "array-equal": "^1.0.0",
+ "cssom": ">= 0.3.2 < 0.4.0",
+ "cssstyle": ">= 0.2.37 < 0.3.0",
+ "data-urls": "^1.0.0",
+ "domexception": "^1.0.0",
+ "escodegen": "^1.9.0",
+ "html-encoding-sniffer": "^1.0.2",
+ "left-pad": "^1.2.0",
+ "nwmatcher": "^1.4.3",
"parse5": "4.0.0",
- "pn": "1.1.0",
- "request": "2.85.0",
- "request-promise-native": "1.0.5",
- "sax": "1.2.4",
- "symbol-tree": "3.2.2",
- "tough-cookie": "2.3.3",
- "w3c-hr-time": "1.0.1",
- "webidl-conversions": "4.0.2",
- "whatwg-encoding": "1.0.3",
- "whatwg-mimetype": "2.1.0",
- "whatwg-url": "6.4.1",
- "ws": "4.1.0",
- "xml-name-validator": "3.0.0"
+ "pn": "^1.1.0",
+ "request": "^2.83.0",
+ "request-promise-native": "^1.0.5",
+ "sax": "^1.2.4",
+ "symbol-tree": "^3.2.2",
+ "tough-cookie": "^2.3.3",
+ "w3c-hr-time": "^1.0.1",
+ "webidl-conversions": "^4.0.2",
+ "whatwg-encoding": "^1.0.3",
+ "whatwg-mimetype": "^2.1.0",
+ "whatwg-url": "^6.4.0",
+ "ws": "^4.0.0",
+ "xml-name-validator": "^3.0.0"
},
"dependencies": {
"escodegen": {
@@ -4110,11 +4099,11 @@
"integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
"dev": true,
"requires": {
- "esprima": "3.1.3",
- "estraverse": "4.2.0",
- "esutils": "2.0.2",
- "optionator": "0.8.2",
- "source-map": "0.6.1"
+ "esprima": "^3.1.3",
+ "estraverse": "^4.2.0",
+ "esutils": "^2.0.2",
+ "optionator": "^0.8.1",
+ "source-map": "~0.6.1"
}
},
"esprima": {
@@ -4168,7 +4157,7 @@
"integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
"dev": true,
"requires": {
- "jsonify": "0.0.0"
+ "jsonify": "~0.0.0"
}
},
"json-stringify-safe": {
@@ -4183,7 +4172,7 @@
"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"dev": true,
"requires": {
- "graceful-fs": "4.1.11"
+ "graceful-fs": "^4.1.6"
}
},
"jsonify": {
@@ -4198,15 +4187,15 @@
"integrity": "sha1-RMJpAuSujs4jZs7cn/FrEKXzkcY=",
"dev": true,
"requires": {
- "any-promise": "1.3.0",
- "graceful-fs": "4.1.11",
- "make-error-cause": "1.2.2",
- "object.pick": "1.3.0",
- "parse-json": "2.2.0",
- "strip-bom": "3.0.0",
- "thenify": "3.3.0",
- "throat": "3.2.0",
- "xtend": "4.0.1"
+ "any-promise": "^1.3.0",
+ "graceful-fs": "^4.1.4",
+ "make-error-cause": "^1.2.1",
+ "object.pick": "^1.1.2",
+ "parse-json": "^2.2.0",
+ "strip-bom": "^3.0.0",
+ "thenify": "^3.2.0",
+ "throat": "^3.0.0",
+ "xtend": "^4.0.1"
}
},
"jsprim": {
@@ -4232,7 +4221,7 @@
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
},
"latest-version": {
@@ -4241,7 +4230,7 @@
"integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=",
"dev": true,
"requires": {
- "package-json": "4.0.1"
+ "package-json": "^4.0.0"
}
},
"lazy-cache": {
@@ -4256,7 +4245,7 @@
"integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
"dev": true,
"requires": {
- "readable-stream": "2.3.3"
+ "readable-stream": "^2.0.5"
}
},
"lcid": {
@@ -4264,7 +4253,7 @@
"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
"integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
"requires": {
- "invert-kv": "1.0.0"
+ "invert-kv": "^1.0.0"
}
},
"lead": {
@@ -4273,7 +4262,7 @@
"integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
"dev": true,
"requires": {
- "flush-write-stream": "1.0.3"
+ "flush-write-stream": "^1.0.2"
}
},
"left-pad": {
@@ -4294,8 +4283,8 @@
"integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
"dev": true,
"requires": {
- "prelude-ls": "1.1.2",
- "type-check": "0.3.2"
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2"
}
},
"liftoff": {
@@ -4304,14 +4293,14 @@
"integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=",
"dev": true,
"requires": {
- "extend": "3.0.1",
- "findup-sync": "2.0.0",
- "fined": "1.1.0",
- "flagged-respawn": "1.0.0",
- "is-plain-object": "2.0.4",
- "object.map": "1.0.1",
- "rechoir": "0.6.2",
- "resolve": "1.1.7"
+ "extend": "^3.0.0",
+ "findup-sync": "^2.0.0",
+ "fined": "^1.0.1",
+ "flagged-respawn": "^1.0.0",
+ "is-plain-object": "^2.0.4",
+ "object.map": "^1.0.0",
+ "rechoir": "^0.6.2",
+ "resolve": "^1.1.7"
}
},
"lint-staged": {
@@ -4320,28 +4309,28 @@
"integrity": "sha512-dCzqskhum0WXQBE0RawBkOlRjg2pc7PkAJD4yRB12+ct5CMTOU9tvzzbsyqJwaGHjTdSFUxiT8n+sww77p2r7w==",
"dev": true,
"requires": {
- "app-root-path": "2.0.1",
- "chalk": "2.4.1",
- "commander": "2.15.1",
- "cosmiconfig": "4.0.0",
- "debug": "3.1.0",
- "dedent": "0.7.0",
- "execa": "0.9.0",
- "find-parent-dir": "0.3.0",
- "is-glob": "4.0.0",
- "jest-validate": "22.4.3",
- "listr": "0.13.0",
- "lodash": "4.17.5",
- "log-symbols": "2.2.0",
- "micromatch": "3.1.8",
- "npm-which": "3.0.1",
- "p-map": "1.2.0",
- "path-is-inside": "1.0.2",
- "pify": "3.0.0",
- "please-upgrade-node": "3.0.2",
+ "app-root-path": "^2.0.1",
+ "chalk": "^2.3.1",
+ "commander": "^2.14.1",
+ "cosmiconfig": "^4.0.0",
+ "debug": "^3.1.0",
+ "dedent": "^0.7.0",
+ "execa": "^0.9.0",
+ "find-parent-dir": "^0.3.0",
+ "is-glob": "^4.0.0",
+ "jest-validate": "^22.4.0",
+ "listr": "^0.13.0",
+ "lodash": "^4.17.5",
+ "log-symbols": "^2.2.0",
+ "micromatch": "^3.1.8",
+ "npm-which": "^3.0.1",
+ "p-map": "^1.1.1",
+ "path-is-inside": "^1.0.2",
+ "pify": "^3.0.0",
+ "please-upgrade-node": "^3.0.2",
"staged-git-files": "1.1.1",
- "string-argv": "0.0.2",
- "stringify-object": "3.2.2"
+ "string-argv": "^0.0.2",
+ "stringify-object": "^3.2.2"
},
"dependencies": {
"ansi-styles": {
@@ -4350,7 +4339,7 @@
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"dev": true,
"requires": {
- "color-convert": "1.9.1"
+ "color-convert": "^1.9.0"
}
},
"chalk": {
@@ -4359,9 +4348,9 @@
"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
"dev": true,
"requires": {
- "ansi-styles": "3.2.1",
- "escape-string-regexp": "1.0.5",
- "supports-color": "5.4.0"
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
}
},
"debug": {
@@ -4379,13 +4368,13 @@
"integrity": "sha512-BbUMBiX4hqiHZUA5+JujIjNb6TyAlp2D5KLheMjMluwOuzcnylDL4AxZYLLn1n2AGB49eSWwyKvvEQoRpnAtmA==",
"dev": true,
"requires": {
- "cross-spawn": "5.1.0",
- "get-stream": "3.0.0",
- "is-stream": "1.1.0",
- "npm-run-path": "2.0.2",
- "p-finally": "1.0.0",
- "signal-exit": "3.0.2",
- "strip-eof": "1.0.0"
+ "cross-spawn": "^5.0.1",
+ "get-stream": "^3.0.0",
+ "is-stream": "^1.1.0",
+ "npm-run-path": "^2.0.0",
+ "p-finally": "^1.0.0",
+ "signal-exit": "^3.0.0",
+ "strip-eof": "^1.0.0"
}
},
"has-flag": {
@@ -4400,7 +4389,7 @@
"integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=",
"dev": true,
"requires": {
- "is-extglob": "2.1.1"
+ "is-extglob": "^2.1.1"
}
},
"supports-color": {
@@ -4409,7 +4398,7 @@
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"dev": true,
"requires": {
- "has-flag": "3.0.0"
+ "has-flag": "^3.0.0"
}
}
}
@@ -4426,23 +4415,23 @@
"integrity": "sha1-ILsLowuuZg7oTMBQPfS+PVYjiH0=",
"dev": true,
"requires": {
- "chalk": "1.1.3",
- "cli-truncate": "0.2.1",
- "figures": "1.7.0",
- "indent-string": "2.1.0",
- "is-observable": "0.2.0",
- "is-promise": "2.1.0",
- "is-stream": "1.1.0",
- "listr-silent-renderer": "1.1.1",
- "listr-update-renderer": "0.4.0",
- "listr-verbose-renderer": "0.4.1",
- "log-symbols": "1.0.2",
- "log-update": "1.0.2",
- "ora": "0.2.3",
- "p-map": "1.2.0",
- "rxjs": "5.5.10",
- "stream-to-observable": "0.2.0",
- "strip-ansi": "3.0.1"
+ "chalk": "^1.1.3",
+ "cli-truncate": "^0.2.1",
+ "figures": "^1.7.0",
+ "indent-string": "^2.1.0",
+ "is-observable": "^0.2.0",
+ "is-promise": "^2.1.0",
+ "is-stream": "^1.1.0",
+ "listr-silent-renderer": "^1.1.1",
+ "listr-update-renderer": "^0.4.0",
+ "listr-verbose-renderer": "^0.4.0",
+ "log-symbols": "^1.0.2",
+ "log-update": "^1.0.2",
+ "ora": "^0.2.3",
+ "p-map": "^1.1.1",
+ "rxjs": "^5.4.2",
+ "stream-to-observable": "^0.2.0",
+ "strip-ansi": "^3.0.1"
},
"dependencies": {
"ansi-regex": {
@@ -4463,11 +4452,11 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
- "ansi-styles": "2.2.1",
- "escape-string-regexp": "1.0.5",
- "has-ansi": "2.0.0",
- "strip-ansi": "3.0.1",
- "supports-color": "2.0.0"
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
}
},
"cli-truncate": {
@@ -4477,7 +4466,7 @@
"dev": true,
"requires": {
"slice-ansi": "0.0.4",
- "string-width": "1.0.2"
+ "string-width": "^1.0.1"
}
},
"is-fullwidth-code-point": {
@@ -4486,7 +4475,7 @@
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"requires": {
- "number-is-nan": "1.0.1"
+ "number-is-nan": "^1.0.0"
}
},
"log-symbols": {
@@ -4495,7 +4484,7 @@
"integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
"dev": true,
"requires": {
- "chalk": "1.1.3"
+ "chalk": "^1.0.0"
}
},
"slice-ansi": {
@@ -4510,9 +4499,9 @@
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
}
},
"strip-ansi": {
@@ -4521,7 +4510,7 @@
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"supports-color": {
@@ -4544,14 +4533,14 @@
"integrity": "sha1-NE2YDaLKLosUW6MFkI8yrj9MyKc=",
"dev": true,
"requires": {
- "chalk": "1.1.3",
- "cli-truncate": "0.2.1",
- "elegant-spinner": "1.0.1",
- "figures": "1.7.0",
- "indent-string": "3.2.0",
- "log-symbols": "1.0.2",
- "log-update": "1.0.2",
- "strip-ansi": "3.0.1"
+ "chalk": "^1.1.3",
+ "cli-truncate": "^0.2.1",
+ "elegant-spinner": "^1.0.1",
+ "figures": "^1.7.0",
+ "indent-string": "^3.0.0",
+ "log-symbols": "^1.0.2",
+ "log-update": "^1.0.2",
+ "strip-ansi": "^3.0.1"
},
"dependencies": {
"ansi-regex": {
@@ -4572,11 +4561,11 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
- "ansi-styles": "2.2.1",
- "escape-string-regexp": "1.0.5",
- "has-ansi": "2.0.0",
- "strip-ansi": "3.0.1",
- "supports-color": "2.0.0"
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
}
},
"cli-truncate": {
@@ -4586,7 +4575,7 @@
"dev": true,
"requires": {
"slice-ansi": "0.0.4",
- "string-width": "1.0.2"
+ "string-width": "^1.0.1"
}
},
"indent-string": {
@@ -4601,7 +4590,7 @@
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"dev": true,
"requires": {
- "number-is-nan": "1.0.1"
+ "number-is-nan": "^1.0.0"
}
},
"log-symbols": {
@@ -4610,7 +4599,7 @@
"integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
"dev": true,
"requires": {
- "chalk": "1.1.3"
+ "chalk": "^1.0.0"
}
},
"slice-ansi": {
@@ -4625,9 +4614,9 @@
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"dev": true,
"requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
}
},
"strip-ansi": {
@@ -4636,7 +4625,7 @@
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"supports-color": {
@@ -4653,10 +4642,10 @@
"integrity": "sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=",
"dev": true,
"requires": {
- "chalk": "1.1.3",
- "cli-cursor": "1.0.2",
- "date-fns": "1.29.0",
- "figures": "1.7.0"
+ "chalk": "^1.1.3",
+ "cli-cursor": "^1.0.2",
+ "date-fns": "^1.27.2",
+ "figures": "^1.7.0"
},
"dependencies": {
"ansi-regex": {
@@ -4677,11 +4666,11 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
- "ansi-styles": "2.2.1",
- "escape-string-regexp": "1.0.5",
- "has-ansi": "2.0.0",
- "strip-ansi": "3.0.1",
- "supports-color": "2.0.0"
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
}
},
"strip-ansi": {
@@ -4690,7 +4679,7 @@
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"supports-color": {
@@ -4706,8 +4695,8 @@
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
"requires": {
- "p-locate": "2.0.0",
- "path-exists": "3.0.0"
+ "p-locate": "^2.0.0",
+ "path-exists": "^3.0.0"
}
},
"lockfile": {
@@ -4782,7 +4771,7 @@
"integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=",
"dev": true,
"requires": {
- "lodash._root": "3.0.1"
+ "lodash._root": "^3.0.0"
}
},
"lodash.get": {
@@ -4809,9 +4798,9 @@
"integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=",
"dev": true,
"requires": {
- "lodash._getnative": "3.9.1",
- "lodash.isarguments": "3.1.0",
- "lodash.isarray": "3.0.4"
+ "lodash._getnative": "^3.0.0",
+ "lodash.isarguments": "^3.0.0",
+ "lodash.isarray": "^3.0.0"
}
},
"lodash.restparam": {
@@ -4832,15 +4821,15 @@
"integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=",
"dev": true,
"requires": {
- "lodash._basecopy": "3.0.1",
- "lodash._basetostring": "3.0.1",
- "lodash._basevalues": "3.0.0",
- "lodash._isiterateecall": "3.0.9",
- "lodash._reinterpolate": "3.0.0",
- "lodash.escape": "3.2.0",
- "lodash.keys": "3.1.2",
- "lodash.restparam": "3.6.1",
- "lodash.templatesettings": "3.1.1"
+ "lodash._basecopy": "^3.0.0",
+ "lodash._basetostring": "^3.0.0",
+ "lodash._basevalues": "^3.0.0",
+ "lodash._isiterateecall": "^3.0.0",
+ "lodash._reinterpolate": "^3.0.0",
+ "lodash.escape": "^3.0.0",
+ "lodash.keys": "^3.0.0",
+ "lodash.restparam": "^3.0.0",
+ "lodash.templatesettings": "^3.0.0"
}
},
"lodash.templatesettings": {
@@ -4849,8 +4838,8 @@
"integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=",
"dev": true,
"requires": {
- "lodash._reinterpolate": "3.0.0",
- "lodash.escape": "3.2.0"
+ "lodash._reinterpolate": "^3.0.0",
+ "lodash.escape": "^3.0.0"
}
},
"log-symbols": {
@@ -4859,7 +4848,7 @@
"integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
"dev": true,
"requires": {
- "chalk": "2.3.0"
+ "chalk": "^2.0.1"
}
},
"log-update": {
@@ -4868,8 +4857,8 @@
"integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
"dev": true,
"requires": {
- "ansi-escapes": "1.4.0",
- "cli-cursor": "1.0.2"
+ "ansi-escapes": "^1.0.0",
+ "cli-cursor": "^1.0.2"
}
},
"lolex": {
@@ -4889,7 +4878,7 @@
"integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=",
"dev": true,
"requires": {
- "js-tokens": "3.0.2"
+ "js-tokens": "^3.0.0"
}
},
"lower-case": {
@@ -4902,7 +4891,7 @@
"resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-1.0.2.tgz",
"integrity": "sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=",
"requires": {
- "lower-case": "1.1.4"
+ "lower-case": "^1.1.2"
}
},
"lowercase-keys": {
@@ -4916,8 +4905,8 @@
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
"integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
"requires": {
- "pseudomap": "1.0.2",
- "yallist": "2.1.2"
+ "pseudomap": "^1.0.2",
+ "yallist": "^2.1.2"
}
},
"lru-queue": {
@@ -4926,7 +4915,7 @@
"integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
"dev": true,
"requires": {
- "es5-ext": "0.10.41"
+ "es5-ext": "~0.10.2"
}
},
"make-dir": {
@@ -4935,7 +4924,7 @@
"integrity": "sha512-0Pkui4wLJ7rxvmfUvs87skoEaxmu0hCUApF8nonzpl7q//FWp9zu8W61Scz4sd/kUiqDxvUhtoam2efDyiBzcA==",
"dev": true,
"requires": {
- "pify": "3.0.0"
+ "pify": "^3.0.0"
},
"dependencies": {
"pify": {
@@ -4958,16 +4947,24 @@
"integrity": "sha1-3wOI/NCzeBbf8KX7gQiTl3fcvJ0=",
"dev": true,
"requires": {
- "make-error": "1.3.2"
+ "make-error": "^1.2.0"
}
},
"make-iterator": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.0.tgz",
- "integrity": "sha1-V7713IXSOSO6I3ZzJNjo+PPZaUs=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+ "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^6.0.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
+ }
}
},
"map-cache": {
@@ -4982,7 +4979,7 @@
"integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
"dev": true,
"requires": {
- "object-visit": "1.0.1"
+ "object-visit": "^1.0.0"
}
},
"mem": {
@@ -4990,7 +4987,7 @@
"resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
"integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
"requires": {
- "mimic-fn": "1.1.0"
+ "mimic-fn": "^1.0.0"
}
},
"memoizee": {
@@ -4999,14 +4996,14 @@
"integrity": "sha512-sprBu6nwxBWBvBOh5v2jcsGqiGLlL2xr2dLub3vR8dnE8YB17omwtm/0NSHl8jjNbcsJd5GMWJAnTSVe/O0Wfg==",
"dev": true,
"requires": {
- "d": "1.0.0",
- "es5-ext": "0.10.41",
- "es6-weak-map": "2.0.2",
- "event-emitter": "0.3.5",
- "is-promise": "2.1.0",
- "lru-queue": "0.1.0",
- "next-tick": "1.0.0",
- "timers-ext": "0.1.5"
+ "d": "1",
+ "es5-ext": "^0.10.30",
+ "es6-weak-map": "^2.0.2",
+ "event-emitter": "^0.3.5",
+ "is-promise": "^2.1",
+ "lru-queue": "0.1",
+ "next-tick": "1",
+ "timers-ext": "^0.1.2"
}
},
"micromatch": {
@@ -5015,19 +5012,19 @@
"integrity": "sha512-/XeuOQqYg+B5kwjDWekXseSwGS7CzE0w9Gjo4Cjkf/uFitNh47NrZHAY2vp/oS2YQVfebPIdbEIvgdy+kIcAog==",
"dev": true,
"requires": {
- "arr-diff": "4.0.0",
- "array-unique": "0.3.2",
- "braces": "2.3.1",
- "define-property": "2.0.2",
- "extend-shallow": "3.0.2",
- "extglob": "2.0.4",
- "fragment-cache": "0.2.1",
- "kind-of": "6.0.2",
- "nanomatch": "1.2.9",
- "object.pick": "1.3.0",
- "regex-not": "1.0.2",
- "snapdragon": "0.8.1",
- "to-regex": "3.0.1"
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "braces": "^2.3.1",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "extglob": "^2.0.4",
+ "fragment-cache": "^0.2.1",
+ "kind-of": "^6.0.2",
+ "nanomatch": "^1.2.9",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
},
"dependencies": {
"arr-diff": {
@@ -5048,18 +5045,18 @@
"integrity": "sha512-SO5lYHA3vO6gz66erVvedSCkp7AKWdv6VcQ2N4ysXfPxdAlxAMMAdwegGGcv1Bqwm7naF1hNdk5d6AAIEHV2nQ==",
"dev": true,
"requires": {
- "arr-flatten": "1.1.0",
- "array-unique": "0.3.2",
- "define-property": "1.0.0",
- "extend-shallow": "2.0.1",
- "fill-range": "4.0.0",
- "isobject": "3.0.1",
- "kind-of": "6.0.2",
- "repeat-element": "1.1.2",
- "snapdragon": "0.8.1",
- "snapdragon-node": "2.1.1",
- "split-string": "3.1.0",
- "to-regex": "3.0.1"
+ "arr-flatten": "^1.1.0",
+ "array-unique": "^0.3.2",
+ "define-property": "^1.0.0",
+ "extend-shallow": "^2.0.1",
+ "fill-range": "^4.0.0",
+ "isobject": "^3.0.1",
+ "kind-of": "^6.0.2",
+ "repeat-element": "^1.1.2",
+ "snapdragon": "^0.8.1",
+ "snapdragon-node": "^2.0.1",
+ "split-string": "^3.0.2",
+ "to-regex": "^3.0.1"
},
"dependencies": {
"define-property": {
@@ -5068,7 +5065,7 @@
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
"dev": true,
"requires": {
- "is-descriptor": "1.0.2"
+ "is-descriptor": "^1.0.0"
}
},
"extend-shallow": {
@@ -5077,7 +5074,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
}
}
@@ -5088,13 +5085,13 @@
"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
"dev": true,
"requires": {
- "debug": "2.6.9",
- "define-property": "0.2.5",
- "extend-shallow": "2.0.1",
- "posix-character-classes": "0.1.1",
- "regex-not": "1.0.2",
- "snapdragon": "0.8.1",
- "to-regex": "3.0.1"
+ "debug": "^2.3.3",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "posix-character-classes": "^0.1.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
},
"dependencies": {
"define-property": {
@@ -5103,7 +5100,7 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
},
"extend-shallow": {
@@ -5112,7 +5109,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
},
"is-descriptor": {
@@ -5121,9 +5118,9 @@
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "0.1.6",
- "is-data-descriptor": "0.1.4",
- "kind-of": "5.1.0"
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
}
},
"kind-of": {
@@ -5140,8 +5137,8 @@
"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
"dev": true,
"requires": {
- "assign-symbols": "1.0.0",
- "is-extendable": "1.0.1"
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
},
"dependencies": {
"is-extendable": {
@@ -5150,7 +5147,7 @@
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"dev": true,
"requires": {
- "is-plain-object": "2.0.4"
+ "is-plain-object": "^2.0.4"
}
}
}
@@ -5161,14 +5158,14 @@
"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
"dev": true,
"requires": {
- "array-unique": "0.3.2",
- "define-property": "1.0.0",
- "expand-brackets": "2.1.4",
- "extend-shallow": "2.0.1",
- "fragment-cache": "0.2.1",
- "regex-not": "1.0.2",
- "snapdragon": "0.8.1",
- "to-regex": "3.0.1"
+ "array-unique": "^0.3.2",
+ "define-property": "^1.0.0",
+ "expand-brackets": "^2.1.4",
+ "extend-shallow": "^2.0.1",
+ "fragment-cache": "^0.2.1",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
},
"dependencies": {
"define-property": {
@@ -5177,7 +5174,7 @@
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
"dev": true,
"requires": {
- "is-descriptor": "1.0.2"
+ "is-descriptor": "^1.0.0"
}
},
"extend-shallow": {
@@ -5186,7 +5183,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
}
}
@@ -5197,10 +5194,10 @@
"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
"dev": true,
"requires": {
- "extend-shallow": "2.0.1",
- "is-number": "3.0.0",
- "repeat-string": "1.6.1",
- "to-regex-range": "2.1.1"
+ "extend-shallow": "^2.0.1",
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1",
+ "to-regex-range": "^2.1.0"
},
"dependencies": {
"extend-shallow": {
@@ -5209,7 +5206,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
}
}
@@ -5220,7 +5217,7 @@
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -5229,7 +5226,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -5240,7 +5237,7 @@
"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -5249,7 +5246,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -5260,7 +5257,7 @@
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -5269,7 +5266,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -5294,7 +5291,7 @@
"integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
"dev": true,
"requires": {
- "mime-db": "1.30.0"
+ "mime-db": "~1.30.0"
}
},
"mimic-fn": {
@@ -5307,7 +5304,7 @@
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"requires": {
- "brace-expansion": "1.1.8"
+ "brace-expansion": "^1.1.7"
}
},
"minimist": {
@@ -5321,8 +5318,8 @@
"integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
"dev": true,
"requires": {
- "for-in": "1.0.2",
- "is-extendable": "1.0.1"
+ "for-in": "^1.0.2",
+ "is-extendable": "^1.0.1"
},
"dependencies": {
"is-extendable": {
@@ -5331,7 +5328,7 @@
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"dev": true,
"requires": {
- "is-plain-object": "2.0.4"
+ "is-plain-object": "^2.0.4"
}
}
}
@@ -5391,7 +5388,7 @@
"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
"dev": true,
"requires": {
- "has-flag": "2.0.0"
+ "has-flag": "^2.0.0"
}
}
}
@@ -5412,9 +5409,9 @@
"resolved": "https://registry.npmjs.org/mssql/-/mssql-4.1.0.tgz",
"integrity": "sha512-ekht0eILEV0P1CbpkwpAxhgO+/5goYizUJrt7pgDm3fP6lGKe0+8V9jhTvQZ8DPHkycSd0wYGUoz/YA7VN7kQQ==",
"requires": {
- "debug": "2.6.9",
- "generic-pool": "3.4.0",
- "tedious": "2.1.5"
+ "debug": "^2.6.3",
+ "generic-pool": "^3.1.7",
+ "tedious": "^2.0.0"
}
},
"multipipe": {
@@ -5442,9 +5439,9 @@
"resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
"integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
"requires": {
- "any-promise": "1.3.0",
- "object-assign": "4.1.1",
- "thenify-all": "1.6.0"
+ "any-promise": "^1.0.0",
+ "object-assign": "^4.0.1",
+ "thenify-all": "^1.0.0"
}
},
"nan": {
@@ -5458,18 +5455,18 @@
"integrity": "sha512-n8R9bS8yQ6eSXaV6jHUpKzD8gLsin02w1HSFiegwrs9E098Ylhw5jdyKPaYqvHknHaSCKTPp7C8dGCQ0q9koXA==",
"dev": true,
"requires": {
- "arr-diff": "4.0.0",
- "array-unique": "0.3.2",
- "define-property": "2.0.2",
- "extend-shallow": "3.0.2",
- "fragment-cache": "0.2.1",
- "is-odd": "2.0.0",
- "is-windows": "1.0.2",
- "kind-of": "6.0.2",
- "object.pick": "1.3.0",
- "regex-not": "1.0.2",
- "snapdragon": "0.8.1",
- "to-regex": "3.0.1"
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "fragment-cache": "^0.2.1",
+ "is-odd": "^2.0.0",
+ "is-windows": "^1.0.2",
+ "kind-of": "^6.0.2",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
},
"dependencies": {
"arr-diff": {
@@ -5490,8 +5487,8 @@
"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
"dev": true,
"requires": {
- "assign-symbols": "1.0.0",
- "is-extendable": "1.0.1"
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
}
},
"is-extendable": {
@@ -5500,7 +5497,7 @@
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"dev": true,
"requires": {
- "is-plain-object": "2.0.4"
+ "is-plain-object": "^2.0.4"
}
},
"is-windows": {
@@ -5518,9 +5515,9 @@
}
},
"natives": {
- "version": "1.1.2",
- "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.2.tgz",
- "integrity": "sha512-5bRASydE1gu6zPOenLN043++J8xj1Ob7ArkfdYO3JN4DF5rDmG7bMoiybkTyD+GnXQEMixVeDHMzuqm6kpBmiA==",
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz",
+ "integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==",
"dev": true
},
"natural-compare": {
@@ -5547,11 +5544,11 @@
"integrity": "sha512-v1J/FLUB9PfGqZLGDBhQqODkbLotP0WtLo9R4EJY2PPu5f5Xg4o0rA8FDlmrjFSv9vBBKcfnOSpfYYuu5RTHqg==",
"dev": true,
"requires": {
- "@sinonjs/formatio": "2.0.0",
- "just-extend": "1.1.27",
- "lolex": "2.3.2",
- "path-to-regexp": "1.7.0",
- "text-encoding": "0.6.4"
+ "@sinonjs/formatio": "^2.0.0",
+ "just-extend": "^1.1.27",
+ "lolex": "^2.3.2",
+ "path-to-regexp": "^1.7.0",
+ "text-encoding": "^0.6.4"
}
},
"no-case": {
@@ -5559,7 +5556,7 @@
"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
"integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==",
"requires": {
- "lower-case": "1.1.4"
+ "lower-case": "^1.1.1"
}
},
"nopt": {
@@ -5568,7 +5565,7 @@
"integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
"dev": true,
"requires": {
- "abbrev": "1.0.9"
+ "abbrev": "1"
}
},
"normalize-path": {
@@ -5583,7 +5580,7 @@
"integrity": "sha1-vGHLtFbXnLMiB85HygUTb/Ln1u4=",
"dev": true,
"requires": {
- "once": "1.4.0"
+ "once": "^1.3.2"
}
},
"npm-path": {
@@ -5592,7 +5589,7 @@
"integrity": "sha512-IFsj0R9C7ZdR5cP+ET342q77uSRdtWOlWpih5eC+lu29tIDbNEgDbzgVJ5UFvYHWhxDZ5TFkJafFioO0pPQjCw==",
"dev": true,
"requires": {
- "which": "1.3.0"
+ "which": "^1.2.10"
}
},
"npm-run-path": {
@@ -5600,7 +5597,7 @@
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
"requires": {
- "path-key": "2.0.1"
+ "path-key": "^2.0.0"
}
},
"npm-which": {
@@ -5609,9 +5606,9 @@
"integrity": "sha1-kiXybsOihcIJyuZ8OxGmtKtxQKo=",
"dev": true,
"requires": {
- "commander": "2.15.1",
- "npm-path": "2.0.4",
- "which": "1.3.0"
+ "commander": "^2.9.0",
+ "npm-path": "^2.0.2",
+ "which": "^1.2.10"
}
},
"number-is-nan": {
@@ -5642,9 +5639,9 @@
"integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
"dev": true,
"requires": {
- "copy-descriptor": "0.1.1",
- "define-property": "0.2.5",
- "kind-of": "3.2.2"
+ "copy-descriptor": "^0.1.0",
+ "define-property": "^0.2.5",
+ "kind-of": "^3.0.3"
},
"dependencies": {
"define-property": {
@@ -5653,7 +5650,7 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
},
"is-accessor-descriptor": {
@@ -5662,7 +5659,7 @@
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
}
},
"is-data-descriptor": {
@@ -5671,7 +5668,7 @@
"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
}
},
"is-descriptor": {
@@ -5680,9 +5677,9 @@
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "0.1.6",
- "is-data-descriptor": "0.1.4",
- "kind-of": "5.1.0"
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
},
"dependencies": {
"kind-of": {
@@ -5707,7 +5704,7 @@
"integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
"dev": true,
"requires": {
- "isobject": "3.0.1"
+ "isobject": "^3.0.0"
}
},
"object.assign": {
@@ -5716,10 +5713,10 @@
"integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
"dev": true,
"requires": {
- "define-properties": "1.1.2",
- "function-bind": "1.1.1",
- "has-symbols": "1.0.0",
- "object-keys": "1.0.11"
+ "define-properties": "^1.1.2",
+ "function-bind": "^1.1.1",
+ "has-symbols": "^1.0.0",
+ "object-keys": "^1.0.11"
}
},
"object.defaults": {
@@ -5728,10 +5725,10 @@
"integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
"dev": true,
"requires": {
- "array-each": "1.0.1",
- "array-slice": "1.1.0",
- "for-own": "1.0.0",
- "isobject": "3.0.1"
+ "array-each": "^1.0.1",
+ "array-slice": "^1.0.0",
+ "for-own": "^1.0.0",
+ "isobject": "^3.0.0"
},
"dependencies": {
"array-slice": {
@@ -5746,7 +5743,7 @@
"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
"dev": true,
"requires": {
- "for-in": "1.0.2"
+ "for-in": "^1.0.1"
}
}
}
@@ -5757,8 +5754,8 @@
"integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
"dev": true,
"requires": {
- "for-own": "1.0.0",
- "make-iterator": "1.0.0"
+ "for-own": "^1.0.0",
+ "make-iterator": "^1.0.0"
},
"dependencies": {
"for-own": {
@@ -5767,7 +5764,7 @@
"integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
"dev": true,
"requires": {
- "for-in": "1.0.2"
+ "for-in": "^1.0.1"
}
}
}
@@ -5778,8 +5775,8 @@
"integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
"dev": true,
"requires": {
- "for-own": "0.1.5",
- "is-extendable": "0.1.1"
+ "for-own": "^0.1.4",
+ "is-extendable": "^0.1.1"
}
},
"object.pick": {
@@ -5788,7 +5785,7 @@
"integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
"dev": true,
"requires": {
- "isobject": "3.0.1"
+ "isobject": "^3.0.1"
}
},
"once": {
@@ -5796,7 +5793,7 @@
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"requires": {
- "wrappy": "1.0.2"
+ "wrappy": "1"
}
},
"onetime": {
@@ -5810,8 +5807,8 @@
"resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
"integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
"requires": {
- "minimist": "0.0.10",
- "wordwrap": "0.0.3"
+ "minimist": "~0.0.1",
+ "wordwrap": "~0.0.2"
}
},
"optionator": {
@@ -5820,12 +5817,12 @@
"integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
"dev": true,
"requires": {
- "deep-is": "0.1.3",
- "fast-levenshtein": "2.0.6",
- "levn": "0.3.0",
- "prelude-ls": "1.1.2",
- "type-check": "0.3.2",
- "wordwrap": "1.0.0"
+ "deep-is": "~0.1.3",
+ "fast-levenshtein": "~2.0.4",
+ "levn": "~0.3.0",
+ "prelude-ls": "~1.1.2",
+ "type-check": "~0.3.2",
+ "wordwrap": "~1.0.0"
},
"dependencies": {
"wordwrap": {
@@ -5842,10 +5839,10 @@
"integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
"dev": true,
"requires": {
- "chalk": "1.1.3",
- "cli-cursor": "1.0.2",
- "cli-spinners": "0.1.2",
- "object-assign": "4.1.1"
+ "chalk": "^1.1.1",
+ "cli-cursor": "^1.0.2",
+ "cli-spinners": "^0.1.2",
+ "object-assign": "^4.0.1"
},
"dependencies": {
"ansi-regex": {
@@ -5866,11 +5863,11 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
- "ansi-styles": "2.2.1",
- "escape-string-regexp": "1.0.5",
- "has-ansi": "2.0.0",
- "strip-ansi": "3.0.1",
- "supports-color": "2.0.0"
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
}
},
"strip-ansi": {
@@ -5879,7 +5876,7 @@
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"supports-color": {
@@ -5890,20 +5887,15 @@
}
}
},
- "oracledb": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/oracledb/-/oracledb-2.2.0.tgz",
- "integrity": "sha512-ywwalyryeJYb5dr1JScyPcNxCeN0zExrKLtorSdptBZqhfS5Dp9KLgGOExc+XMMfEejXGtC/RfiDxKaGn6+VJA=="
- },
"orchestrator": {
"version": "0.3.8",
"resolved": "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz",
"integrity": "sha1-FOfp4nZPcxX7rBhOUGx6pt+UrX4=",
"dev": true,
"requires": {
- "end-of-stream": "0.1.5",
- "sequencify": "0.0.7",
- "stream-consume": "0.1.1"
+ "end-of-stream": "~0.1.5",
+ "sequencify": "~0.0.7",
+ "stream-consume": "~0.1.0"
}
},
"ordered-read-streams": {
@@ -5923,9 +5915,9 @@
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
"requires": {
- "execa": "0.7.0",
- "lcid": "1.0.0",
- "mem": "1.1.0"
+ "execa": "^0.7.0",
+ "lcid": "^1.0.0",
+ "mem": "^1.1.0"
}
},
"p-finally": {
@@ -5938,7 +5930,7 @@
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz",
"integrity": "sha512-Y/OtIaXtUPr4/YpMv1pCL5L5ed0rumAaAeBSj12F+bSlMdys7i8oQF/GUJmfpTS/QoaRrS/k6pma29haJpsMng==",
"requires": {
- "p-try": "1.0.0"
+ "p-try": "^1.0.0"
}
},
"p-locate": {
@@ -5946,7 +5938,7 @@
"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
"requires": {
- "p-limit": "1.2.0"
+ "p-limit": "^1.1.0"
}
},
"p-map": {
@@ -5966,10 +5958,10 @@
"integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=",
"dev": true,
"requires": {
- "got": "6.7.1",
- "registry-auth-token": "3.3.1",
- "registry-url": "3.1.0",
- "semver": "5.5.0"
+ "got": "^6.7.1",
+ "registry-auth-token": "^3.0.1",
+ "registry-url": "^3.0.3",
+ "semver": "^5.1.0"
},
"dependencies": {
"semver": {
@@ -5990,7 +5982,7 @@
"resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz",
"integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=",
"requires": {
- "no-case": "2.3.2"
+ "no-case": "^2.2.0"
}
},
"parent-require": {
@@ -6004,9 +5996,9 @@
"integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
"dev": true,
"requires": {
- "is-absolute": "1.0.0",
- "map-cache": "0.2.2",
- "path-root": "0.1.1"
+ "is-absolute": "^1.0.0",
+ "map-cache": "^0.2.0",
+ "path-root": "^0.1.1"
},
"dependencies": {
"is-absolute": {
@@ -6015,8 +6007,8 @@
"integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
"dev": true,
"requires": {
- "is-relative": "1.0.0",
- "is-windows": "1.0.2"
+ "is-relative": "^1.0.0",
+ "is-windows": "^1.0.1"
}
},
"is-relative": {
@@ -6025,7 +6017,7 @@
"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
"dev": true,
"requires": {
- "is-unc-path": "1.0.0"
+ "is-unc-path": "^1.0.0"
}
},
"is-unc-path": {
@@ -6034,7 +6026,7 @@
"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
"dev": true,
"requires": {
- "unc-path-regex": "0.1.2"
+ "unc-path-regex": "^0.1.2"
}
},
"is-windows": {
@@ -6051,10 +6043,10 @@
"integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
"dev": true,
"requires": {
- "glob-base": "0.3.0",
- "is-dotfile": "1.0.3",
- "is-extglob": "1.0.0",
- "is-glob": "2.0.1"
+ "glob-base": "^0.3.0",
+ "is-dotfile": "^1.0.0",
+ "is-extglob": "^1.0.0",
+ "is-glob": "^2.0.0"
},
"dependencies": {
"is-extglob": {
@@ -6069,7 +6061,7 @@
"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
"dev": true,
"requires": {
- "is-extglob": "1.0.0"
+ "is-extglob": "^1.0.0"
}
}
}
@@ -6080,7 +6072,7 @@
"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
"dev": true,
"requires": {
- "error-ex": "1.3.1"
+ "error-ex": "^1.2.0"
}
},
"parse-passwd": {
@@ -6094,7 +6086,7 @@
"resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz",
"integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==",
"requires": {
- "@types/node": "10.0.1"
+ "@types/node": "*"
}
},
"pascal-case": {
@@ -6102,8 +6094,8 @@
"resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-2.0.1.tgz",
"integrity": "sha1-LVeNNFX2YNpl7KGO+VtODekSdh4=",
"requires": {
- "camel-case": "3.0.0",
- "upper-case-first": "1.1.2"
+ "camel-case": "^3.0.0",
+ "upper-case-first": "^1.1.0"
}
},
"pascalcase": {
@@ -6117,7 +6109,7 @@
"resolved": "https://registry.npmjs.org/path-case/-/path-case-2.1.1.tgz",
"integrity": "sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=",
"requires": {
- "no-case": "2.3.2"
+ "no-case": "^2.2.0"
}
},
"path-dirname": {
@@ -6153,7 +6145,7 @@
"integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
"dev": true,
"requires": {
- "path-root-regex": "0.1.2"
+ "path-root-regex": "^0.1.0"
}
},
"path-root-regex": {
@@ -6200,9 +6192,9 @@
"js-string-escape": "1.0.1",
"packet-reader": "0.3.1",
"pg-connection-string": "0.1.3",
- "pg-pool": "2.0.3",
- "pg-types": "1.12.1",
- "pgpass": "1.0.2",
+ "pg-pool": "~2.0.3",
+ "pg-types": "~1.12.1",
+ "pgpass": "1.x",
"semver": "4.3.2"
}
},
@@ -6221,10 +6213,10 @@
"resolved": "https://registry.npmjs.org/pg-types/-/pg-types-1.12.1.tgz",
"integrity": "sha1-1kCH45A7WP+q0nnnWVxSIIoUw9I=",
"requires": {
- "postgres-array": "1.0.2",
- "postgres-bytea": "1.0.0",
- "postgres-date": "1.0.3",
- "postgres-interval": "1.1.1"
+ "postgres-array": "~1.0.0",
+ "postgres-bytea": "~1.0.0",
+ "postgres-date": "~1.0.0",
+ "postgres-interval": "^1.1.0"
}
},
"pgpass": {
@@ -6232,7 +6224,7 @@
"resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz",
"integrity": "sha1-Knu0G2BltnkH6R2hsHwYR8h3swY=",
"requires": {
- "split": "1.0.1"
+ "split": "^1.0.0"
}
},
"pify": {
@@ -6247,7 +6239,7 @@
"integrity": "sha512-bslfSeW+ksUbB/sYZeEdKFyTG4YWU9YKRvqfSRvZKE675khAuBUPqV5RUwJZaGuWmVQLweK45Q+lPHFVnSlSug==",
"dev": true,
"requires": {
- "semver-compare": "1.0.0"
+ "semver-compare": "^1.0.0"
}
},
"plugin-error": {
@@ -6256,11 +6248,11 @@
"integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
"dev": true,
"requires": {
- "ansi-cyan": "0.1.1",
- "ansi-red": "0.1.1",
- "arr-diff": "1.1.0",
- "arr-union": "2.1.0",
- "extend-shallow": "1.1.4"
+ "ansi-cyan": "^0.1.1",
+ "ansi-red": "^0.1.1",
+ "arr-diff": "^1.0.1",
+ "arr-union": "^2.0.1",
+ "extend-shallow": "^1.1.2"
}
},
"pn": {
@@ -6275,10 +6267,10 @@
"integrity": "sha512-petRj39w05GvH1WKuGFmzxR9+k+R9E7zX5XWTFee7P/qf88hMuLT7aAO/RsmldpQMtJsWQISkTQlfMRECKlxhw==",
"dev": true,
"requires": {
- "concat-stream": "1.6.0",
- "form-data": "2.1.4",
- "make-error-cause": "1.2.2",
- "tough-cookie": "2.3.3"
+ "concat-stream": "^1.4.7",
+ "form-data": "^2.0.0",
+ "make-error-cause": "^1.2.1",
+ "tough-cookie": "^2.0.0"
}
},
"popsicle-proxy-agent": {
@@ -6287,8 +6279,8 @@
"integrity": "sha1-uRM8VdlFdZq37mG3cRNkYg066tw=",
"dev": true,
"requires": {
- "http-proxy-agent": "1.0.0",
- "https-proxy-agent": "1.0.0"
+ "http-proxy-agent": "^1.0.0",
+ "https-proxy-agent": "^1.0.0"
}
},
"popsicle-retry": {
@@ -6297,8 +6289,8 @@
"integrity": "sha1-4G6GZTO0KnoSPrMwy+Y6fOvLoQw=",
"dev": true,
"requires": {
- "any-promise": "1.3.0",
- "xtend": "4.0.1"
+ "any-promise": "^1.1.0",
+ "xtend": "^4.0.1"
}
},
"popsicle-rewrite": {
@@ -6339,7 +6331,7 @@
"resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.1.tgz",
"integrity": "sha512-OkuCi9t/3CZmeQreutGgx/OVNv9MKHGIT5jH8KldQ4NLYXkvmT9nDVxEuCENlNwhlGPE374oA/xMqn05G49pHA==",
"requires": {
- "xtend": "4.0.1"
+ "xtend": "^4.0.0"
}
},
"prelude-ls": {
@@ -6372,8 +6364,8 @@
"integrity": "sha512-S4oT9/sT6MN7/3COoOy+ZJeA92VmOnveLHgrwBE3Z1W5N9S2A1QGNYiE1z75DAENbJrXXUb+OWXhpJcg05QKQQ==",
"dev": true,
"requires": {
- "ansi-regex": "3.0.0",
- "ansi-styles": "3.2.0"
+ "ansi-regex": "^3.0.0",
+ "ansi-styles": "^3.2.0"
}
},
"pretty-hrtime": {
@@ -6404,8 +6396,8 @@
"integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
"dev": true,
"requires": {
- "end-of-stream": "1.4.1",
- "once": "1.4.0"
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
},
"dependencies": {
"end-of-stream": {
@@ -6414,7 +6406,7 @@
"integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==",
"dev": true,
"requires": {
- "once": "1.4.0"
+ "once": "^1.4.0"
}
}
}
@@ -6425,9 +6417,9 @@
"integrity": "sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA==",
"dev": true,
"requires": {
- "duplexify": "3.5.4",
- "inherits": "2.0.3",
- "pump": "2.0.1"
+ "duplexify": "^3.5.3",
+ "inherits": "^2.0.3",
+ "pump": "^2.0.0"
}
},
"punycode": {
@@ -6448,8 +6440,8 @@
"integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
"dev": true,
"requires": {
- "is-number": "3.0.0",
- "kind-of": "4.0.0"
+ "is-number": "^3.0.0",
+ "kind-of": "^4.0.0"
},
"dependencies": {
"is-number": {
@@ -6458,7 +6450,7 @@
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -6467,7 +6459,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -6478,7 +6470,7 @@
"integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -6489,10 +6481,10 @@
"integrity": "sha1-UVdakA+N1oOBxxC0cSwhVMPiA1s=",
"dev": true,
"requires": {
- "deep-extend": "0.4.2",
- "ini": "1.3.5",
- "minimist": "1.2.0",
- "strip-json-comments": "2.0.1"
+ "deep-extend": "~0.4.0",
+ "ini": "~1.3.0",
+ "minimist": "^1.2.0",
+ "strip-json-comments": "~2.0.1"
},
"dependencies": {
"minimist": {
@@ -6508,13 +6500,13 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "1.0.7",
- "safe-buffer": "5.1.1",
- "string_decoder": "1.0.3",
- "util-deprecate": "1.0.2"
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~1.0.6",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.0.3",
+ "util-deprecate": "~1.0.1"
}
},
"rechoir": {
@@ -6523,7 +6515,7 @@
"integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
"dev": true,
"requires": {
- "resolve": "1.1.7"
+ "resolve": "^1.1.6"
}
},
"reflect-metadata": {
@@ -6542,7 +6534,7 @@
"integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
"dev": true,
"requires": {
- "is-equal-shallow": "0.1.3"
+ "is-equal-shallow": "^0.1.3"
}
},
"regex-not": {
@@ -6551,8 +6543,8 @@
"integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
"dev": true,
"requires": {
- "extend-shallow": "3.0.2",
- "safe-regex": "1.1.0"
+ "extend-shallow": "^3.0.2",
+ "safe-regex": "^1.1.0"
},
"dependencies": {
"extend-shallow": {
@@ -6561,8 +6553,8 @@
"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
"dev": true,
"requires": {
- "assign-symbols": "1.0.0",
- "is-extendable": "1.0.1"
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
}
},
"is-extendable": {
@@ -6571,7 +6563,7 @@
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"dev": true,
"requires": {
- "is-plain-object": "2.0.4"
+ "is-plain-object": "^2.0.4"
}
}
}
@@ -6582,8 +6574,8 @@
"integrity": "sha1-+w0yie4Nmtosu1KvXf5mywcNMAY=",
"dev": true,
"requires": {
- "rc": "1.2.3",
- "safe-buffer": "5.1.1"
+ "rc": "^1.1.6",
+ "safe-buffer": "^5.0.1"
}
},
"registry-url": {
@@ -6592,7 +6584,7 @@
"integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=",
"dev": true,
"requires": {
- "rc": "1.2.3"
+ "rc": "^1.0.1"
}
},
"remap-istanbul": {
@@ -6601,11 +6593,11 @@
"integrity": "sha512-Itv3XvYjD6G+9xDzAeFohx4GUwbFjfqFt0UXlC826jHR18E49fEiEGqZUxUASwMq4z7wwUv2H9/XF2d6qj0iaQ==",
"dev": true,
"requires": {
- "amdefine": "1.0.1",
+ "amdefine": "^1.0.0",
"istanbul": "0.4.5",
- "minimatch": "3.0.4",
- "plugin-error": "0.1.2",
- "source-map": "0.6.1",
+ "minimatch": "^3.0.3",
+ "plugin-error": "^0.1.2",
+ "source-map": "^0.6.1",
"through2": "2.0.1"
},
"dependencies": {
@@ -6623,8 +6615,8 @@
"integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
"dev": true,
"requires": {
- "is-buffer": "1.1.6",
- "is-utf8": "0.2.1"
+ "is-buffer": "^1.1.5",
+ "is-utf8": "^0.2.1"
}
},
"remove-bom-stream": {
@@ -6633,9 +6625,9 @@
"integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
"dev": true,
"requires": {
- "remove-bom-buffer": "3.0.0",
- "safe-buffer": "5.1.1",
- "through2": "2.0.3"
+ "remove-bom-buffer": "^3.0.0",
+ "safe-buffer": "^5.1.0",
+ "through2": "^2.0.3"
},
"dependencies": {
"through2": {
@@ -6644,8 +6636,8 @@
"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
"dev": true,
"requires": {
- "readable-stream": "2.3.3",
- "xtend": "4.0.1"
+ "readable-stream": "^2.1.5",
+ "xtend": "~4.0.1"
}
}
}
@@ -6673,7 +6665,7 @@
"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
"dev": true,
"requires": {
- "is-finite": "1.0.2"
+ "is-finite": "^1.0.0"
}
},
"replace-ext": {
@@ -6688,28 +6680,28 @@
"integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==",
"dev": true,
"requires": {
- "aws-sign2": "0.7.0",
- "aws4": "1.7.0",
- "caseless": "0.12.0",
- "combined-stream": "1.0.5",
- "extend": "3.0.1",
- "forever-agent": "0.6.1",
- "form-data": "2.3.2",
- "har-validator": "5.0.3",
- "hawk": "6.0.2",
- "http-signature": "1.2.0",
- "is-typedarray": "1.0.0",
- "isstream": "0.1.2",
- "json-stringify-safe": "5.0.1",
- "mime-types": "2.1.17",
- "oauth-sign": "0.8.2",
- "performance-now": "2.1.0",
- "qs": "6.5.1",
- "safe-buffer": "5.1.1",
- "stringstream": "0.0.5",
- "tough-cookie": "2.3.3",
- "tunnel-agent": "0.6.0",
- "uuid": "3.2.1"
+ "aws-sign2": "~0.7.0",
+ "aws4": "^1.6.0",
+ "caseless": "~0.12.0",
+ "combined-stream": "~1.0.5",
+ "extend": "~3.0.1",
+ "forever-agent": "~0.6.1",
+ "form-data": "~2.3.1",
+ "har-validator": "~5.0.3",
+ "hawk": "~6.0.2",
+ "http-signature": "~1.2.0",
+ "is-typedarray": "~1.0.0",
+ "isstream": "~0.1.2",
+ "json-stringify-safe": "~5.0.1",
+ "mime-types": "~2.1.17",
+ "oauth-sign": "~0.8.2",
+ "performance-now": "^2.1.0",
+ "qs": "~6.5.1",
+ "safe-buffer": "^5.1.1",
+ "stringstream": "~0.0.5",
+ "tough-cookie": "~2.3.3",
+ "tunnel-agent": "^0.6.0",
+ "uuid": "^3.1.0"
},
"dependencies": {
"form-data": {
@@ -6718,9 +6710,9 @@
"integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
"dev": true,
"requires": {
- "asynckit": "0.4.0",
+ "asynckit": "^0.4.0",
"combined-stream": "1.0.6",
- "mime-types": "2.1.17"
+ "mime-types": "^2.1.12"
},
"dependencies": {
"combined-stream": {
@@ -6729,7 +6721,7 @@
"integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
"dev": true,
"requires": {
- "delayed-stream": "1.0.0"
+ "delayed-stream": "~1.0.0"
}
}
}
@@ -6742,7 +6734,7 @@
"integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=",
"dev": true,
"requires": {
- "lodash": "4.17.5"
+ "lodash": "^4.13.1"
}
},
"request-promise-native": {
@@ -6752,8 +6744,8 @@
"dev": true,
"requires": {
"request-promise-core": "1.1.1",
- "stealthy-require": "1.1.1",
- "tough-cookie": "2.3.3"
+ "stealthy-require": "^1.1.0",
+ "tough-cookie": ">=2.3.3"
}
},
"require-directory": {
@@ -6784,8 +6776,8 @@
"integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
"dev": true,
"requires": {
- "expand-tilde": "2.0.2",
- "global-modules": "1.0.0"
+ "expand-tilde": "^2.0.0",
+ "global-modules": "^1.0.0"
}
},
"resolve-options": {
@@ -6794,7 +6786,7 @@
"integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
"dev": true,
"requires": {
- "value-or-function": "3.0.0"
+ "value-or-function": "^3.0.0"
}
},
"resolve-url": {
@@ -6809,8 +6801,8 @@
"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
"dev": true,
"requires": {
- "exit-hook": "1.1.1",
- "onetime": "1.1.0"
+ "exit-hook": "^1.0.0",
+ "onetime": "^1.0.0"
}
},
"ret": {
@@ -6825,7 +6817,7 @@
"integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=",
"optional": true,
"requires": {
- "align-text": "0.1.4"
+ "align-text": "^0.1.1"
}
},
"rimraf": {
@@ -6834,7 +6826,7 @@
"integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
"dev": true,
"requires": {
- "glob": "7.1.2"
+ "glob": "^7.0.5"
}
},
"rxjs": {
@@ -6865,7 +6857,7 @@
"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
"dev": true,
"requires": {
- "ret": "0.1.15"
+ "ret": "~0.1.10"
}
},
"samsam": {
@@ -6896,7 +6888,7 @@
"integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=",
"dev": true,
"requires": {
- "semver": "5.5.0"
+ "semver": "^5.0.3"
},
"dependencies": {
"semver": {
@@ -6912,8 +6904,8 @@
"resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-2.1.1.tgz",
"integrity": "sha1-H24t2jnBaL+S0T+G1KkYkz9mftQ=",
"requires": {
- "no-case": "2.3.2",
- "upper-case-first": "1.1.2"
+ "no-case": "^2.2.0",
+ "upper-case-first": "^1.1.2"
}
},
"sequencify": {
@@ -6933,7 +6925,7 @@
"integrity": "sha1-12nBgsnVpR9AkUXy+6guXoboA3Y=",
"dev": true,
"requires": {
- "to-object-path": "0.3.0"
+ "to-object-path": "^0.3.0"
}
},
"set-value": {
@@ -6942,10 +6934,10 @@
"integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
"dev": true,
"requires": {
- "extend-shallow": "2.0.1",
- "is-extendable": "0.1.1",
- "is-plain-object": "2.0.4",
- "split-string": "3.1.0"
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.3",
+ "split-string": "^3.0.1"
},
"dependencies": {
"extend-shallow": {
@@ -6954,7 +6946,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
}
}
@@ -6964,7 +6956,7 @@
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
"requires": {
- "shebang-regex": "1.0.0"
+ "shebang-regex": "^1.0.0"
}
},
"shebang-regex": {
@@ -6989,13 +6981,13 @@
"integrity": "sha512-xhPMTWl8dusKsa/4Px+K0FCHsAhcpxjMurofDzPr6BF1I5C2G6r4JLIaHKSOcMnXkt7X4Md0OZgJuuIqlw9ieA==",
"dev": true,
"requires": {
- "@sinonjs/formatio": "2.0.0",
- "diff": "3.5.0",
- "lodash.get": "4.4.2",
- "lolex": "2.3.2",
- "nise": "1.3.3",
- "supports-color": "5.4.0",
- "type-detect": "4.0.6"
+ "@sinonjs/formatio": "^2.0.0",
+ "diff": "^3.1.0",
+ "lodash.get": "^4.4.2",
+ "lolex": "^2.2.0",
+ "nise": "^1.2.0",
+ "supports-color": "^5.1.0",
+ "type-detect": "^4.0.5"
},
"dependencies": {
"has-flag": {
@@ -7010,7 +7002,7 @@
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"dev": true,
"requires": {
- "has-flag": "3.0.0"
+ "has-flag": "^3.0.0"
}
}
}
@@ -7033,7 +7025,7 @@
"integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
"dev": true,
"requires": {
- "is-fullwidth-code-point": "2.0.0"
+ "is-fullwidth-code-point": "^2.0.0"
}
},
"snake-case": {
@@ -7041,7 +7033,7 @@
"resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz",
"integrity": "sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=",
"requires": {
- "no-case": "2.3.2"
+ "no-case": "^2.2.0"
}
},
"snapdragon": {
@@ -7050,14 +7042,14 @@
"integrity": "sha1-4StUh/re0+PeoKyR6UAL91tAE3A=",
"dev": true,
"requires": {
- "base": "0.11.2",
- "debug": "2.6.9",
- "define-property": "0.2.5",
- "extend-shallow": "2.0.1",
- "map-cache": "0.2.2",
- "source-map": "0.5.7",
- "source-map-resolve": "0.5.1",
- "use": "2.0.2"
+ "base": "^0.11.1",
+ "debug": "^2.2.0",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "map-cache": "^0.2.2",
+ "source-map": "^0.5.6",
+ "source-map-resolve": "^0.5.0",
+ "use": "^2.0.0"
},
"dependencies": {
"define-property": {
@@ -7066,7 +7058,7 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
},
"extend-shallow": {
@@ -7075,7 +7067,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
},
"is-accessor-descriptor": {
@@ -7084,7 +7076,7 @@
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -7093,7 +7085,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -7104,7 +7096,7 @@
"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -7113,7 +7105,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -7124,9 +7116,9 @@
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "0.1.6",
- "is-data-descriptor": "0.1.4",
- "kind-of": "5.1.0"
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
}
},
"kind-of": {
@@ -7149,9 +7141,9 @@
"integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
"dev": true,
"requires": {
- "define-property": "1.0.0",
- "isobject": "3.0.1",
- "snapdragon-util": "3.0.1"
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.0",
+ "snapdragon-util": "^3.0.1"
},
"dependencies": {
"define-property": {
@@ -7160,7 +7152,7 @@
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
"dev": true,
"requires": {
- "is-descriptor": "1.0.2"
+ "is-descriptor": "^1.0.0"
}
}
}
@@ -7171,7 +7163,7 @@
"integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.2.0"
}
},
"sntp": {
@@ -7180,7 +7172,7 @@
"integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
"dev": true,
"requires": {
- "hoek": "4.2.1"
+ "hoek": "4.x.x"
}
},
"sort-keys": {
@@ -7189,7 +7181,7 @@
"integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
"dev": true,
"requires": {
- "is-plain-obj": "1.1.0"
+ "is-plain-obj": "^1.0.0"
}
},
"source-map": {
@@ -7197,7 +7189,7 @@
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
"integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
"requires": {
- "amdefine": "1.0.1"
+ "amdefine": ">=0.0.4"
}
},
"source-map-resolve": {
@@ -7206,11 +7198,11 @@
"integrity": "sha512-0KW2wvzfxm8NCTb30z0LMNyPqWCdDGE2viwzUaucqJdkTRXtZiSY3I+2A6nVAjmdOy0I4gU8DwnVVGsk9jvP2A==",
"dev": true,
"requires": {
- "atob": "2.0.3",
- "decode-uri-component": "0.2.0",
- "resolve-url": "0.2.1",
- "source-map-url": "0.4.0",
- "urix": "0.1.0"
+ "atob": "^2.0.0",
+ "decode-uri-component": "^0.2.0",
+ "resolve-url": "^0.2.1",
+ "source-map-url": "^0.4.0",
+ "urix": "^0.1.0"
}
},
"source-map-support": {
@@ -7219,8 +7211,8 @@
"integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==",
"dev": true,
"requires": {
- "buffer-from": "1.0.0",
- "source-map": "0.6.1"
+ "buffer-from": "^1.0.0",
+ "source-map": "^0.6.0"
},
"dependencies": {
"source-map": {
@@ -7238,9 +7230,9 @@
"dev": true
},
"sparkles": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz",
- "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
+ "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
"dev": true
},
"split": {
@@ -7248,7 +7240,7 @@
"resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
"integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==",
"requires": {
- "through": "2.3.8"
+ "through": "2"
}
},
"split-string": {
@@ -7257,7 +7249,7 @@
"integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
"dev": true,
"requires": {
- "extend-shallow": "3.0.2"
+ "extend-shallow": "^3.0.0"
},
"dependencies": {
"extend-shallow": {
@@ -7266,8 +7258,8 @@
"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
"dev": true,
"requires": {
- "assign-symbols": "1.0.0",
- "is-extendable": "1.0.1"
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
}
},
"is-extendable": {
@@ -7276,7 +7268,7 @@
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"dev": true,
"requires": {
- "is-plain-object": "2.0.4"
+ "is-plain-object": "^2.0.4"
}
}
}
@@ -7296,8 +7288,8 @@
"resolved": "https://registry.npmjs.org/sqlite3/-/sqlite3-4.0.0.tgz",
"integrity": "sha512-6OlcAQNGaRSBLK1CuaRbKwlMFBb9DEhzmZyQP+fltNRF6XcIMpVIfXCBEcXPe1d4v9LnhkQUYkknDbA5JReqJg==",
"requires": {
- "nan": "2.9.2",
- "node-pre-gyp": "0.9.0"
+ "nan": "~2.9.2",
+ "node-pre-gyp": "~0.9.0"
},
"dependencies": {
"abbrev": {
@@ -7316,8 +7308,8 @@
"version": "1.1.4",
"bundled": true,
"requires": {
- "delegates": "1.0.0",
- "readable-stream": "2.3.5"
+ "delegates": "^1.0.0",
+ "readable-stream": "^2.0.6"
}
},
"balanced-match": {
@@ -7328,7 +7320,7 @@
"version": "1.1.11",
"bundled": true,
"requires": {
- "balanced-match": "1.0.0",
+ "balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
@@ -7375,7 +7367,7 @@
"version": "1.2.5",
"bundled": true,
"requires": {
- "minipass": "2.2.1"
+ "minipass": "^2.2.1"
}
},
"fs.realpath": {
@@ -7386,26 +7378,26 @@
"version": "2.7.4",
"bundled": true,
"requires": {
- "aproba": "1.2.0",
- "console-control-strings": "1.1.0",
- "has-unicode": "2.0.1",
- "object-assign": "4.1.1",
- "signal-exit": "3.0.2",
- "string-width": "1.0.2",
- "strip-ansi": "3.0.1",
- "wide-align": "1.1.2"
+ "aproba": "^1.0.3",
+ "console-control-strings": "^1.0.0",
+ "has-unicode": "^2.0.0",
+ "object-assign": "^4.1.0",
+ "signal-exit": "^3.0.0",
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1",
+ "wide-align": "^1.1.0"
}
},
"glob": {
"version": "7.1.2",
"bundled": true,
"requires": {
- "fs.realpath": "1.0.0",
- "inflight": "1.0.6",
- "inherits": "2.0.3",
- "minimatch": "3.0.4",
- "once": "1.4.0",
- "path-is-absolute": "1.0.1"
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.0.4",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
}
},
"has-unicode": {
@@ -7420,15 +7412,15 @@
"version": "3.0.1",
"bundled": true,
"requires": {
- "minimatch": "3.0.4"
+ "minimatch": "^3.0.4"
}
},
"inflight": {
"version": "1.0.6",
"bundled": true,
"requires": {
- "once": "1.4.0",
- "wrappy": "1.0.2"
+ "once": "^1.3.0",
+ "wrappy": "1"
}
},
"inherits": {
@@ -7443,7 +7435,7 @@
"version": "1.0.0",
"bundled": true,
"requires": {
- "number-is-nan": "1.0.1"
+ "number-is-nan": "^1.0.0"
}
},
"isarray": {
@@ -7454,7 +7446,7 @@
"version": "3.0.4",
"bundled": true,
"requires": {
- "brace-expansion": "1.1.11"
+ "brace-expansion": "^1.1.7"
}
},
"minimist": {
@@ -7465,14 +7457,14 @@
"version": "2.2.1",
"bundled": true,
"requires": {
- "yallist": "3.0.2"
+ "yallist": "^3.0.0"
}
},
"minizlib": {
"version": "1.1.0",
"bundled": true,
"requires": {
- "minipass": "2.2.1"
+ "minipass": "^2.2.1"
}
},
"mkdirp": {
@@ -7490,33 +7482,33 @@
"version": "2.2.0",
"bundled": true,
"requires": {
- "debug": "2.6.9",
- "iconv-lite": "0.4.19",
- "sax": "1.2.4"
+ "debug": "^2.1.2",
+ "iconv-lite": "^0.4.4",
+ "sax": "^1.2.4"
}
},
"node-pre-gyp": {
"version": "0.9.0",
"bundled": true,
"requires": {
- "detect-libc": "1.0.3",
- "mkdirp": "0.5.1",
- "needle": "2.2.0",
- "nopt": "4.0.1",
- "npm-packlist": "1.1.10",
- "npmlog": "4.1.2",
- "rc": "1.2.6",
- "rimraf": "2.6.2",
- "semver": "5.5.0",
- "tar": "4.4.0"
+ "detect-libc": "^1.0.2",
+ "mkdirp": "^0.5.1",
+ "needle": "^2.2.0",
+ "nopt": "^4.0.1",
+ "npm-packlist": "^1.1.6",
+ "npmlog": "^4.0.2",
+ "rc": "^1.1.7",
+ "rimraf": "^2.6.1",
+ "semver": "^5.3.0",
+ "tar": "^4"
}
},
"nopt": {
"version": "4.0.1",
"bundled": true,
"requires": {
- "abbrev": "1.1.1",
- "osenv": "0.1.5"
+ "abbrev": "1",
+ "osenv": "^0.1.4"
}
},
"npm-bundled": {
@@ -7527,18 +7519,18 @@
"version": "1.1.10",
"bundled": true,
"requires": {
- "ignore-walk": "3.0.1",
- "npm-bundled": "1.0.3"
+ "ignore-walk": "^3.0.1",
+ "npm-bundled": "^1.0.1"
}
},
"npmlog": {
"version": "4.1.2",
"bundled": true,
"requires": {
- "are-we-there-yet": "1.1.4",
- "console-control-strings": "1.1.0",
- "gauge": "2.7.4",
- "set-blocking": "2.0.0"
+ "are-we-there-yet": "~1.1.2",
+ "console-control-strings": "~1.1.0",
+ "gauge": "~2.7.3",
+ "set-blocking": "~2.0.0"
}
},
"number-is-nan": {
@@ -7553,7 +7545,7 @@
"version": "1.4.0",
"bundled": true,
"requires": {
- "wrappy": "1.0.2"
+ "wrappy": "1"
}
},
"os-homedir": {
@@ -7568,8 +7560,8 @@
"version": "0.1.5",
"bundled": true,
"requires": {
- "os-homedir": "1.0.2",
- "os-tmpdir": "1.0.2"
+ "os-homedir": "^1.0.0",
+ "os-tmpdir": "^1.0.0"
}
},
"path-is-absolute": {
@@ -7584,10 +7576,10 @@
"version": "1.2.6",
"bundled": true,
"requires": {
- "deep-extend": "0.4.2",
- "ini": "1.3.5",
- "minimist": "1.2.0",
- "strip-json-comments": "2.0.1"
+ "deep-extend": "~0.4.0",
+ "ini": "~1.3.0",
+ "minimist": "^1.2.0",
+ "strip-json-comments": "~2.0.1"
},
"dependencies": {
"minimist": {
@@ -7600,20 +7592,20 @@
"version": "2.3.5",
"bundled": true,
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "2.0.0",
- "safe-buffer": "5.1.1",
- "string_decoder": "1.0.3",
- "util-deprecate": "1.0.2"
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.3",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~2.0.0",
+ "safe-buffer": "~5.1.1",
+ "string_decoder": "~1.0.3",
+ "util-deprecate": "~1.0.1"
}
},
"rimraf": {
"version": "2.6.2",
"bundled": true,
"requires": {
- "glob": "7.1.2"
+ "glob": "^7.0.5"
}
},
"safe-buffer": {
@@ -7640,23 +7632,23 @@
"version": "1.0.2",
"bundled": true,
"requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
}
},
"string_decoder": {
"version": "1.0.3",
"bundled": true,
"requires": {
- "safe-buffer": "5.1.1"
+ "safe-buffer": "~5.1.0"
}
},
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"strip-json-comments": {
@@ -7667,12 +7659,12 @@
"version": "4.4.0",
"bundled": true,
"requires": {
- "chownr": "1.0.1",
- "fs-minipass": "1.2.5",
- "minipass": "2.2.1",
- "minizlib": "1.1.0",
- "mkdirp": "0.5.1",
- "yallist": "3.0.2"
+ "chownr": "^1.0.1",
+ "fs-minipass": "^1.2.3",
+ "minipass": "^2.2.1",
+ "minizlib": "^1.1.0",
+ "mkdirp": "^0.5.0",
+ "yallist": "^3.0.2"
}
},
"util-deprecate": {
@@ -7683,7 +7675,7 @@
"version": "1.1.2",
"bundled": true,
"requires": {
- "string-width": "1.0.2"
+ "string-width": "^1.0.2"
}
},
"wrappy": {
@@ -7707,14 +7699,14 @@
"integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
"dev": true,
"requires": {
- "asn1": "0.2.3",
- "assert-plus": "1.0.0",
- "bcrypt-pbkdf": "1.0.1",
- "dashdash": "1.14.1",
- "ecc-jsbn": "0.1.1",
- "getpass": "0.1.7",
- "jsbn": "0.1.1",
- "tweetnacl": "0.14.5"
+ "asn1": "~0.2.3",
+ "assert-plus": "^1.0.0",
+ "bcrypt-pbkdf": "^1.0.0",
+ "dashdash": "^1.12.0",
+ "ecc-jsbn": "~0.1.1",
+ "getpass": "^0.1.1",
+ "jsbn": "~0.1.0",
+ "tweetnacl": "~0.14.0"
}
},
"stack-utils": {
@@ -7735,8 +7727,8 @@
"integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
"dev": true,
"requires": {
- "define-property": "0.2.5",
- "object-copy": "0.1.0"
+ "define-property": "^0.2.5",
+ "object-copy": "^0.1.0"
},
"dependencies": {
"define-property": {
@@ -7745,7 +7737,7 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
},
"is-accessor-descriptor": {
@@ -7754,7 +7746,7 @@
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -7763,7 +7755,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -7774,7 +7766,7 @@
"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -7783,7 +7775,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -7794,9 +7786,9 @@
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "0.1.6",
- "is-data-descriptor": "0.1.4",
- "kind-of": "5.1.0"
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
}
},
"kind-of": {
@@ -7831,7 +7823,7 @@
"integrity": "sha1-WdbqOT2HwsDdrBCqDVYbxrpvDhA=",
"dev": true,
"requires": {
- "any-observable": "0.2.0"
+ "any-observable": "^0.2.0"
}
},
"string-argv": {
@@ -7851,8 +7843,8 @@
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
"requires": {
- "is-fullwidth-code-point": "2.0.0",
- "strip-ansi": "4.0.0"
+ "is-fullwidth-code-point": "^2.0.0",
+ "strip-ansi": "^4.0.0"
}
},
"string_decoder": {
@@ -7860,7 +7852,7 @@
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
"requires": {
- "safe-buffer": "5.1.1"
+ "safe-buffer": "~5.1.0"
}
},
"stringify-object": {
@@ -7869,9 +7861,9 @@
"integrity": "sha512-O696NF21oLiDy8PhpWu8AEqoZHw++QW6mUv0UvKZe8gWSdSvMXkiLufK7OmnP27Dro4GU5kb9U7JIO0mBuCRQg==",
"dev": true,
"requires": {
- "get-own-enumerable-property-symbols": "2.0.1",
- "is-obj": "1.0.1",
- "is-regexp": "1.0.0"
+ "get-own-enumerable-property-symbols": "^2.0.1",
+ "is-obj": "^1.0.1",
+ "is-regexp": "^1.0.0"
}
},
"stringstream": {
@@ -7885,7 +7877,7 @@
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"requires": {
- "ansi-regex": "3.0.0"
+ "ansi-regex": "^3.0.0"
}
},
"strip-bom": {
@@ -7922,7 +7914,7 @@
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz",
"integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=",
"requires": {
- "has-flag": "2.0.0"
+ "has-flag": "^2.0.0"
}
},
"swap-case": {
@@ -7930,8 +7922,8 @@
"resolved": "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz",
"integrity": "sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=",
"requires": {
- "lower-case": "1.1.4",
- "upper-case": "1.1.3"
+ "lower-case": "^1.1.1",
+ "upper-case": "^1.1.1"
}
},
"symbol-observable": {
@@ -7951,11 +7943,11 @@
"resolved": "https://registry.npmjs.org/tedious/-/tedious-2.1.5.tgz",
"integrity": "sha1-hVdNIs3hdp3+TMSg1pcXWxPl0xg=",
"requires": {
- "babel-runtime": "6.26.0",
+ "babel-runtime": "^6.26.0",
"big-number": "0.3.1",
- "bl": "1.2.1",
- "iconv-lite": "0.4.19",
- "readable-stream": "2.3.3",
+ "bl": "^1.2.0",
+ "iconv-lite": "^0.4.11",
+ "readable-stream": "^2.2.6",
"sprintf": "0.1.5"
}
},
@@ -7965,7 +7957,7 @@
"integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=",
"dev": true,
"requires": {
- "execa": "0.7.0"
+ "execa": "^0.7.0"
}
},
"text-encoding": {
@@ -7979,7 +7971,7 @@
"resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.0.tgz",
"integrity": "sha1-5p44obq+lpsBCCB5eLn2K4hgSDk=",
"requires": {
- "any-promise": "1.3.0"
+ "any-promise": "^1.0.0"
}
},
"thenify-all": {
@@ -7987,7 +7979,7 @@
"resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
"integrity": "sha1-GhkY1ALY/D+Y+/I02wvMjMEOlyY=",
"requires": {
- "thenify": "3.3.0"
+ "thenify": ">= 3.1.0 < 4"
}
},
"throat": {
@@ -8007,8 +7999,8 @@
"integrity": "sha1-OE51MU1J8y3hLuu4E2uOtrXVnak=",
"dev": true,
"requires": {
- "readable-stream": "2.0.6",
- "xtend": "4.0.1"
+ "readable-stream": "~2.0.0",
+ "xtend": "~4.0.0"
},
"dependencies": {
"readable-stream": {
@@ -8017,12 +8009,12 @@
"integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
"dev": true,
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
- "isarray": "1.0.0",
- "process-nextick-args": "1.0.7",
- "string_decoder": "0.10.31",
- "util-deprecate": "1.0.2"
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~1.0.6",
+ "string_decoder": "~0.10.x",
+ "util-deprecate": "~1.0.1"
}
},
"string_decoder": {
@@ -8039,8 +8031,8 @@
"integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=",
"dev": true,
"requires": {
- "through2": "2.0.1",
- "xtend": "4.0.1"
+ "through2": "~2.0.0",
+ "xtend": "~4.0.0"
}
},
"tildify": {
@@ -8049,7 +8041,7 @@
"integrity": "sha1-3OwD9V3Km3qj5bBPIYF+tW5jWIo=",
"dev": true,
"requires": {
- "os-homedir": "1.0.2"
+ "os-homedir": "^1.0.0"
}
},
"time-stamp": {
@@ -8070,8 +8062,8 @@
"integrity": "sha512-tsEStd7kmACHENhsUPaxb8Jf8/+GZZxyNFQbZD07HQOyooOa6At1rQqjffgvg7n+dxscQa9cjjMdWhJtsP2sxg==",
"dev": true,
"requires": {
- "es5-ext": "0.10.41",
- "next-tick": "1.0.0"
+ "es5-ext": "~0.10.14",
+ "next-tick": "1"
}
},
"title-case": {
@@ -8079,8 +8071,8 @@
"resolved": "https://registry.npmjs.org/title-case/-/title-case-2.1.1.tgz",
"integrity": "sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=",
"requires": {
- "no-case": "2.3.2",
- "upper-case": "1.1.3"
+ "no-case": "^2.2.0",
+ "upper-case": "^1.0.3"
}
},
"to-absolute-glob": {
@@ -8089,8 +8081,8 @@
"integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
"dev": true,
"requires": {
- "is-absolute": "1.0.0",
- "is-negated-glob": "1.0.0"
+ "is-absolute": "^1.0.0",
+ "is-negated-glob": "^1.0.0"
},
"dependencies": {
"is-absolute": {
@@ -8099,8 +8091,8 @@
"integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
"dev": true,
"requires": {
- "is-relative": "1.0.0",
- "is-windows": "1.0.2"
+ "is-relative": "^1.0.0",
+ "is-windows": "^1.0.1"
}
},
"is-relative": {
@@ -8109,7 +8101,7 @@
"integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
"dev": true,
"requires": {
- "is-unc-path": "1.0.0"
+ "is-unc-path": "^1.0.0"
}
},
"is-unc-path": {
@@ -8118,7 +8110,7 @@
"integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
"dev": true,
"requires": {
- "unc-path-regex": "0.1.2"
+ "unc-path-regex": "^0.1.2"
}
},
"is-windows": {
@@ -8135,7 +8127,7 @@
"integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
}
},
"to-regex": {
@@ -8144,9 +8136,9 @@
"integrity": "sha1-FTWL7kosg712N3uh3ASdDxiDeq4=",
"dev": true,
"requires": {
- "define-property": "0.2.5",
- "extend-shallow": "2.0.1",
- "regex-not": "1.0.2"
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "regex-not": "^1.0.0"
},
"dependencies": {
"define-property": {
@@ -8155,7 +8147,7 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
},
"extend-shallow": {
@@ -8164,7 +8156,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
},
"is-accessor-descriptor": {
@@ -8173,7 +8165,7 @@
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -8182,7 +8174,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -8193,7 +8185,7 @@
"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -8202,7 +8194,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -8213,9 +8205,9 @@
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "0.1.6",
- "is-data-descriptor": "0.1.4",
- "kind-of": "5.1.0"
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
}
},
"kind-of": {
@@ -8232,8 +8224,8 @@
"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
"dev": true,
"requires": {
- "is-number": "3.0.0",
- "repeat-string": "1.6.1"
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1"
},
"dependencies": {
"is-number": {
@@ -8242,7 +8234,7 @@
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
}
}
}
@@ -8253,7 +8245,7 @@
"integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
"dev": true,
"requires": {
- "through2": "2.0.3"
+ "through2": "^2.0.3"
},
"dependencies": {
"through2": {
@@ -8262,8 +8254,8 @@
"integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=",
"dev": true,
"requires": {
- "readable-stream": "2.3.3",
- "xtend": "4.0.1"
+ "readable-stream": "^2.1.5",
+ "xtend": "~4.0.1"
}
}
}
@@ -8274,7 +8266,7 @@
"integrity": "sha1-RJy+LbrlqMgDjjDXH6D/RklHxN4=",
"dev": true,
"requires": {
- "nopt": "1.0.10"
+ "nopt": "~1.0.10"
},
"dependencies": {
"nopt": {
@@ -8283,7 +8275,7 @@
"integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
"dev": true,
"requires": {
- "abbrev": "1.0.9"
+ "abbrev": "1"
}
}
}
@@ -8294,7 +8286,7 @@
"integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
"dev": true,
"requires": {
- "punycode": "1.4.1"
+ "punycode": "^1.4.1"
}
},
"tr46": {
@@ -8303,7 +8295,7 @@
"integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
"dev": true,
"requires": {
- "punycode": "2.1.0"
+ "punycode": "^2.1.0"
},
"dependencies": {
"punycode": {
@@ -8320,7 +8312,7 @@
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"dev": true,
"requires": {
- "safe-buffer": "5.1.1"
+ "safe-buffer": "^5.0.1"
}
},
"tweetnacl": {
@@ -8336,7 +8328,7 @@
"integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
"dev": true,
"requires": {
- "prelude-ls": "1.1.2"
+ "prelude-ls": "~1.1.2"
}
},
"type-detect": {
@@ -8356,19 +8348,19 @@
"resolved": "https://registry.npmjs.org/typeorm/-/typeorm-0.2.4.tgz",
"integrity": "sha512-TLoLZaPCDZt4UAYxcdNO7Ta68+EkG0CwwuaWdxgs11cWHRTs4njFyKzW+cvgGQ2TlJX53adyb3tqbGAR19TBmg==",
"requires": {
- "app-root-path": "2.0.1",
- "buffer": "5.1.0",
- "chalk": "2.4.1",
- "cli-highlight": "1.2.3",
- "debug": "3.1.0",
- "dotenv": "5.0.1",
- "glob": "7.1.2",
- "js-yaml": "3.11.0",
- "mkdirp": "0.5.1",
- "reflect-metadata": "0.1.12",
- "xml2js": "0.4.19",
- "yargonaut": "1.1.2",
- "yargs": "11.1.0"
+ "app-root-path": "^2.0.1",
+ "buffer": "^5.1.0",
+ "chalk": "^2.3.2",
+ "cli-highlight": "^1.2.3",
+ "debug": "^3.1.0",
+ "dotenv": "^5.0.1",
+ "glob": "^7.1.2",
+ "js-yaml": "^3.11.0",
+ "mkdirp": "^0.5.1",
+ "reflect-metadata": "^0.1.12",
+ "xml2js": "^0.4.17",
+ "yargonaut": "^1.1.2",
+ "yargs": "^11.1.0"
},
"dependencies": {
"ansi-styles": {
@@ -8376,7 +8368,7 @@
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"requires": {
- "color-convert": "1.9.1"
+ "color-convert": "^1.9.0"
}
},
"chalk": {
@@ -8384,9 +8376,9 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
"requires": {
- "ansi-styles": "3.2.1",
- "escape-string-regexp": "1.0.5",
- "supports-color": "5.4.0"
+ "ansi-styles": "^3.2.1",
+ "escape-string-regexp": "^1.0.5",
+ "supports-color": "^5.3.0"
}
},
"debug": {
@@ -8407,8 +8399,8 @@
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
"integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
"requires": {
- "argparse": "1.0.9",
- "esprima": "4.0.0"
+ "argparse": "^1.0.7",
+ "esprima": "^4.0.0"
}
},
"supports-color": {
@@ -8416,7 +8408,7 @@
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": {
- "has-flag": "3.0.0"
+ "has-flag": "^3.0.0"
}
}
}
@@ -8432,21 +8424,21 @@
"integrity": "sha1-usxp0lWXCkeOCfdsf2iZddU1p4o=",
"dev": true,
"requires": {
- "archy": "1.0.0",
- "bluebird": "3.5.1",
- "chalk": "1.1.3",
- "cli-truncate": "1.1.0",
- "columnify": "1.5.4",
- "elegant-spinner": "1.0.1",
- "has-unicode": "2.0.1",
- "listify": "1.0.0",
- "log-update": "1.0.2",
- "minimist": "1.2.0",
- "promise-finally": "3.0.0",
- "typings-core": "2.3.3",
- "update-notifier": "2.3.0",
- "wordwrap": "1.0.0",
- "xtend": "4.0.1"
+ "archy": "^1.0.0",
+ "bluebird": "^3.1.1",
+ "chalk": "^1.0.0",
+ "cli-truncate": "^1.0.0",
+ "columnify": "^1.5.2",
+ "elegant-spinner": "^1.0.1",
+ "has-unicode": "^2.0.1",
+ "listify": "^1.0.0",
+ "log-update": "^1.0.2",
+ "minimist": "^1.2.0",
+ "promise-finally": "^3.0.0",
+ "typings-core": "^2.3.3",
+ "update-notifier": "^2.0.0",
+ "wordwrap": "^1.0.0",
+ "xtend": "^4.0.1"
},
"dependencies": {
"ansi-regex": {
@@ -8467,11 +8459,11 @@
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"dev": true,
"requires": {
- "ansi-styles": "2.2.1",
- "escape-string-regexp": "1.0.5",
- "has-ansi": "2.0.0",
- "strip-ansi": "3.0.1",
- "supports-color": "2.0.0"
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
}
},
"minimist": {
@@ -8486,7 +8478,7 @@
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"supports-color": {
@@ -8509,38 +8501,38 @@
"integrity": "sha1-CexUzVsR3V8e8vwKsx03ACyita0=",
"dev": true,
"requires": {
- "array-uniq": "1.0.3",
- "configstore": "3.1.1",
- "debug": "2.6.9",
- "detect-indent": "5.0.0",
- "graceful-fs": "4.1.11",
- "has": "1.0.1",
- "invariant": "2.2.2",
- "is-absolute": "0.2.6",
- "jspm-config": "0.3.4",
- "listify": "1.0.0",
- "lockfile": "1.0.3",
- "make-error-cause": "1.2.2",
- "mkdirp": "0.5.1",
- "object.pick": "1.3.0",
- "parse-json": "2.2.0",
- "popsicle": "9.2.0",
- "popsicle-proxy-agent": "3.0.0",
- "popsicle-retry": "3.2.1",
- "popsicle-rewrite": "1.0.0",
- "popsicle-status": "2.0.1",
- "promise-finally": "3.0.0",
- "rc": "1.2.3",
- "rimraf": "2.6.2",
- "sort-keys": "1.1.2",
- "string-template": "1.0.0",
- "strip-bom": "3.0.0",
- "thenify": "3.3.0",
- "throat": "3.2.0",
- "touch": "1.0.0",
- "typescript": "2.8.3",
- "xtend": "4.0.1",
- "zip-object": "0.1.0"
+ "array-uniq": "^1.0.2",
+ "configstore": "^3.0.0",
+ "debug": "^2.2.0",
+ "detect-indent": "^5.0.0",
+ "graceful-fs": "^4.1.2",
+ "has": "^1.0.1",
+ "invariant": "^2.2.0",
+ "is-absolute": "^0.2.3",
+ "jspm-config": "^0.3.0",
+ "listify": "^1.0.0",
+ "lockfile": "^1.0.1",
+ "make-error-cause": "^1.2.1",
+ "mkdirp": "^0.5.1",
+ "object.pick": "^1.1.1",
+ "parse-json": "^2.2.0",
+ "popsicle": "^9.0.0",
+ "popsicle-proxy-agent": "^3.0.0",
+ "popsicle-retry": "^3.2.0",
+ "popsicle-rewrite": "^1.0.0",
+ "popsicle-status": "^2.0.0",
+ "promise-finally": "^3.0.0",
+ "rc": "^1.1.5",
+ "rimraf": "^2.4.4",
+ "sort-keys": "^1.0.0",
+ "string-template": "^1.0.0",
+ "strip-bom": "^3.0.0",
+ "thenify": "^3.1.0",
+ "throat": "^3.0.0",
+ "touch": "^1.0.0",
+ "typescript": "^2.1.4",
+ "xtend": "^4.0.0",
+ "zip-object": "^0.1.0"
}
},
"uglify-js": {
@@ -8549,9 +8541,9 @@
"integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=",
"optional": true,
"requires": {
- "source-map": "0.5.7",
- "uglify-to-browserify": "1.0.2",
- "yargs": "3.10.0"
+ "source-map": "~0.5.1",
+ "uglify-to-browserify": "~1.0.0",
+ "yargs": "~3.10.0"
},
"dependencies": {
"source-map": {
@@ -8566,9 +8558,9 @@
"integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=",
"optional": true,
"requires": {
- "camelcase": "1.2.1",
- "cliui": "2.1.0",
- "decamelize": "1.2.0",
+ "camelcase": "^1.0.2",
+ "cliui": "^2.1.0",
+ "decamelize": "^1.0.0",
"window-size": "0.1.0"
}
}
@@ -8592,10 +8584,10 @@
"integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
"dev": true,
"requires": {
- "arr-union": "3.1.0",
- "get-value": "2.0.6",
- "is-extendable": "0.1.1",
- "set-value": "0.4.3"
+ "arr-union": "^3.1.0",
+ "get-value": "^2.0.6",
+ "is-extendable": "^0.1.1",
+ "set-value": "^0.4.3"
},
"dependencies": {
"arr-union": {
@@ -8610,7 +8602,7 @@
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"dev": true,
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
},
"set-value": {
@@ -8619,10 +8611,10 @@
"integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
"dev": true,
"requires": {
- "extend-shallow": "2.0.1",
- "is-extendable": "0.1.1",
- "is-plain-object": "2.0.4",
- "to-object-path": "0.3.0"
+ "extend-shallow": "^2.0.1",
+ "is-extendable": "^0.1.1",
+ "is-plain-object": "^2.0.1",
+ "to-object-path": "^0.3.0"
}
}
}
@@ -8639,7 +8631,7 @@
"integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=",
"dev": true,
"requires": {
- "crypto-random-string": "1.0.0"
+ "crypto-random-string": "^1.0.0"
}
},
"universalify": {
@@ -8654,8 +8646,8 @@
"integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
"dev": true,
"requires": {
- "has-value": "0.3.1",
- "isobject": "3.0.1"
+ "has-value": "^0.3.1",
+ "isobject": "^3.0.0"
},
"dependencies": {
"has-value": {
@@ -8664,9 +8656,9 @@
"integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
"dev": true,
"requires": {
- "get-value": "2.0.6",
- "has-values": "0.1.4",
- "isobject": "2.1.0"
+ "get-value": "^2.0.3",
+ "has-values": "^0.1.4",
+ "isobject": "^2.0.0"
},
"dependencies": {
"isobject": {
@@ -8700,15 +8692,15 @@
"integrity": "sha1-TognpruRUUCrCTVZ1wFOPruDdFE=",
"dev": true,
"requires": {
- "boxen": "1.3.0",
- "chalk": "2.3.0",
- "configstore": "3.1.1",
- "import-lazy": "2.1.0",
- "is-installed-globally": "0.1.0",
- "is-npm": "1.0.0",
- "latest-version": "3.1.0",
- "semver-diff": "2.1.0",
- "xdg-basedir": "3.0.0"
+ "boxen": "^1.2.1",
+ "chalk": "^2.0.1",
+ "configstore": "^3.0.0",
+ "import-lazy": "^2.1.0",
+ "is-installed-globally": "^0.1.0",
+ "is-npm": "^1.0.0",
+ "latest-version": "^3.0.0",
+ "semver-diff": "^2.0.0",
+ "xdg-basedir": "^3.0.0"
}
},
"upper-case": {
@@ -8721,7 +8713,7 @@
"resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-1.1.2.tgz",
"integrity": "sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=",
"requires": {
- "upper-case": "1.1.3"
+ "upper-case": "^1.1.1"
}
},
"urix": {
@@ -8736,7 +8728,7 @@
"integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=",
"dev": true,
"requires": {
- "prepend-http": "1.0.4"
+ "prepend-http": "^1.0.1"
}
},
"urlgrey": {
@@ -8751,9 +8743,9 @@
"integrity": "sha1-riig1y+TvyJCKhii43mZMRLeyOg=",
"dev": true,
"requires": {
- "define-property": "0.2.5",
- "isobject": "3.0.1",
- "lazy-cache": "2.0.2"
+ "define-property": "^0.2.5",
+ "isobject": "^3.0.0",
+ "lazy-cache": "^2.0.2"
},
"dependencies": {
"define-property": {
@@ -8762,7 +8754,7 @@
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"dev": true,
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
},
"is-accessor-descriptor": {
@@ -8771,7 +8763,7 @@
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -8780,7 +8772,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -8791,7 +8783,7 @@
"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
"dev": true,
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -8800,7 +8792,7 @@
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"dev": true,
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -8811,9 +8803,9 @@
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
"dev": true,
"requires": {
- "is-accessor-descriptor": "0.1.6",
- "is-data-descriptor": "0.1.4",
- "kind-of": "5.1.0"
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
}
},
"kind-of": {
@@ -8828,7 +8820,7 @@
"integrity": "sha1-uRkKT5EzVGlIQIWfio9whNiCImQ=",
"dev": true,
"requires": {
- "set-getter": "0.1.0"
+ "set-getter": "^0.1.0"
}
}
}
@@ -8856,7 +8848,7 @@
"integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
"dev": true,
"requires": {
- "user-home": "1.1.1"
+ "user-home": "^1.1.1"
}
},
"value-or-function": {
@@ -8871,9 +8863,9 @@
"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
"dev": true,
"requires": {
- "assert-plus": "1.0.0",
+ "assert-plus": "^1.0.0",
"core-util-is": "1.0.2",
- "extsprintf": "1.3.0"
+ "extsprintf": "^1.2.0"
}
},
"vinyl": {
@@ -8882,8 +8874,8 @@
"integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=",
"dev": true,
"requires": {
- "clone": "1.0.3",
- "clone-stats": "0.0.1",
+ "clone": "^1.0.0",
+ "clone-stats": "^0.0.1",
"replace-ext": "0.0.1"
}
},
@@ -8893,14 +8885,14 @@
"integrity": "sha1-mmhRzhysHBzqX+hsCTHWIMLPqeY=",
"dev": true,
"requires": {
- "defaults": "1.0.3",
- "glob-stream": "3.1.18",
- "glob-watcher": "0.0.6",
- "graceful-fs": "3.0.11",
- "mkdirp": "0.5.1",
- "strip-bom": "1.0.0",
- "through2": "0.6.5",
- "vinyl": "0.4.6"
+ "defaults": "^1.0.0",
+ "glob-stream": "^3.1.5",
+ "glob-watcher": "^0.0.6",
+ "graceful-fs": "^3.0.0",
+ "mkdirp": "^0.5.0",
+ "strip-bom": "^1.0.0",
+ "through2": "^0.6.1",
+ "vinyl": "^0.4.0"
},
"dependencies": {
"clone": {
@@ -8915,7 +8907,7 @@
"integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
"dev": true,
"requires": {
- "natives": "1.1.2"
+ "natives": "^1.1.0"
}
},
"isarray": {
@@ -8930,10 +8922,10 @@
"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
"dev": true,
"requires": {
- "core-util-is": "1.0.2",
- "inherits": "2.0.3",
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
"isarray": "0.0.1",
- "string_decoder": "0.10.31"
+ "string_decoder": "~0.10.x"
}
},
"string_decoder": {
@@ -8948,8 +8940,8 @@
"integrity": "sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=",
"dev": true,
"requires": {
- "first-chunk-stream": "1.0.0",
- "is-utf8": "0.2.1"
+ "first-chunk-stream": "^1.0.0",
+ "is-utf8": "^0.2.0"
}
},
"through2": {
@@ -8958,8 +8950,8 @@
"integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=",
"dev": true,
"requires": {
- "readable-stream": "1.0.34",
- "xtend": "4.0.1"
+ "readable-stream": ">=1.0.33-1 <1.1.0-0",
+ "xtend": ">=4.0.0 <4.1.0-0"
}
},
"vinyl": {
@@ -8968,8 +8960,8 @@
"integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=",
"dev": true,
"requires": {
- "clone": "0.2.0",
- "clone-stats": "0.0.1"
+ "clone": "^0.2.0",
+ "clone-stats": "^0.0.1"
}
}
}
@@ -8980,13 +8972,13 @@
"integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
"dev": true,
"requires": {
- "append-buffer": "1.0.2",
- "convert-source-map": "1.5.1",
- "graceful-fs": "4.1.11",
- "normalize-path": "2.1.1",
- "now-and-later": "2.0.0",
- "remove-bom-buffer": "3.0.0",
- "vinyl": "2.1.0"
+ "append-buffer": "^1.0.2",
+ "convert-source-map": "^1.5.0",
+ "graceful-fs": "^4.1.6",
+ "normalize-path": "^2.1.1",
+ "now-and-later": "^2.0.0",
+ "remove-bom-buffer": "^3.0.0",
+ "vinyl": "^2.0.0"
},
"dependencies": {
"clone": {
@@ -9007,7 +8999,7 @@
"integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
"dev": true,
"requires": {
- "remove-trailing-separator": "1.1.0"
+ "remove-trailing-separator": "^1.0.1"
}
},
"replace-ext": {
@@ -9022,12 +9014,12 @@
"integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=",
"dev": true,
"requires": {
- "clone": "2.1.1",
- "clone-buffer": "1.0.0",
- "clone-stats": "1.0.0",
- "cloneable-readable": "1.1.2",
- "remove-trailing-separator": "1.1.0",
- "replace-ext": "1.0.0"
+ "clone": "^2.1.1",
+ "clone-buffer": "^1.0.0",
+ "clone-stats": "^1.0.0",
+ "cloneable-readable": "^1.0.0",
+ "remove-trailing-separator": "^1.0.1",
+ "replace-ext": "^1.0.0"
}
}
}
@@ -9038,7 +9030,7 @@
"integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
"dev": true,
"requires": {
- "source-map": "0.5.7"
+ "source-map": "^0.5.1"
},
"dependencies": {
"source-map": {
@@ -9055,7 +9047,7 @@
"integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=",
"dev": true,
"requires": {
- "browser-process-hrtime": "0.1.2"
+ "browser-process-hrtime": "^0.1.2"
}
},
"wcwidth": {
@@ -9064,7 +9056,7 @@
"integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
"dev": true,
"requires": {
- "defaults": "1.0.3"
+ "defaults": "^1.0.3"
}
},
"webidl-conversions": {
@@ -9094,9 +9086,9 @@
"integrity": "sha512-FwygsxsXx27x6XXuExA/ox3Ktwcbf+OAvrKmLulotDAiO1Q6ixchPFaHYsis2zZBZSJTR0+dR+JVtf7MlbqZjw==",
"dev": true,
"requires": {
- "lodash.sortby": "4.7.0",
- "tr46": "1.0.1",
- "webidl-conversions": "4.0.2"
+ "lodash.sortby": "^4.7.0",
+ "tr46": "^1.0.1",
+ "webidl-conversions": "^4.0.2"
}
},
"which": {
@@ -9104,7 +9096,7 @@
"resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
"integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
"requires": {
- "isexe": "2.0.0"
+ "isexe": "^2.0.0"
}
},
"which-module": {
@@ -9118,7 +9110,7 @@
"integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=",
"dev": true,
"requires": {
- "string-width": "2.1.1"
+ "string-width": "^2.1.1"
}
},
"window-size": {
@@ -9137,8 +9129,8 @@
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
"integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
"requires": {
- "string-width": "1.0.2",
- "strip-ansi": "3.0.1"
+ "string-width": "^1.0.1",
+ "strip-ansi": "^3.0.1"
},
"dependencies": {
"ansi-regex": {
@@ -9151,7 +9143,7 @@
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"requires": {
- "number-is-nan": "1.0.1"
+ "number-is-nan": "^1.0.0"
}
},
"string-width": {
@@ -9159,9 +9151,9 @@
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": {
- "code-point-at": "1.1.0",
- "is-fullwidth-code-point": "1.0.0",
- "strip-ansi": "3.0.1"
+ "code-point-at": "^1.0.0",
+ "is-fullwidth-code-point": "^1.0.0",
+ "strip-ansi": "^3.0.0"
}
},
"strip-ansi": {
@@ -9169,7 +9161,7 @@
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
}
}
@@ -9185,9 +9177,9 @@
"integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==",
"dev": true,
"requires": {
- "graceful-fs": "4.1.11",
- "imurmurhash": "0.1.4",
- "signal-exit": "3.0.2"
+ "graceful-fs": "^4.1.11",
+ "imurmurhash": "^0.1.4",
+ "signal-exit": "^3.0.2"
}
},
"ws": {
@@ -9196,8 +9188,8 @@
"integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
"dev": true,
"requires": {
- "async-limiter": "1.0.0",
- "safe-buffer": "5.1.1"
+ "async-limiter": "~1.0.0",
+ "safe-buffer": "~5.1.0"
}
},
"xdg-basedir": {
@@ -9217,8 +9209,8 @@
"resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz",
"integrity": "sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==",
"requires": {
- "sax": "1.2.4",
- "xmlbuilder": "9.0.7"
+ "sax": ">=0.6.0",
+ "xmlbuilder": "~9.0.1"
}
},
"xmlbuilder": {
@@ -9246,9 +9238,9 @@
"resolved": "https://registry.npmjs.org/yargonaut/-/yargonaut-1.1.2.tgz",
"integrity": "sha1-7nuJ6YEho/JB+pJqKm4bZkHIGz8=",
"requires": {
- "chalk": "1.1.3",
- "figlet": "1.2.0",
- "parent-require": "1.0.0"
+ "chalk": "^1.1.1",
+ "figlet": "^1.1.1",
+ "parent-require": "^1.0.0"
},
"dependencies": {
"ansi-regex": {
@@ -9266,11 +9258,11 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
- "ansi-styles": "2.2.1",
- "escape-string-regexp": "1.0.5",
- "has-ansi": "2.0.0",
- "strip-ansi": "3.0.1",
- "supports-color": "2.0.0"
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
}
},
"strip-ansi": {
@@ -9278,7 +9270,7 @@
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": {
- "ansi-regex": "2.1.1"
+ "ansi-regex": "^2.0.0"
}
},
"supports-color": {
@@ -9293,18 +9285,18 @@
"resolved": "https://registry.npmjs.org/yargs/-/yargs-11.1.0.tgz",
"integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==",
"requires": {
- "cliui": "4.1.0",
- "decamelize": "1.2.0",
- "find-up": "2.1.0",
- "get-caller-file": "1.0.2",
- "os-locale": "2.1.0",
- "require-directory": "2.1.1",
- "require-main-filename": "1.0.1",
- "set-blocking": "2.0.0",
- "string-width": "2.1.1",
- "which-module": "2.0.0",
- "y18n": "3.2.1",
- "yargs-parser": "9.0.2"
+ "cliui": "^4.0.0",
+ "decamelize": "^1.1.1",
+ "find-up": "^2.1.0",
+ "get-caller-file": "^1.0.1",
+ "os-locale": "^2.0.0",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^1.0.1",
+ "set-blocking": "^2.0.0",
+ "string-width": "^2.0.0",
+ "which-module": "^2.0.0",
+ "y18n": "^3.2.1",
+ "yargs-parser": "^9.0.2"
},
"dependencies": {
"cliui": {
@@ -9312,9 +9304,9 @@
"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
"requires": {
- "string-width": "2.1.1",
- "strip-ansi": "4.0.0",
- "wrap-ansi": "2.1.0"
+ "string-width": "^2.1.1",
+ "strip-ansi": "^4.0.0",
+ "wrap-ansi": "^2.0.0"
}
}
}
@@ -9324,7 +9316,7 @@
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz",
"integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=",
"requires": {
- "camelcase": "4.1.0"
+ "camelcase": "^4.1.0"
},
"dependencies": {
"camelcase": {
diff --git a/package.json b/package.json
index 0e6ea00..5d250d0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "typeorm-model-generator",
- "version": "0.2.16",
+ "version": "0.2.17",
"description": "Generates models for TypeORM from existing databases.",
"bin": "bin/typeorm-model-generator",
"scripts": {
@@ -25,7 +25,6 @@
"handlebars": "^4.0.11",
"mssql": "^4.0.4",
"mysql": "^2.15.0",
- "oracledb": "^2.2.0",
"pg": "^7.4.0",
"reflect-metadata": "^0.1.10",
"typeorm": "^0.2.4",
diff --git a/src/AbstractNamingStrategy.ts b/src/AbstractNamingStrategy.ts
new file mode 100644
index 0000000..c0ea4bf
--- /dev/null
+++ b/src/AbstractNamingStrategy.ts
@@ -0,0 +1,14 @@
+import { RelationInfo } from "./models/RelationInfo";
+import { DatabaseModel } from "./models/DatabaseModel";
+
+export abstract class AbstractNamingStrategy {
+ abstract relationName(
+ columnName: string,
+ relation: RelationInfo,
+ dbModel: DatabaseModel
+ ): string;
+
+ abstract entityName(entityName: string): string;
+
+ abstract columnName(columnName: string): string;
+}
diff --git a/src/Engine.ts b/src/Engine.ts
index 799f321..8f86dff 100644
--- a/src/Engine.ts
+++ b/src/Engine.ts
@@ -5,6 +5,7 @@ import fs = require("fs");
import path = require("path");
import * as TomgUtils from "./Utils";
import changeCase = require("change-case");
+import { AbstractNamingStrategy } from "./AbstractNamingStrategy";
export class Engine {
constructor(
@@ -20,7 +21,9 @@ export class Engine {
this.Options.user,
this.Options.password,
this.Options.schemaName,
- this.Options.ssl
+ this.Options.ssl,
+ this.Options.namingStrategy,
+ this.Options.relationIds
);
if (dbModel.entities.length > 0) {
this.createModelFromMetadata(dbModel);
@@ -39,7 +42,9 @@ export class Engine {
user: string,
password: string,
schemaName: string,
- ssl: boolean
+ ssl: boolean,
+ namingStrategy: AbstractNamingStrategy,
+ relationIds: boolean
): Promise<DatabaseModel> {
return await this.driver.GetDataFromServer(
database,
@@ -48,7 +53,9 @@ export class Engine {
user,
password,
schemaName,
- ssl
+ ssl,
+ namingStrategy,
+ relationIds
);
}
private createModelFromMetadata(databaseModel: DatabaseModel) {
@@ -223,7 +230,7 @@ export class Engine {
"username": "${this.Options.user}",
"password": "${this.Options.password}",
"database": "${this.Options.databaseName}",
- "synchronize": false
+ "synchronize": false,
"entities": [
"entities/*.js"
]
@@ -271,4 +278,6 @@ export interface EngineOptions {
convertCaseProperty: "pascal" | "camel" | "none";
lazy: boolean;
constructor: boolean;
+ namingStrategy: AbstractNamingStrategy;
+ relationIds: boolean;
}
diff --git a/src/NamingStrategy.ts b/src/NamingStrategy.ts
new file mode 100644
index 0000000..01d6b2f
--- /dev/null
+++ b/src/NamingStrategy.ts
@@ -0,0 +1,76 @@
+import { AbstractNamingStrategy } from "./AbstractNamingStrategy";
+import { RelationInfo } from "./models/RelationInfo";
+import { DatabaseModel } from "./models/DatabaseModel";
+
+export class NamingStrategy extends AbstractNamingStrategy {
+ relationName(
+ columnOldName: string,
+ relation: RelationInfo,
+ dbModel: DatabaseModel
+ ): string {
+ let isRelationToMany = relation.isOneToMany || relation.isManyToMany;
+ let ownerEntity = dbModel.entities.filter(v => {
+ return v.EntityName == relation.ownerTable;
+ })[0];
+ let referencedEntity = dbModel.entities.filter(v => {
+ return v.EntityName == relation.relatedTable;
+ })[0];
+
+ let columnName =
+ columnOldName[0].toLowerCase() +
+ columnOldName.substring(1, columnOldName.length);
+ if (
+ columnName
+ .toLowerCase()
+ .endsWith(
+ "id"
+ ) /*&& !ownerEntity.Columns.some(x=>x.tsName==columnName && x.isPrimary)*/
+ ) {
+ columnName = columnName.substring(
+ 0,
+ columnName.toLowerCase().lastIndexOf("id")
+ );
+ }
+ if (!isNaN(parseInt(columnName[columnName.length - 1]))) {
+ columnName = columnName.substring(0, columnName.length - 1);
+ }
+ if (!isNaN(parseInt(columnName[columnName.length - 1]))) {
+ columnName = columnName.substring(0, columnName.length - 1);
+ }
+ columnName += isRelationToMany ? "s" : "";
+
+ if (
+ relation.relationType != "ManyToMany" &&
+ columnOldName != columnName
+ ) {
+ if (ownerEntity.Columns.some(v => v.tsName == columnName)) {
+ columnName = columnName + "_";
+ for (let i = 2; i <= ownerEntity.Columns.length; i++) {
+ columnName =
+ columnName.substring(
+ 0,
+ columnName.length - i.toString().length
+ ) + i.toString();
+ if (
+ ownerEntity.Columns.every(
+ v =>
+ v.tsName != columnName ||
+ columnName == columnOldName
+ )
+ )
+ break;
+ }
+ }
+ }
+
+ return columnName;
+ }
+
+ entityName(entityName: string): string {
+ return entityName;
+ }
+
+ columnName(columnName: string): string {
+ return columnName;
+ }
+}
diff --git a/src/drivers/AbstractDriver.ts b/src/drivers/AbstractDriver.ts
index b3d6103..9baa5c5 100644
--- a/src/drivers/AbstractDriver.ts
+++ b/src/drivers/AbstractDriver.ts
@@ -1,15 +1,120 @@
-import { EntityInfo } from "./../models/EntityInfo";
-import { DatabaseModel } from "./../models/DatabaseModel";
-import * as TomgUtils from "./../Utils";
+import { EntityInfo } from "../models/EntityInfo";
+import { DatabaseModel } from "../models/DatabaseModel";
+import * as TomgUtils from "../Utils";
import { RelationInfo } from "../models/RelationInfo";
import { ColumnInfo } from "../models/ColumnInfo";
import {
WithWidthColumnType,
WithPrecisionColumnType,
WithLengthColumnType
-} from "./../../node_modules/typeorm/driver/types/ColumnTypes";
+} from "typeorm/driver/types/ColumnTypes";
+import { AbstractNamingStrategy } from "../AbstractNamingStrategy";
export abstract class AbstractDriver {
+ changeColumnNames(dbModel: DatabaseModel) {
+ dbModel.entities.forEach(entity => {
+ entity.Columns.forEach(column => {
+ let newName = this.namingStrategy.columnName(column.tsName);
+ entity.Indexes.forEach(index => {
+ index.columns
+ .filter(column2 => {
+ return column2.name == column.tsName;
+ })
+ .forEach(column2 => {
+ column2.name = newName;
+ });
+ });
+ dbModel.entities.forEach(entity2 => {
+ entity2.Columns.forEach(column2 => {
+ column2.relations
+ .filter(relation => {
+ return (
+ relation.relatedTable ==
+ entity.EntityName &&
+ relation.relatedColumn == column.tsName
+ );
+ })
+ .map(v => {
+ v.relatedColumn = newName;
+ });
+ column2.relations
+ .filter(relation => {
+ return (
+ relation.ownerTable == entity.EntityName &&
+ relation.ownerColumn == column.tsName
+ );
+ })
+ .map(v => {
+ v.ownerColumn = newName;
+ });
+ });
+ });
+
+ column.tsName = newName;
+ });
+ });
+ }
+ changeEntityNames(dbModel: DatabaseModel) {
+ dbModel.entities.forEach(entity => {
+ let newName = this.namingStrategy.columnName(entity.EntityName);
+ dbModel.entities.forEach(entity2 => {
+ entity2.Columns.forEach(column => {
+ column.relations.forEach(relation => {
+ if (relation.ownerTable == entity.EntityName)
+ relation.ownerTable = newName;
+ if (relation.relatedTable == entity.EntityName)
+ relation.relatedTable = newName;
+ });
+ });
+ });
+ entity.EntityName = newName;
+ });
+ }
+ changeRelationNames(dbModel: DatabaseModel) {
+ dbModel.entities.forEach(entity => {
+ entity.Columns.forEach(column => {
+ column.relations.forEach(relation => {
+ if (true || !relation.isOwner) {
+ let newName = this.namingStrategy.relationName(
+ column.tsName,
+ relation,
+ dbModel
+ );
+ dbModel.entities.forEach(entity2 => {
+ entity2.Columns.forEach(column2 => {
+ column2.relations.forEach(relation2 => {
+ if (
+ relation2.relatedTable ==
+ entity.EntityName &&
+ relation2.ownerColumn == column.tsName
+ ) {
+ relation2.ownerColumn = newName;
+ }
+ if (
+ relation2.relatedTable ==
+ entity.EntityName &&
+ relation2.relatedColumn == column.tsName
+ ) {
+ relation2.relatedColumn = newName;
+ }
+ if (relation.isOwner) {
+ entity.Indexes.forEach(ind => {
+ ind.columns.forEach(col => {
+ if (col.name == column.tsName) {
+ col.name = newName;
+ }
+ });
+ });
+ }
+ });
+ });
+ });
+ column.tsName = newName;
+ }
+ });
+ });
+ });
+ }
ColumnTypesWithWidth: WithWidthColumnType[] = [
"tinyint",
"smallint",
@@ -52,6 +157,8 @@ export abstract class AbstractDriver {
"binary",
"varbinary"
];
+ namingStrategy: AbstractNamingStrategy;
+ generateRelationsIds: boolean;
FindManyToManyRelations(dbModel: DatabaseModel) {
let manyToManyEntities = dbModel.entities.filter(entity => {
@@ -79,7 +186,7 @@ export abstract class AbstractDriver {
)[0];
relatedTable1.Columns = relatedTable1.Columns.filter(
v =>
- !v.name
+ !v.tsName
.toLowerCase()
.startsWith(entity.EntityName.toLowerCase())
);
@@ -88,7 +195,7 @@ export abstract class AbstractDriver {
)[0];
relatedTable2.Columns = relatedTable2.Columns.filter(
v =>
- !v.name
+ !v.tsName
.toLowerCase()
.startsWith(entity.EntityName.toLowerCase())
);
@@ -97,21 +204,26 @@ export abstract class AbstractDriver {
});
let column1 = new ColumnInfo();
- column1.name = namesOfRelatedTables[1];
+ column1.tsName = namesOfRelatedTables[1];
+
let col1Rel = new RelationInfo();
col1Rel.relatedTable = namesOfRelatedTables[1];
col1Rel.relatedColumn = namesOfRelatedTables[1];
+
col1Rel.relationType = "ManyToMany";
col1Rel.isOwner = true;
col1Rel.ownerColumn = namesOfRelatedTables[0];
+
column1.relations.push(col1Rel);
relatedTable1.Columns.push(column1);
let column2 = new ColumnInfo();
- column2.name = namesOfRelatedTables[0];
+ column2.tsName = namesOfRelatedTables[0];
+
let col2Rel = new RelationInfo();
col2Rel.relatedTable = namesOfRelatedTables[0];
col2Rel.relatedColumn = namesOfRelatedTables[1];
+
col2Rel.relationType = "ManyToMany";
col2Rel.isOwner = false;
column2.relations.push(col2Rel);
@@ -126,9 +238,13 @@ export abstract class AbstractDriver {
user: string,
password: string,
schema: string,
- ssl: boolean
+ ssl: boolean,
+ namingStrategy: AbstractNamingStrategy,
+ relationIds: boolean
): Promise<DatabaseModel> {
+ this.generateRelationsIds = relationIds;
let dbModel = <DatabaseModel>{};
+ this.namingStrategy = namingStrategy;
await this.ConnectToServer(database, server, port, user, password, ssl);
let sqlEscapedSchema = "'" + schema.split(",").join("','") + "'";
dbModel.entities = await this.GetAllTables(sqlEscapedSchema);
@@ -141,8 +257,16 @@ export abstract class AbstractDriver {
await this.DisconnectFromServer();
this.FindManyToManyRelations(dbModel);
this.FindPrimaryColumnsFromIndexes(dbModel);
+ this.ApplyNamingStrategy(dbModel);
return dbModel;
}
+
+ private ApplyNamingStrategy(dbModel: DatabaseModel) {
+ this.changeRelationNames(dbModel);
+ this.changeEntityNames(dbModel);
+ this.changeColumnNames(dbModel);
+ }
+
abstract async ConnectToServer(
database: string,
server: string,
@@ -209,7 +333,7 @@ export abstract class AbstractDriver {
) {
let ownerColumn = ownerEntity.Columns.find(column => {
return (
- column.name ==
+ column.tsName ==
relationTmp.ownerColumnsNames[relationColumnIndex]
);
});
@@ -227,7 +351,7 @@ export abstract class AbstractDriver {
}
let relatedColumn = referencedEntity.Columns.find(column => {
return (
- column.name ==
+ column.tsName ==
relationTmp.referencedColumnsNames[relationColumnIndex]
);
});
@@ -249,48 +373,49 @@ export abstract class AbstractDriver {
return (
index.isUnique &&
index.columns.some(col => {
- return col.name == ownerColumn!.name;
+ return col.name == ownerColumn!.tsName;
})
);
});
isOneToMany = !index;
let ownerRelation = new RelationInfo();
- let columnName =
- ownerEntity.EntityName.toLowerCase() +
- (isOneToMany ? "s" : "");
+ ownerRelation.actionOnDelete = relationTmp.actionOnDelete;
+ ownerRelation.actionOnUpdate = relationTmp.actionOnUpdate;
+ ownerRelation.isOwner = true;
+ ownerRelation.relatedColumn = relatedColumn.tsName.toLowerCase();
+ ownerRelation.relatedTable = relationTmp.referencedTable;
+ ownerRelation.ownerTable = relationTmp.ownerTable;
+ ownerRelation.relationType = isOneToMany
+ ? "ManyToOne"
+ : "OneToOne";
+ ownerRelation.relationIdField = this.generateRelationsIds;
+
+ let columnName = ownerEntity.EntityName;
if (
- referencedEntity.Columns.filter(filterVal => {
- return filterVal.name == columnName;
- }).length > 0
+ referencedEntity.Columns.some(v => v.tsName == columnName)
) {
- for (let i = 2; i <= ownerEntity.Columns.length; i++) {
+ columnName = columnName + "_";
+ for (let i = 2; i <= referencedEntity.Columns.length; i++) {
columnName =
- ownerEntity.EntityName.toLowerCase() +
- (isOneToMany ? "s" : "") +
- i.toString();
+ columnName.substring(
+ 0,
+ columnName.length - i.toString().length
+ ) + i.toString();
if (
- referencedEntity.Columns.filter(filterVal => {
- return filterVal.name == columnName;
- }).length == 0
+ referencedEntity.Columns.every(
+ v => v.tsName != columnName
+ )
)
break;
}
}
- ownerRelation.actionOnDelete = relationTmp.actionOnDelete;
- ownerRelation.actionOnUpdate = relationTmp.actionOnUpdate;
- ownerRelation.isOwner = true;
- ownerRelation.relatedColumn = relatedColumn.name.toLowerCase();
- ownerRelation.relatedTable = relationTmp.referencedTable;
- ownerRelation.ownerTable = relationTmp.ownerTable;
+
ownerRelation.ownerColumn = columnName;
- ownerRelation.relationType = isOneToMany
- ? "ManyToOne"
- : "OneToOne";
ownerColumn.relations.push(ownerRelation);
if (isOneToMany) {
let col = new ColumnInfo();
- col.name = columnName;
+ col.tsName = columnName;
let referencedRelation = new RelationInfo();
col.relations.push(referencedRelation);
referencedRelation.actionOnDelete =
@@ -298,15 +423,15 @@ export abstract class AbstractDriver {
referencedRelation.actionOnUpdate =
relationTmp.actionOnUpdate;
referencedRelation.isOwner = false;
- referencedRelation.relatedColumn = ownerColumn.name;
+ referencedRelation.relatedColumn = ownerColumn.tsName;
referencedRelation.relatedTable = relationTmp.ownerTable;
referencedRelation.ownerTable = relationTmp.referencedTable;
- referencedRelation.ownerColumn = relatedColumn.name.toLowerCase();
+ referencedRelation.ownerColumn = relatedColumn.tsName;
referencedRelation.relationType = "OneToMany";
referencedEntity.Columns.push(col);
} else {
let col = new ColumnInfo();
- col.name = columnName;
+ col.tsName = columnName;
let referencedRelation = new RelationInfo();
col.relations.push(referencedRelation);
referencedRelation.actionOnDelete =
@@ -314,10 +439,10 @@ export abstract class AbstractDriver {
referencedRelation.actionOnUpdate =
relationTmp.actionOnUpdate;
referencedRelation.isOwner = false;
- referencedRelation.relatedColumn = ownerColumn.name;
+ referencedRelation.relatedColumn = ownerColumn.tsName;
referencedRelation.relatedTable = relationTmp.ownerTable;
referencedRelation.ownerTable = relationTmp.referencedTable;
- referencedRelation.ownerColumn = relatedColumn.name.toLowerCase();
+ referencedRelation.ownerColumn = relatedColumn.tsName;
referencedRelation.relationType = "OneToOne";
referencedEntity.Columns.push(col);
}
@@ -344,7 +469,9 @@ export abstract class AbstractDriver {
entity.Columns.forEach(col => {
if (
primaryIndex &&
- primaryIndex.columns.some(cIndex => cIndex.name == col.name)
+ primaryIndex.columns.some(
+ cIndex => cIndex.name == col.tsName
+ )
)
col.isPrimary = true;
});
diff --git a/src/drivers/MssqlDriver.ts b/src/drivers/MssqlDriver.ts
index 0b03735..ac64a13 100644
--- a/src/drivers/MssqlDriver.ts
+++ b/src/drivers/MssqlDriver.ts
@@ -1,8 +1,8 @@
import { AbstractDriver } from "./AbstractDriver";
import * as MSSQL from "mssql";
-import { ColumnInfo } from "./../models/ColumnInfo";
-import { EntityInfo } from "./../models/EntityInfo";
-import * as TomgUtils from "./../Utils";
+import { ColumnInfo } from "../models/ColumnInfo";
+import { EntityInfo } from "../models/EntityInfo";
+import * as TomgUtils from "../Utils";
export class MssqlDriver extends AbstractDriver {
GetAllTablesQuery = async (schema: string) => {
@@ -53,7 +53,8 @@ export class MssqlDriver extends AbstractDriver {
})
.forEach(resp => {
let colInfo: ColumnInfo = new ColumnInfo();
- colInfo.name = resp.COLUMN_NAME;
+ colInfo.tsName = resp.COLUMN_NAME;
+ colInfo.sqlName = resp.COLUMN_NAME;
colInfo.is_nullable = resp.IS_NULLABLE == "YES";
colInfo.is_generated = resp.IsIdentity == 1;
colInfo.is_unique = resp.IsUnique == 1;
diff --git a/src/drivers/MysqlDriver.ts b/src/drivers/MysqlDriver.ts
index d091150..b4ffe98 100644
--- a/src/drivers/MysqlDriver.ts
+++ b/src/drivers/MysqlDriver.ts
@@ -1,8 +1,8 @@
import { AbstractDriver } from "./AbstractDriver";
import * as MYSQL from "mysql";
-import { ColumnInfo } from "./../models/ColumnInfo";
-import { EntityInfo } from "./../models/EntityInfo";
-import * as TomgUtils from "./../Utils";
+import { ColumnInfo } from "../models/ColumnInfo";
+import { EntityInfo } from "../models/EntityInfo";
+import * as TomgUtils from "../Utils";
export class MysqlDriver extends AbstractDriver {
readonly EngineName: string = "MySQL";
@@ -45,7 +45,8 @@ export class MysqlDriver extends AbstractDriver {
})
.forEach(resp => {
let colInfo: ColumnInfo = new ColumnInfo();
- colInfo.name = resp.COLUMN_NAME;
+ colInfo.tsName = resp.COLUMN_NAME;
+ colInfo.sqlName = resp.COLUMN_NAME;
colInfo.is_nullable = resp.IS_NULLABLE == "YES";
colInfo.is_generated = resp.IsIdentity == 1;
colInfo.is_unique = resp.column_key == "UNI";
diff --git a/src/drivers/OracleDriver.ts b/src/drivers/OracleDriver.ts
index 563ef7e..2b9b5d3 100644
--- a/src/drivers/OracleDriver.ts
+++ b/src/drivers/OracleDriver.ts
@@ -1,7 +1,7 @@
import { AbstractDriver } from "./AbstractDriver";
-import { ColumnInfo } from "./../models/ColumnInfo";
-import { EntityInfo } from "./../models/EntityInfo";
-import * as TomgUtils from "./../Utils";
+import { ColumnInfo } from "../models/ColumnInfo";
+import { EntityInfo } from "../models/EntityInfo";
+import * as TomgUtils from "../Utils";
export class OracleDriver extends AbstractDriver {
Oracle: any;
@@ -55,7 +55,8 @@ export class OracleDriver extends AbstractDriver {
})
.forEach(resp => {
let colInfo: ColumnInfo = new ColumnInfo();
- colInfo.name = resp.COLUMN_NAME;
+ colInfo.tsName = resp.COLUMN_NAME;
+ colInfo.sqlName = resp.COLUMN_NAME;
colInfo.is_nullable = resp.NULLABLE == "Y";
colInfo.is_generated = resp.IDENTITY_COLUMN == "YES";
colInfo.default =
diff --git a/src/drivers/PostgresDriver.ts b/src/drivers/PostgresDriver.ts
index 5f9e9d2..989322e 100644
--- a/src/drivers/PostgresDriver.ts
+++ b/src/drivers/PostgresDriver.ts
@@ -1,8 +1,8 @@
import { AbstractDriver } from "./AbstractDriver";
import * as PG from "pg";
-import { ColumnInfo } from "./../models/ColumnInfo";
-import { EntityInfo } from "./../models/EntityInfo";
-import * as TomgUtils from "./../Utils";
+import { ColumnInfo } from "../models/ColumnInfo";
+import { EntityInfo } from "../models/EntityInfo";
+import * as TomgUtils from "../Utils";
export class PostgresDriver extends AbstractDriver {
private Connection: PG.Client;
@@ -54,7 +54,8 @@ export class PostgresDriver extends AbstractDriver {
})
.forEach(resp => {
let colInfo: ColumnInfo = new ColumnInfo();
- colInfo.name = resp.column_name;
+ colInfo.tsName = resp.column_name;
+ colInfo.sqlName = resp.column_name;
colInfo.is_nullable = resp.is_nullable == "YES";
colInfo.is_generated = resp.isidentity == "YES";
colInfo.is_unique = resp.isunique == 1;
diff --git a/src/drivers/SqliteDriver.ts b/src/drivers/SqliteDriver.ts
index 563d40e..9768316 100644
--- a/src/drivers/SqliteDriver.ts
+++ b/src/drivers/SqliteDriver.ts
@@ -1,7 +1,7 @@
import { AbstractDriver } from "./AbstractDriver";
-import { ColumnInfo } from "./../models/ColumnInfo";
-import { EntityInfo } from "./../models/EntityInfo";
-import * as TomgUtils from "./../Utils";
+import { ColumnInfo } from "../models/ColumnInfo";
+import { EntityInfo } from "../models/EntityInfo";
+import * as TomgUtils from "../Utils";
export class SqliteDriver extends AbstractDriver {
sqlite = require("sqlite3").verbose();
@@ -41,7 +41,8 @@ export class SqliteDriver extends AbstractDriver {
}>(`PRAGMA table_info('${ent.EntityName}');`);
response.forEach(resp => {
let colInfo: ColumnInfo = new ColumnInfo();
- colInfo.name = resp.name;
+ colInfo.tsName = resp.name;
+ colInfo.sqlName = resp.name;
colInfo.is_nullable = resp.notnull == 0;
colInfo.isPrimary = resp.pk > 0;
colInfo.default = resp.dflt_value ? resp.dflt_value : null;
@@ -231,7 +232,7 @@ export class SqliteDriver extends AbstractDriver {
indexInfo.isUnique
) {
ent.Columns.filter(
- v => v.name == indexColumnInfo.name
+ v => v.tsName == indexColumnInfo.name
).map(v => (v.is_unique = true));
}
indexInfo.columns.push(indexColumnInfo);
diff --git a/src/entity.mst b/src/entity.mst
index 86d5279..1cba3ed 100644
--- a/src/entity.mst
+++ b/src/entity.mst
@@ -1,4 +1,4 @@
-import {Index,Entity, PrimaryColumn, Column, OneToOne, OneToMany, ManyToOne, ManyToMany, JoinColumn, JoinTable} from "typeorm";
+import {Index,Entity, PrimaryColumn, Column, OneToOne, OneToMany, ManyToOne, ManyToMany, JoinColumn, JoinTable, RelationId} from "typeorm";
{{relationImports}}{{#each UniqueImports}}import {{curly true}}{{toEntityName this}}{{curly false}} from "./{{toFileName this}}";
{{/each}}
@@ -20,15 +20,19 @@ import {Index,Entity, PrimaryColumn, Column, OneToOne, OneToMany, ManyToOne, Man
scale:{{.}},{{/numericScale}}{{#isPrimary}}
primary:{{isPrimary}},{{/isPrimary}}{{#enumOptions}}
enum:[{{.}}],{{/enumOptions}}
- name:"{{name}}"
+ name:"{{sqlName}}"
})
- {{toPropertyName name}}:{{ts_type}};
+ {{toPropertyName tsName}}:{{ts_type}}{{#is_nullable}} | null{{/is_nullable}};
{{/relations}}{{#relations}}
- @{{relationType}}(type=>{{toEntityName relatedTable}}, {{toPropertyName ../name}}=>{{toPropertyName ../name}}.{{#if isOwner}}{{toPropertyName ownerColumn}},{ {{#../isPrimary}}primary:true,{{/../isPrimary}}{{^../is_nullable}} nullable:false,{{/../is_nullable}}{{#actionOnDelete}}onDelete: '{{.}}',{{/actionOnDelete}}{{#actionOnUpdate}}onUpdate: '{{.}}'{{/actionOnUpdate}} }{{else}}{{toPropertyName relatedColumn}}{{#actionOnDelete}},{ onDelete: '{{.}}' }{{/actionOnDelete}}{{/if}}){{#isOwner}}
- {{#if isManyToMany}}@JoinTable(){{else}}@JoinColumn({ name:'{{ ../name}}'}){{/if}}{{/isOwner}}
- {{#if (or isOneToMany isManyToMany)}}{{toPropertyName ../name}}:{{toLazy (concat (toEntityName relatedTable) "[]")}};
- {{else}}{{toPropertyName ../name}}:{{toLazy (toEntityName relatedTable)}};
- {{/if}}{{/relations}}
+ @{{relationType}}(type=>{{toEntityName relatedTable}}, {{toEntityName relatedTable}}=>{{toEntityName relatedTable}}.{{#if isOwner}}{{toPropertyName ownerColumn}},{ {{#../isPrimary}}primary:true,{{/../isPrimary}}{{^../is_nullable}} nullable:false,{{/../is_nullable}}{{#actionOnDelete}}onDelete: '{{.}}',{{/actionOnDelete}}{{#actionOnUpdate}}onUpdate: '{{.}}'{{/actionOnUpdate}} }{{else}}{{toPropertyName relatedColumn}}{{#actionOnDelete}},{ onDelete: '{{.}}' }{{/actionOnDelete}}{{/if}}){{#isOwner}}
+ {{#if isManyToMany}}@JoinTable(){{else}}@JoinColumn({ name:'{{ ../sqlName}}'}){{/if}}{{/isOwner}}
+ {{#if (or isOneToMany isManyToMany)}}{{toPropertyName ../tsName}}:{{toLazy (concat (toEntityName relatedTable) "[]")}};
+ {{else}}{{toPropertyName ../tsName}}:{{toLazy (concat (toEntityName relatedTable) ' | null')}};
+ {{/if}}
+ {{#if relationIdField }}
+
+ @RelationId(({{../../EntityName}}: {{../../EntityName}}) => {{../../EntityName}}.{{toPropertyName ../tsName}})
+ {{toPropertyName ../tsName}}Id: {{#if isOneToOne}}{{toLazy ../ts_type}}{{else}}{{toLazy (concat ../ts_type "[]")}}{{/if}};{{/if}}{{/relations}}
{{/Columns}}
{{#if GenerateConstructor}}
constructor(init?: Partial<{{toEntityName EntityName}}>) {
diff --git a/src/index.ts b/src/index.ts
index c334bce..151d6ae 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -9,6 +9,8 @@ import { Engine } from "./Engine";
import * as Yargs from "yargs";
import * as TomgUtils from "./Utils";
import path = require("path");
+import { AbstractNamingStrategy } from "./AbstractNamingStrategy";
+import { NamingStrategy } from "./NamingStrategy";
var argv = Yargs.usage(
"Usage: typeorm-model-generator -h <host> -d <database> -p [port] -u <user> -x [password] -e [engine]"
@@ -84,6 +86,14 @@ var argv = Yargs.usage(
boolean: true,
default: false
})
+ .option("namingStrategy", {
+ describe: "Use custom naming strategy"
+ })
+ .option("relationIds", {
+ describe: "Generate RelationId fields",
+ boolean: true,
+ default: false
+ })
.option("generateConstructor", {
describe: "Generate constructor allowing partial initialization",
boolean: true,
@@ -113,7 +123,7 @@ switch (argv.e) {
standardUser = "root";
break;
case "mariadb":
- driver = new MysqlDriver();
+ driver = new MariaDbDriver();
standardPort = 3306;
standardUser = "root";
break;
@@ -130,6 +140,13 @@ switch (argv.e) {
TomgUtils.LogError("Database engine not recognized.", false);
throw new Error("Database engine not recognized.");
}
+let namingStrategy: AbstractNamingStrategy;
+if (argv.namingStrategy && argv.namingStrategy != "") {
+ let req = require(argv.namingStrategy);
+ namingStrategy = new req.NamingStrategy();
+} else {
+ namingStrategy = new NamingStrategy();
+}
let engine = new Engine(driver, {
host: argv.h,
@@ -146,7 +163,9 @@ let engine = new Engine(driver, {
convertCaseEntity: argv.ce,
convertCaseProperty: argv.cp,
lazy: argv.lazy,
- constructor: argv.constructor
+ constructor: argv.generateConstructor,
+ relationIds: argv.relationIds,
+ namingStrategy: namingStrategy
});
console.log(TomgUtils.packageVersion());
diff --git a/src/models/ColumnInfo.ts b/src/models/ColumnInfo.ts
index 1507011..455c4d4 100644
--- a/src/models/ColumnInfo.ts
+++ b/src/models/ColumnInfo.ts
@@ -1,7 +1,8 @@
import { RelationInfo } from "./RelationInfo";
export class ColumnInfo {
- name: string = "";
+ tsName: string = "";
+ sqlName: string = "";
default: string | null = null;
is_nullable: boolean = false;
is_unique: boolean = false;
@@ -24,7 +25,6 @@ export class ColumnInfo {
numericScale: number | null = null;
enumOptions: string | null = null;
relations: RelationInfo[];
-
constructor() {
this.relations = [];
}
diff --git a/src/models/RelationInfo.ts b/src/models/RelationInfo.ts
index 3a39f87..58fc7fe 100644
--- a/src/models/RelationInfo.ts
+++ b/src/models/RelationInfo.ts
@@ -7,6 +7,7 @@ export class RelationInfo {
ownerColumn: string;
actionOnDelete: "RESTRICT" | "CASCADE" | "SET NULL" | null;
actionOnUpdate: "RESTRICT" | "CASCADE" | "SET NULL" | null;
+ relationIdField: boolean = false;
get isOneToMany(): boolean {
return this.relationType == "OneToMany";
@@ -14,4 +15,10 @@ export class RelationInfo {
get isManyToMany(): boolean {
return this.relationType == "ManyToMany";
}
+ get isOneToOne(): boolean {
+ return this.relationType == "OneToOne";
+ }
+ get isManyToOne(): boolean {
+ return this.relationType == "OneToOne";
+ }
}
diff --git a/test/drivers/MssqlDriver.test.ts b/test/drivers/MssqlDriver.test.ts
index 9649ce1..0e28241 100644
--- a/test/drivers/MssqlDriver.test.ts
+++ b/test/drivers/MssqlDriver.test.ts
@@ -1,11 +1,12 @@
import { expect } from "chai";
-import { MssqlDriver } from './../../src/drivers/MssqlDriver'
+import { MssqlDriver } from '../../src/drivers/MssqlDriver'
import * as Sinon from 'sinon'
import * as MSSQL from 'mssql'
-import { EntityInfo } from './../../src/models/EntityInfo'
-import { ColumnInfo } from './../../src/models/ColumnInfo'
-import { RelationInfo } from './../../src/models/RelationInfo'
+import { EntityInfo } from '../../src/models/EntityInfo'
+import { ColumnInfo } from '../../src/models/ColumnInfo'
+import { RelationInfo } from '../../src/models/RelationInfo'
import { Table, IColumnMetadata } from "mssql";
+import { NamingStrategy } from "../../src/NamingStrategy";
class fakeResponse implements MSSQL.IResult<any> {
recordsets: MSSQL.IRecordSet<any>[];
@@ -27,6 +28,7 @@ describe('MssqlDriver', function () {
beforeEach(() => {
driver = new MssqlDriver();
+ driver.namingStrategy = new NamingStrategy();
})
afterEach(() => {
@@ -84,7 +86,8 @@ describe('MssqlDriver', function () {
is_nullable: true,
isPrimary: false,
is_generated: true,
- name: 'name',
+ tsName: 'name',
+ sqlName: 'name',
numericPrecision: null,
numericScale: null,
width: null,
@@ -92,7 +95,7 @@ describe('MssqlDriver', function () {
ts_type: 'number',
enumOptions: null,
is_unique:false,
- relations: <RelationInfo[]>[]
+ relations: <RelationInfo[]>[],
})
let result = await driver.GetCoulmnsFromEntity(entities, 'schema');
expect(result).to.be.deep.equal(expected)
diff --git a/test/integration/entityTypes.test.ts b/test/integration/entityTypes.test.ts
index a4ffab0..10e570f 100644
--- a/test/integration/entityTypes.test.ts
+++ b/test/integration/entityTypes.test.ts
@@ -8,7 +8,7 @@ var chai = require('chai');
var chaiSubset = require('chai-subset');
import * as ts from "typescript";
import * as GTU from "../utils/GeneralTestUtils"
-import { Engine } from "./../../src/Engine";
+import { Engine } from "../../src/Engine";
chai.use(chaiSubset);
diff --git a/test/integration/examples/sample18-lazy-relations/entity/Category.ts b/test/integration/examples/sample18-lazy-relations/entity/Category.ts
index 42ce1f2..410df9b 100644
--- a/test/integration/examples/sample18-lazy-relations/entity/Category.ts
+++ b/test/integration/examples/sample18-lazy-relations/entity/Category.ts
@@ -10,7 +10,7 @@ export class Category {
@Column()
name: string;
- @ManyToMany(type => Post, post => post.Category)
- Post: Promise<Post[]>;
+ @ManyToMany(type => Post, post => post.categorys)
+ posts: Promise<Post[]>;
}
diff --git a/test/integration/examples/sample18-lazy-relations/entity/Post.ts b/test/integration/examples/sample18-lazy-relations/entity/Post.ts
index 88bfe40..6d74a76 100644
--- a/test/integration/examples/sample18-lazy-relations/entity/Post.ts
+++ b/test/integration/examples/sample18-lazy-relations/entity/Post.ts
@@ -21,10 +21,10 @@ export class Post {
})
author: Promise<Author | null>;
- @ManyToMany(type => Category, category => category.Post, {
+ @ManyToMany(type => Category, category => category.posts, {
// cascade: true
})
@JoinTable()
- Category: Promise<Category[]>;
+ categorys: Promise<Category[]>;
}
diff --git a/test/integration/examples/sample4-many-to-many/entity/Post.ts b/test/integration/examples/sample4-many-to-many/entity/Post.ts
index 0495570..83b80c0 100644
--- a/test/integration/examples/sample4-many-to-many/entity/Post.ts
+++ b/test/integration/examples/sample4-many-to-many/entity/Post.ts
@@ -1,5 +1,5 @@
import { PrimaryGeneratedColumn, Column, Entity, OneToOne, OneToMany, ManyToOne, ManyToMany, JoinColumn, JoinTable } from "typeorm";
-import {PostDetails} from "./PostDetails";
+import {PostDetail} from "./PostDetail";
import {PostCategory} from "./PostCategory";
import {PostAuthor} from "./PostAuthor";
import {PostInformation} from "./PostInformation";
@@ -23,40 +23,40 @@ export class Post {
cascade: true
})
@JoinTable()
- PostCategory: PostCategory[];
+ postCategorys: PostCategory[];
// post has relation with details. cascade inserts here means if new PostDetails instance will be set to this
// relation it will be inserted automatically to the db when you save this Post entity
- @ManyToMany(type => PostDetails, details => details.Post, {
+ @ManyToMany(type => PostDetail, details => details.posts, {
cascade: true
})
@JoinTable()
- PostDetails: PostDetails[];
+ postDetails: PostDetail[];
// post has relation with details. cascade update here means if new PostDetail instance will be set to this relation
// it will be inserted automatically to the db when you save this Post entity
- @ManyToMany(type => PostImage, image => image.Post, {
+ @ManyToMany(type => PostImage, image => image.posts, {
cascade: true
})
@JoinTable()
- PostImage: PostImage[];
+ postImages: PostImage[];
// post has relation with details. cascade update here means if new PostDetail instance will be set to this relation
// it will be inserted automatically to the db when you save this Post entity
- @ManyToMany(type => PostMetadata, metadata => metadata.Post)
+ @ManyToMany(type => PostMetadata, metadata => metadata.posts)
@JoinTable()
- PostMetadata: PostMetadata[];
+ postMetadatas: PostMetadata[];
// post has relation with details. full cascades here
- @ManyToMany(type => PostInformation, information => information.Post, {
+ @ManyToMany(type => PostInformation, information => information.posts, {
cascade: true
})
@JoinTable()
- PostInformation: PostInformation[];
+ postInformations: PostInformation[];
// post has relation with details. not cascades here. means cannot be persisted, updated or removed
- @ManyToMany(type => PostAuthor, author => author.Post)
+ @ManyToMany(type => PostAuthor, author => author.posts)
@JoinTable()
- PostAuthor: PostAuthor[];
+ postAuthors: PostAuthor[];
}
diff --git a/test/integration/examples/sample4-many-to-many/entity/PostAuthor.ts b/test/integration/examples/sample4-many-to-many/entity/PostAuthor.ts
index abb6d03..fcebbca 100644
--- a/test/integration/examples/sample4-many-to-many/entity/PostAuthor.ts
+++ b/test/integration/examples/sample4-many-to-many/entity/PostAuthor.ts
@@ -10,7 +10,7 @@ export class PostAuthor {
@Column()
name: string;
- @ManyToMany(type => Post, post => post.PostAuthor)
- Post: Post[];
+ @ManyToMany(type => Post, post => post.postAuthors)
+ posts: Post[];
}
diff --git a/test/integration/examples/sample4-many-to-many/entity/PostDetails.ts b/test/integration/examples/sample4-many-to-many/entity/PostDetail.ts
similarity index 72%
rename from test/integration/examples/sample4-many-to-many/entity/PostDetails.ts
rename to test/integration/examples/sample4-many-to-many/entity/PostDetail.ts
index 2b570d8..c5d799d 100644
--- a/test/integration/examples/sample4-many-to-many/entity/PostDetails.ts
+++ b/test/integration/examples/sample4-many-to-many/entity/PostDetail.ts
@@ -1,8 +1,8 @@
import { PrimaryGeneratedColumn, Column, Entity, OneToOne, OneToMany, ManyToOne, ManyToMany, JoinColumn, JoinTable } from "typeorm";
import {Post} from "./Post";
-@Entity("PostDetails")
-export class PostDetails {
+@Entity("PostDetail")
+export class PostDetail {
@PrimaryGeneratedColumn()
id: number;
@@ -16,7 +16,7 @@ export class PostDetails {
@Column()
metadata: string;
- @ManyToMany(type => Post, post => post.PostDetails)
- Post: Post[];
+ @ManyToMany(type => Post, post => post.postDetails)
+ posts: Post[];
}
diff --git a/test/integration/examples/sample4-many-to-many/entity/PostImage.ts b/test/integration/examples/sample4-many-to-many/entity/PostImage.ts
index d758949..32b8af4 100644
--- a/test/integration/examples/sample4-many-to-many/entity/PostImage.ts
+++ b/test/integration/examples/sample4-many-to-many/entity/PostImage.ts
@@ -10,7 +10,7 @@ export class PostImage {
@Column()
url: string;
- @ManyToMany(type => Post, post => post.PostImage)
- Post: Post[];
+ @ManyToMany(type => Post, post => post.postImages)
+ posts: Post[];
}
diff --git a/test/integration/examples/sample4-many-to-many/entity/PostInformation.ts b/test/integration/examples/sample4-many-to-many/entity/PostInformation.ts
index 600fea7..037eed5 100644
--- a/test/integration/examples/sample4-many-to-many/entity/PostInformation.ts
+++ b/test/integration/examples/sample4-many-to-many/entity/PostInformation.ts
@@ -10,7 +10,7 @@ export class PostInformation {
@Column()
text: string;
- @ManyToMany(type => Post, post => post.PostInformation)
- Post: Post[];
+ @ManyToMany(type => Post, post => post.postInformations)
+ posts: Post[];
}
diff --git a/test/integration/examples/sample4-many-to-many/entity/PostMetadata.ts b/test/integration/examples/sample4-many-to-many/entity/PostMetadata.ts
index 283f2d4..9bb0f38 100644
--- a/test/integration/examples/sample4-many-to-many/entity/PostMetadata.ts
+++ b/test/integration/examples/sample4-many-to-many/entity/PostMetadata.ts
@@ -10,7 +10,7 @@ export class PostMetadata {
@Column()
description: string;
- @ManyToMany(type => Post, post => post.PostMetadata)
- Post: Post[];
+ @ManyToMany(type => Post, post => post.postMetadatas)
+ posts: Post[];
}
diff --git a/test/integration/examples/sample4_2-many-to-many_composite_keys/entity/Post.ts b/test/integration/examples/sample4_2-many-to-many_composite_keys/entity/Post.ts
index 8f7e369..a9929bf 100644
--- a/test/integration/examples/sample4_2-many-to-many_composite_keys/entity/Post.ts
+++ b/test/integration/examples/sample4_2-many-to-many_composite_keys/entity/Post.ts
@@ -11,8 +11,8 @@ export class Post {
type: string;
// post has relation with details. not cascades here. means cannot be persisted, updated or removed
- @ManyToMany(type => PostAuthor, author => author.Post)
+ @ManyToMany(type => PostAuthor, author => author.posts)
@JoinTable()
- PostAuthor: PostAuthor[];
+ postAuthors: PostAuthor[];
}
diff --git a/test/integration/examples/sample4_2-many-to-many_composite_keys/entity/PostAuthor.ts b/test/integration/examples/sample4_2-many-to-many_composite_keys/entity/PostAuthor.ts
index b807231..99394f6 100644
--- a/test/integration/examples/sample4_2-many-to-many_composite_keys/entity/PostAuthor.ts
+++ b/test/integration/examples/sample4_2-many-to-many_composite_keys/entity/PostAuthor.ts
@@ -15,7 +15,7 @@ export class PostAuthor {
@Column()
name: string;
- @ManyToMany(type => Post, post => post.PostAuthor)
- Post: Post[];
+ @ManyToMany(type => Post, post => post.postAuthors)
+ posts: Post[];
}
diff --git a/test/integration/github-issues/58/entity/feedextrainfo.ts b/test/integration/github-issues/58/entity/feedextrainfo.ts
index f402b83..7413759 100644
--- a/test/integration/github-issues/58/entity/feedextrainfo.ts
+++ b/test/integration/github-issues/58/entity/feedextrainfo.ts
@@ -4,33 +4,33 @@ import {quests} from "./quests";
@Entity("feedextrainfo")
-@Index("feedExtraInfo_FeedOwnerId_idx",["FeedOwnerId",])
-@Index("feedExtraInfo_ReaderId_idx",["ReaderId",])
-@Index("feedExtraInfo_QuestId_idx",["QuestId",])
+@Index("feedExtraInfo_FeedOwnerId_idx",["feedOwnerId",])
+@Index("feedExtraInfo_ReaderId_idx",["readerId",])
+@Index("feedExtraInfo_QuestId_idx",["questId",])
export class feedextrainfo {
-
+
@OneToOne(type=>users, FeedOwnerId=>FeedOwnerId.feedextrainfo,{primary:true, nullable:false, })
@JoinColumn({ name:'FeedOwnerId'})
- FeedOwnerId:users;
-
+ feedOwnerId:users;
+
+
-
@OneToOne(type=>quests, QuestId=>QuestId.feedextrainfo,{primary:true, nullable:false, })
@JoinColumn({ name:'QuestId'})
- QuestId:quests;
-
+ questId:quests;
+
+
-
@OneToOne(type=>users, ReaderId=>ReaderId.feedextrainfo2,{primary:true, nullable:false, })
@JoinColumn({ name:'ReaderId'})
- ReaderId:users;
-
+ readerId:users;
- @Column("int",{
+
+ @Column("int",{
nullable:false,
name:"MostUpdatedFeedEntryIdUserRead"
})
MostUpdatedFeedEntryIdUserRead:number;
-
+
}
diff --git a/test/integration/github-issues/58/entity/quests.ts b/test/integration/github-issues/58/entity/quests.ts
index f24de9d..acdc56d 100644
--- a/test/integration/github-issues/58/entity/quests.ts
+++ b/test/integration/github-issues/58/entity/quests.ts
@@ -5,16 +5,16 @@ import {feedextrainfo} from "./feedextrainfo";
@Entity("quests")
export class quests {
- @Column("int",{
+ @Column("int",{
nullable:false,
primary:true,
name:"QuestId"
})
QuestId:number;
-
-
- @OneToOne(type=>feedextrainfo, feedextrainfo=>feedextrainfo.QuestId)
+
+
+ @OneToOne(type=>feedextrainfo, feedextrainfo=>feedextrainfo.questId)
feedextrainfo:feedextrainfo;
-
+
}
diff --git a/test/integration/github-issues/58/entity/users.ts b/test/integration/github-issues/58/entity/users.ts
index 88da779..754e1e1 100644
--- a/test/integration/github-issues/58/entity/users.ts
+++ b/test/integration/github-issues/58/entity/users.ts
@@ -5,21 +5,21 @@ import {feedextrainfo} from "./feedextrainfo";
@Entity("users")
export class users {
- @Column("int",{
+ @Column("int",{
nullable:false,
primary:true,
name:"UserId"
})
UserId:number;
-
-
- @OneToOne(type=>feedextrainfo, feedextrainfo=>feedextrainfo.FeedOwnerId)
+
+
+ @OneToOne(type=>feedextrainfo, feedextrainfo=>feedextrainfo.feedOwnerId)
feedextrainfo:feedextrainfo;
-
-
- @OneToOne(type=>feedextrainfo, feedextrainfo2=>feedextrainfo2.ReaderId)
+
+
+ @OneToOne(type=>feedextrainfo, feedextrainfo2=>feedextrainfo2.readerId)
feedextrainfo2:feedextrainfo;
-
+
}
diff --git a/test/integration/github-issues/65/entity/Post.ts b/test/integration/github-issues/65/entity/Post.ts
new file mode 100644
index 0000000..abe57e9
--- /dev/null
+++ b/test/integration/github-issues/65/entity/Post.ts
@@ -0,0 +1,24 @@
+import {Index,Entity, PrimaryColumn, Column, OneToOne, OneToMany, ManyToOne, ManyToMany, JoinColumn, JoinTable} from "typeorm";
+import { PostAuthor } from "./PostAuthor";
+import { PostReader } from "./PostReader";
+
+
+@Entity("Post")
+export class Post {
+
+ @Column("int",{
+ nullable:false,
+ primary:true,
+ name:"Id"
+ })
+ Id:number;
+
+
+
+ @OneToOne(type => PostAuthor, PostAuthor => PostAuthor.Id)
+ postAuthor: PostAuthor;
+
+ @OneToMany(type => PostReader, PostReader => PostReader.Id)
+ postReaders: PostReader[];
+
+}
diff --git a/test/integration/github-issues/65/entity/PostAuthor.ts b/test/integration/github-issues/65/entity/PostAuthor.ts
new file mode 100644
index 0000000..8ff3809
--- /dev/null
+++ b/test/integration/github-issues/65/entity/PostAuthor.ts
@@ -0,0 +1,23 @@
+import {Index,Entity, PrimaryColumn, Column, OneToOne, OneToMany, ManyToOne, ManyToMany, JoinColumn, JoinTable, RelationId} from "typeorm";
+import { Post } from "./Post";
+
+
+@Entity("PostAuthor")
+export class PostAuthor {
+
+ @Column("int",{
+ nullable:false,
+ primary:true,
+ name:"Id"
+ })
+ Id:number;
+
+
+
+ @OneToOne(type => Post, Post => Post.Id)
+ @JoinColumn()
+ post:Post;
+
+ @RelationId((postAuthor: PostAuthor) => postAuthor.post)
+ postId: number;
+}
diff --git a/test/integration/github-issues/65/entity/PostReader.ts b/test/integration/github-issues/65/entity/PostReader.ts
new file mode 100644
index 0000000..1fcc60e
--- /dev/null
+++ b/test/integration/github-issues/65/entity/PostReader.ts
@@ -0,0 +1,21 @@
+import {Index,Entity, PrimaryColumn, Column, OneToOne, OneToMany, ManyToOne, ManyToMany, JoinColumn, JoinTable, RelationId} from "typeorm";
+import { Post } from "./Post";
+
+
+@Entity("PostReader")
+export class PostReader {
+
+ @Column("int",{
+ nullable:false,
+ primary:true,
+ name:"Id"
+ })
+ Id:number;
+
+ @ManyToOne(type => Post, Post => Post.Id)
+ @JoinColumn()
+ post:Post;
+
+ @RelationId((postReader: PostReader) => postReader.post)
+ postId: number[];
+}
diff --git a/test/integration/githubIssues.test.ts b/test/integration/githubIssues.test.ts
index 02edcc0..1c348ed 100644
--- a/test/integration/githubIssues.test.ts
+++ b/test/integration/githubIssues.test.ts
@@ -3,7 +3,7 @@ import "reflect-metadata";
import { createConnection, ConnectionOptions, Connection } from "typeorm";
import fs = require('fs-extra');
import path = require('path')
-import { Engine } from "./../../src/Engine";
+import { Engine } from "../../src/Engine";
import { expect } from "chai";
import * as Sinon from 'sinon'
import { EntityFileToJson } from "../utils/EntityFileToJson";
@@ -78,6 +78,14 @@ describe("GitHub issues", async function () {
break;
}
+ switch (folder) {
+ case '65':
+ engine.Options.relationIds = true;
+ break;
+ default:
+ break;
+ }
+
await engine.createModelFromDatabase()
let filesGenPath = path.resolve(resultsPath, 'entities')
diff --git a/test/integration/integration.test.ts b/test/integration/integration.test.ts
index 1900d8e..d75bb1a 100644
--- a/test/integration/integration.test.ts
+++ b/test/integration/integration.test.ts
@@ -2,7 +2,7 @@ require('dotenv').config()
import "reflect-metadata";
import fs = require('fs-extra');
import path = require('path')
-import { Engine } from "./../../src/Engine";
+import { Engine } from "../../src/Engine";
import { expect } from "chai";
import { EntityFileToJson } from "../utils/EntityFileToJson";
var chai = require('chai');
diff --git a/test/utils/GeneralTestUtils.ts b/test/utils/GeneralTestUtils.ts
index b9b9d0f..b1fa87f 100644
--- a/test/utils/GeneralTestUtils.ts
+++ b/test/utils/GeneralTestUtils.ts
@@ -1,7 +1,7 @@
import * as ts from "typescript";
import { AbstractDriver } from "../../src/drivers/AbstractDriver";
import { MssqlDriver } from "../../src/drivers/MssqlDriver";
-import { PostgresDriver } from "./../../src/drivers/PostgresDriver";
+import { PostgresDriver } from "../../src/drivers/PostgresDriver";
import { MysqlDriver } from "../../src/drivers/MysqlDriver";
import { MariaDbDriver } from "../../src/drivers/MariaDbDriver";
import { OracleDriver } from "../../src/drivers/OracleDriver";
@@ -10,6 +10,8 @@ import { Engine } from "../../src/Engine";
import { createConnection, ConnectionOptions } from "typeorm";
import * as yn from "yn"
import path = require('path')
+import { AbstractNamingStrategy } from "../../src/AbstractNamingStrategy";
+import { NamingStrategy } from "../../src/NamingStrategy";
export async function createMSSQLModels(filesOrgPath: string, resultsPath: string): Promise<Engine> {
@@ -45,6 +47,7 @@ export async function createMSSQLModels(filesOrgPath: string, resultsPath: strin
if (conn.isConnected)
await conn.close()
+ let namingStrategy: AbstractNamingStrategy = new NamingStrategy();
driver = new MssqlDriver();
let engine = new Engine(
@@ -63,7 +66,9 @@ export async function createMSSQLModels(filesOrgPath: string, resultsPath: strin
convertCaseFile: 'none',
convertCaseProperty: 'none',
lazy: false,
- constructor:false
+ constructor: false,
+ namingStrategy: namingStrategy,
+ relationIds:false
});
conn = await createConnection(connOpt)
@@ -110,6 +115,7 @@ export async function createPostgresModels(filesOrgPath: string, resultsPath: st
if (conn.isConnected)
await conn.close()
+ let namingStrategy: AbstractNamingStrategy = new NamingStrategy();
driver = new PostgresDriver();
let engine = new Engine(
@@ -128,7 +134,9 @@ export async function createPostgresModels(filesOrgPath: string, resultsPath: st
convertCaseFile: 'none',
convertCaseProperty: 'none',
lazy: false,
- constructor:false
+ constructor:false,
+ namingStrategy: namingStrategy,
+ relationIds: false
});
conn = await createConnection(connOpt)
@@ -167,6 +175,7 @@ export async function createSQLiteModels(filesOrgPath: string, resultsPath: stri
if (conn.isConnected)
await conn.close()
+ let namingStrategy: AbstractNamingStrategy = new NamingStrategy();
driver = new SqliteDriver();
let engine = new Engine(
@@ -185,7 +194,9 @@ export async function createSQLiteModels(filesOrgPath: string, resultsPath: stri
convertCaseFile: 'none',
convertCaseProperty: 'none',
lazy: false,
- constructor:false
+ constructor:false,
+ namingStrategy: namingStrategy,
+ relationIds: false
});
conn = await createConnection(connOpt)
@@ -222,6 +233,7 @@ export async function createMysqlModels(filesOrgPath: string, resultsPath: strin
if (conn.isConnected)
await conn.close()
+ let namingStrategy: AbstractNamingStrategy = new NamingStrategy();
driver = new MysqlDriver();
let engine = new Engine(
@@ -240,7 +252,9 @@ export async function createMysqlModels(filesOrgPath: string, resultsPath: strin
convertCaseFile: 'none',
convertCaseProperty: 'none',
lazy: false,
- constructor:false
+ constructor:false,
+ namingStrategy: namingStrategy,
+ relationIds: false
});
return engine;
@@ -270,6 +284,7 @@ export async function createMariaDBModels(filesOrgPath: string, resultsPath: str
if (conn.isConnected)
await conn.close()
+ let namingStrategy: AbstractNamingStrategy = new NamingStrategy();
driver = new MariaDbDriver();
let engine = new Engine(
@@ -288,7 +303,9 @@ export async function createMariaDBModels(filesOrgPath: string, resultsPath: str
convertCaseFile: 'none',
convertCaseProperty: 'none',
lazy: false,
- constructor:false
+ constructor:false,
+ namingStrategy: namingStrategy,
+ relationIds: false
});
@@ -321,6 +338,7 @@ export async function createOracleDBModels(filesOrgPath: string, resultsPath: st
if (conn.isConnected)
await conn.close()
+ let namingStrategy: AbstractNamingStrategy = new NamingStrategy();
driver = new OracleDriver();
let engine = new Engine(
@@ -339,7 +357,9 @@ export async function createOracleDBModels(filesOrgPath: string, resultsPath: st
convertCaseFile: 'none',
convertCaseProperty: 'none',
lazy: false,
- constructor:false
+ constructor:false,
+ namingStrategy: namingStrategy,
+ relationIds: false
});
return engine;