@jujulego/jill 1.1.16 → 1.2.0

package/dist/main.js

@@ -1,151 +1,55 @@
 "use strict";
 
-var _helpers = require("yargs/helpers");
-
-var _yargs = _interopRequireDefault(require("yargs"));
-
-var _each = require("./commands/each");
+var _jillCommon = require("@jujulego/jill-common");
+
+var _core = require("./core.plugin");
+
+var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
 
-var _info = require("./commands/info");
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
 
-var _list = require("./commands/list");
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
 
-var _run = require("./commands/run");
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
 
-var _command = require("./myr/command");
+// Class
+class JillApp extends _jillCommon.Application {
+  constructor() {
+    super(...arguments); // Attributes
 
-var _watch = require("./myr/watch");
+    this.name = 'jill';
+    this.corePlugin = _core.corePlugin;
+  }
 
-var _wrapper = require("./wrapper");
+} // Bootstrap
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// Bootstrap
-(async () => {
-  // Options
-  await (0, _yargs.default)((0, _helpers.hideBin)(process.argv)).scriptName('jill').option('project', {
-    alias: 'p',
-    type: 'string',
-    description: 'Project root directory'
-  }).option('package-manager', {
-    choices: ['yarn', 'npm'],
-    type: 'string',
-    description: 'Force package manager'
-  }).option('verbose', {
-    alias: 'v',
-    type: 'count',
-    description: 'Set verbosity level (1 for verbose, 2 for debug)'
-  }).parserConfiguration({
-    'populate--': true
-  }).command(['list', 'ls'], 'List workspaces', {
-    private: {
-      type: 'boolean',
-      group: 'Filters:',
-      desc: 'Print only private workspaces'
-    },
-    'with-script': {
-      type: 'array',
-      group: 'Filters:',
-      desc: 'Print only workspaces having the given script'
-    },
-    affected: {
-      alias: 'a',
-      type: 'string',
-      coerce: rev => rev === '' ? 'master' : rev,
-      group: 'Affected:',
-      desc: 'Print only affected workspaces towards given git revision. If no revision is given, it will check towards master.\n' + 'Replaces %name by workspace name.'
-    },
-    'affected-rev-sort': {
-      type: 'string',
-      group: 'Affected:',
-      desc: 'Sort applied to git tag / git branch command'
-    },
-    'affected-rev-fallback': {
-      type: 'string',
-      default: 'master',
-      group: 'Affected:',
-      desc: 'Fallback revision, used if no revision matching the given format is found'
-    },
-    attrs: {
-      type: 'array',
-      choices: ['name', 'version', 'root', 'slug'],
-      group: 'Format:',
-      desc: 'Select printed attributes'
-    },
-    headers: {
-      type: 'boolean',
-      group: 'Format:',
-      desc: 'Prints columns headers'
-    },
-    long: {
-      alias: 'l',
-      type: 'boolean',
-      conflicts: 'attrs',
-      group: 'Format:',
-      desc: 'Prints name, version and root of all workspaces'
-    },
-    json: {
-      type: 'boolean',
-      group: 'Format:',
-      desc: 'Prints data as a JSON array'
-    }
-  }, (0, _wrapper.commandHandler)(_list.listCommand)).command('info', 'Print workspace data', {
-    workspace: {
-      alias: 'w',
-      type: 'string',
-      desc: 'Workspace to use'
-    }
-  }, (0, _wrapper.commandHandler)(_info.infoCommand)).command('run <script>', 'Run script inside workspace', {
-    workspace: {
-      alias: 'w',
-      type: 'string',
-      desc: 'Workspace to use'
-    },
-    'deps-mode': {
-      choice: ['all', 'prod', 'none'],
-      default: 'all',
-      desc: 'Dependency selection mode:\n' + ' - all = dependencies AND devDependencies\n' + ' - prod = dependencies\n' + ' - none = nothing'
-    }
-  }, (0, _wrapper.commandHandler)(_run.runCommand)).command('each <script>', 'Run script on selected workspaces', {
-    'deps-mode': {
-      choice: ['all', 'prod', 'none'],
-      default: 'all',
-      desc: 'Dependency selection mode:\n' + ' - all = dependencies AND devDependencies\n' + ' - prod = dependencies\n' + ' - none = nothing'
-    },
-    private: {
-      type: 'boolean',
-      group: 'Filters:',
-      desc: 'Print only private workspaces'
-    },
-    affected: {
-      alias: 'a',
-      type: 'string',
-      coerce: rev => rev === '' ? 'master' : rev,
-      group: 'Affected:',
-      desc: 'Print only affected workspaces towards given git revision. If no revision is given, it will check towards master.\n' + 'Replaces %name by workspace name.'
-    },
-    'affected-rev-sort': {
-      type: 'string',
-      group: 'Affected:',
-      desc: 'Sort applied to git tag / git branch command'
-    },
-    'affected-rev-fallback': {
-      type: 'string',
-      default: 'master',
-      group: 'Affected:',
-      desc: 'Fallback revision, used if no revision matching the given format is found'
-    }
-  }, (0, _wrapper.commandHandler)(_each.eachCommand)).command('myr', 'Interact with myr server', _command.myrCommand).command('watch <script>', 'Run script inside workspace and watch over deps', {
-    daemon: {
-      alias: 'd',
-      boolean: true,
-      default: false,
-      desc: 'Run watch script also in background'
-    },
-    workspace: {
-      alias: 'w',
-      type: 'string',
-      desc: 'Workspace to use'
-    }
-  }, (0, _wrapper.commandHandler)(_watch.watchCommand)).demandCommand(1).help().example('$0 list -a', 'List all affected workspaces towards master branch').example('$0 list --no-private', 'List all public workspaces').parse();
-})();
+(() => __awaiter(void 0, void 0, void 0, function* () {
+  const app = new JillApp();
+  yield app.parse();
+}))();
+//# sourceMappingURL=main.js.map

