@webiny/cli 0.0.0-mt-2 → 0.0.0-unstable.5e7233243f

package/commands/wcp/utils/getProjectEnvironment.js

@@ -0,0 +1,120 @@
+const { localStorage, log } = require("@webiny/cli/utils");
+const { request } = require("graphql-request");
+const { getWcpGqlApiUrl } = require("@webiny/wcp");
+
+const ENVIRONMENT_FIELDS = /* GraphQL */ `
+    fragment EnvironmentFields on Environment {
+        id
+        status
+        name
+        apiKey
+        org {
+            id
+            name
+        }
+        project {
+            id
+            name
+        }
+        user {
+            id
+            email
+        }
+    }
+`;
+
+const CREATE_ENVIRONMENT = /* GraphQL */ `
+    ${ENVIRONMENT_FIELDS}
+    mutation CreateEnvironment(
+        $orgId: ID!
+        $projectId: ID!
+        $userId: ID
+        $data: CreateEnvironmentDataInput!
+    ) {
+        projects {
+            createEnvironment(orgId: $orgId, projectId: $projectId, userId: $userId, data: $data) {
+                ...EnvironmentFields
+            }
+        }
+    }
+`;
+
+const GET_ENVIRONMENT = /* GraphQL */ `
+    ${ENVIRONMENT_FIELDS}
+    query GetEnvironment(
+        $environmentId: ID
+        $orgId: ID
+        $projectId: ID
+        $userId: ID
+        $apiKey: String
+    ) {
+        projects {
+            getEnvironment(
+                environmentId: $environmentId
+                orgId: $orgId
+                projectId: $projectId
+                userId: $userId
+                apiKey: $apiKey
+            ) {
+                ...EnvironmentFields
+            }
+        }
+    }
+`;
+
+module.exports.getProjectEnvironment = async ({
+    orgId,
+    projectId,
+    userId,
+    environmentId,
+    apiKey
+}) => {
+    if (apiKey) {
+        return request(getWcpGqlApiUrl(), GET_ENVIRONMENT, { apiKey })
+            .then(response => response.projects.getEnvironment)
+            .catch(() => {
+                throw new Error(
+                    `It seems the API key you provided is incorrect or disabled. Please double check the API key and try again.`
+                );
+            });
+    }
+
+    const pat = localStorage().get("wcpPat");
+    if (!pat) {
+        throw new Error(
+            `It seems you are not logged in. Please login using the ${log.error.hl(
+                "webiny login"
+            )} command.`
+        );
+    }
+
+    const headers = { authorization: pat };
+    return request(
+        getWcpGqlApiUrl(),
+        GET_ENVIRONMENT,
+        {
+            orgId,
+            projectId,
+            userId,
+            environmentId,
+            apiKey
+        },
+        headers
+    )
+        .then(async response => response.projects.getEnvironment)
+        .catch(() => {
+            return request(
+                getWcpGqlApiUrl(),
+                CREATE_ENVIRONMENT,
+                {
+                    orgId,
+                    projectId,
+                    userId,
+                    data: {
+                        name: environmentId
+                    }
+                },
+                headers
+            ).then(async response => response.projects.createEnvironment);
+        });
+};

package/commands/wcp/utils/getUser.js

