@nrwl/nx-cloud 14.0.3-beta.1 → 14.0.3-beta.2

package/lib/core/runners/distributed-execution/distributed-execution.runner.js

@@ -0,0 +1,306 @@
+"use strict";
+var __awaiter = (this && this.__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); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TaskGraphCreator = exports.nxCloudDistributedTasksRunner = void 0;
+const Observable_1 = require("rxjs/internal/Observable");
+const stripJsonComments = require("strip-json-comments");
+const fs_1 = require("fs");
+const distributed_execution_api_1 = require("./distributed-execution.api");
+const file_storage_1 = require("../../file-storage/file-storage");
+const e2e_encryption_1 = require("../../file-storage/e2e-encryption");
+const waiter_1 = require("../../../utilities/waiter");
+const environment_1 = require("../../../utilities/environment");
+const print_run_group_error_1 = require("../../error/print-run-group-error");
+const create_no_new_messages_timeout_1 = require("../../../utilities/create-no-new-messages-timeout");
+const metric_logger_1 = require("../../../utilities/metric-logger");
+const { output, getDependencyConfigs, getOutputs, unparse, Cache, } = require('../../../utilities/nx-imports');
+class NoopLifeCycle {
+    scheduleTask(task) { }
+    startTask(task) { }
+    endTask(task, code) { }
+}
+function runDistributedExecution(api, options, context, fileStorage, cache, runGroup, tasks) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const nxjson = JSON.parse(stripJsonComments((0, fs_1.readFileSync)('nx.json').toString()));
+        const stages = new TaskOrderer(context.projectGraph, getDefaultDependencyConfigs(nxjson, options)).splitTasksIntoStages(tasks);
+        const id = yield api.start((0, distributed_execution_api_1.createStartRequest)(runGroup, stages, options));
+        return yield processTasks(api, fileStorage, cache, options, id, tasks, context);
+    });
+}
+function processTasks(api, fileStorage, cache, options, executionId, tasks, context) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const processedTasks = {};
+        const failIfNumberOfCompletedTasksDoesNotChangeIn30Mins = (0, create_no_new_messages_timeout_1.createNoNewMessagesTimeout)();
+        const waiter = new waiter_1.Waiter();
+        while (true) {
+            if (environment_1.VERBOSE_LOGGING) {
+                output.note({
+                    title: 'Waiting...',
+                });
+            }
+            yield waiter.wait();
+            const r = yield api.status(executionId);
+            if (environment_1.VERBOSE_LOGGING) {
+                output.note({
+                    title: `Status update`,
+                    bodyLines: [
+                        `executionId: ${executionId}`,
+                        `executionStatus: ${r.executionStatus}`,
+                        `number of completed tasks: ${r.completedTasks.length}`,
+                        `error: ${r.criticalErrorMessage}`,
+                    ],
+                });
+            }
+            if (r.criticalErrorMessage) {
+                output.error({
+                    title: 'Distributed Execution Terminated',
+                    bodyLines: ['Error:', r.criticalErrorMessage],
+                });
+                process.exit(1);
+            }
+            failIfNumberOfCompletedTasksDoesNotChangeIn30Mins(r.completedTasks.length);
+            for (const t of r.completedTasks) {
+                if (processedTasks[t.taskId])
+                    continue;
+                yield processTask(fileStorage, cache, context, options, tasks, t);
+                waiter.reset();
+                processedTasks[t.taskId] = true;
+            }
+            if (r.executionStatus === 'COMPLETED') {
+                return { commandStatus: r.commandStatus, runUrl: r.runUrl };
+            }
+        }
+    });
+}
+function processTask(fileStorage, cache, context, options, tasks, completedTask) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (environment_1.VERBOSE_LOGGING) {
+            output.note({
+                title: `Processing task ${completedTask.taskId}`,
+            });
+        }
+        const matchingTask = tasks.find((tt) => completedTask.taskId === tt.id);
+        if (!matchingTask) {
+            throw new Error(`Found unknown task: ${completedTask.taskId}`);
+        }
+        if (environment_1.VERBOSE_LOGGING) {
+            output.note({
+                title: `Retrieving artifacts from ${completedTask.url}`,
+            });
+        }
+        yield fileStorage.retrieve(completedTask.hash, completedTask.url, options.cacheDirectory || './node_modules/.cache/nx');
+        const cachedResult = yield cache.get(Object.assign(Object.assign({}, matchingTask), { hash: completedTask.hash }));
+        const outputs = getOutputs(context.projectGraph.nodes, matchingTask);
+        if (environment_1.VERBOSE_LOGGING) {
+            output.note({
+                title: `Extracting artifacts`,
+                bodyLines: outputs,
+            });
+        }
+        yield cache.copyFilesFromCache(completedTask.hash, cachedResult, outputs);
+        output.logCommand(getCommand(matchingTask));
+        process.stdout.write(cachedResult.terminalOutput);
+        output.addVerticalSeparator();
+    });
+}
+function getCommand(task) {
+    const args = unparse(task.overrides || {});
+    const config = task.target.configuration
+        ? `:${task.target.configuration}`
+        : '';
+    return [
+        'nx',
+        'run',
+        `${task.target.project}:${task.target.target}${config}`,
+        ...args,
+    ].join(' ');
+}
+const nxCloudDistributedTasksRunner = (tasks, options, context) => {
+    if (environment_1.VERBOSE_LOGGING) {
+        output.note({
+            title: 'Starting distributed command execution',
+        });
+    }
+    options.lifeCycle = new NoopLifeCycle();
+    const runGroup = (0, environment_1.getRunGroup)();
+    if (!runGroup) {
+        (0, print_run_group_error_1.printRunGroupError)();
+        return process.exit(1);
+    }
+    const encryption = new e2e_encryption_1.E2EEncryption(environment_1.ENCRYPTION_KEY || options.encryptionKey);
+    const fileStorage = new file_storage_1.FileStorage(encryption);
+    const cache = new Cache(options);
+    const api = new distributed_execution_api_1.DistributedExecutionApi(options);
+    runDistributedExecution(api, options, context, fileStorage, cache, runGroup, tasks)
+        .then((r) => __awaiter(void 0, void 0, void 0, function* () {
+        if (r.commandStatus === 0) {
+            output.success({
+                title: 'Successfully completed running the command.',
+                bodyLines: [`See run details at ${r.runUrl}`],
+            });
+        }
+        else {
+            output.error({
+                title: 'Command execution failed.',
+                bodyLines: [`See run details at ${r.runUrl}`],
+            });
+        }
+        yield (0, metric_logger_1.submitRunMetrics)(options);
+        process.exit(r.commandStatus);
+    }))
+        .catch((e) => {
+        output.error({
+            title: 'Unable to complete a run.',
+            bodyLines: [e.message],
+        });
+        if (e.axiosException) {
+            console.log(e.axiosException);
+        }
+        else {
+            console.log(e);
+        }
+        api
+            .completeRunGroupWithError(runGroup, `Main job terminated with an error: "${e.message}"`)
+            .finally(() => process.exit(1));
+    });
+    return new Observable_1.Observable(() => { });
+};
+exports.nxCloudDistributedTasksRunner = nxCloudDistributedTasksRunner;
+class TaskOrderer {
+    constructor(projectGraph, defaultTargetDependencies) {
+        this.projectGraph = projectGraph;
+        this.defaultTargetDependencies = defaultTargetDependencies;
+    }
+    splitTasksIntoStages(tasks) {
+        if (tasks.length === 0)
+            return [];
+        const stages = [];
+        const taskGraph = this.createTaskGraph(tasks);
+        const notStagedTaskIds = new Set(tasks.map((t) => t.id));
+        let stageIndex = 0;
+        // Loop through tasks and try to stage them. As tasks are staged, they are removed from the loop
+        while (notStagedTaskIds.size > 0) {
+            const currentStage = (stages[stageIndex] = []);
+            for (const taskId of notStagedTaskIds) {
+                let ready = true;
+                for (const dependency of taskGraph.dependencies[taskId]) {
+                    if (notStagedTaskIds.has(dependency)) {
+                        // dependency has not been staged yet, this task is not ready to be staged.
+                        ready = false;
+                        break;
+                    }
+                }
+                // Some dependency still has not been staged, skip it for now, it will be processed again
+                if (!ready) {
+                    continue;
+                }
+                // All the dependencies have been staged, let's stage it.
+                const task = taskGraph.tasks[taskId];
+                currentStage.push(task);
+            }
+            // Remove the entire new stage of tasks from the list
+            for (const task of currentStage) {
+                notStagedTaskIds.delete(task.id);
+            }
+            stageIndex++;
+        }
+        return stages;
+    }
+    createTaskGraph(tasks) {
+        const t = new TaskGraphCreator(this.projectGraph, this.defaultTargetDependencies);
+        return t.createTaskGraph(tasks);
+    }
+}
+class TaskGraphCreator {
+    constructor(projectGraph, defaultTargetDependencies) {
+        this.projectGraph = projectGraph;
+        this.defaultTargetDependencies = defaultTargetDependencies;
+    }
+    createTaskGraph(tasks) {
+        const graph = {
+            roots: [],
+            tasks: {},
+            dependencies: {},
+        };
+        for (const task of tasks) {
+            this.addTaskToGraph(task, graph);
+            const dependencyConfigs = getDependencyConfigs(task.target, this.defaultTargetDependencies, this.projectGraph);
+            if (!dependencyConfigs) {
+                continue;
+            }
+            this.addTaskDependencies(task, dependencyConfigs, tasks, graph);
+        }
+        graph.roots = Object.keys(graph.dependencies).filter((k) => graph.dependencies[k].length === 0);
+        return graph;
+    }
+    addTaskDependencies(task, dependencyConfigs, tasks, graph) {
+        for (const dependencyConfig of dependencyConfigs) {
+            if (dependencyConfig.projects === 'self') {
+                for (const t of tasks) {
+                    if (t.target.project === task.target.project &&
+                        t.target.target === dependencyConfig.target) {
+                        graph.dependencies[task.id].push(t.id);
+                    }
+                }
+            }
+            else if (dependencyConfig.projects === 'dependencies') {
+                const seen = new Set();
+                this.addDependencies(task.target.project, dependencyConfig.target, tasks, graph, task.id, seen);
+            }
+        }
+    }
+    addDependencies(project, target, tasks, graph, taskId, seen) {
+        seen.add(project);
+        const dependencies = this.projectGraph.dependencies[project];
+        if (dependencies) {
+            const projectDependencies = dependencies.map((dependency) => dependency.target);
+            for (const projectDependency of projectDependencies) {
+                if (seen.has(projectDependency)) {
+                    continue;
+                }
+                const dependency = this.findTask({ project: projectDependency, target }, tasks);
+                if (dependency) {
+                    if (graph.dependencies[taskId].indexOf(dependency.id) === -1) {
+                        graph.dependencies[taskId].push(dependency.id);
+                    }
+                }
+                else {
+                    this.addDependencies(projectDependency, target, tasks, graph, taskId, seen);
+                }
+            }
+        }
+    }
+    findTask({ project, target }, tasks) {
+        return tasks.find((t) => t.target.project === project && t.target.target === target);
+    }
+    addTaskToGraph(task, graph) {
+        graph.tasks[task.id] = task;
+        graph.dependencies[task.id] = [];
+    }
+}
+exports.TaskGraphCreator = TaskGraphCreator;
+function getDefaultDependencyConfigs(nxJson, runnerOptions) {
+    var _a, _b;
+    const defaults = (_a = nxJson.targetDependencies) !== null && _a !== void 0 ? _a : {};
+    const strictlyOrderedTargets = runnerOptions
+        ? (_b = runnerOptions.strictlyOrderedTargets) !== null && _b !== void 0 ? _b : ['build']
+        : [];
+    // Strictly Ordered Targets depend on their dependencies
+    for (const target of strictlyOrderedTargets) {
+        defaults[target] = defaults[target] || [];
+        defaults[target].push({
+            target,
+            projects: 'dependencies',
+        });
+    }
+    return defaults;
+}
+//# sourceMappingURL=distributed-execution.runner.js.map