package/dist/main.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["main.ts","main.js"],"names":["__awaiter","thisArg","_arguments","P","generator","adopt","value","resolve","Promise","reject","fulfilled","step","next","e","rejected","result","done","then","apply","JillApp","Application","constructor","arguments","name","corePlugin","app","parse"],"mappings":";;AAAA;;AAEA;;ACFA,IAAIA,SAAS,GAAI,UAAQ,SAAKA,SAAd,IAA4B,UAAUC,OAAV,EAAmBC,UAAnB,EAA+BC,CAA/B,EAAkCC,SAAlC,EAA6C;AACrF,WAASC,KAAT,CAAeC,KAAf,EAAsB;AAAE,WAAOA,KAAK,YAAYH,CAAjB,GAAqBG,KAArB,GAA6B,IAAIH,CAAJ,CAAM,UAAUI,OAAV,EAAmB;AAAEA,MAAAA,OAAO,CAACD,KAAD,CAAP;AAAiB,KAA5C,CAApC;AAAoF;;AAC5G,SAAO,KAAKH,CAAC,KAAKA,CAAC,GAAGK,OAAT,CAAN,EAAyB,UAAUD,OAAV,EAAmBE,MAAnB,EAA2B;AACvD,aAASC,SAAT,CAAmBJ,KAAnB,EAA0B;AAAE,UAAI;AAAEK,QAAAA,IAAI,CAACP,SAAS,CAACQ,IAAV,CAAeN,KAAf,CAAD,CAAJ;AAA8B,OAApC,CAAqC,OAAOO,CAAP,EAAU;AAAEJ,QAAAA,MAAM,CAACI,CAAD,CAAN;AAAY;AAAE;;AAC3F,aAASC,QAAT,CAAkBR,KAAlB,EAAyB;AAAE,UAAI;AAAEK,QAAAA,IAAI,CAACP,SAAS,CAAC,OAAD,CAAT,CAAmBE,KAAnB,CAAD,CAAJ;AAAkC,OAAxC,CAAyC,OAAOO,CAAP,EAAU;AAAEJ,QAAAA,MAAM,CAACI,CAAD,CAAN;AAAY;AAAE;;AAC9F,aAASF,IAAT,CAAcI,MAAd,EAAsB;AAAEA,MAAAA,MAAM,CAACC,IAAP,GAAcT,OAAO,CAACQ,MAAM,CAACT,KAAR,CAArB,GAAsCD,KAAK,CAACU,MAAM,CAACT,KAAR,CAAL,CAAoBW,IAApB,CAAyBP,SAAzB,EAAoCI,QAApC,CAAtC;AAAsF;;AAC9GH,IAAAA,IAAI,CAAC,CAACP,SAAS,GAAGA,SAAS,CAACc,KAAV,CAAgBjB,OAAhB,EAAyBC,UAAU,IAAI,EAAvC,CAAb,EAAyDU,IAAzD,EAAD,CAAJ;AACH,GALM,CAAP;AAMH,CARD;;ADIA;AACA,MAAMO,OAAN,SAAsBC,uBAAtB,CAAiC;AAAjCC,EAAAA,WAAA,GAAA;ACSQ,UAAM,GAAGC,SAAT,EDTR,CACE;;AACS,SAAAC,IAAA,GAAO,MAAP;AACA,SAAAC,UAAA,GAAaA,gBAAb;AACV;;AAJgC,C,CAMjC;;;AACA,CAAC,MAAWxB,SAAA,CAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,KAAA,CAAA,EAAA,aAAA;AACV,QAAMyB,GAAG,GAAG,IAAIN,OAAJ,EAAZ;AACA,QAAMM,GAAG,CAACC,KAAJ,EAAN;AACD,CAHW,CAAZ","file":"main.js","sourcesContent":["import { Application } from '@jujulego/jill-common';\n\nimport { corePlugin } from './core.plugin';\n\n// Class\nclass JillApp extends Application {\n  // Attributes\n  readonly name = 'jill';\n  readonly corePlugin = corePlugin;\n}\n\n// Bootstrap\n(async () => {\n  const app = new JillApp();\n  await app.parse();\n})();\n","var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n    return new (P || (P = Promise))(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n        step((generator = generator.apply(thisArg, _arguments || [])).next());\n    });\n};\nimport { Application } from '@jujulego/jill-common';\nimport { corePlugin } from './core.plugin';\n// Class\nclass JillApp extends Application {\n    constructor() {\n        super(...arguments);\n        // Attributes\n        this.name = 'jill';\n        this.corePlugin = corePlugin;\n    }\n}\n// Bootstrap\n(() => __awaiter(void 0, void 0, void 0, function* () {\n    const app = new JillApp();\n    yield app.parse();\n}))();"]}