@@ -0,0 +1,100 @@
+const { log } = require("@webiny/cli/utils");
+const { request } = require("graphql-request");
+const { getWcpPat } = require("./getWcpPat");
+const { getWcpGqlApiUrl } = require("@webiny/wcp");
+
+const GET_CURRENT_USER = /* GraphQL */ `
+    query GetUser {
+        users {
+            getCurrentUser {
+                id
+                email
+                firstName
+                lastName
+            }
+        }
+    }
+`;
+
+const LIST_ORGS = /* GraphQL */ `
+    query ListOrgs {
+        orgs {
+            listOrgs {
+                data {
+                    id
+                    name
+                }
+            }
+        }
+    }
+`;
+
+const LIST_PROJECTS = /* GraphQL */ `
+    query ListProjects($orgId: ID!) {
+        projects {
+            listProjects(orgId: $orgId) {
+                data {
+                    id
+                    name
+                    org {
+                        id
+                        name
+                    }
+                }
+            }
+        }
+    }
+`;
+
+let user;
+module.exports.getUser = async () => {
+    if (user) {
+        return user;
+    }
+
+    const pat = getWcpPat();
+    if (!pat) {
+        throw new Error(
+            `It seems you are not logged into your WCP project. Please log in using the ${log.error.hl(
+                "yarn webiny login"
+            )} command. If you are not using WCP, make sure you don't have an "id" property in your "webiny.project.ts" file.`
+        );
+    }
+
+    try {
+        const headers = { authorization: pat };
+        user = await request(getWcpGqlApiUrl(), GET_CURRENT_USER, {}, headers).then(
+            async response => {
+                const user = response.users.getCurrentUser;
+
+                const orgs = await request(getWcpGqlApiUrl(), LIST_ORGS, {}, headers).then(
+                    async response => {
+                        const orgs = response.orgs.listOrgs.data;
+                        for (let i = 0; i < orgs.length; i++) {
+                            const org = orgs[i];
+                            org.projects = await request(
+                                getWcpGqlApiUrl(),
+                                LIST_PROJECTS,
+                                { orgId: org.id },
+                                headers
+                            ).then(response => response.projects.listProjects.data);
+                        }
+                        return orgs;
+                    }
+                );
+
+                const projects = orgs.map(org => org.projects).flat();
+
+                return { ...user, orgs, projects };
+            }
+        );
+    } catch {
+        throw new Error(
+            `It seems the personal access token is incorrect or does not exist. Please log out and log in again using the ${log.error.hl(
+                "yarn webiny login"
+            )} command.`
+        );
+    }
+
+    return user;
+};

package/commands/wcp/utils/getWcpPat.js

@@ -0,0 +1,5 @@
+const { localStorage } = require("@webiny/cli/utils");
+
+module.exports.getWcpPat = wcpPat => {
+    return localStorage().get("wcpPat", wcpPat);
+};

package/commands/wcp/utils/index.js

@@ -0,0 +1,17 @@
+const { getUser } = require("./getUser");
+const { getProjectEnvironment } = require("./getProjectEnvironment");
+const { updateUserLastActiveOn } = require("./updateUserLastActiveOn");
+const { setProjectId } = require("./setProjectId");
+const { setWcpPat } = require("./setWcpPat");
+const { getWcpPat } = require("./getWcpPat");
+const { sleep } = require("./sleep");
+
+module.exports = {
+    getUser,
+    getProjectEnvironment,
+    updateUserLastActiveOn,
+    setProjectId,
+    setWcpPat,
+    getWcpPat,
+    sleep
+};

package/commands/wcp/utils/setProjectId.js

@@ -0,0 +1,44 @@
+const path = require("path");
+const tsMorph = require("ts-morph");
+const { log } = require("@webiny/cli/utils");
+
+module.exports.setProjectId = async ({ project, orgId, projectId }) => {
+    // Assign the necessary IDs into root `webiny.project.ts` project file.
+    const webinyProjectPath = path.join(project.root, "webiny.project.ts");
+
+    const tsMorphProject = new tsMorph.Project();
+    tsMorphProject.addSourceFileAtPath(webinyProjectPath);
+
+    const source = tsMorphProject.getSourceFile(webinyProjectPath);
+
+    const defaultExport = source.getFirstDescendant(node => {
+        if (tsMorph.Node.isExportAssignment(node) === false) {
+            return false;
+        }
+        return node.getText().startsWith("export default ");
+    });
+
+    if (!defaultExport) {
+        throw new Error(
+            `Could not find the default export in ${log.error.hl("webiny.project.ts")}.`
+        );
+    }
+
+    // Get ObjectLiteralExpression within the default export and assign the `id` property to it.
+    const exportedObjectLiteral = defaultExport.getFirstDescendant(
+        node => tsMorph.Node.isObjectLiteralExpression(node) === true
+    );
+
+    const existingIdProperty = exportedObjectLiteral.getProperty(node => {
+        return tsMorph.Node.isPropertyAssignment(node) && node.getName() === "id";
+    });
+
+    const fullId = `${orgId}/${projectId}`;
+    if (tsMorph.Node.isPropertyAssignment(existingIdProperty)) {
+        existingIdProperty.setInitializer(`"${fullId}"`);
+    } else {
+        exportedObjectLiteral.insertProperty(0, `id: "${fullId}"`);
+    }
+
+    await tsMorphProject.save();
+};

