ngx - npm Package Compare versions

Comparing version 2.3.0 to 2.4.0

lib/bin/ngx.js

@@ -12,3 +12,3 @@ #!/usr/bin/env node
 
-_commander2.default.version(require('../../package.json').version).usage('<cmd> [options]').option('-v, --nginx-version', 'show nginx version').command('test', 'test nginx config').command('reload', 'reload nginx server').command('start', 'start nginx server').command('stop', 'stop nginx server').command('restart', 'restart (stop and start) nginx server').command('down <ip>:<port>', 'remove a upstream server').command('list [upstream]', 'list all upstreams').parse(process.argv);
+_commander2.default.version(require('../../package.json').version).usage('<cmd> [options]').option('-v, --nginx-version', 'show nginx version').command('build', 'build nginx config').command('test', 'test nginx config').command('reload', 'reload nginx server').command('start', 'start nginx server').command('stop', 'stop nginx server').command('restart', 'restart (stop and start) nginx server').command('down <ip>:<port>', 'remove a upstream server').command('list [upstream]', 'list all upstreams').parse(process.argv);
 
@@ -15,0 +15,0 @@ if (_commander2.default.nginxVersion) {

lib/builder.js

@@ -50,3 +50,4 @@ 'use strict';
         config = _ref2.data,
-        entry = _ref2.entry;
+        entry = _ref2.entry,
+        map = _ref2.map;
     var absEntry, includeServer, servers, data;
@@ -75,3 +76,4 @@ return _regenerator2.default.wrap(function _callee2$(_context2) {
                           data: data,
-                          file: entry
+                          file: entry,
+                          map: map
                         });
@@ -117,2 +119,3 @@ _context.next = 5;
               file: entry,
+              map: map,
               isEntry: true
@@ -119,0 +122,0 @@ }).transform();

lib/compiler.js

@@ -84,2 +84,3 @@ 'use strict';
         src = _ref.src,
+        map = _ref.map,
         isEntry = _ref.isEntry;
@@ -93,2 +94,3 @@ (0, _classCallCheck3.default)(this, Compiler);
     this.isEntry = isEntry;
+    this.map = map;
 
@@ -164,3 +166,3 @@ this.file = file;
                 case 0:
-                  return _context.abrupt('return', name + ' ' + _this2._resolve(p).srcpath);
+                  return _context.abrupt('return', name + ' ' + _this2.map(_this2._resolve(p).srcpath));
 
@@ -203,3 +205,3 @@ case 1:
                 case 4:
-                  return _context2.abrupt('return', name + ' ' + destpath);
+                  return _context2.abrupt('return', name + ' ' + _this3.map(destpath));
 