package/dist/task-logger.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"sources":["task-logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAGpD,oBAAY,eAAe,GAAG,eAAe,GAAG,aAAa,GAAG,MAAM,GAAG,SAAS,CAAC;AAGnF,qBAAa,UAAU;IAErB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAKvB;IAGF,OAAO,CAAC,eAAe;IASvB,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,gBAAgB;IAYxB,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAK3B,EAAE,CAAC,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI;IACnE,EAAE,CAAC,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,MAAM,GAAG,IAAI;IAC7D,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,MAAM,GAAG,IAAI;IACtD,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,MAAM,GAAG,IAAI;CAI1D","file":"task-logger.d.ts","sourcesContent":["import { transport } from '@jujulego/jill-common';\nimport { Task, TaskSet } from '@jujulego/jill-core';\n\n// Types\nexport type TaskLoggerState = 'spin-multiple' | 'spin-simple' | 'fail' | 'succeed';\n\n// Class\nexport class TaskLogger {\n  // Attributes\n  private readonly _running = new Set<Task>();\n  private readonly _formats = {\n    'spin-multiple': (count: number) => `Building ${count} workspaces ...`,\n    'spin-simple': (tsk: Task) => `Building ${tsk.context.workspace?.name} ...`,\n    'fail': (tsk: Task) => `Failed to build ${tsk.context.workspace?.name}`,\n    'succeed': (tsk: Task) => `${tsk.context.workspace?.name} built`,\n  };\n\n  // Methods\n  private _refreshSpinner() {\n    if (this._running.size > 1) {\n      transport.spin(this._formats['spin-multiple'](this._running.size));\n    } else if (this._running.size > 0) {\n      const tsk = this._running.values().next().value;\n      transport.spin(this._formats['spin-simple'](tsk));\n    }\n  }\n\n  private _handleStarted(task: Task) {\n    this._running.add(task);\n\n    this._refreshSpinner();\n  }\n\n  private _handleCompleted(task: Task) {\n    this._running.delete(task);\n\n    if (task.status === 'failed') {\n      transport.fail(this._formats['fail'](task));\n    } else {\n      transport.succeed(this._formats['succeed'](task));\n    }\n\n    this._refreshSpinner();\n  }\n\n  connect(set: TaskSet): void {\n    set.on('started', (task) => this._handleStarted(task));\n    set.on('completed', (task) => this._handleCompleted(task));\n  }\n\n  on(state: 'spin-multiple', format: (count: number) => string): void;\n  on(state: 'spin-simple', format: (tsk: Task) => string): void;\n  on(state: 'fail', format: (tsk: Task) => string): void;\n  on(state: 'succeed', format: (tsk: Task) => string): void;\n  on(state: TaskLoggerState, format: (arg: never) => string): void {\n    this._formats[state] = format;\n  }\n}\n"]}

