nx 13.8.8 → 13.9.0-beta.2

package/src/cli/parse-run-one-options.js

@@ -0,0 +1,139 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseRunOneOptions = void 0;
+const yargsParser = require("yargs-parser");
+const fileutils_1 = require("../utils/fileutils");
+function calculateDefaultProjectName(cwd, root, workspaceConfiguration) {
+    var _a;
+    let relativeCwd = cwd.replace(/\\/g, '/').split(root.replace(/\\/g, '/'))[1];
+    if (relativeCwd) {
+        relativeCwd = relativeCwd.startsWith('/')
+            ? relativeCwd.substring(1)
+            : relativeCwd;
+        const matchingProject = Object.keys(workspaceConfiguration.projects).find((p) => {
+            const projectRoot = workspaceConfiguration.projects[p].root;
+            return (relativeCwd == projectRoot ||
+                relativeCwd.startsWith(`${projectRoot}/`));
+        });
+        if (matchingProject)
+            return matchingProject;
+    }
+    return (((_a = workspaceConfiguration.cli) === null || _a === void 0 ? void 0 : _a.defaultProjectName) ||
+        workspaceConfiguration.defaultProject ||
+        workspaceConfiguration.defaultProject);
+}
+const invalidTargetNames = [
+    'g',
+    'generate',
+    'update',
+    'migrate',
+    'add',
+    'affected',
+    'run-many',
+    'affected:apps',
+    'affected:libs',
+    'affected:build',
+    'affected:test',
+    'affected:e2e',
+    'affected:dep-graph',
+    'affected:lint',
+    'print-affected',
+    'daemon',
+    'format:check',
+    'format',
+    'format:write',
+    'workspace-lint',
+    'workspace-generator',
+    'workspace-schematic',
+    'connect-to-nx-cloud',
+    'clear-cache',
+    'reset',
+    'report',
+    'list',
+];
+const targetAliases = {
+    b: 'build',
+    e: 'e2e',
+    'i18n-extract': 'extract-i18n',
+    xi18n: 'extract-i18n',
+    l: 'lint',
+    s: 'serve',
+    t: 'test',
+};
+function parseRunOneOptions(root, workspaceConfiguration, args) {
+    var _a, _b, _c;
+    const defaultProjectName = calculateDefaultProjectName(process.cwd(), root, workspaceConfiguration);
+    const parsedArgs = yargsParser(args, {
+        boolean: ['prod', 'help'],
+        string: ['configuration', 'project'],
+        alias: {
+            c: 'configuration',
+        },
+        configuration: {
+            'strip-dashed': true,
+        },
+    });
+    if (parsedArgs['help']) {
+        return false;
+    }
+    let project;
+    let target;
+    let configuration;
+    if (parsedArgs._[0] === 'run') {
+        [project, target, configuration] = parsedArgs._[1].split(':');
+        parsedArgs._ = parsedArgs._.slice(2);
+    }
+    else {
+        target = parsedArgs._[0];
+        project = parsedArgs._[1];
+        parsedArgs._ = parsedArgs._.slice(2);
+    }
+    if (parsedArgs.project) {
+        project = parsedArgs.project;
+    }
+    const projectIsNotSetExplicitly = !project;
+    if (!project && defaultProjectName) {
+        project = defaultProjectName;
+    }
+    // we need both to be able to run a target, no tasks runner
+    if (!project || !target) {
+        return false;
+    }
+    // we need both to be able to run a target, no tasks runner
+    const p = (_a = workspaceConfiguration.projects) === null || _a === void 0 ? void 0 : _a[project];
+    if (!p)
+        return false;
+    let targets;
+    if (typeof p === 'string') {
+        targets = (0, fileutils_1.readJsonFile)(`${p}/project.json`).targets;
+    }
+    else {
+        targets = (_b = p.architect) !== null && _b !== void 0 ? _b : p.targets;
+    }
+    // if it doesn't match an existing target, try to find an alias
+    if (!(targets === null || targets === void 0 ? void 0 : targets[target]) && targetAliases[target]) {
+        target = targetAliases[target];
+    }
+    // for backwards compat we require targets to be set when use defaultProjectName
+    if ((!targets || !targets[target]) && projectIsNotSetExplicitly)
+        return false;
+    if (invalidTargetNames.indexOf(target) > -1)
+        return false;
+    if (parsedArgs.configuration) {
+        configuration = parsedArgs.configuration;
+    }
+    else if (parsedArgs.prod) {
+        configuration = 'production';
+    }
+    else if (!configuration && ((_c = targets === null || targets === void 0 ? void 0 : targets[target]) === null || _c === void 0 ? void 0 : _c.defaultConfiguration)) {
+        configuration = targets[target].defaultConfiguration;
+    }
+    const res = { project, target, configuration, parsedArgs };
+    delete parsedArgs['c'];
+    delete parsedArgs['configuration'];
+    delete parsedArgs['prod'];
+    delete parsedArgs['project'];
+    return res;
+}
+exports.parseRunOneOptions = parseRunOneOptions;
+//# sourceMappingURL=parse-run-one-options.js.map