package/lib/core/runners/distributed-execution/distributed-execution.runner.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"distributed-execution.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-execution/distributed-execution.runner.ts"],"names":[],"mappings":"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"}

package/lib/core/terminal-output/end-of-run-message.d.ts

@@ -0,0 +1,8 @@
+import { RunContext } from '../models/run-context.model';
+import { TaskExecution } from '../models/task-execution.model';
+export declare class EndOfRunMessage {
+    private readonly runContext;
+    private readonly taskExecutions;
+    constructor(runContext: RunContext, taskExecutions: TaskExecution[]);
+    printCacheHitsMessage(): void;
+}

package/lib/core/terminal-output/end-of-run-message.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EndOfRunMessage = void 0;
+const environment_1 = require("../../utilities/environment");
+const print_message_1 = require("../../utilities/print-message");
+const chalk = require('chalk');
+class EndOfRunMessage {
+    constructor(runContext, taskExecutions) {
+        this.runContext = runContext;
+        this.taskExecutions = taskExecutions;
+    }
+    printCacheHitsMessage() {
+        if (environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION)
+            return;
+        const hits = this.taskExecutions
+            .filter((t) => this.runContext.statuses[t.hash] === 'remote-cache-hit')
+            .map((t) => t.projectName);
+        if (hits.length === 0 && !this.runContext.runUrl) {
+            return;
+        }
+        const tasks = hits.length === 1 ? hits[0] : `${hits.length} tasks`;
+        const message = [];
+        if (hits.length > 0) {
+            message.push(`Nx Cloud made it possible to reuse ${tasks}${this.runContext.runUrl ? `: ${this.runContext.runUrl}` : ''}`);
+        }
+        else {
+            if (this.runContext.runUrl) {
+                message.push(`See Nx Cloud run details at ${this.runContext.runUrl}`);
+            }
+        }
+        if (message.length > 0) {
+            (0, print_message_1.printMessage)(message.join(' '));
+        }
+    }
+}
+exports.EndOfRunMessage = EndOfRunMessage;
+//# sourceMappingURL=end-of-run-message.js.map