package/dist/task-logger.js

@@ -5,31 +5,41 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.TaskLogger = void 0;
 
-var _logger = require("./logger");
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+var _jillCommon = require("@jujulego/jill-common");
 
 // Class
 class TaskLogger {
   constructor() {
-    _defineProperty(this, "_running", new Set());
-
-    _defineProperty(this, "_formats", {
+    // Attributes
+    this._running = new Set();
+    this._formats = {
       'spin-multiple': count => `Building ${count} workspaces ...`,
-      'spin-simple': tsk => `Building ${tsk.context.workspace?.name} ...`,
-      'fail': tsk => `Failed to build ${tsk.context.workspace?.name}`,
-      'succeed': tsk => `${tsk.context.workspace?.name} built`
-    });
-  }
+      'spin-simple': tsk => {
+        var _a;
+
+        return `Building ${(_a = tsk.context.workspace) === null || _a === void 0 ? void 0 : _a.name} ...`;
+      },
+      'fail': tsk => {
+        var _a;
+
+        return `Failed to build ${(_a = tsk.context.workspace) === null || _a === void 0 ? void 0 : _a.name}`;
+      },
+      'succeed': tsk => {
+        var _a;
+
+        return `${(_a = tsk.context.workspace) === null || _a === void 0 ? void 0 : _a.name} built`;
+      }
+    };
+  } // Methods
+
 
-  // Methods
   _refreshSpinner() {
     if (this._running.size > 1) {
-      _logger.logger.spin(this._formats['spin-multiple'](this._running.size));
+      _jillCommon.transport.spin(this._formats['spin-multiple'](this._running.size));
     } else if (this._running.size > 0) {
       const tsk = this._running.values().next().value;
 
-      _logger.logger.spin(this._formats['spin-simple'](tsk));
+      _jillCommon.transport.spin(this._formats['spin-simple'](tsk));
     }
   }
 