package/src/cli/parse-run-one-options.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-run-one-options.js","sourceRoot":"","sources":["../../../../../packages/nx/src/cli/parse-run-one-options.ts"],"names":[],"mappings":"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"}

package/src/cli/run-cli.d.ts

@@ -0,0 +1 @@
+export {};

package/src/cli/run-cli.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_1 = require("fs");
+if (process.env.NX_TERMINAL_OUTPUT_PATH) {
+    setUpOutputWatching(process.env.NX_TERMINAL_CAPTURE_STDERR === 'true', process.env.NX_FORWARD_OUTPUT === 'true');
+}
+if (!process.env.NX_WORKSPACE_ROOT) {
+    console.error('Invalid Nx command invocation');
+    process.exit(1);
+}
+requireCli();
+function requireCli() {
+    process.env.NX_CLI_SET = 'true';
+    try {
+        const cli = require.resolve('nx/src/cli/index.js', {
+            paths: [process.env.NX_WORKSPACE_ROOT],
+        });
+        require(cli);
+    }
+    catch (e) {
+        console.error(`Could not find 'nx' module in this workspace.`, e);
+        process.exit(1);
+    }
+}
+/**
+ * We need to collect all stdout and stderr and store it, so the caching mechanism
+ * could store it.
+ *
+ * Writing stdout and stderr into different stream is too risky when using TTY.
+ *
+ * So we are simply monkey-patching the Javascript object. In this case the actual output will always be correct.
+ * And the cached output should be correct unless the CLI bypasses process.stdout or console.log and uses some
+ * C-binary to write to stdout.
+ */
+function setUpOutputWatching(captureStderr, forwardOutput) {
+    const stdoutWrite = process.stdout._write;
+    const stderrWrite = process.stderr._write;
+    // The terminal output file gets out and err
+    const outputPath = process.env.NX_TERMINAL_OUTPUT_PATH;
+    const stdoutAndStderrLogFileHandle = (0, fs_1.openSync)(outputPath, 'w');
+    const onlyStdout = [];
+    process.stdout._write = (chunk, encoding, callback) => {
+        onlyStdout.push(chunk);
+        (0, fs_1.appendFileSync)(stdoutAndStderrLogFileHandle, chunk);
+        if (forwardOutput) {
+            stdoutWrite.apply(process.stdout, [chunk, encoding, callback]);
+        }
+        else {
+            callback();
+        }
+    };
+    process.stderr._write = (chunk, encoding, callback) => {
+        (0, fs_1.appendFileSync)(stdoutAndStderrLogFileHandle, chunk);
+        if (forwardOutput) {
+            stderrWrite.apply(process.stderr, [chunk, encoding, callback]);
+        }
+        else {
+            callback();
+        }
+    };
+    process.on('exit', (code) => {
+        // when the process exits successfully, and we are not asked to capture stderr
+        // override the file with only stdout
+        if (code === 0 && !captureStderr) {
+            (0, fs_1.writeFileSync)(outputPath, onlyStdout.join(''));
+        }
+    });
+}
+//# sourceMappingURL=run-cli.js.map