package/lib/core/terminal-output/end-of-run-message.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"end-of-run-message.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/terminal-output/end-of-run-message.ts"],"names":[],"mappings":";;;AAEA,6DAAqF;AACrF,iEAA6D;AAE7D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,MAAa,eAAe;IAC1B,YACmB,UAAsB,EACtB,cAA+B;QAD/B,eAAU,GAAV,UAAU,CAAY;QACtB,mBAAc,GAAd,cAAc,CAAiB;IAC/C,CAAC;IAEJ,qBAAqB;QACnB,IAAI,oDAAsC;YAAE,OAAO;QAEnD,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc;aAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,kBAAkB,CAAC;aACtE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAE7B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAChD,OAAO;SACR;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,QAAQ,CAAC;QACnE,MAAM,OAAO,GAAG,EAAW,CAAC;QAC5B,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,OAAO,CAAC,IAAI,CACV,sCAAsC,KAAK,GACzC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAC3D,EAAE,CACH,CAAC;SACH;aAAM;YACL,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC1B,OAAO,CAAC,IAAI,CAAC,+BAA+B,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;aACvE;SACF;QACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,IAAA,4BAAY,EAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACjC;IACH,CAAC;CACF;AAlCD,0CAkCC"}

package/lib/core/terminal-output/message-reporter.d.ts