@@ -43,9 +53,9 @@ class TaskLogger {
     this._running.delete(task);
 
     if (task.status === 'failed') {
-      _logger.logger.fail(this._formats['fail'](task));
+      _jillCommon.transport.fail(this._formats['fail'](task));
     } else {
-      _logger.logger.succeed(this._formats['succeed'](task));
+      _jillCommon.transport.succeed(this._formats['succeed'](task));
     }
 
     this._refreshSpinner();
@@ -62,4 +72,5 @@ class TaskLogger {
 
 }
 
-exports.TaskLogger = TaskLogger;
+exports.TaskLogger = TaskLogger;
+//# sourceMappingURL=task-logger.js.map

package/dist/task-logger.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["task-logger.ts"],"names":["TaskLogger","constructor","_running","Set","_formats","count","tsk","_a","context","workspace","name","_refreshSpinner","size","transport","spin","values","next","value","_handleStarted","task","add","_handleCompleted","delete","status","fail","succeed","connect","set","on","state","format"],"mappings":";;;;;;;AAAA;;AAMA;AACM,MAAOA,UAAP,CAAiB;AAAvBC,EAAAA,WAAA,GAAA;AACE;AACiB,SAAAC,QAAA,GAAW,IAAIC,GAAJ,EAAX;AACA,SAAAC,QAAA,GAAW;AAC1B,uBAAkBC,KAAD,IAAmB,YAAYA,KAAK,iBAD3B;AAE1B,qBAAgBC,GAAD,IAAc;AAAA,YAAAC,EAAA;;AAAC,eAAA,YAAY,CAAAA,EAAA,GAAAD,GAAG,CAACE,OAAJ,CAAYC,SAAZ,MAAqB,IAArB,IAAqBF,EAAA,KAAA,KAAA,CAArB,GAAqB,KAAA,CAArB,GAAqBA,EAAA,CAAEG,IAAI,MAAvC;AAA6C,OAFjD;AAG1B,cAASJ,GAAD,IAAc;AAAA,YAAAC,EAAA;;AAAC,eAAA,mBAAmB,CAAAA,EAAA,GAAAD,GAAG,CAACE,OAAJ,CAAYC,SAAZ,MAAqB,IAArB,IAAqBF,EAAA,KAAA,KAAA,CAArB,GAAqB,KAAA,CAArB,GAAqBA,EAAA,CAAEG,IAAI,EAA9C;AAAgD,OAH7C;AAI1B,iBAAYJ,GAAD,IAAc;AAAA,YAAAC,EAAA;;AAAC,eAAA,GAAG,CAAAA,EAAA,GAAAD,GAAG,CAACE,OAAJ,CAAYC,SAAZ,MAAqB,IAArB,IAAqBF,EAAA,KAAA,KAAA,CAArB,GAAqB,KAAA,CAArB,GAAqBA,EAAA,CAAEG,IAAI,QAA9B;AAAsC;AAJtC,KAAX;AA+ClB,GAlDsB,CAUrB;;;AACQC,EAAAA,eAAe,GAAA;AACrB,QAAI,KAAKT,QAAL,CAAcU,IAAd,GAAqB,CAAzB,EAA4B;AAC1BC,4BAAUC,IAAV,CAAe,KAAKV,QAAL,CAAc,eAAd,EAA+B,KAAKF,QAAL,CAAcU,IAA7C,CAAf;AACD,KAFD,MAEO,IAAI,KAAKV,QAAL,CAAcU,IAAd,GAAqB,CAAzB,EAA4B;AACjC,YAAMN,GAAG,GAAG,KAAKJ,QAAL,CAAca,MAAd,GAAuBC,IAAvB,GAA8BC,KAA1C;;AACAJ,4BAAUC,IAAV,CAAe,KAAKV,QAAL,CAAc,aAAd,EAA6BE,GAA7B,CAAf;AACD;AACF;;AAEOY,EAAAA,cAAc,CAACC,IAAD,EAAW;AAC/B,SAAKjB,QAAL,CAAckB,GAAd,CAAkBD,IAAlB;;AAEA,SAAKR,eAAL;AACD;;AAEOU,EAAAA,gBAAgB,CAACF,IAAD,EAAW;AACjC,SAAKjB,QAAL,CAAcoB,MAAd,CAAqBH,IAArB;;AAEA,QAAIA,IAAI,CAACI,MAAL,KAAgB,QAApB,EAA8B;AAC5BV,4BAAUW,IAAV,CAAe,KAAKpB,QAAL,CAAc,MAAd,EAAsBe,IAAtB,CAAf;AACD,KAFD,MAEO;AACLN,4BAAUY,OAAV,CAAkB,KAAKrB,QAAL,CAAc,SAAd,EAAyBe,IAAzB,CAAlB;AACD;;AAED,SAAKR,eAAL;AACD;;AAEDe,EAAAA,OAAO,CAACC,GAAD,EAAa;AAClBA,IAAAA,GAAG,CAACC,EAAJ,CAAO,SAAP,EAAmBT,IAAD,IAAU,KAAKD,cAAL,CAAoBC,IAApB,CAA5B;AACAQ,IAAAA,GAAG,CAACC,EAAJ,CAAO,WAAP,EAAqBT,IAAD,IAAU,KAAKE,gBAAL,CAAsBF,IAAtB,CAA9B;AACD;;AAMDS,EAAAA,EAAE,CAACC,KAAD,EAAyBC,MAAzB,EAAuD;AACvD,SAAK1B,QAAL,CAAcyB,KAAd,IAAuBC,MAAvB;AACD;;AAjDoB","file":"task-logger.js","sourcesContent":["import { transport } from '@jujulego/jill-common';\nimport { Task, TaskSet } from '@jujulego/jill-core';\n\n// Types\nexport type TaskLoggerState = 'spin-multiple' | 'spin-simple' | 'fail' | 'succeed';\n\n// Class\nexport class TaskLogger {\n  // Attributes\n  private readonly _running = new Set<Task>();\n  private readonly _formats = {\n    'spin-multiple': (count: number) => `Building ${count} workspaces ...`,\n    'spin-simple': (tsk: Task) => `Building ${tsk.context.workspace?.name} ...`,\n    'fail': (tsk: Task) => `Failed to build ${tsk.context.workspace?.name}`,\n    'succeed': (tsk: Task) => `${tsk.context.workspace?.name} built`,\n  };\n\n  // Methods\n  private _refreshSpinner() {\n    if (this._running.size > 1) {\n      transport.spin(this._formats['spin-multiple'](this._running.size));\n    } else if (this._running.size > 0) {\n      const tsk = this._running.values().next().value;\n      transport.spin(this._formats['spin-simple'](tsk));\n    }\n  }\n\n  private _handleStarted(task: Task) {\n    this._running.add(task);\n\n    this._refreshSpinner();\n  }\n\n  private _handleCompleted(task: Task) {\n    this._running.delete(task);\n\n    if (task.status === 'failed') {\n      transport.fail(this._formats['fail'](task));\n    } else {\n      transport.succeed(this._formats['succeed'](task));\n    }\n\n    this._refreshSpinner();\n  }\n\n  connect(set: TaskSet): void {\n    set.on('started', (task) => this._handleStarted(task));\n    set.on('completed', (task) => this._handleCompleted(task));\n  }\n\n  on(state: 'spin-multiple', format: (count: number) => string): void;\n  on(state: 'spin-simple', format: (tsk: Task) => string): void;\n  on(state: 'fail', format: (tsk: Task) => string): void;\n  on(state: 'succeed', format: (tsk: Task) => string): void;\n  on(state: TaskLoggerState, format: (arg: never) => string): void {\n    this._formats[state] = format;\n  }\n}\n"]}