package/commands/wcp/utils/setWcpPat.js

@@ -0,0 +1,5 @@
+const { localStorage } = require("@webiny/cli/utils");
+
+module.exports.setWcpPat = wcpPat => {
+    localStorage().set("wcpPat", wcpPat);
+};

package/commands/wcp/utils/sleep.js

@@ -0,0 +1 @@
+module.exports.sleep = () => new Promise(resolve => setTimeout(resolve, 1500));

package/commands/wcp/utils/updateUserLastActiveOn.js

@@ -0,0 +1,28 @@
+const { request } = require("graphql-request");
+const { localStorage, log } = require("@webiny/cli/utils");
+const { getWcpGqlApiUrl } = require("@webiny/wcp");
+
+const UPDATE_LAST_ACTIVE_TO_NOW = /* GraphQL */ `
+    mutation UpdateLastActiveToNow {
+        users {
+            updateLastActiveToNow {
+                id
+                lastActiveOn
+            }
+        }
+    }
+`;
+
+module.exports.updateUserLastActiveOn = async () => {
+    const pat = localStorage().get("wcpPat");
+    if (!pat) {
+        throw new Error(
+            `It seems you are not logged in. Please login using the ${log.error.hl(
+                "webiny login"
+            )} command.`
+        );
+    }
+
+    const headers = { authorization: pat };
+    return request(getWcpGqlApiUrl(), UPDATE_LAST_ACTIVE_TO_NOW, {}, headers);
+};

package/commands/wcp/whoami.js

@@ -0,0 +1,43 @@
+const { getUser } = require("./utils");
+
+module.exports.command = () => ({
+    type: "cli-command",
+    name: "cli-command-wcp-whoami",
+    create({ yargs, context }) {
+        yargs.command(
+            "whoami",
+            `Display the current logged-in user`,
+            yargs => {
+                yargs.example("$0 whoami");
+                yargs.option("debug", {
+                    describe: `Turn on debug logs`,
+                    type: "boolean"
+                });
+                yargs.option("debug-level", {
+                    default: 1,
+                    describe: `Set the debug logs verbosity level`,
+                    type: "number"
+                });
+            },
+            async ({ debug }) => {
+                try {
+                    const user = await getUser();
+                    console.log(
+                        `You are logged in to Webiny Control Panel as ${context.info.hl(
+                            user.email
+                        )}.`
+                    );
+                } catch (e) {
+                    if (debug) {
+                        context.debug(e);
+                    }
+                    throw new Error(
+                        `It seems you are not logged in. Please login using the ${context.error.hl(
+                            "webiny login"
+                        )} command.`
+                    );
+                }
+            }
+        );
+    }
+});

package/context.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const { importModule, getProject, PluginsContainer, log, localStorage } = require("./utils");
+const { importModule, getProject, PluginsContainer, log, localStorage, noop } = require("./utils");
 
 const project = getProject();
 