@@ -0,0 +1,11 @@
+import { CloudTaskRunnerOptions } from '../models/cloud-task-runner-options';
+export declare class MessageReporter {
+    private readonly options;
+    cacheError: string | null;
+    apiError: string | null;
+    message: string | null;
+    constructor(options: CloudTaskRunnerOptions);
+    get anyErrors(): string | null;
+    printMessages(): void;
+    extractErrorMessage(e: any, scope: string): string | null;
+}

package/lib/core/terminal-output/message-reporter.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageReporter = void 0;
+const print_message_1 = require("../../utilities/print-message");
+const { output } = require('../../utilities/nx-imports');
+class MessageReporter {
+    constructor(options) {
+        this.options = options;
+        this.cacheError = null;
+        this.apiError = null;
+        this.message = null;
+    }
+    get anyErrors() {
+        return this.cacheError || this.apiError;
+    }
+    printMessages() {
+        if (this.anyErrors) {
+            const bodyLines = [];
+            if (this.cacheError) {
+                bodyLines.push(`- ${this.cacheError}`);
+            }
+            if (this.apiError && this.apiError !== this.cacheError) {
+                bodyLines.push(`- ${this.apiError}`);
+            }
+            output.warn({
+                title: `Nx Cloud Problems`,
+                bodyLines,
+            });
+        }
+        if (this.message) {
+            (0, print_message_1.printMessage)(this.message);
+        }
+    }
+    extractErrorMessage(e, scope) {
+        if (e.code === 'ECONNABORTED') {
+            return `Cannot connect to Nx Cloud (scope: ${scope}, code: ${e.code}). Try invoking the command with the NX_CLOUD_NO_TIMEOUTS env variable set to 'true'.`;
+        }
+        else if (e.code === 'ECONNREFUSED' ||
+            e.code === 'EAI_AGAIN' ||
+            e.code === 'ENOTFOUND' ||
+            e.code === 'EPROTO') {
+            return `Cannot connect to Nx Cloud (scope: ${scope}, code: ${e.code}).`;
+        }
+        else if (e.response && e.response.status === 401) {
+            return e.response.data.message
+                ? e.response.data.message
+                : e.response.data;
+        }
+        else if (e.response && e.response.status === 402) {
+            if (this.options.showUsageWarnings === false ||
+                this.options.showUsageWarnings === undefined)
+                return null;
+            return e.response.data.message
+                ? e.response.data.message
+                : e.response.data;
+        }
+        else {
+            let details = '';
+            if (e.response && e.response.data && e.response.data.message) {
+                details = `. ${e.response.data.message}`;
+            }
+            else if (e.response && e.response.data) {
+                details = `. ${e.response.data}`;
+            }
+            const code = e.code ? ` (code: ${e.code})` : ``;
+            return `${e.message}${details}${code}`;
+        }
+    }
+}
+exports.MessageReporter = MessageReporter;
+//# sourceMappingURL=message-reporter.js.map