package/package.json

@@ -1,14 +1,18 @@
 {
   "name": "@jujulego/jill",
-  "version": "1.1.16",
+  "version": "1.2.0",
   "license": "MIT",
-  "bin": "./bin/jill.js",
-  "main": "./dist/main.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/Jujulego/jill",
     "directory": "packages/cli"
   },
+  "bin": "./bin/jill.js",
+  "main": "./dist/main.js",
+  "files": [
+    "bin",
+    "dist"
+  ],
   "scripts": {
     "lint": "eslint {src,tests}/**/*.*",
     "clean": "gulp clean",
@@ -20,44 +24,53 @@
   "engines": {
     "node": "^14"
   },
+  "peerDependencies": {
+    "@jujulego/jill-myr": "1.2.0"
+  },
+  "peerDependenciesMeta": {
+    "@jujulego/jill-myr": {
+      "optional": true
+    }
+  },
   "dependencies": {
-    "@jujulego/jill-core": "^1.1.11",
-    "@jujulego/jill-myr": "^0.0.5",
+    "@jujulego/jill-common": "^1.2.0",
+    "@jujulego/jill-core": "^1.2.0",
     "@repeaterjs/repeater": "^3.0.4",
     "chalk": "^4.1.1",
     "graphql": "^15.7.2",
     "graphql-request": "^3.6.1",
+    "graphql-tag": "^2.12.6",
+    "graphql-ws": "^5.5.5",
     "ora": "^5.4.1",
     "slugify": "^1.6.0",
     "winston": "^3.3.3",
     "winston-transport": "^4.4.0",
+    "ws": "^8.3.0",
     "yargs": "^17.0.1"
   },
   "devDependencies": {
-    "@babel/core": "7.16.0",
-    "@babel/plugin-proposal-class-properties": "7.16.0",
-    "@babel/preset-env": "7.16.4",
-    "@babel/preset-typescript": "7.16.0",
-    "@babel/runtime": "7.16.3",
-    "@types/jest": "27.0.3",
-    "@types/node": "14.17.34",
-    "@types/yargs": "17.0.7",
-    "@typescript-eslint/eslint-plugin": "5.4.0",
-    "@typescript-eslint/parser": "5.4.0",
-    "babel-jest": "27.3.1",
-    "babel-plugin-macros": "3.1.0",
+    "@babel/core": "7.16.7",
+    "@babel/plugin-proposal-class-properties": "7.16.7",
+    "@babel/preset-env": "7.16.8",
+    "@babel/runtime": "7.16.7",
+    "@types/gulp": "4.0.9",
+    "@types/jest": "27.4.0",
+    "@types/node": "14.18.5",
+    "@types/ws": "8.2.1",
+    "@types/yargs": "17.0.8",
+    "@typescript-eslint/eslint-plugin": "5.9.1",
+    "@typescript-eslint/parser": "5.9.1",
     "del": "6.0.0",
-    "eslint": "7.32.0",
-    "eslint-plugin-jest": "25.2.4",
+    "eslint": "8.6.0",
+    "eslint-plugin-jest": "25.3.4",
     "eslint-plugin-workspaces": "0.7.0",
-    "graphql.macro": "1.4.2",
     "gulp": "4.0.2",
-    "gulp-babel": "8.0.0",
     "gulp-cli": "2.3.0",
-    "gulp-typescript": "6.0.0-alpha.1",
-    "jest": "27.3.1",
-    "msw": "0.35.0",
+    "jest": "27.4.7",
+    "jill-tools": "0.0.0",
+    "msw": "0.36.4",
+    "ts-jest": "27.1.1",
     "ts-node": "10.4.0",
-    "typescript": "4.4.4"
+    "typescript": "4.5.4"
   }
 }