package/src/cli/run-cli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-cli.js","sourceRoot":"","sources":["../../../../../packages/nx/src/cli/run-cli.ts"],"names":[],"mappings":";;AAAA,2BAAwE;AAExE,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;IACvC,mBAAmB,CACjB,OAAO,CAAC,GAAG,CAAC,0BAA0B,KAAK,MAAM,EACjD,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,MAAM,CACzC,CAAC;CACH;AAED,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;IAClC,OAAO,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC;IAC/C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACjB;AACD,UAAU,EAAE,CAAC;AAEb,SAAS,UAAU;IACjB,OAAO,CAAC,GAAG,CAAC,UAAU,GAAG,MAAM,CAAC;IAChC,IAAI;QACF,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,qBAAqB,EAAE;YACjD,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;SACvC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,CAAC;KACd;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,+CAA+C,EAAE,CAAC,CAAC,CAAC;QAClE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,mBAAmB,CAAC,aAAsB,EAAE,aAAsB;IACzE,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC;IAE1C,4CAA4C;IAC5C,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;IACvD,MAAM,4BAA4B,GAAG,IAAA,aAAQ,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAE/D,MAAM,UAAU,GAAG,EAAc,CAAC;IAClC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CACtB,KAAU,EACV,QAAgB,EAChB,QAAkB,EAClB,EAAE;QACF,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,IAAA,mBAAc,EAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,aAAa,EAAE;YACjB,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;SAChE;aAAM;YACL,QAAQ,EAAE,CAAC;SACZ;IACH,CAAC,CAAC;IAEF,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,CACtB,KAAU,EACV,QAAgB,EAChB,QAAkB,EAClB,EAAE;QACF,IAAA,mBAAc,EAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QACpD,IAAI,aAAa,EAAE;YACjB,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;SAChE;aAAM;YACL,QAAQ,EAAE,CAAC;SACZ;IACH,CAAC,CAAC;IAEF,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QAC1B,8EAA8E;QAC9E,qCAAqC;QACrC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE;YAChC,IAAA,kBAAa,EAAC,UAAU,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;SAChD;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}

package/src/cli/workspace.d.ts

@@ -0,0 +1,4 @@
+export interface Workspace {
+    type: 'nx' | 'angular';
+    dir: string;
+}

package/src/cli/workspace.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=workspace.js.map

package/src/cli/workspace.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../packages/nx/src/cli/workspace.ts"],"names":[],"mappings":""}

package/src/commands/generate.d.ts

@@ -0,0 +1,15 @@
+import { Options, Schema } from '../shared/params';
+export interface GenerateOptions {
+    collectionName: string;
+    generatorName: string;
+    generatorOptions: Options;
+    help: boolean;
+    debug: boolean;
+    dryRun: boolean;
+    force: boolean;
+    interactive: boolean;
+    defaults: boolean;
+}
+export declare function printGenHelp(opts: GenerateOptions, schema: Schema): void;
+export declare function newWorkspace(cwd: string, args: string[], isVerbose?: boolean): Promise<any>;
+export declare function generate(cwd: string, root: string, args: string[], isVerbose?: boolean): Promise<any>;

package/src/commands/generate.js