package/lib/core/terminal-output/message-reporter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"message-reporter.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/terminal-output/message-reporter.ts"],"names":[],"mappings":"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"}

package/lib/core/terminal-output/output-obfuscator.d.ts

@@ -0,0 +1,6 @@
+export declare class OutputObfuscator {
+    private normalizedMaskedProperties;
+    constructor(maskedProperties?: string[]);
+    obfuscate(terminalOutput: string): string;
+    toCamelCase(input: string): string;
+}

package/lib/core/terminal-output/output-obfuscator.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OutputObfuscator = void 0;
+class OutputObfuscator {
+    constructor(maskedProperties = []) {
+        this.normalizedMaskedProperties = [];
+        // Remove possible duplicates from config
+        this.normalizedMaskedProperties = Array.from(new Set(maskedProperties)).map(this.toCamelCase);
+    }
+    obfuscate(terminalOutput) {
+        if (!this.normalizedMaskedProperties.length) {
+            return terminalOutput;
+        }
+        /**
+         * Replace instances of a secret key being used as a command flag
+         * --secret-key=somekey => --secret-key=********
+         * or
+         * --secretKey=somekey => --secretKey=********
+         */
+        this.normalizedMaskedProperties.forEach((secretKey) => {
+            const commandFlagPattern = new RegExp(`(--${secretKey}=)[\\S]*`);
+            terminalOutput = terminalOutput.replace(commandFlagPattern, '$1********');
+        });
+        /**
+         * Replace instances of a secret key's value that exists in process.env
+         * by reverse lookup
+         */
+        const secretValues = this.normalizedMaskedProperties
+            .filter((secretKey) => secretKey in process.env)
+            .map((secretKey) => process.env[secretKey]);
+        secretValues.forEach((secretValue) => {
+            terminalOutput = terminalOutput.replace(secretValue, '********');
+        });
+        return terminalOutput;
+    }
+    toCamelCase(input) {
+        if (input.indexOf('-') > 1) {
+            return input
+                .toLowerCase()
+                .replace(/-(.)/g, (match, group1) => group1.toUpperCase());
+        }
+        else {
+            return input;
+        }
+    }
+}
+exports.OutputObfuscator = OutputObfuscator;
+//# sourceMappingURL=output-obfuscator.js.map

package/lib/core/terminal-output/output-obfuscator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"output-obfuscator.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/terminal-output/output-obfuscator.ts"],"names":[],"mappings":";;;AAAA,MAAa,gBAAgB;IAG3B,YAAY,mBAA6B,EAAE;QAFnC,+BAA0B,GAAa,EAAE,CAAC;QAGhD,yCAAyC;QACzC,IAAI,CAAC,0BAA0B,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CACzE,IAAI,CAAC,WAAW,CACjB,CAAC;IACJ,CAAC;IAED,SAAS,CAAC,cAAsB;QAC9B,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE;YAC3C,OAAO,cAAc,CAAC;SACvB;QAED;;;;;WAKG;QACH,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YACpD,MAAM,kBAAkB,GAAG,IAAI,MAAM,CAAC,MAAM,SAAS,UAAU,CAAC,CAAC;YACjE,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QAEH;;;WAGG;QACH,MAAM,YAAY,GAAa,IAAI,CAAC,0BAA0B;aAC3D,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC;aAC/C,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC,CAAC;QAC/C,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACnC,cAAc,GAAG,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC1B,OAAO,KAAK;iBACT,WAAW,EAAE;iBACb,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;SAC9D;aAAM;YACL,OAAO,KAAK,CAAC;SACd;IACH,CAAC;CACF;AAjDD,4CAiDC"}

package/lib/generators/init/init.d.ts

