@takeshape/cli 8.269.0 → 8.271.1

package/dist/commands/branch/commands/merge.d.ts

@@ -0,0 +1,2 @@
+export declare const mergeBranch: import("../../../types").Handler;
+//# sourceMappingURL=merge.d.ts.map

package/dist/commands/branch/commands/merge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../../../src/commands/branch/commands/merge.ts"],"names":[],"mappings":"AA2FA,eAAO,MAAM,WAAW,kCAsEtB,CAAC"}

package/dist/commands/branch/commands/merge.js

@@ -0,0 +1,158 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mergeBranch = void 0;
+
+var _linkedCommand = require("../../../util/linked-command");
+
+var _graphql = require("../../../graphql");
+
+var _log = _interopRequireDefault(require("../../../log"));
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _branches = require("../../../util/branches");
+
+var _fatalError = require("../../../util/fatal-error");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const getBranchQuery = (0, _graphql.graphQLQuery)(
+/* GraphQL */
+`
+  query CliGetBranchQuery($projectId: String!, $environment: TSSchemaBranchEnvironment!, $branchName: String) {
+    result: tsGetSchemaBranch(projectId: $projectId, environment: $environment, branchName: $branchName) {
+      latestVersion {
+        branchName
+        environment
+        version
+      }
+    }
+  }
+`);
+const getBranchParentQuery = (0, _graphql.graphQLQuery)(
+/* GraphQL */
+`
+  query CliGetBranchParentQuery($projectId: String!, $environment: TSSchemaBranchEnvironment!, $branchName: String) {
+    result: tsGetSchemaBranch(projectId: $projectId, environment: $environment, branchName: $branchName) {
+      parentVersion {
+        branchName
+        environment
+      }
+    }
+  }
+`);
+const mergeBranchMutation = (0, _graphql.graphQLQuery)(
+/* GraphQL */
+`
+  mutation CliMergeBranchMutation($input: TSMergeSchemaBranchInput!) {
+    result: tsMergeSchemaBranch(input: $input) {
+      dryRun
+      deletedBranch {
+        environment
+        branchName
+      }
+      mergedBranch {
+        environment
+        branchName
+      }
+    }
+  }
+`);
+
+function ensureHeadArgs(cli) {
+  if (!cli.flags.head) {
+    throw new Error('You must provide a --head to merge.');
+  }
+
+  return (0, _branches.getBranchArgs)(cli.flags.head);
+}
+
+const mergeBranch = (0, _linkedCommand.loggedInAndLinkedCommand)(async (cli, params) => {
+  try {
+    const {
+      dryRun,
+      deleteMergedBranch
+    } = cli.flags;
+    const {
+      projectId
+    } = params;
+    const head = ensureHeadArgs(cli);
+    const baseInput = cli.flags.base && (0, _branches.getBranchArgs)(cli.flags.base);
+    const targetInput = cli.flags.target && (0, _branches.getBranchArgs)(cli.flags.target);
+    const client = (0, _graphql.createAdminConnector)(params, params.authToken, projectId);
+    let base;
+
+    if (baseInput) {
+      const baseQueryResult = await getBranchQuery(client, {
+        projectId,
+        ...baseInput
+      });
+
+      if (!(baseQueryResult !== null && baseQueryResult !== void 0 && baseQueryResult.latestVersion)) {
+        return (0, _fatalError.fatalError)('Base branch does not exist');
+      }
+
+      const {
+        environment,
+        branchName
+      } = baseQueryResult.latestVersion;
+      base = {
+        environment,
+        branchName
+      };
+    } else {
+      const parentQueryResult = await getBranchParentQuery(client, {
+        projectId,
+        ...head
+      });
+
+      if (!(parentQueryResult !== null && parentQueryResult !== void 0 && parentQueryResult.parentVersion)) {
+        return (0, _fatalError.fatalError)('Head branch does not exist');
+      }
+
+      base = parentQueryResult.parentVersion;
+    }
+
+    const targetParams = targetInput ? {
+      projectId,
+      ...targetInput
+    } : {
+      projectId,
+      ...base
+    };
+    const branchQueryResult = await getBranchQuery(client, targetParams);
+
+    if (!(branchQueryResult !== null && branchQueryResult !== void 0 && branchQueryResult.latestVersion)) {
+      return (0, _fatalError.fatalError)('Target branch does not exist');
+    }
+
+    const target = branchQueryResult.latestVersion;
+    const res = await mergeBranchMutation(client, {
+      input: {
+        deleteMergedHead: deleteMergedBranch ?? false,
+        dryRun: dryRun ?? false,
+        projectId,
+        head,
+        base,
+        target
+      }
+    });
+    const headBranchName = head.branchName ?? head.environment.toLowerCase();
+    const baseBranchName = base.branchName ?? base.environment.toLocaleLowerCase();
+    const targetBranchName = target.branchName ?? target.environment.toLocaleLowerCase();
+    const deletedBranchName = res.deletedBranch ? res.deletedBranch.branchName ?? res.deletedBranch.environment : undefined;
+    const dryRunText = res.dryRun ? _chalk.default.blue('[DRY RUN]') : '';
+    (0, _log.default)(_chalk.default.green(`${dryRunText} Head branch "${headBranchName}" was merged into base branch "${baseBranchName}"`.trim()));
+    (0, _log.default)(_chalk.default.green(`${dryRunText} Target branch "${targetBranchName}" was updated`.trim()));
+
+    if (deletedBranchName) {
+      (0, _log.default)(_chalk.default.green(`${dryRunText} Head branch "${headBranchName}" was deleted`.trim()));
+    }
+  } catch (e) {
+    (0, _fatalError.fatalError)(e.message);
+  }
+});
+exports.mergeBranch = mergeBranch;