@@ -0,0 +1,170 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generate = exports.newWorkspace = exports.printGenHelp = void 0;
+const tslib_1 = require("tslib");
+const yargsParser = require("yargs-parser");
+const params_1 = require("../shared/params");
+const print_help_1 = require("../shared/print-help");
+const workspace_1 = require("../shared/workspace");
+const tree_1 = require("../shared/tree");
+const logger_1 = require("../shared/logger");
+const chalk = require("chalk");
+function throwInvalidInvocation() {
+    throw new Error(`Specify the generator name (e.g., nx generate @nrwl/workspace:library)`);
+}
+function parseGenerateOpts(args, mode, defaultCollection) {
+    const generatorOptions = (0, params_1.convertToCamelCase)(yargsParser(args, {
+        boolean: ['help', 'dryRun', 'debug', 'force', 'interactive', 'defaults'],
+        alias: {
+            dryRun: 'dry-run',
+            d: 'dryRun',
+        },
+        default: {
+            debug: false,
+            dryRun: false,
+            interactive: true,
+        },
+    }));
+    // TODO: vsavkin remove defaults in Nx 13
+    if (generatorOptions.defaults) {
+        logger_1.logger.warn(`Use --no-interactive instead of --defaults. The --defaults option will be removed in Nx 13.`);
+        generatorOptions.interactive = false;
+    }
+    let collectionName = null;
+    let generatorName = null;
+    if (mode === 'generate') {
+        if (!generatorOptions['_'] ||
+            generatorOptions['_'].length === 0) {
+            throwInvalidInvocation();
+        }
+        const generatorDescriptor = generatorOptions['_'].shift();
+        const separatorIndex = generatorDescriptor.lastIndexOf(':');
+        if (separatorIndex > 0) {
+            collectionName = generatorDescriptor.substr(0, separatorIndex);
+            generatorName = generatorDescriptor.substr(separatorIndex + 1);
+        }
+        else {
+            collectionName = defaultCollection;
+            generatorName = generatorDescriptor;
+        }
+    }
+    else {
+        collectionName = generatorOptions.collection;
+        generatorName = 'new';
+    }
+    if (!collectionName) {
+        throwInvalidInvocation();
+    }
+    const res = {
+        collectionName,
+        generatorName,
+        generatorOptions,
+        help: generatorOptions.help,
+        debug: generatorOptions.debug,
+        dryRun: generatorOptions.dryRun,
+        force: generatorOptions.force,
+        interactive: generatorOptions.interactive,
+        defaults: generatorOptions.defaults,
+    };
+    delete generatorOptions.debug;
+    delete generatorOptions.d;
+    delete generatorOptions.dryRun;
+    delete generatorOptions.force;
+    delete generatorOptions.interactive;
+    delete generatorOptions.defaults;
+    delete generatorOptions.help;
+    delete generatorOptions.collection;
+    delete generatorOptions['--'];
+    return res;
+}
+function printGenHelp(opts, schema) {
+    (0, print_help_1.printHelp)(`nx generate ${opts.collectionName}:${opts.generatorName}`, Object.assign(Object.assign({}, schema), { properties: Object.assign(Object.assign({}, schema.properties), { dryRun: {
+                type: 'boolean',
+                default: false,
+                description: `Runs through and reports activity without writing to disk.`,
+            } }) }));
+}
+exports.printGenHelp = printGenHelp;
+function readDefaultCollection(nxConfig) {
+    return nxConfig.cli ? nxConfig.cli.defaultCollection : null;
+}
+function printChanges(fileChanges) {
+    fileChanges.forEach((f) => {
+        if (f.type === 'CREATE') {
+            console.log(`${chalk.green('CREATE')} ${f.path}`);
+        }
+        else if (f.type === 'UPDATE') {
+            console.log(`${chalk.white('UPDATE')} ${f.path}`);
+        }
+        else if (f.type === 'DELETE') {
+            console.log(`${chalk.yellow('DELETE')} ${f.path}`);
+        }
+    });
+}
+function newWorkspace(cwd, args, isVerbose = false) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const ws = new workspace_1.Workspaces(null);
+        return (0, params_1.handleErrors)(isVerbose, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+            const opts = parseGenerateOpts(args, 'new', null);
+            const { normalizedGeneratorName, schema, implementationFactory } = ws.readGenerator(opts.collectionName, opts.generatorName);
+            const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, null, schema, opts.interactive, null, null, isVerbose);
+            if (ws.isNxGenerator(opts.collectionName, normalizedGeneratorName)) {
+                const host = new tree_1.FsTree(cwd, isVerbose);
+                const implementation = implementationFactory();
+                const task = yield implementation(host, combinedOpts);
+                const changes = host.listChanges();
+                printChanges(changes);
+                if (!opts.dryRun) {
+                    (0, tree_1.flushChanges)(cwd, changes);
+                    if (task) {
+                        yield task();
+                    }
+                }
+                else {
+                    logger_1.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
+                }
+            }
+            else {
+                return (yield Promise.resolve().then(() => require('./ngcli-adapter'))).generate(cwd, Object.assign(Object.assign({}, opts), { generatorOptions: combinedOpts }), isVerbose);
+            }
+        }));
+    });
+}
+exports.newWorkspace = newWorkspace;
+function generate(cwd, root, args, isVerbose = false) {
+    return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+        const ws = new workspace_1.Workspaces(root);
+        return (0, params_1.handleErrors)(isVerbose, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
+            const workspaceDefinition = ws.readWorkspaceConfiguration();
+            const opts = parseGenerateOpts(args, 'generate', readDefaultCollection(workspaceDefinition));
+            const { normalizedGeneratorName, schema, implementationFactory } = ws.readGenerator(opts.collectionName, opts.generatorName);
+            if (opts.help) {
+                printGenHelp(opts, schema);
+                return 0;
+            }
+            const combinedOpts = yield (0, params_1.combineOptionsForGenerator)(opts.generatorOptions, opts.collectionName, normalizedGeneratorName, workspaceDefinition, schema, opts.interactive, ws.calculateDefaultProjectName(cwd, workspaceDefinition), ws.relativeCwd(cwd), isVerbose);
+            if (ws.isNxGenerator(opts.collectionName, normalizedGeneratorName)) {
+                const host = new tree_1.FsTree(root, isVerbose);
+                const implementation = implementationFactory();
+                const task = yield implementation(host, combinedOpts);
+                const changes = host.listChanges();
+                printChanges(changes);
+                if (!opts.dryRun) {
+                    (0, tree_1.flushChanges)(root, changes);
+                    if (task) {
+                        yield task();
+                    }
+                }
+                else {
+                    logger_1.logger.warn(`\nNOTE: The "dryRun" flag means no changes were made.`);
+                }
+            }
+            else {
+                require('../compat/compat');
+                return (yield Promise.resolve().then(() => require('./ngcli-adapter'))).generate(root, Object.assign(Object.assign({}, opts), { generatorOptions: combinedOpts }), isVerbose);
+            }
+        }));
+    });
+}
+exports.generate = generate;
+//# sourceMappingURL=generate.js.map

