create-nx-workspace 19.5.3 → 19.5.4

package/bin/create-nx-workspace.js

@@ -14,7 +14,6 @@ const get_third_party_preset_1 = require("../src/utils/preset/get-third-party-pr
 const prompts_1 = require("../src/internal-utils/prompts");
 const yargs_options_1 = require("../src/internal-utils/yargs-options");
 const show_nx_warning_1 = require("../src/utils/nx/show-nx-warning");
-const nx_cloud_1 = require("../src/utils/nx/nx-cloud");
 const ab_testing_1 = require("../src/utils/nx/ab-testing");
 const error_utils_1 = require("../src/utils/error-utils");
 const fs_1 = require("fs");
@@ -125,7 +124,7 @@ async function main(parsedArgs) {
         ],
     });
     if (parsedArgs.nxCloud && workspaceInfo.nxCloudInfo) {
-        (0, nx_cloud_1.printNxCloudSuccessMessage)(workspaceInfo.nxCloudInfo);
+        console.log(workspaceInfo.nxCloudInfo);
     }
     if ((0, preset_1.isKnownPreset)(parsedArgs.preset)) {
         (0, point_to_tutorial_and_course_1.pointToTutorialAndCourse)(parsedArgs.preset);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nx-workspace",
-  "version": "19.5.3",
+  "version": "19.5.4",
   "private": false,
   "description": "Smart Monorepos · Fast CI",
   "repository": {
@@ -37,7 +37,7 @@
     "tmp": "~0.2.1",
     "tslib": "^2.3.0",
     "yargs": "^17.6.2",
-    "axios": "^1.6.0"
+    "axios": "^1.7.2"
   },
   "publishConfig": {
     "access": "public"

package/src/create-workspace.js

@@ -26,19 +26,19 @@ async function createWorkspace(preset, options) {
     if (thirdPartyPackageName) {
         await (0, create_preset_1.createPreset)(thirdPartyPackageName, options, packageManager, directory);
     }
-    let nxCloudInstallRes;
+    let connectUrl;
+    let nxCloudInfo;
     if (nxCloud !== 'skip') {
-        nxCloudInstallRes = await (0, nx_cloud_1.setupNxCloud)(directory, packageManager, nxCloud, useGitHub);
+        const token = await (0, nx_cloud_1.setupNxCloud)(directory, nxCloud, useGitHub);
         if (nxCloud !== 'yes') {
-            await (0, setup_ci_1.setupCI)(directory, nxCloud, packageManager, nxCloudInstallRes?.code === 0);
+            await (0, setup_ci_1.setupCI)(directory, nxCloud, packageManager);
         }
+        const { connectCloudUrl, output } = await (0, nx_cloud_1.getOnboardingInfo)(nxCloud, token, directory, useGitHub);
+        connectUrl = connectCloudUrl;
+        nxCloudInfo = output;
     }
     if (!skipGit) {
         try {
-            let connectUrl;
-            if (nxCloudInstallRes?.code === 0) {
-                connectUrl = extractConnectUrl(nxCloudInstallRes?.stdout);
-            }
             await (0, git_1.initializeGitRepo)(directory, { defaultBase, commit, connectUrl });
         }
         catch (e) {
@@ -54,7 +54,7 @@ async function createWorkspace(preset, options) {
         }
     }
     return {
-        nxCloudInfo: nxCloudInstallRes?.stdout,
+        nxCloudInfo,
         directory,
     };
 }

package/src/utils/ci/setup-ci.d.ts

@@ -1,5 +1,5 @@
 import { PackageManager } from '../package-manager';
-export declare function setupCI(directory: string, ci: string, packageManager: PackageManager, nxCloudSuccessfullyInstalled: boolean): Promise<{
+export declare function setupCI(directory: string, ci: string, packageManager: PackageManager): Promise<{
     code: number;
     stdout: string;
 }>;

package/src/utils/ci/setup-ci.js

@@ -6,16 +6,7 @@ const child_process_utils_1 = require("../child-process-utils");
 const error_utils_1 = require("../error-utils");
 const output_1 = require("../output");
 const package_manager_1 = require("../package-manager");
-async function setupCI(directory, ci, packageManager, nxCloudSuccessfullyInstalled) {
-    if (!nxCloudSuccessfullyInstalled) {
-        output_1.output.error({
-            title: `CI workflow generation skipped`,
-            bodyLines: [
-                `Nx Cloud was not installed`,
-                `The autogenerated CI workflow requires Nx Cloud to be set-up.`,
-            ],
-        });
-    }
+async function setupCI(directory, ci, packageManager) {
     const ciSpinner = ora(`Generating CI workflow`).start();
     try {
         const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);

package/src/utils/nx/messages.d.ts

@@ -0,0 +1,259 @@
+declare const outputMessages: {
+    readonly 'create-nx-workspace-success-ci-setup': readonly [{
+        readonly code: "nx-cloud-workspace-push-goto";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "nx-cloud-powered-ci-setup-visit";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "nx-cloud-powered-ci-setup-connect";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "ci-setup-visit";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "ci-setup-connect";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "nx-cloud-powered-ci-setup-visit-warn";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "nx-cloud-powered-ci-setup-connect-warn";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "ci-setup-visit-warn";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "ci-setup-connect-warn";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }];
+    readonly 'create-nx-workspace-success-cache-setup': readonly [{
+        readonly code: "nx-cloud-workspace-push-goto";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "nx-cloud-remote-cache-setup-finish";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "nx-cloud-remote-cache-setup-connect";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "remote-cache-visit";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "remote-cache-connect";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "nx-cloud-remote-cache-setup-visit-warn";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "nx-cloud-remote-cache-setup-connect-warn";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "remote-cache-visit-warn";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }, {
+        readonly code: "remote-cache-connect-warn";
+        readonly createMessage: (url: string) => {
+            title: string;
+            type: string;
+            bodyLines: string[];
+        };
+    }];
+};
+type OutputMessageKey = keyof typeof outputMessages;
+export declare function getMessageFactory(key: OutputMessageKey): {
+    readonly code: "nx-cloud-workspace-push-goto";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "nx-cloud-powered-ci-setup-visit";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "nx-cloud-powered-ci-setup-connect";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "ci-setup-visit";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "ci-setup-connect";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "nx-cloud-powered-ci-setup-visit-warn";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "nx-cloud-powered-ci-setup-connect-warn";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "ci-setup-visit-warn";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "ci-setup-connect-warn";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "nx-cloud-workspace-push-goto";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "nx-cloud-remote-cache-setup-finish";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "nx-cloud-remote-cache-setup-connect";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "remote-cache-visit";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "remote-cache-connect";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "nx-cloud-remote-cache-setup-visit-warn";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "nx-cloud-remote-cache-setup-connect-warn";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "remote-cache-visit-warn";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+} | {
+    readonly code: "remote-cache-connect-warn";
+    readonly createMessage: (url: string) => {
+        title: string;
+        type: string;
+        bodyLines: string[];
+    };
+};
+export {};

package/src/utils/nx/messages.js

@@ -0,0 +1,185 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMessageFactory = getMessageFactory;
+const outputMessages = {
+    'create-nx-workspace-success-ci-setup': [
+        {
+            code: 'nx-cloud-workspace-push-goto',
+            createMessage: (url) => ({
+                title: `Your Nx Cloud workspace is ready.`,
+                type: 'success',
+                bodyLines: [
+                    `To claim it, connect it to your Nx Cloud account:`,
+                    `- Push your repository to your git hosting provider.`,
+                    `- Go to the following URL to connect your workspace to Nx Cloud:`,
+                    '',
+                    `${url}`,
+                ],
+            }),
+        },
+        {
+            code: 'nx-cloud-powered-ci-setup-visit',
+            createMessage: (url) => ({
+                title: `Your CI setup powered by Nx Cloud is almost complete.`,
+                type: 'success',
+                bodyLines: [`Finish it by visiting: ${url}`],
+            }),
+        },
+        {
+            code: 'nx-cloud-powered-ci-setup-connect',
+            createMessage: (url) => ({
+                title: `Your CI setup powered by Nx Cloud is almost complete.`,
+                type: 'success',
+                bodyLines: [`Connect your repository: ${url}`],
+            }),
+        },
+        {
+            code: 'ci-setup-visit',
+            createMessage: (url) => ({
+                title: `Your CI setup is almost complete.`,
+                type: 'success',
+                bodyLines: [`Finish it by visiting: ${url}`],
+            }),
+        },
+        {
+            code: 'ci-setup-connect',
+            createMessage: (url) => ({
+                title: `Your CI setup is almost complete.`,
+                type: 'success',
+                bodyLines: [`Connect your repository: ${url}`],
+            }),
+        },
+        {
+            code: 'nx-cloud-powered-ci-setup-visit-warn',
+            createMessage: (url) => ({
+                title: `Your CI setup powered by Nx Cloud is almost complete.`,
+                type: 'warning',
+                bodyLines: [`Finish it by visiting: ${url}`],
+            }),
+        },
+        {
+            code: 'nx-cloud-powered-ci-setup-connect-warn',
+            createMessage: (url) => ({
+                title: `Your CI setup powered by Nx Cloud is almost complete.`,
+                type: 'warning',
+                bodyLines: [`Connect your repository: ${url}`],
+            }),
+        },
+        {
+            code: 'ci-setup-visit-warn',
+            createMessage: (url) => ({
+                title: `Your CI setup is almost complete.`,
+                type: 'warning',
+                bodyLines: [`Finish it by visiting: ${url}`],
+            }),
+        },
+        {
+            code: 'ci-setup-connect-warn',
+            createMessage: (url) => ({
+                title: `Your CI setup is almost complete.`,
+                type: 'warning',
+                bodyLines: [`Connect your repository: ${url}`],
+            }),
+        },
+    ],
+    'create-nx-workspace-success-cache-setup': [
+        {
+            code: 'nx-cloud-workspace-push-goto',
+            createMessage: (url) => ({
+                title: `Your Nx Cloud workspace is ready.`,
+                type: 'success',
+                bodyLines: [
+                    `To claim it, connect it to your Nx Cloud account:`,
+                    `- Push your repository to your git hosting provider.`,
+                    `- Go to the following URL to connect your workspace to Nx Cloud:`,
+                    '',
+                    `${url}`,
+                ],
+            }),
+        },
+        {
+            code: 'nx-cloud-remote-cache-setup-finish',
+            createMessage: (url) => ({
+                title: `Your Nx Cloud remote cache setup is almost complete.`,
+                type: 'success',
+                bodyLines: [`Finish it by visiting: ${url}`],
+            }),
+        },
+        {
+            code: 'nx-cloud-remote-cache-setup-connect',
+            createMessage: (url) => ({
+                title: `Your Nx Cloud remote cache setup is almost complete.`,
+                type: 'success',
+                bodyLines: [`Connect your repository: ${url}`],
+            }),
+        },
+        {
+            code: 'remote-cache-visit',
+            createMessage: (url) => ({
+                title: `Your remote cache setup is almost complete.`,
+                type: 'success',
+                bodyLines: [`Finish it by visiting: ${url}`],
+            }),
+        },
+        {
+            code: 'remote-cache-connect',
+            createMessage: (url) => ({
+                title: `Your remote cache setup is almost complete.`,
+                type: 'success',
+                bodyLines: [`Connect your repository: ${url}`],
+            }),
+        },
+        {
+            code: 'nx-cloud-remote-cache-setup-visit-warn',
+            createMessage: (url) => ({
+                title: `Your Nx Cloud remote cache setup is almost complete.`,
+                type: 'warning',
+                bodyLines: [`Finish it by visiting: ${url}`],
+            }),
+        },
+        {
+            code: 'nx-cloud-remote-cache-setup-connect-warn',
+            createMessage: (url) => ({
+                title: `Your Nx Cloud remote cache setup is almost complete.`,
+                type: 'warning',
+                bodyLines: [`Connect your repository: ${url}`],
+            }),
+        },
+        {
+            code: 'remote-cache-visit-warn',
+            createMessage: (url) => ({
+                title: `Your remote cache setup is almost complete.`,
+                type: 'warning',
+                bodyLines: [`Finish it by visiting: ${url}`],
+            }),
+        },
+        {
+            code: 'remote-cache-connect-warn',
+            createMessage: (url) => ({
+                title: `Your remote cache setup is almost complete.`,
+                type: 'warning',
+                bodyLines: [`Connect your repository: ${url}`],
+            }),
+        },
+    ],
+};
+class ABTestingMessages {
+    constructor() {
+        this.selectedMessages = {};
+    }
+    getMessageFactory(key) {
+        if (this.selectedMessages[key] === undefined) {
+            if (process.env.NX_GENERATE_DOCS_PROCESS === 'true') {
+                this.selectedMessages[key] = 0;
+            }
+            else {
+                this.selectedMessages[key] = Math.floor(Math.random() * outputMessages[key].length);
+            }
+        }
+        return outputMessages[key][this.selectedMessages[key]];
+    }
+}
+const messages = new ABTestingMessages();
+function getMessageFactory(key) {
+    return messages.getMessageFactory(key);
+}

package/src/utils/nx/nx-cloud.d.ts

@@ -1,7 +1,6 @@
-import { PackageManager } from '../package-manager';
 export type NxCloud = 'yes' | 'github' | 'circleci' | 'skip';
-export declare function setupNxCloud(directory: string, packageManager: PackageManager, nxCloud: NxCloud, useGitHub?: boolean): Promise<{
-    code: number;
-    stdout: string;
+export declare function setupNxCloud(directory: string, nxCloud: NxCloud, useGitHub?: boolean): Promise<string>;
+export declare function getOnboardingInfo(nxCloud: NxCloud, token: string, directory: string, useGithub?: boolean): Promise<{
+    output: string;
+    connectCloudUrl: string;
 }>;
-export declare function printNxCloudSuccessMessage(nxCloudOut: string): void;

package/src/utils/nx/nx-cloud.js

@@ -1,24 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupNxCloud = setupNxCloud;
-exports.printNxCloudSuccessMessage = printNxCloudSuccessMessage;
+exports.getOnboardingInfo = getOnboardingInfo;
 const ora = require("ora");
-const child_process_utils_1 = require("../child-process-utils");
 const output_1 = require("../output");
-const package_manager_1 = require("../package-manager");
 const error_utils_1 = require("../error-utils");
-async function setupNxCloud(directory, packageManager, nxCloud, useGitHub) {
+const messages_1 = require("./messages");
+async function setupNxCloud(directory, nxCloud, useGitHub) {
     const nxCloudSpinner = ora(`Setting up Nx Cloud`).start();
     try {
-        const pmc = (0, package_manager_1.getPackageManagerCommand)(packageManager);
-        const res = await (0, child_process_utils_1.execAndWait)(`${pmc.exec} nx g nx:connect-to-nx-cloud --installationSource=create-nx-workspace --directory=${directory} ${useGitHub ? '--github' : ''} --no-interactive`, directory);
-        if (nxCloud !== 'yes') {
-            nxCloudSpinner.succeed('CI workflow with Nx Cloud has been generated successfully');
+        // nx-ignore-next-line
+        const { connectWorkspaceToCloud } = require(require.resolve('nx/src/command-line/connect/connect-to-nx-cloud', {
+            paths: [directory],
         }
-        else {
-            nxCloudSpinner.succeed('Nx Cloud has been set up successfully');
-        }
-        return res;
+        // nx-ignore-next-line
+        ));
+        const accessToken = await connectWorkspaceToCloud({
+            installationSource: 'create-nx-workspace',
+            directory,
+            github: useGitHub,
+        });
+        nxCloudSpinner.succeed('Nx Cloud has been set up successfully');
+        return accessToken;
     }
     catch (e) {
         nxCloudSpinner.fail();
@@ -37,19 +40,26 @@ async function setupNxCloud(directory, packageManager, nxCloud, useGitHub) {
         nxCloudSpinner.stop();
     }
 }
-function printNxCloudSuccessMessage(nxCloudOut) {
-    // remove leading Nx carret and any new lines
-    const logContent = nxCloudOut.split('NX   ')[1];
-    const indexOfTitleEnd = logContent.indexOf('\n');
-    const title = logContent.slice(0, logContent.indexOf('\n')).trim();
-    const bodyLines = logContent
-        .slice(indexOfTitleEnd)
-        .replace(/^\n*/, '') // remove leading new lines
-        .replace(/\n*$/, '') // remove trailing new lines
-        .split('\n')
-        .map((r) => r.trim());
-    output_1.output.warn({
-        title,
-        bodyLines,
-    });
+async function getOnboardingInfo(nxCloud, token, directory, useGithub) {
+    // nx-ignore-next-line
+    const { createNxCloudOnboardingURL } = require(require.resolve('nx/src/nx-cloud/utilities/url-shorten', {
+        paths: [directory],
+    }
+    // nx-ignore-next-line
+    ));
+    const source = nxCloud === 'yes'
+        ? 'create-nx-workspace-success-cache-setup'
+        : 'create-nx-workspace-success-ci-setup';
+    const { code, createMessage } = (0, messages_1.getMessageFactory)(source);
+    const connectCloudUrl = await createNxCloudOnboardingURL(source, token, useGithub ??
+        (nxCloud === 'yes' || nxCloud === 'github' || nxCloud === 'circleci'), code);
+    const out = new output_1.CLIOutput(false);
+    const message = createMessage(connectCloudUrl);
+    if (message.type === 'success') {
+        out.success(message);
+    }
+    else {
+        out.warn(message);
+    }
+    return { output: out.getOutput(), connectCloudUrl };
 }

package/src/utils/output.d.ts

@@ -15,7 +15,10 @@ export interface CLISuccessMessageConfig {
     title: string;
     bodyLines?: string[];
 }
-declare class CLIOutput {
+export declare class CLIOutput {
+    private real;
+    private outstream;
+    constructor(real?: boolean);
     /**
      * Longer dash character which forms more of a continuous line when place side to side
      * with itself, unlike the standard dash character
@@ -53,6 +56,6 @@ declare class CLIOutput {
     log({ title, bodyLines, color }: CLIWarnMessageConfig & {
         color?: string;
     }): void;
+    getOutput(): string;
 }
 export declare const output: CLIOutput;
-export {};

package/src/utils/output.js

@@ -4,7 +4,7 @@
  * we duplicate the helper functions from @nx/workspace in this file.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.output = void 0;
+exports.output = exports.CLIOutput = void 0;
 const chalk = require("chalk");
 const os_1 = require("os");
 const is_ci_1 = require("./ci/is-ci");
@@ -15,7 +15,9 @@ if ((0, is_ci_1.isCI)()) {
     chalk.level = 0;
 }
 class CLIOutput {
-    constructor() {
+    constructor(real = true) {
+        this.real = real;
+        this.outstream = this.real ? process.stdout : new FakeStdout();
         /**
          * Expose some color and other utility functions so that other parts of the codebase that need
          * more fine-grained control of message bodies are still using a centralized
@@ -45,7 +47,7 @@ class CLIOutput {
         return divider;
     }
     writeToStdOut(str) {
-        process.stdout.write(str);
+        this.outstream.write(str);
     }
     writeOutputTitle({ color, title, }) {
         this.writeToStdOut(`${this.applyCLIPrefix(color, title)}${os_1.EOL}`);
@@ -134,5 +136,20 @@ class CLIOutput {
         this.writeOptionalOutputBody(bodyLines);
         this.addNewline();
     }
+    getOutput() {
+        return this.outstream.toString();
+    }
 }
+exports.CLIOutput = CLIOutput;
 exports.output = new CLIOutput();
+class FakeStdout {
+    constructor() {
+        this.content = '';
+    }
+    write(str) {
+        this.content += str;
+    }
+    toString() {
+        return this.content;
+    }
+}