package/dist/commands/branch/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/branch/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AAmBpC,QAAA,MAAM,cAAc,EAAE,OAQrB,CAAC;AAEF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/branch/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AAqBpC,QAAA,MAAM,cAAc,EAAE,OAQrB,CAAC;AAEF,eAAe,cAAc,CAAC"}

package/dist/commands/branch/index.js

@@ -19,6 +19,8 @@ var _list = require("./commands/list");
 
 var _tagVersion = require("./commands/tag-version");
 
+var _merge = require("./commands/merge");
+
 const subcommands = {
   delete: _delete.deleteBranch,
   create: _create.createBranch,
@@ -26,7 +28,8 @@ const subcommands = {
   url: _url.getUrl,
   versionUrl: _url.getVersionUrl,
   list: _list.listBranches,
-  tagVersion: _tagVersion.tagBranchVersion
+  tagVersion: _tagVersion.tagBranchVersion,
+  merge: _merge.mergeBranch
 };
 
 const commandHandler = async (cli, params) => {

package/dist/index.js

@@ -44,6 +44,12 @@ const help = `
                   it multiple time with the same tag and no hash specified it
                   will return the versioned API URL for the existing tag and
                   will not create a new one
+      merge       merge two branches and place the output in a target branch —
+                  'branch merge --head my_branch' will use my_branch as a merge
+                  head, the branch's parent as a base, and the parent as a target.
+                  This typically means your merge will be compared to production
+                  and merged into production.
+
 
       Examples
         $ takeshape build --file path/to/tsg.yml
@@ -53,6 +59,7 @@ const help = `
         $ takeshape branch promote --name my-feature
         $ takeshape branch url --production
         $ takeshape branch tagVersion --name my-feature --tag my-tag
+        $ takeshape brance merge --head my-feature
 
     Options
       --token,         -t  TakeShape API auth token
@@ -75,6 +82,12 @@ const help = `
         --tag          tag to apply to a branch version
         --hash         (optional) which version to hash — if not specified will tag the latest
 
+      Only for the merge command — base and target are optional
+        --head                a development branch name to use as the head. Use this
+                              flag alone for a smart merge with the branch parent.
+        --base                the development branch name or 'production' to use for the base
+        --target              the development branch name to 'production' to use for the target
+
       --branch         use with non-branch commands to specify the branch name, required when using --development
       --name           use with branch commands to specify the branch name, required when using --development
 

package/dist/options.d.ts

@@ -78,6 +78,21 @@ export declare const options: {
         readonly hash: {
             readonly type: "string";
         };
+        readonly dryRun: {
+            readonly type: "boolean";
+        };
+        readonly deleteMergedBranch: {
+            readonly type: "boolean";
+        };
+        readonly head: {
+            readonly type: "string";
+        };
+        readonly base: {
+            readonly type: "string";
+        };
+        readonly target: {
+            readonly type: "string";
+        };
     };
 };
 export declare type Flags = typeof options.flags;

package/dist/options.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,MAAM,CAAC;AAE5B,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgFV,CAAC;AAEX,oBAAY,KAAK,GAAG,OAAO,OAAO,CAAC,KAAK,CAAC;AACzC,oBAAY,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,GAAG;IAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;CAAC,CAAC"}
+{"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../../src/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,MAAM,CAAC;AAE5B,eAAO,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+FV,CAAC;AAEX,oBAAY,KAAK,GAAG,OAAO,OAAO,CAAC,KAAK,CAAC;AACzC,oBAAY,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,GAAG;IAAC,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAA;CAAC,CAAC"}

package/dist/options.js

@@ -82,6 +82,21 @@ const options = {
     },
     hash: {
       type: 'string'
+    },
+    dryRun: {
+      type: 'boolean'
+    },
+    deleteMergedBranch: {
+      type: 'boolean'
+    },
+    head: {
+      type: 'string'
+    },
+    base: {
+      type: 'string'
+    },
+    target: {
+      type: 'string'
     }
   }
 };

package/dist/util/branches.d.ts

@@ -1,10 +1,18 @@
 import { Cli } from '../options';
-export declare type Environment = 'PRODUCTION' | 'DEVELOPMENT' | 'SCRATCH';
-export declare function getEnvironment(cli: Cli, flag?: 'branch' | 'name'): Environment;
+import { BRANCH_ENVIRONMENT_PRODUCTION_ENUM, BRANCH_ENVIRONMENT_DEVELOPMENT_ENUM, BRANCH_ENVIRONMENT_SCRATCH_ENUM } from '@takeshape/branches';
+export declare type BranchFlag = 'branch' | 'name';
+export declare type Environment = typeof BRANCH_ENVIRONMENT_PRODUCTION_ENUM | typeof BRANCH_ENVIRONMENT_DEVELOPMENT_ENUM | typeof BRANCH_ENVIRONMENT_SCRATCH_ENUM;
+export declare function getEnvironment(cli: Cli, flag?: BranchFlag): Environment;
+export declare function isEnvironment(environment: string): environment is Environment;
+export declare type BranchArgs = {
+    environment: Environment;
+    branchName?: string;
+};
+export declare function getBranchArgs(name: string): BranchArgs;
 export interface BranchParams {
     environment: Environment;
     branch?: string;
 }
-export declare function getBranchParams(cli: Cli, flag?: 'branch' | 'name'): BranchParams;
+export declare function getBranchParams(cli: Cli, flag?: BranchFlag): BranchParams;
 export declare function getBranchBasePath({ environment, branch }: BranchParams, projectId: string): string;
 //# sourceMappingURL=branches.d.ts.map

package/dist/util/branches.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branches.d.ts","sourceRoot":"","sources":["../../../src/util/branches.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AAI/B,oBAAY,WAAW,GAAG,YAAY,GAAG,aAAa,GAAG,SAAS,CAAC;AAEnE,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,GAAE,QAAQ,GAAG,MAAiB,GAAG,WAAW,CAcxF;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,GAAE,QAAQ,GAAG,MAAiB,GAAG,YAAY,CAa1F;AAED,wBAAgB,iBAAiB,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAGhG"}
+{"version":3,"file":"branches.d.ts","sourceRoot":"","sources":["../../../src/util/branches.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,YAAY,CAAC;AAG/B,OAAO,EAEL,kCAAkC,EAClC,mCAAmC,EACnC,+BAA+B,EAChC,MAAM,qBAAqB,CAAC;AAE7B,oBAAY,UAAU,GAAG,QAAQ,GAAG,MAAM,CAAC;AAE3C,oBAAY,WAAW,GACnB,OAAO,kCAAkC,GACzC,OAAO,mCAAmC,GAC1C,OAAO,+BAA+B,CAAC;AAE3C,wBAAgB,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,GAAE,UAAqB,GAAG,WAAW,CAcjF;AAED,wBAAgB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW,IAAI,WAAW,CAM7E;AAED,oBAAY,UAAU,GAAG;IACvB,WAAW,EAAE,WAAW,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,UAAU,CAWtD;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,WAAW,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,eAAe,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,GAAE,UAAqB,GAAG,YAAY,CAanF;AAED,wBAAgB,iBAAiB,CAAC,EAAC,WAAW,EAAE,MAAM,EAAC,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAGhG"}

package/dist/util/branches.js

@@ -3,41 +3,62 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.getBranchArgs = getBranchArgs;
 exports.getBranchBasePath = getBranchBasePath;
 exports.getBranchParams = getBranchParams;
 exports.getEnvironment = getEnvironment;
+exports.isEnvironment = isEnvironment;
 
 var _fatalError = require("./fatal-error");
 
 var _compact = _interopRequireDefault(require("lodash/compact"));
 
+var _branches = require("@takeshape/branches");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function getEnvironment(cli, flag = 'branch') {
   if (cli.flags.production) {
-    return 'PRODUCTION';
+    return _branches.BRANCH_ENVIRONMENT_PRODUCTION_ENUM;
   }
 
   if (cli.flags.development) {
-    return 'DEVELOPMENT';
+    return _branches.BRANCH_ENVIRONMENT_DEVELOPMENT_ENUM;
   }
 
   if (cli.flags.scratch) {
-    return 'SCRATCH';
+    return _branches.BRANCH_ENVIRONMENT_SCRATCH_ENUM;
   }
 
-  return cli.flags[flag] ? 'DEVELOPMENT' : 'PRODUCTION';
+  return cli.flags[flag] ? _branches.BRANCH_ENVIRONMENT_DEVELOPMENT_ENUM : _branches.BRANCH_ENVIRONMENT_PRODUCTION_ENUM;
+}
+
+function isEnvironment(environment) {
+  return [_branches.BRANCH_ENVIRONMENT_PRODUCTION_ENUM, _branches.BRANCH_ENVIRONMENT_DEVELOPMENT_ENUM, _branches.BRANCH_ENVIRONMENT_SCRATCH_ENUM].includes(environment);
+}
+
+function getBranchArgs(name) {
+  if (name === _branches.BRANCH_ENVIRONMENT_PRODUCTION) {
+    return {
+      environment: _branches.BRANCH_ENVIRONMENT_PRODUCTION_ENUM
+    };
+  }
+
+  return {
+    environment: _branches.BRANCH_ENVIRONMENT_DEVELOPMENT_ENUM,
+    branchName: name
+  };
 }
 
 function getBranchParams(cli, flag = 'branch') {
   const branch = cli.flags[flag];
   const environment = getEnvironment(cli, flag);
 
-  if (environment === 'PRODUCTION' && branch) {
+  if (environment === _branches.BRANCH_ENVIRONMENT_PRODUCTION_ENUM && branch) {
     return (0, _fatalError.fatalError)('There is only one production branch --name is invalid');
   }
 
-  if (environment === 'DEVELOPMENT' && !branch) {
+  if (environment === _branches.BRANCH_ENVIRONMENT_DEVELOPMENT_ENUM && !branch) {
     return (0, _fatalError.fatalError)('Development branches require a name, please specify one with --name');
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takeshape/cli",
-  "version": "8.269.0",
+  "version": "8.271.1",
   "description": "TakeShape CLI",
   "homepage": "https://www.takeshape.io",
   "repository": {
@@ -57,11 +57,11 @@
     "semver": "^6.3.0",
     "stream-to-promise": "^2.2.0",
     "tmp": "^0.0.33",
-    "@takeshape/branches": "8.269.0",
-    "@takeshape/schema": "8.269.0",
-    "@takeshape/streams": "8.269.0",
-    "@takeshape/ssg": "8.269.0",
-    "@takeshape/util": "8.269.0"
+    "@takeshape/branches": "8.271.1",
+    "@takeshape/schema": "8.271.1",
+    "@takeshape/ssg": "8.271.1",
+    "@takeshape/util": "8.271.1",
+    "@takeshape/streams": "8.271.1"
   },
   "devDependencies": {
     "@types/archiver": "^3.1.0",