@@ -92,7 +92,7 @@ class Context {
     log = log.log;
     info = log.info;
     success = log.success;
-    debug = log.debug;
+    debug = process.argv.includes("--debug") ? log.debug : noop;
     warning = log.warning;
     error = log.error;
 

package/index.d.ts

@@ -0,0 +1,3 @@
+import { CliContext } from "./types";
+
+export declare const cli: CliContext;

package/index.js

@@ -0,0 +1,3 @@
+const context = require("./context");
+
+module.exports.cli = context;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/cli",
-	"version": "0.0.0-mt-2",
+	"version": "0.0.0-unstable.5e7233243f",
 	"main": "index.js",
 	"bin": {
 		"webiny": "./bin.js"
@@ -13,19 +13,26 @@
 	"author": "Pavel Denisjuk <pavel@webiny.com>",
 	"description": "A tool to bootstrap a Webiny project.",
 	"dependencies": {
-		"@webiny/telemetry": "0.0.0-mt-2",
+		"@webiny/telemetry": "0.0.0-unstable.5e7233243f",
+		"@webiny/wcp": "0.0.0-unstable.5e7233243f",
 		"boolean": "3.1.4",
 		"camelcase": "5.3.1",
 		"chalk": "4.1.2",
 		"dotenv": "8.2.0",
-		"execa": "2.1.0",
+		"execa": "5.1.1",
 		"fast-glob": "3.2.7",
 		"find-up": "5.0.0",
-		"pirates": "4.0.1",
-		"semver": "7.3.4",
-		"typescript": "4.1.3",
+		"fs-extra": "9.1.0",
+		"graphql-request": "3.7.0",
+		"inquirer": "7.3.3",
+		"ncp": "2.0.0",
+		"open": "8.4.0",
+		"pirates": "4.0.5",
+		"semver": "7.3.7",
+		"ts-morph": "11.0.3",
+		"typescript": "4.7.4",
 		"uniqid": "5.4.0",
-		"yargs": "14.2.3"
+		"yargs": "17.5.1"
 	},
 	"license": "MIT",
 	"publishConfig": {
@@ -43,9 +50,7 @@
 				"@webiny/project-utils",
 				"@webiny/api-file-manager",
 				"@webiny/cli-plugin-deploy-pulumi",
-				"@webiny/handler",
-				"@webiny/handler-http",
-				"@webiny/handler-args",
+				"@webiny/api",
 				"@webiny/handler-client",
 				"@webiny/api-elasticsearch",
 				"@webiny/api-tenancy",
@@ -59,5 +64,5 @@
 			]
 		}
 	},
-	"gitHead": "3c0dcfb3c22c9f83107fdb97b25014cd03d9db7d"
+	"gitHead": "995a4b337db9b8497c6615e335dcd206afe26f8f"
 }

package/types.d.ts