package/dist/commands/each.d.ts

@@ -1,12 +0,0 @@
-import { WorkspaceDepsMode } from '@jujulego/jill-core';
-import { CommandHandler } from '../wrapper';
-export interface EachArgs {
-    script: string;
-    'deps-mode': WorkspaceDepsMode;
-    '--': (string | number)[] | undefined;
-    private: boolean | undefined;
-    affected: string | undefined;
-    'affected-rev-fallback': string;
-    'affected-rev-sort': string | undefined;
-}
-export declare const eachCommand: CommandHandler<EachArgs>;

package/dist/commands/each.js

@@ -1,74 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.eachCommand = void 0;
-
-var _jillCore = require("@jujulego/jill-core");
-
-var _filters = require("../filters");
-
-var _logger = require("../logger");
-
-var _taskLogger = require("../task-logger");
-
-var _pipeline = require("../pipeline");
-
-// Handler
-const eachCommand = async (prj, argv) => {
-  _logger.logger.spin('Loading project'); // Setup pipeline
-
-
-  const pipeline = new _pipeline.Pipeline();
-  pipeline.add(_filters.Filter.scripts([argv.script]));
-
-  if (argv.private !== undefined) {
-    pipeline.add(_filters.Filter.privateWorkspace(argv.private));
-  }
-
-  if (argv.affected !== undefined) {
-    pipeline.add(new _filters.AffectedFilter(argv.affected, argv['affected-rev-fallback'], argv['affected-rev-sort']));
-  } // Filter
-
-
-  const workspaces = [];
-
-  for await (const wks of pipeline.filter(prj.workspaces())) {
-    workspaces.push(wks);
-  }
-
-  _logger.logger.stop();
-
-  if (workspaces.length === 0) {
-    _logger.logger.fail('No workspace found !');
-
-    return 1;
-  }
-
-  _logger.logger.verbose(`Will run ${argv.script} in ${workspaces.map(wks => wks.name).join(', ')}`); // Run tasks
-
-
-  const set = new _jillCore.TaskSet();
-  const tasks = [];
-
-  for (const wks of workspaces) {
-    const task = await wks.run(argv.script, argv['--']?.map(arg => arg.toString()), {
-      buildDeps: argv['deps-mode']
-    });
-    tasks.push(task);
-    set.add(task);
-  }
-
-  const tlogger = new _taskLogger.TaskLogger();
-  tlogger.on('spin-multiple', count => `Working in ${count} packages ...`);
-  tlogger.on('spin-simple', tsk => tasks.includes(tsk) ? `Running ${argv.script} in ${tsk.context.workspace?.name} ...` : `Building ${tsk.context.workspace?.name} ...`);
-  tlogger.on('fail', tsk => tasks.includes(tsk) ? `${tsk.context.workspace?.name} ${argv.script} failed` : `Failed to build ${tsk.context.workspace?.name}`);
-  tlogger.on('succeed', tsk => tasks.includes(tsk) ? `${tsk.context.workspace?.name} ${argv.script} done` : `${tsk.context.workspace?.name} built`);
-  tlogger.connect(set);
-  set.start();
-  const [result] = await set.waitFor('finished');
-  return result.failed === 0 ? 0 : 1;
-};
-
-exports.eachCommand = eachCommand;

package/dist/commands/info.d.ts

@@ -1,5 +0,0 @@
-import { CommandHandler } from '../wrapper';
-export interface InfoArgs {
-    workspace: string | undefined;
-}
-export declare const infoCommand: CommandHandler<InfoArgs>;

package/dist/commands/info.js

@@ -1,42 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.infoCommand = void 0;
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _path = _interopRequireDefault(require("path"));
-
-var _logger = require("../logger");
-
-var _depsTree = require("../utils/deps-tree");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// Handler
-const infoCommand = async (prj, argv) => {
-  // Get workspace
-  _logger.logger.spin('Loading project');
-
-  const wks = await (argv.workspace ? prj.workspace(argv.workspace) : prj.currentWorkspace());
-
-  if (!wks) {
-    _logger.logger.fail(`Workspace ${argv.workspace || '.'} not found`);
-
-    return 1;
-  }
-
-  _logger.logger.stop(); // Print data
-
-
-  console.log((0, _chalk.default)`Workspace {bold ${wks.name}}:`);
-  console.log((0, _chalk.default)`{bold Version:}   ${wks.manifest.version || _chalk.default.grey('unset')}`);
-  console.log((0, _chalk.default)`{bold Directory:} ${_path.default.relative(process.cwd(), wks.cwd) || '.'}`);
-  console.log('');
-  await (0, _depsTree.printDepsTree)(wks);
-  return 0;
-};
-
-exports.infoCommand = infoCommand;

