@jujulego/jill 1.1.15 → 1.1.19

package/package.json

@@ -1,14 +1,18 @@
 {
   "name": "@jujulego/jill",
-  "version": "1.1.15",
+  "version": "1.1.19",
   "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",
@@ -21,43 +25,45 @@
     "node": "^14"
   },
   "dependencies": {
-    "@jujulego/jill-core": "^1.1.11",
-    "@jujulego/jill-myr": "^0.0.4",
+    "@jujulego/jill-common": "^1.0.0",
+    "@jujulego/jill-core": "^1.1.12",
+    "@jujulego/jill-myr": "^0.1.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",
+    "@babel/core": "7.16.5",
+    "@babel/plugin-proposal-class-properties": "7.16.5",
+    "@babel/preset-env": "7.16.5",
+    "@babel/runtime": "7.16.5",
+    "@types/gulp": "4.0.9",
     "@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",
+    "@types/node": "14.18.3",
+    "@types/ws": "8.2.1",
+    "@types/yargs": "17.0.8",
+    "@typescript-eslint/eslint-plugin": "5.8.1",
+    "@typescript-eslint/parser": "5.8.1",
     "del": "6.0.0",
     "eslint": "7.32.0",
-    "eslint-plugin-jest": "25.2.4",
+    "eslint-plugin-jest": "25.3.2",
     "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.5",
+    "jill-tools": "0.0.0",
+    "msw": "0.36.3",
+    "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;

package/dist/commands/run.d.ts

@@ -1,9 +0,0 @@
-import { WorkspaceDepsMode } from '@jujulego/jill-core';
-import { CommandHandler } from '../wrapper';
-export interface RunArgs {
-    script: string;
-    workspace: string | undefined;
-    'deps-mode': WorkspaceDepsMode;
-    '--'?: (string | number)[] | undefined;
-}
-export declare const runCommand: CommandHandler<RunArgs>;

package/dist/commands/run.js

@@ -1,43 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.runCommand = void 0;
-
-var _jillCore = require("@jujulego/jill-core");
-
-var _logger = require("../logger");
-
-var _taskLogger = require("../task-logger");
-
-// Command
-const runCommand = 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;
-  } // Run build task
-
-
-  const set = new _jillCore.TaskSet();
-  const task = await wks.run(argv.script, argv['--']?.map(arg => arg.toString()), {
-    buildDeps: argv['deps-mode']
-  });
-  set.add(task);
-  const tlogger = new _taskLogger.TaskLogger();
-  tlogger.on('spin-simple', tsk => tsk === task ? `Running ${argv.script} in ${wks.name} ...` : `Building ${tsk.context.workspace?.name} ...`);
-  tlogger.on('fail', tsk => tsk === task ? `${argv.script} failed` : `Failed to build ${tsk.context.workspace?.name}`);
-  tlogger.on('succeed', tsk => tsk === task ? `${wks.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.runCommand = runCommand;

package/dist/filters/affected.d.ts

@@ -1,10 +0,0 @@
-import { Workspace } from '@jujulego/jill-core';
-import { Filter } from './filter';
-export declare class AffectedFilter extends Filter {
-    readonly format: string;
-    readonly fallback: string;
-    readonly sort?: string | undefined;
-    constructor(format: string, fallback: string, sort?: string | undefined);
-    private _formatRevision;
-    test(workspace: Workspace): Promise<boolean>;
-}

package/dist/filters/affected.js

@@ -1,81 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.AffectedFilter = void 0;
-
-var _jillCore = require("@jujulego/jill-core");
-
-var _filter = require("./filter");
-
-var _logger = require("../logger");
-
-// Class
-class AffectedFilter extends _filter.Filter {
-  // Constructor
-  constructor(format, fallback, sort) {
-    super();
-    this.format = format;
-    this.fallback = fallback;
-    this.sort = sort;
-  } // Methods
-
-
-  async _formatRevision(wks) {
-    const log = _logger.logger.child({
-      label: wks.name
-    }); // Format revision
-
-
-    let result = this.format;
-    result = result.replace(/(?<!\\)((?:\\\\)*)%name/g, `$1${wks.name}`);
-    result = result.replace(/\\(.)/g, '$1'); // Ask git to complete it
-
-    const sortArgs = this.sort ? ['--sort', this.sort] : []; // - search in branches
-
-    if (result.includes('*')) {
-      const branches = await _jillCore.git.listBranches([...sortArgs, result], {
-        cwd: wks.cwd,
-        logger: log,
-        streamLogLevel: 'debug'
-      });
-
-      if (branches.length > 0) {
-        result = branches[branches.length - 1];
-      }
-    } // - search in tags
-
-
-    if (result.includes('*')) {
-      const tags = await _jillCore.git.listTags([...sortArgs, result], {
-        cwd: wks.cwd,
-        logger: log,
-        streamLogLevel: 'debug'
-      });
-
-      if (tags.length > 0) {
-        result = tags[tags.length - 1];
-      }
-    }
-
-    if (result !== this.format) {
-      log.verbose(`Resolved ${this.format} into ${result}`);
-    }
-
-    if (result.includes('*')) {
-      log.warn(`No revision found matching ${result}, using fallback ${this.fallback}`);
-      return this.fallback;
-    }
-
-    return result;
-  }
-
-  async test(workspace) {
-    const rev = await this._formatRevision(workspace);
-    return await workspace.isAffected(rev);
-  }
-
-}
-
-exports.AffectedFilter = AffectedFilter;

package/dist/filters/filter.d.ts

@@ -1,8 +0,0 @@
-import { Workspace } from '@jujulego/jill-core';
-export declare class Filter {
-    private _predicate?;
-    constructor(_predicate?: ((workspace: Workspace) => boolean) | undefined);
-    static privateWorkspace(value: boolean): Filter;
-    static scripts(values: string[]): Filter;
-    test(workspace: Workspace): Promise<boolean>;
-}

package/dist/filters/filter.js

@@ -1,35 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Filter = void 0;
-
-// Class
-class Filter {
-  // Constructor
-  constructor(_predicate) {
-    this._predicate = _predicate;
-  } // Statics
-
-
-  static privateWorkspace(value) {
-    return new Filter(wks => (wks.manifest.private ?? false) === value);
-  }
-
-  static scripts(values) {
-    return new Filter(wks => {
-      const scripts = Object.keys(wks.manifest.scripts || {});
-      return values.some(scr => scripts.includes(scr));
-    });
-  } // Methods
-
-
-  async test(workspace) {
-    if (!this._predicate) return true;
-    return this._predicate(workspace);
-  }
-
-}
-
-exports.Filter = Filter;

package/dist/filters/index.d.ts

@@ -1,2 +0,0 @@
-export { AffectedFilter } from './affected';
-export { Filter } from './filter';

package/dist/filters/index.js

@@ -1,21 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "AffectedFilter", {
-  enumerable: true,
-  get: function () {
-    return _affected.AffectedFilter;
-  }
-});
-Object.defineProperty(exports, "Filter", {
-  enumerable: true,
-  get: function () {
-    return _filter.Filter;
-  }
-});
-
-var _affected = require("./affected");
-
-var _filter = require("./filter");

package/dist/logger.d.ts

@@ -1,32 +0,0 @@
-import { Logger } from 'winston';
-import Transport from 'winston-transport';
-import ora from 'ora';
-export declare class OraTransport extends Transport {
-    readonly _spinner: ora.Ora;
-    private _keepSpinner;
-    log(info: any, next: () => void): void;
-    spin(message: string): void;
-    succeed(log: string): void;
-    fail(log: Error | string): void;
-    stop(): void;
-}
-export declare class OraLogger {
-    private readonly logger;
-    private readonly transport;
-    constructor(logger: Logger, transport: OraTransport);
-    log(level: string, message: string, meta?: Record<string, unknown>): void;
-    debug(message: string): void;
-    verbose(message: string): void;
-    info(message: string): void;
-    warn(message: string): void;
-    error(message: string): void;
-    child(options: Record<string, unknown>): Logger;
-    spin(msg: string): void;
-    succeed(msg: string): void;
-    fail(msg: string): void;
-    stop(): void;
-    get level(): string;
-    set level(level: string);
-}
-export declare const transport: OraTransport;
-export declare const logger: OraLogger;