@@ -0,0 +1,2 @@
+export declare function generator(host: any): Promise<() => void>;
+export declare function schematic(): () => Promise<(host: any, context: any) => void>;

package/lib/generators/init/init.js

@@ -0,0 +1,126 @@
+"use strict";
+var __awaiter = (this && this.__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); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.schematic = exports.generator = void 0;
+const fs_1 = require("fs");
+const rxjs_1 = require("rxjs");
+function updateNxJson(json, token) {
+    var _a, _b, _c;
+    const alreadySetOptions = (_c = (_b = (_a = json.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a.default) === null || _b === void 0 ? void 0 : _b.options) !== null && _c !== void 0 ? _c : {};
+    const options = Object.assign(Object.assign({}, alreadySetOptions), { accessToken: token });
+    // TODO: remove after Nx 13 is out
+    if (process.env.NRWL_API) {
+        options.url = process.env.NRWL_API;
+    }
+    if (process.env.NX_CLOUD_API) {
+        options.url = process.env.NX_CLOUD_API;
+    }
+    json.tasksRunnerOptions = {
+        default: {
+            runner: '@nrwl/nx-cloud',
+            options,
+        },
+    };
+}
+function updateNxJsonUsingNx(host, token) {
+    try {
+        const jsonUtils = require('nx/src/utils/json');
+        const json = jsonUtils.parseJson(host.read('nx.json', 'utf-8'));
+        updateNxJson(json, token);
+        host.write('nx.json', jsonUtils.serializeJson(json));
+    }
+    catch (ee) {
+        const json = JSON.parse(host.read('nx.json', 'utf-8'));
+        updateNxJson(json, token);
+        host.write('nx.json', JSON.stringify(json, null, 2));
+    }
+}
+function updateNxJsonUsingNrwlWorkspace(token) {
+    return require('@nrwl/workspace').updateJsonInTree('nx.json', (json) => {
+        updateNxJson(json, token);
+        return json;
+    });
+}
+function readNpmScope() {
+    const nxJson = JSON.parse((0, fs_1.readFileSync)('nx.json').toString());
+    return nxJson.npmScope;
+}
+function removeTrailingSlash(apiUrl) {
+    return apiUrl[apiUrl.length - 1] === '/'
+        ? apiUrl.substr(0, apiUrl.length - 1)
+        : apiUrl;
+}
+function createNxCloudWorkspace(workspaceName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const apiUrl = removeTrailingSlash(process.env.NX_CLOUD_API || process.env.NRWL_API || `https://api.nrwl.io`);
+        const response = yield require('axios').post(`${apiUrl}/nx-cloud/create-org-and-workspace`, {
+            workspaceName,
+        });
+        if (response.data.message) {
+            throw new Error(response.data.message);
+        }
+        return response.data;
+    });
+}
+function printMessage(url) {
+    const { output } = require('../../utilities/nx-imports');
+    let host = 'nx.app';
+    try {
+        host = new (require('url').URL)(url).host;
+    }
+    catch (e) { }
+    output.note({
+        title: `Nx Cloud has been enabled`,
+        bodyLines: [
+            `Your workspace is currently public. Anybody with code access can view the workspace on ${host}. `,
+            `You can connect the workspace to your Nx Cloud account at ${url} (You can do this later.)`,
+        ],
+    });
+}
+function printMessageTaskExecutor(url) {
+    return {
+        name: 'NxCloudPrintMessage',
+        create: () => {
+            return Promise.resolve(() => {
+                return new rxjs_1.Observable((obs) => {
+                    printMessage(url);
+                    obs.next();
+                    obs.complete();
+                });
+            });
+        },
+    };
+}
+function generator(host) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const r = yield createNxCloudWorkspace(readNpmScope());
+        updateNxJsonUsingNx(host, r.token);
+        return () => printMessage(r.url);
+    });
+}
+exports.generator = generator;
+function schematic() {
+    return () => __awaiter(this, void 0, void 0, function* () {
+        const r = yield createNxCloudWorkspace(readNpmScope());
+        return (host, context) => {
+            const engineHost = context.engine.workflow.engineHost;
+            engineHost.registerTaskExecutor(printMessageTaskExecutor(r.url));
+            context.addTask({
+                toConfiguration() {
+                    return { name: 'NxCloudPrintMessage' };
+                },
+            });
+            updateNxJsonUsingNrwlWorkspace(r.token)(host, context);
+        };
+    });
+}
+exports.schematic = schematic;
+//# sourceMappingURL=init.js.map