package/dist/commands/list.d.ts

@@ -1,15 +0,0 @@
-import { CommandHandler } from '../wrapper';
-export declare type Attribute = 'name' | 'version' | 'root' | 'slug';
-export declare type Data = Partial<Record<Attribute, string>>;
-export interface ListArgs {
-    private: boolean | undefined;
-    'with-script': string[] | undefined;
-    affected: string | undefined;
-    'affected-rev-fallback': string;
-    'affected-rev-sort': string | undefined;
-    attrs: Attribute[] | undefined;
-    headers: boolean | undefined;
-    long: boolean;
-    json: boolean;
-}
-export declare const listCommand: CommandHandler<ListArgs>;

package/dist/commands/list.js

@@ -1,119 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.listCommand = void 0;
-
-var _chalk = _interopRequireDefault(require("chalk"));
-
-var _path = _interopRequireDefault(require("path"));
-
-var _slugify = _interopRequireDefault(require("slugify"));
-
-var _filters = require("../filters");
-
-var _logger = require("../logger");
-
-var _pipeline = require("../pipeline");
-
-var _cliList = require("../utils/cli-list");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// Constants
-const LONG_ATTRIBUTES = ['name', 'version', 'root'];
-const JSON_ATTRIBUTES = ['name', 'version', 'slug', 'root'];
-const DEFAULT_ATTRIBUTES = ['name']; // Utils
-
-const extractors = {
-  name: wks => wks.name,
-  version: (wks, argv) => wks.manifest.version || (argv.json ? undefined : _chalk.default.grey('unset')),
-  root: wks => wks.cwd,
-  slug: wks => (0, _slugify.default)(wks.name)
-};
-
-function buildExtractor(attrs) {
-  return (wks, argv) => {
-    const data = {};
-
-    for (const attr of attrs) {
-      data[attr] = extractors[attr](wks, argv);
-    }
-
-    return data;
-  };
-} // Handler
-
-
-const listCommand = async (prj, argv) => {
-  _logger.logger.spin('Loading project'); // Setup pipeline
-
-
-  const pipeline = new _pipeline.Pipeline();
-
-  if (argv.private !== undefined) {
-    pipeline.add(_filters.Filter.privateWorkspace(argv.private));
-  }
-
-  if (argv['with-script'] !== undefined) {
-    pipeline.add(_filters.Filter.scripts(argv['with-script']));
-  }
-
-  if (argv.affected !== undefined) {
-    pipeline.add(new _filters.AffectedFilter(argv.affected, argv['affected-rev-fallback'], argv['affected-rev-sort']));
-  } // Filter
-
-
-  const workspaces = [];
-
-  for await (const wks of pipeline.filter(prj.workspaces())) {
-    workspaces.push(wks);
-  }
-
-  _logger.logger.stop(); // Build data
-
-
-  let attrs = argv.attrs || DEFAULT_ATTRIBUTES;
-
-  if (!argv.attrs) {
-    if (argv.long) {
-      attrs = LONG_ATTRIBUTES;
-    } else if (argv.json) {
-      attrs = JSON_ATTRIBUTES;
-    }
-  }
-
-  const data = workspaces.map(wks => buildExtractor(attrs)(wks, argv)); // Print data
-
-  if (argv.json) {
-    if (process.stdout.isTTY) {
-      // Pretty print for ttys
-      console.log(JSON.stringify(data, null, 2));
-    } else {
-      console.log(JSON.stringify(data));
-    }
-  } else {
-    const list = new _cliList.CliList();
-
-    if (argv.headers ?? attrs.length > 1) {
-      list.setHeaders(attrs);
-    }
-
-    for (const d of data) {
-      if (d.root) {
-        d.root = _path.default.relative(process.cwd(), d.root) || '.';
-      }
-
-      list.add(attrs.map(attr => d[attr] || ''));
-    }
-
-    for (const d of list.lines()) {
-      console.log(d);
-    }
-  }
-
-  return 0;
-};
-
-exports.listCommand = listCommand;