package/src/commands/generate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../packages/nx/src/commands/generate.ts"],"names":[],"mappings":"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"}

package/src/commands/help.d.ts

@@ -0,0 +1 @@
+export declare function help(): number;

package/src/commands/help.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.help = void 0;
+const chalk = require("chalk");
+const logger_1 = require("../shared/logger");
+function help() {
+    logger_1.logger.info((0, logger_1.stripIndent)(`
+    ${chalk.bold('Nx - Smart, Fast and Extensible Build System')}
+  
+    ${chalk.bold('Create a new project.')}
+     nx new ${chalk.grey('[project-name] [--collection=collection] [options, ...]')}
+    
+    ${chalk.bold('Generate code.')}
+     nx generate ${chalk.grey('[collection:][generator] [options, ...]')}
+     nx g ${chalk.grey('[collection:][generator] [options, ...]')}
+
+    ${chalk.bold('Run target.')}    
+     nx run ${chalk.grey('[project][:target][:configuration] [options, ...]')}
+     nx r ${chalk.grey('[project][:target][:configuration] [options, ...]')}
+    
+    You can also use the infix notation to run a target:
+     nx [target] [project] [options, ...]
+
+    ${chalk.bold('Migrate packages and create migrations.json.')}
+     nx migrate ${chalk.grey('[package-name]')}
+    
+    ${chalk.bold('Run migrations.')}
+     nx migrate ${chalk.grey('--run-migrations=[filename]')}
+
+  `));
+    return 0;
+}
+exports.help = help;
+//# sourceMappingURL=help.js.map