@@ -305,3 +307,3 @@ case 5:
       var _ref5 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee4(file) {
-        var data, sub, _ref6, compiledDest;
+        var data, dest, src, map, sub, _ref6, compiledDest;
 
@@ -313,7 +315,9 @@ return _regenerator2.default.wrap(function _callee4$(_context4) {
                 data = this._cleanData(this.data);
+                dest = this.dest, src = this.src, map = this.map;
                 sub = new Compiler({
                   data: data,
                   file: file,
-                  dest: this.dest,
-                  src: this.src
+                  dest: dest,
+                  src: src,
+                  map: map
                 });
@@ -324,11 +328,11 @@
                 // Or we should use the new compiled file
-                _context4.next = 5;
+                _context4.next = 6;
                 return sub.transform();
 
-              case 5:
+              case 6:
                 _ref6 = _context4.sent;
                 compiledDest = _ref6.destpath;
-                return _context4.abrupt('return', 'include ' + compiledDest);
+                return _context4.abrupt('return', 'include ' + this.map(compiledDest));
 
-              case 8:
+              case 9:
               case 'end':
@@ -335,0 +339,0 @@ return _context4.stop();

lib/index.js

@@ -31,3 +31,3 @@ 'use strict';
 
-    var _ref3, src, dest, preset, entry, env, data, error;
+    var _ref3, src, dest, preset, entry, env, map, data, error;
 
@@ -51,10 +51,11 @@ return _regenerator2.default.wrap(function _callee$(_context) {
             env = _ref3.env;
-            _context.next = 10;
+            map = _ref3.map;
+            _context.next = 11;
             return (0, _file.readYaml)(preset);
 
-          case 10:
+          case 11:
             data = _context.sent;
 
             if (!(!data.user && !user)) {
-              _context.next = 14;
+              _context.next = 15;
               break;
@@ -66,3 +67,3 @@ }
 
-          case 14:
+          case 15:
 
@@ -81,6 +82,7 @@ // cli user has higher priority
               preset: preset,
-              entry: entry
+              entry: entry,
+              map: map
             });
 
-          case 17:
+          case 18:
           case 'end':
@@ -87,0 +89,0 @@ return _context.stop();

lib/option-manager.js

 'use strict';
 
+var _keys = require('babel-runtime/core-js/object/keys');
+
+var _keys2 = _interopRequireDefault(_keys);
+
+var _create = require('babel-runtime/core-js/object/create');
+
+var _create2 = _interopRequireDefault(_create);
+
 var _promise = require('babel-runtime/core-js/promise');
@@ -33,2 +41,4 @@
 
+var _preSuf = require('pre-suf');
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -195,3 +205,3 @@
       var _ref4 = (0, _asyncToGenerator3.default)(_regenerator2.default.mark(function _callee3() {
-        var _ref5, rc, filepath, preset, src, dest, entry, relativeEntry;
+        var _ref5, rc, filepath, preset, src, dest, entry, relativeEntry, volumes, _ref6, map;
 
@@ -228,2 +238,4 @@ return _regenerator2.default.wrap(function _callee3$(_context3) {
               case 14:
+                volumes = this._parseVolumes();
+                _ref6 = new Mapper(volumes), map = _ref6.map;
                 return _context3.abrupt('return', {
@@ -243,6 +255,7 @@ // `path` absolute path, the unbuilt source files
                   entry: relativeEntry,
-                  env: this.env
+                  env: this.env,
+                  map: map
                 });
 
-              case 15:
+              case 17:
               case 'end':
@@ -261,3 +274,21 @@ return _context3.stop();
     }()
+  }, {
+    key: '_parseVolumes',
+    value: function _parseVolumes() {
+      var _this = this;
 
+      var volumes = this._rc.volumes;
+
+      if (!volumes) {
+        return {};
+      }
+
+      var real = (0, _create2.default)(null);
+      (0, _keys2.default)(volumes).forEach(function (from) {
+        real[_this._resolveToBase(from)] = (0, _preSuf.removeEnding)(volumes[from], '/');
+      });
+
+      return real;
+    }
+
     // Resolve a key from rc
@@ -272,3 +303,3 @@ // - rc: resolve with rcPath
       if (key in rc) {
-        return _path2.default.resolve(this._rcBase, rc[key]);
+        return this._resolveToBase(rc[key]);
       }
@@ -279,2 +310,8 @@
   }, {
+    key: '_resolveToBase',
+    value: function _resolveToBase(filepath) {
+      var resolved = _path2.default.resolve(this._rcBase, filepath);
+      return (0, _preSuf.removeEnding)(resolved, '/');
+    }
+  }, {
     key: '_presetFile',
@@ -284,2 +321,3 @@ value: function _presetFile() {
 
+
       if (!preset) {
@@ -301,2 +339,36 @@ throw new Error('preset is not defined');
   return OptionManager;
+}();
+
+var justReturn = function justReturn(x) {
+  return x;
+};
+
+var Mapper = function () {
+  function Mapper(mapper) {
+    (0, _classCallCheck3.default)(this, Mapper);
+
+    this._mapper = mapper;
+    this._paths = (0, _keys2.default)(mapper);
+
+    this.map = !this._paths.length ? justReturn : this.map.bind(this);
+  }
+
+  (0, _createClass3.default)(Mapper, [{
+    key: 'map',
+    value: function map(path) {
+      var index = this._paths.findIndex(function (from) {
+        if (path.indexOf(from) === 0) {
+          return true;
+        }
+      });
+
+      if (!~index) {
+        return path;
+      }
+
+      var from = this._paths[index];
+      return this._mapper[from] + path.slice(from.length);
+    }
+  }]);
+  return Mapper;
 }();

package.json

 {
   "name": "ngx",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "The Data-driven nginx configuration manager",
@@ -13,3 +13,4 @@ "bin": {
     "ngx-list": "lib/bin/list.js",
-    "ngx-down": "lib/bin/down.js"
+    "ngx-down": "lib/bin/down.js",
+    "ngx-build": "lib/bin/build.js"
   },
@@ -51,11 +52,11 @@ "scripts": {
   "devDependencies": {
-    "ava": "^0.16.0",
-    "babel-cli": "^6.16.0",
+    "ava": "^0.25.0",
+    "babel-cli": "^6.26.0",
     "babel-plugin-syntax-trailing-function-commas": "^6.13.0",
     "babel-plugin-transform-async-to-generator": "^6.22.0",
     "babel-plugin-transform-class-properties": "^6.16.0",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.16.0",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "babel-plugin-transform-exponentiation-operator": "^6.8.0",
     "babel-plugin-transform-inline-environment-variables": "^6.8.0",
-    "babel-plugin-transform-object-rest-spread": "^6.16.0",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
@@ -66,12 +67,13 @@ "babel-preset-es2015": "^6.16.0"
     "code-stringify": "^1.2.3",
-    "commander": "^2.11.0",
-    "cross-spawn": "^5.1.0",
-    "debug": "^2.6.3",
-    "fs-extra": "^3.0.1",
-    "globby": "^6.1.0",
-    "is-glob": "^3.1.0",
-    "js-yaml": "^3.9.0",
+    "commander": "^2.14.1",
+    "cross-spawn": "^6.0.4",
+    "debug": "^3.1.0",
+    "fs-extra": "^5.0.0",
+    "globby": "^8.0.0",
+    "is-glob": "^4.0.0",
+    "js-yaml": "^3.10.0",
     "json5": "^0.5.1",
-    "make-array": "^1.0.1",
+    "make-array": "^1.0.3",
     "once": "^1.4.0",
+    "pre-suf": "^1.0.4",
     "typo": "^1.0.6",
@@ -78,0 +80,0 @@ "typo-chalk": "^1.0.0"

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

182672

increased by1.33%

Number of package files

59

increased by1.72%

Lines of code

1766

increased by4.07%

Worsened metrics

Dependency count

14

increased by7.69%

Dependency changes

• + Addedpre-suf@^1.0.4

• + Added@mrmlnc/readdir-enhanced@2.2.1(transitive)

• + Added@nodelib/fs.stat@1.1.3(transitive)

• + Addedarr-diff@4.0.0(transitive)

• + Addedarr-flatten@1.1.0(transitive)

• + Addedarr-union@3.1.0(transitive)

• + Addedarray-unique@0.3.2(transitive)

• + Addedarrify@1.0.1(transitive)

• + Addedassign-symbols@1.0.0(transitive)

• + Addedatob@2.1.2(transitive)

• + Addedbase@0.11.2(transitive)

• + Addedbraces@2.3.2(transitive)

• + Addedcache-base@1.0.1(transitive)

• + Addedcall-me-maybe@1.0.2(transitive)

• + Addedclass-utils@0.3.6(transitive)

• + Addedcollection-visit@1.0.0(transitive)

• + Addedcomponent-emitter@1.3.1(transitive)

• + Addedcopy-descriptor@0.1.1(transitive)

• + Addedcross-spawn@6.0.5(transitive)

• + Addeddebug@3.2.7(transitive)

• + Addeddecode-uri-component@0.2.2(transitive)

• + Addeddefine-property@0.2.51.0.02.0.2(transitive)

• + Addeddir-glob@2.0.0(transitive)

• + Addedexpand-brackets@2.1.4(transitive)

• + Addedextend-shallow@3.0.2(transitive)

• + Addedextglob@2.0.4(transitive)

• + Addedfast-glob@2.2.7(transitive)

• + Addedfill-range@4.0.0(transitive)

• + Addedfor-in@1.0.2(transitive)

• + Addedfragment-cache@0.2.1(transitive)

• + Addedfs-extra@5.0.0(transitive)

• + Addedfunction-bind@1.1.2(transitive)

• + Addedget-value@2.0.6(transitive)

• + Addedglob-parent@3.1.0(transitive)

• + Addedglob-to-regexp@0.3.0(transitive)

• + Addedglobby@8.0.2(transitive)

• + Addedhas-value@0.3.11.0.0(transitive)

• + Addedhas-values@0.1.41.0.0(transitive)

• + Addedhasown@2.0.2(transitive)

• + Addedignore@3.3.10(transitive)

• + Addedis-accessor-descriptor@1.0.1(transitive)

• + Addedis-buffer@1.1.6(transitive)

• + Addedis-data-descriptor@1.0.1(transitive)

• + Addedis-descriptor@0.1.71.0.3(transitive)

• + Addedis-extendable@1.0.1(transitive)

• + Addedis-glob@4.0.3(transitive)

• + Addedis-number@3.0.0(transitive)

• + Addedis-plain-object@2.0.4(transitive)

• + Addedis-windows@1.0.2(transitive)

• + Addedisarray@1.0.0(transitive)

• + Addedisobject@2.1.03.0.1(transitive)

• + Addedjsonfile@4.0.0(transitive)

• + Addedkind-of@3.2.24.0.06.0.3(transitive)

• + Addedmap-cache@0.2.2(transitive)

• + Addedmap-visit@1.0.0(transitive)

• + Addedmerge2@1.4.1(transitive)

• + Addedmicromatch@3.1.10(transitive)

• + Addedmixin-deep@1.3.2(transitive)

• + Addedms@2.1.3(transitive)

• + Addednanomatch@1.2.13(transitive)

• + Addednice-try@1.0.5(transitive)

• + Addedobject-copy@0.1.0(transitive)

• + Addedobject-visit@1.0.1(transitive)

• + Addedobject.pick@1.3.0(transitive)

• + Addedpascalcase@0.1.1(transitive)

• + Addedpath-dirname@1.0.2(transitive)

• + Addedpath-key@2.0.1(transitive)

• + Addedpath-type@3.0.0(transitive)

• + Addedpify@3.0.0(transitive)

• + Addedposix-character-classes@0.1.1(transitive)

• + Addedpre-suf@1.1.1(transitive)

• + Addedregex-not@1.0.2(transitive)

• + Addedrepeat-element@1.1.4(transitive)

• + Addedrepeat-string@1.6.1(transitive)

• + Addedresolve-url@0.2.1(transitive)

• + Addedret@0.1.15(transitive)

• + Addedsafe-regex@1.1.0(transitive)

• + Addedsemver@5.7.2(transitive)

• + Addedset-value@2.0.1(transitive)

• + Addedslash@1.0.0(transitive)

• + Addedsnapdragon@0.8.2(transitive)

• + Addedsnapdragon-node@2.1.1(transitive)

• + Addedsnapdragon-util@3.0.1(transitive)

• + Addedsource-map@0.5.7(transitive)

• + Addedsource-map-resolve@0.5.3(transitive)

• + Addedsource-map-url@0.4.1(transitive)

• + Addedsplit-string@3.1.0(transitive)

• + Addedstatic-extend@0.1.2(transitive)

• + Addedto-object-path@0.3.0(transitive)

• + Addedto-regex@3.0.2(transitive)

• + Addedto-regex-range@2.1.1(transitive)

• + Addedunion-value@1.0.1(transitive)

• + Addedunset-value@1.0.0(transitive)

• + Addedurix@0.1.0(transitive)

• + Addeduse@3.1.1(transitive)

• - Removedcross-spawn@5.1.0(transitive)

• - Removedfs-extra@3.0.1(transitive)

• - Removedglobby@6.1.0(transitive)

• - Removedjsonfile@3.0.1(transitive)

• - Removedlru-cache@4.1.5(transitive)

• - Removedobject-assign@4.1.1(transitive)

• - Removedpify@2.3.0(transitive)

• - Removedpinkie@2.0.4(transitive)

• - Removedpinkie-promise@2.0.1(transitive)

• - Removedpseudomap@1.0.2(transitive)

• - Removedyallist@2.1.2(transitive)

• Updatedcommander@^2.14.1

• Updatedcross-spawn@^6.0.4

• Updateddebug@^3.1.0

• Updatedfs-extra@^5.0.0

• Updatedglobby@^8.0.0

• Updatedis-glob@^4.0.0

• Updatedjs-yaml@^3.10.0

• Updatedmake-array@^1.0.3