@@ -15,7 +15,7 @@ export interface PluginsContainer {
  * A simplified plugin interface, used specifically within the Webiny CLI.
  * Not in relation with "@webiny/plugins" package.
  */
-export interface Plugin<T = Record<string, any>> {
+export interface Plugin {
     type: string;
     name?: string;
     [key: string]: any;
@@ -40,9 +40,9 @@ interface Project {
  * A type that represents the logging method.
  */
 interface Log {
-    (...args): string;
-    hl: (...args) => string;
-    highlight: (...args) => string;
+    (...args: any): string;
+    hl: (...args: any) => string;
+    highlight: (...args: any) => string;
 }
 
 /**
@@ -100,7 +100,7 @@ export interface CliContext {
     /**
      * Resolve given dir or dirs against project root path.
      */
-    resolve: (dir) => string;
+    resolve: (dir: string) => string;
 
     /**
      * Provides a way to store some meta data in the project's local ".webiny/cli.json" file.
@@ -111,39 +111,3 @@ export interface CliContext {
         get: (key: string) => any;
     };
 }
-
-/**
- * Args received from the CLI.
- */
-interface CliUpgradePluginOptions {
-    /**
-     * Targeted version of the upgrade.
-     */
-    targetVersion: string;
-}
-/**
- *
- */
-export interface CliUpgradePlugin extends Plugin {
-    /**
-     * Name of the plugin to differentiate from others.
-     * Something like: cli-upgrade-5.0.0
-     */
-    name: string;
-    /**
-     * Type of the plugin.
-     */
-    type: "cli-upgrade";
-    /**
-     * Version the plugin is for.
-     */
-    version: string;
-    /**
-     * Is this plugin usable for the upgrade?
-     */
-    canUpgrade?: (options: CliUpgradePluginOptions, context: CliContext) => Promise<boolean>;
-    /**
-     * Apply the upgrade.
-     */
-    upgrade: (options: CliUpgradePluginOptions, context: CliContext) => Promise<void>;
-}

package/utils/createProjectApplicationWorkspace.js

@@ -0,0 +1,16 @@
+const util = require("util");
+const fs = require("fs-extra");
+const ncpBase = require("ncp");
+const ncp = util.promisify(ncpBase.ncp);
+
+module.exports = async projectApplication => {
+    if (await fs.pathExists(projectApplication.paths.workspace)) {
+        await fs.remove(projectApplication.paths.workspace);
+    }
+
+    await fs.ensureDir(projectApplication.paths.workspace);
+    await ncp(projectApplication.paths.absolute, projectApplication.paths.workspace);
+
+    // Wait a bit and make sure the files are ready to have its content replaced.
+    return new Promise(resolve => setTimeout(resolve, 10));
+};

package/utils/getApiProjectApplicationFolder.js

@@ -0,0 +1,12 @@
+const fs = require("fs");
+const path = require("path");
+
+// This function has been created in order to help preserve backwards compatibility
+// (from 5.29.0, the `api` app has been moved into the `apps/api` directory).
+module.exports = project => {
+    if (fs.existsSync(path.join(project.root, "api"))) {
+        return "api";
+    }
+
+    return "apps/api";
+};

package/utils/getProjectApplication.js

@@ -1,4 +1,4 @@
-const { dirname, basename, join } = require("path");
+const { dirname, basename, join, relative } = require("path");
 const findUp = require("find-up");
 const getProject = require("./getProject");
 const { importModule } = require("./importModule");
@@ -15,31 +15,55 @@ module.exports = args => {
     }
 
     const rootFile = applicationRootFile.replace(/\\/g, "/");
-    const applicationRoot = dirname(rootFile);
+    const projectAppRootPath = dirname(rootFile);
 
     let applicationConfig;
     if (appConfigs.includes(basename(rootFile))) {
         applicationConfig = importModule(rootFile);
     }
 
-    let name, id;
+    let id, name, description;
     if (applicationConfig) {
         id = applicationConfig.id;
         name = applicationConfig.name;
+        description = applicationConfig.description;
     } else {
-        name = basename(applicationRoot);
+        name = basename(projectAppRootPath);
+        description = name;
         id = name;
     }
 
+    const project = getProject(args);
+
+    const projectAppRelativePath = relative(project.root, projectAppRootPath);
+    const projectAppWorkspacePath = join(
+        project.root,
+        ".webiny",
+        "workspaces",
+        projectAppRelativePath
+    );
+
+    // If we're missing the `pulumi` property in the `applicationConfig` object, that
+    // means we're dealing with an old project application where all of the Pulumi code is
+    // located in user's project. New projects applications have this code abstracted away.
+    const type = applicationConfig.pulumi ? "v5-workspaces" : "v5";
+
     return {
         id,
         name,
-        root: applicationRoot,
+        description,
+        type,
+        root: projectAppRootPath,
+        paths: {
+            relative: projectAppRelativePath,
+            absolute: projectAppRootPath,
+            workspace: projectAppWorkspacePath
+        },
         config: applicationConfig,
-        project: getProject(args),
+        project,
         get packages() {
             const webinyConfigs = glob.sync(
-                join(applicationRoot, "**/webiny.config*.{ts,js}").replace(/\\/g, "/")
+                join(projectAppRootPath, "**/webiny.config*.{ts,js}").replace(/\\/g, "/")
             );
 
             return webinyConfigs.map(config => {

package/utils/index.d.ts

@@ -0,0 +1 @@
+export function getApiProjectApplicationFolder(project: Record<string, any>): boolean;

package/utils/index.js

@@ -1,17 +1,26 @@
 const { importModule } = require("./importModule");
+const createProjectApplicationWorkspace = require("./createProjectApplicationWorkspace");
 const getProject = require("./getProject");
 const getProjectApplication = require("./getProjectApplication");
+const getApiProjectApplicationFolder = require("./getApiProjectApplicationFolder");
 const localStorage = require("./localStorage");
 const log = require("./log");
 const sendEvent = require("./sendEvent");
 const PluginsContainer = require("./PluginsContainer");
 
+const noop = () => {
+    // Do nothing.
+};
+
 module.exports = {
-    importModule,
+    createProjectApplicationWorkspace,
+    getApiProjectApplicationFolder,
     getProject,
     getProjectApplication,
+    importModule,
     localStorage,
     log,
+    noop,
     sendEvent,
     PluginsContainer
 };