package/src/commands/help.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"help.js","sourceRoot":"","sources":["../../../../../packages/nx/src/commands/help.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,6CAAuD;AAEvD,SAAgB,IAAI;IAClB,eAAM,CAAC,IAAI,CACT,IAAA,oBAAW,EAAC;MACV,KAAK,CAAC,IAAI,CAAC,8CAA8C,CAAC;;MAE1D,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC;cAC3B,KAAK,CAAC,IAAI,CACjB,yDAAyD,CAC1D;;MAEA,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC;mBACf,KAAK,CAAC,IAAI,CAAC,yCAAyC,CAAC;YAC5D,KAAK,CAAC,IAAI,CAAC,yCAAyC,CAAC;;MAE3D,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC;cACjB,KAAK,CAAC,IAAI,CAAC,mDAAmD,CAAC;YACjE,KAAK,CAAC,IAAI,CAAC,mDAAmD,CAAC;;;;;MAKrE,KAAK,CAAC,IAAI,CAAC,8CAA8C,CAAC;kBAC9C,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC;;MAExC,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC;kBACjB,KAAK,CAAC,IAAI,CAAC,6BAA6B,CAAC;;GAExD,CAAC,CACD,CAAC;IACF,OAAO,CAAC,CAAC;AACX,CAAC;AA9BD,oBA8BC"}

package/src/commands/migrate.d.ts

@@ -0,0 +1,77 @@
+declare type Dependencies = 'dependencies' | 'devDependencies';
+export declare type MigrationsJson = {
+    version: string;
+    collection?: string;
+    generators?: {
+        [name: string]: {
+            version: string;
+            description?: string;
+            cli?: string;
+        };
+    };
+    packageJsonUpdates?: {
+        [name: string]: {
+            version: string;
+            packages: {
+                [p: string]: {
+                    version: string;
+                    ifPackageInstalled?: string;
+                    alwaysAddToPackageJson?: boolean;
+                    addToPackageJson?: Dependencies;
+                };
+            };
+        };
+    };
+};
+export declare function normalizeVersion(version: string): string;
+export declare class Migrator {
+    private readonly packageJson;
+    private readonly versions;
+    private readonly fetch;
+    private readonly from;
+    private readonly to;
+    constructor(opts: {
+        packageJson: any;
+        versions: (p: string) => string;
+        fetch: (p: string, v: string) => Promise<MigrationsJson>;
+        from: {
+            [p: string]: string;
+        };
+        to: {
+            [p: string]: string;
+        };
+    });
+    updatePackageJson(targetPackage: string, targetVersion: string): Promise<{
+        packageJson: any;
+        migrations: {
+            package: string;
+            name: string;
+            version: string;
+            description?: string;
+            cli?: string;
+        }[];
+    }>;
+    private _createMigrateJson;
+    private _updatePackageJson;
+    private collapsePackages;
+    private gt;
+    private lte;
+}
+declare type GenerateMigrations = {
+    type: 'generateMigrations';
+    targetPackage: string;
+    targetVersion: string;
+    from: {
+        [k: string]: string;
+    };
+    to: {
+        [k: string]: string;
+    };
+};
+declare type RunMigrations = {
+    type: 'runMigrations';
+    runMigrations: string;
+};
+export declare function parseMigrationsOptions(args: string[]): GenerateMigrations | RunMigrations;
+export declare function migrate(root: string, args: string[], isVerbose?: boolean): Promise<any>;
+export {};