@takeshape/cli 8.239.0 → 8.241.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (88) hide show
  1. package/dist/commands/branch/commands/create.d.ts +2 -0
  2. package/dist/commands/branch/commands/create.d.ts.map +1 -0
  3. package/dist/commands/branch/commands/create.js +63 -0
  4. package/dist/commands/branch/commands/delete.d.ts +2 -0
  5. package/dist/commands/branch/commands/delete.d.ts.map +1 -0
  6. package/dist/commands/branch/commands/delete.js +50 -0
  7. package/dist/commands/branch/commands/list.d.ts +12 -0
  8. package/dist/commands/branch/commands/list.d.ts.map +1 -0
  9. package/dist/commands/branch/commands/list.js +54 -0
  10. package/dist/commands/branch/commands/url.d.ts +3 -0
  11. package/dist/commands/branch/commands/url.d.ts.map +1 -0
  12. package/dist/commands/branch/commands/url.js +44 -0
  13. package/dist/commands/branch/index.d.ts +4 -0
  14. package/dist/commands/branch/index.d.ts.map +1 -0
  15. package/dist/commands/branch/index.js +38 -0
  16. package/dist/commands/build-or-watch.d.ts +1 -1
  17. package/dist/commands/build-or-watch.d.ts.map +1 -1
  18. package/dist/commands/build-or-watch.js +7 -3
  19. package/dist/commands/deploy/index.d.ts +1 -1
  20. package/dist/commands/export/index.d.ts +1 -3
  21. package/dist/commands/export/index.d.ts.map +1 -1
  22. package/dist/commands/export/index.js +4 -4
  23. package/dist/commands/export/project-export.d.ts +1 -6
  24. package/dist/commands/export/project-export.d.ts.map +1 -1
  25. package/dist/commands/export/project-export.js +4 -1
  26. package/dist/commands/export/schema-export.d.ts +1 -5
  27. package/dist/commands/export/schema-export.d.ts.map +1 -1
  28. package/dist/commands/export/schema-export.js +8 -2
  29. package/dist/commands/import/index.d.ts +1 -4
  30. package/dist/commands/import/index.d.ts.map +1 -1
  31. package/dist/commands/import/index.js +10 -6
  32. package/dist/commands/import/project-import.d.ts +1 -7
  33. package/dist/commands/import/project-import.d.ts.map +1 -1
  34. package/dist/commands/import/project-import.js +5 -2
  35. package/dist/commands/import/roles-import.d.ts +1 -5
  36. package/dist/commands/import/roles-import.d.ts.map +1 -1
  37. package/dist/commands/import/roles-import.js +10 -2
  38. package/dist/commands/import/schema-import.d.ts +1 -5
  39. package/dist/commands/import/schema-import.d.ts.map +1 -1
  40. package/dist/commands/import/schema-import.js +10 -2
  41. package/dist/commands/link.d.ts +1 -1
  42. package/dist/commands/login.d.ts +3 -3
  43. package/dist/commands/login.d.ts.map +1 -1
  44. package/dist/commands/login.js +2 -1
  45. package/dist/commands/logout.d.ts +3 -3
  46. package/dist/commands/logout.d.ts.map +1 -1
  47. package/dist/commands/logout.js +2 -1
  48. package/dist/commands/schema.d.ts +1 -1
  49. package/dist/commands/schema.d.ts.map +1 -1
  50. package/dist/commands/schema.js +5 -3
  51. package/dist/commands/status.d.ts +1 -1
  52. package/dist/commands/status.d.ts.map +1 -1
  53. package/dist/commands/status.js +1 -1
  54. package/dist/commands/types.d.ts +1 -4
  55. package/dist/commands/types.d.ts.map +1 -1
  56. package/dist/commands/types.js +4 -4
  57. package/dist/commands/unlink.d.ts +3 -3
  58. package/dist/commands/unlink.d.ts.map +1 -1
  59. package/dist/commands/unlink.js +2 -1
  60. package/dist/commands/validate.d.ts +3 -6
  61. package/dist/commands/validate.d.ts.map +1 -1
  62. package/dist/commands/validate.js +5 -1
  63. package/dist/config.js +2 -0
  64. package/dist/graphql.d.ts +12 -4
  65. package/dist/graphql.d.ts.map +1 -1
  66. package/dist/graphql.js +15 -7
  67. package/dist/index.js +32 -42
  68. package/dist/main.d.ts +1 -1
  69. package/dist/main.d.ts.map +1 -1
  70. package/dist/main.js +5 -3
  71. package/dist/options.d.ts +78 -0
  72. package/dist/options.d.ts.map +1 -0
  73. package/dist/options.js +79 -0
  74. package/dist/types.d.ts +6 -4
  75. package/dist/types.d.ts.map +1 -1
  76. package/dist/util/branches.d.ts +10 -0
  77. package/dist/util/branches.d.ts.map +1 -0
  78. package/dist/util/branches.js +56 -0
  79. package/dist/util/connector.d.ts +2 -1
  80. package/dist/util/connector.d.ts.map +1 -1
  81. package/dist/util/connector.js +4 -4
  82. package/dist/util/data.d.ts +4 -3
  83. package/dist/util/data.d.ts.map +1 -1
  84. package/dist/util/data.js +6 -6
  85. package/dist/util/linked-command.d.ts +4 -3
  86. package/dist/util/linked-command.d.ts.map +1 -1
  87. package/dist/util/linked-command.js +28 -13
  88. package/package.json +8 -5
package/dist/types.d.ts CHANGED
@@ -1,5 +1,6 @@
1
- import { ApiKey } from './util/data';
2
- export declare type Handler<Flags = unknown> = (command: string, params: CliConfig, flags: Flags) => Promise<void>;
1
+ import type { ApiKey } from './util/data';
2
+ import type { Cli } from './options';
3
+ export declare type Handler = (cli: Cli, params: CliConfig) => Promise<void>;
3
4
  export interface CliConfig {
4
5
  buildPath: string;
5
6
  configFilePath: string;
@@ -16,8 +17,9 @@ export interface CliConfig {
16
17
  cache: boolean;
17
18
  watchContent: boolean;
18
19
  }
19
- export declare type AuthedHandler<Flags = unknown> = (command: string, params: LoggedInCliConfig, flags: Flags) => Promise<void>;
20
- export declare type LinkedHandler<Flags = unknown> = (command: string, params: LinkedCliConfig, flags: Flags) => Promise<void>;
20
+ export declare type AuthedHandler = (cli: Cli, params: LoggedInCliConfig) => Promise<void>;
21
+ export declare type LinkedHandler = (cli: Cli, params: LinkedCliConfig) => Promise<void>;
22
+ export declare type LoggedInAndLinkedHandler = (cli: Cli, params: LoggedInAndLinkedConfig) => Promise<void>;
21
23
  export interface LoggedInCliConfig extends CliConfig {
22
24
  authToken: string;
23
25
  personalAccessTokenId: string;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAEnC,oBAAY,OAAO,CAAC,KAAK,GAAG,OAAO,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAE3G,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,oBAAY,aAAa,CAAC,KAAK,GAAG,OAAO,IAAI,CAC3C,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,iBAAiB,EACzB,KAAK,EAAE,KAAK,KACT,OAAO,CAAC,IAAI,CAAC,CAAC;AACnB,oBAAY,aAAa,CAAC,KAAK,GAAG,OAAO,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvH,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,oBAAY,uBAAuB,GAAG,iBAAiB,GAAG,eAAe,CAAC;AAE1E,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,eAAe,CAEpF;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,iBAAiB,CAExF;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,uBAAuB,CAEpG;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,oBAAY,MAAM,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,WAAW,CAAC;AAEnC,oBAAY,OAAO,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,oBAAY,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,iBAAiB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AACnF,oBAAY,aAAa,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AACjF,oBAAY,wBAAwB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,uBAAuB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEpG,MAAM,WAAW,iBAAkB,SAAQ,SAAS;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,eAAgB,SAAQ,SAAS;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,oBAAY,uBAAuB,GAAG,iBAAiB,GAAG,eAAe,CAAC;AAE1E,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,eAAe,CAEpF;AAED,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,iBAAiB,CAExF;AAED,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,SAAS,GAAG,SAAS,IAAI,uBAAuB,CAEpG;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,YAAY,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,oBAAY,MAAM,GAAG,CAAC,MAAM,EAAE,oBAAoB,KAAK,OAAO,CAAC,eAAe,CAAC,CAAC"}
@@ -0,0 +1,10 @@
1
+ import { Cli } from '../options';
2
+ export declare type Environment = 'PRODUCTION' | 'DEVELOPMENT' | 'SCRATCH';
3
+ export declare function getEnvironment(cli: Cli, flag?: 'branch' | 'name'): Environment;
4
+ export interface BranchParams {
5
+ environment: Environment;
6
+ branch?: string;
7
+ }
8
+ export declare function getBranchParams(cli: Cli, flag?: 'branch' | 'name'): BranchParams;
9
+ export declare function getBranchBasePath({ environment, branch }: BranchParams, projectId: string): string;
10
+ //# sourceMappingURL=branches.d.ts.map
@@ -0,0 +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"}
@@ -0,0 +1,56 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.getBranchBasePath = getBranchBasePath;
7
+ exports.getBranchParams = getBranchParams;
8
+ exports.getEnvironment = getEnvironment;
9
+
10
+ var _fatalError = require("./fatal-error");
11
+
12
+ var _compact = _interopRequireDefault(require("lodash/compact"));
13
+
14
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15
+
16
+ function getEnvironment(cli, flag = 'branch') {
17
+ if (cli.flags.production) {
18
+ return 'PRODUCTION';
19
+ }
20
+
21
+ if (cli.flags.development) {
22
+ return 'DEVELOPMENT';
23
+ }
24
+
25
+ if (cli.flags.scratch) {
26
+ return 'SCRATCH';
27
+ }
28
+
29
+ return cli.flags[flag] ? 'DEVELOPMENT' : 'PRODUCTION';
30
+ }
31
+
32
+ function getBranchParams(cli, flag = 'branch') {
33
+ const branch = cli.flags[flag];
34
+ const environment = getEnvironment(cli, flag);
35
+
36
+ if (environment === 'PRODUCTION' && branch) {
37
+ return (0, _fatalError.fatalError)('There is only one production branch --name is invalid');
38
+ }
39
+
40
+ if (environment === 'DEVELOPMENT' && !branch) {
41
+ return (0, _fatalError.fatalError)('Development branches require a name, please specify one with --name');
42
+ }
43
+
44
+ return {
45
+ branch,
46
+ environment
47
+ };
48
+ }
49
+
50
+ function getBranchBasePath({
51
+ environment,
52
+ branch
53
+ }, projectId) {
54
+ const branchComponent = branch ? encodeURIComponent(branch) : undefined;
55
+ return '/' + (0, _compact.default)(['project', projectId, environment.toLowerCase(), branchComponent]).join('/');
56
+ }
@@ -1,6 +1,7 @@
1
1
  import { GraphQLConnectorOptions } from '../graphql';
2
2
  import { LinkedCliConfig } from '../types';
3
- export declare function createConnector(params: LinkedCliConfig, options?: GraphQLConnectorOptions): import("../ssg/src/types").GraphQLConnector | {
3
+ import { BranchParams } from './branches';
4
+ export declare function createConnector(params: LinkedCliConfig, branchParams: BranchParams, options?: GraphQLConnectorOptions): import("../ssg/src/types").GraphQLConnector | {
4
5
  (params: any): Promise<any>;
5
6
  clearCache(): Promise<void>;
6
7
  };
@@ -1 +1 @@
1
- {"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../../src/util/connector.ts"],"names":[],"mappings":"AACA,OAAO,EAAyC,uBAAuB,EAAC,MAAM,YAAY,CAAC;AAE3F,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;AAEzC,wBAAgB,eAAe,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,CAAC,EAAE,uBAAuB;;;EAKzF"}
1
+ {"version":3,"file":"connector.d.ts","sourceRoot":"","sources":["../../../src/util/connector.ts"],"names":[],"mappings":"AACA,OAAO,EAAyC,uBAAuB,EAAC,MAAM,YAAY,CAAC;AAE3F,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;AACzC,OAAO,EAAC,YAAY,EAAC,MAAM,YAAY,CAAC;AAExC,wBAAgB,eAAe,CAC7B,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,EAC1B,OAAO,CAAC,EAAE,uBAAuB;;;EAMlC"}
@@ -11,9 +11,9 @@ var _graphql = require("../graphql");
11
11
 
12
12
  var _cachedConnector = require("./cached-connector");
13
13
 
14
- function createConnector(params, options) {
15
- var _params$linkedApiKey;
16
-
17
- const connector = (0, _ssg.connectorWithMigrations)((0, _graphql.createConnector)(params, (_params$linkedApiKey = params.linkedApiKey) === null || _params$linkedApiKey === void 0 ? void 0 : _params$linkedApiKey.apiKey, params.projectId, options));
14
+ function createConnector(params, branchParams, options) {
15
+ const connector = (0, _ssg.connectorWithMigrations)((0, _graphql.createConnector)(params, params.linkedApiKey.apiKey, { ...branchParams,
16
+ projectId: params.projectId
17
+ }, options));
18
18
  return options !== null && options !== void 0 && options.cache ? (0, _cachedConnector.connectorWithCache)(connector) : connector;
19
19
  }
@@ -1,3 +1,4 @@
1
+ import { ProjectPathParams } from '../graphql';
1
2
  import { LoggedInCliConfig, CliConfig } from '../types';
2
3
  import { Choice } from '../prompt';
3
4
  export declare const projectListQuery = "\n {\n projects: tsGetProjectList {\n value: id\n name\n invite\n }\n }\n";
@@ -10,7 +11,7 @@ export declare const laterSite: {
10
11
  name: string;
11
12
  value: string;
12
13
  };
13
- export declare function fetchSites(params: LoggedInCliConfig, projectId: string): Promise<Choice[]>;
14
+ export declare function fetchSites(params: LoggedInCliConfig, pathParams: ProjectPathParams): Promise<Choice[]>;
14
15
  export interface PersonalAccessToken {
15
16
  accessToken: string;
16
17
  id: string;
@@ -33,6 +34,6 @@ export declare const deleteApiKeyMutation: (client: import("../types").Client, v
33
34
  }) => Promise<boolean>;
34
35
  export declare function createPersonalAccessToken(params: CliConfig, userJwt: string): Promise<PersonalAccessToken>;
35
36
  export declare function deletePersonalAccessToken(params: LoggedInCliConfig): Promise<boolean>;
36
- export declare function createReadOnlyApiKey(params: LoggedInCliConfig, projectId: string): Promise<ApiKey>;
37
- export declare function deleteApiKey(params: LoggedInCliConfig, projectId: string, apiKeyId: string): Promise<boolean>;
37
+ export declare function createReadOnlyApiKey(params: LoggedInCliConfig, pathParams: ProjectPathParams): Promise<ApiKey>;
38
+ export declare function deleteApiKey(params: LoggedInCliConfig, pathParams: ProjectPathParams, apiKeyId: string): Promise<boolean>;
38
39
  //# sourceMappingURL=data.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/util/data.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,iBAAiB,EAAE,SAAS,EAAC,MAAM,UAAU,CAAC;AACtD,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AAGjC,eAAO,MAAM,gBAAgB,4HAQ5B,CAAC;AAEF,eAAO,MAAM,aAAa,sJASzB,CAAC;AAEF,MAAM,WAAW,aAAc,SAAQ,MAAM;IAC3C,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAQhF;AAED,eAAO,MAAM,SAAS;;;CAA6C,CAAC;AAEpE,wBAAsB,UAAU,CAAC,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAShG;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,iCAAiC;UAAuB,MAAM;kCAOzE,CAAC;AAEH,eAAO,MAAM,4BAA4B;UAAuB,MAAM;qBAOpE,CAAC;AAEH,eAAO,MAAM,iCAAiC;QAAqB,MAAM;sBAIvE,CAAC;AAEH,eAAO,MAAM,oBAAoB;QAAqB,MAAM;sBAI1D,CAAC;AAMH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAOhH;AAED,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,iBAAiB,oBAOxE;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOxG;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,oBAOhG"}
1
+ {"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../src/util/data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsD,iBAAiB,EAAC,MAAM,YAAY,CAAC;AAElG,OAAO,EAAC,iBAAiB,EAAE,SAAS,EAAC,MAAM,UAAU,CAAC;AACtD,OAAO,EAAC,MAAM,EAAC,MAAM,WAAW,CAAC;AAGjC,eAAO,MAAM,gBAAgB,4HAQ5B,CAAC;AAEF,eAAO,MAAM,aAAa,sJASzB,CAAC;AAEF,MAAM,WAAW,aAAc,SAAQ,MAAM;IAC3C,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,wBAAsB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAQhF;AAED,eAAO,MAAM,SAAS;;;CAA6C,CAAC;AAEpE,wBAAsB,UAAU,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAS5G;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,EAAE,MAAM,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,MAAM;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,iCAAiC;UAAuB,MAAM;kCAOzE,CAAC;AAEH,eAAO,MAAM,4BAA4B;UAAuB,MAAM;qBAOpE,CAAC;AAEH,eAAO,MAAM,iCAAiC;QAAqB,MAAM;sBAIvE,CAAC;AAEH,eAAO,MAAM,oBAAoB;QAAqB,MAAM;sBAI1D,CAAC;AAMH,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAOhH;AAED,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,iBAAiB,oBAOxE;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,CAOpH;AAED,wBAAsB,YAAY,CAAC,MAAM,EAAE,iBAAiB,EAAE,UAAU,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,oBAO5G"}
package/dist/util/data.js CHANGED
@@ -65,9 +65,9 @@ const laterSite = {
65
65
  };
66
66
  exports.laterSite = laterSite;
67
67
 
68
- async function fetchSites(params, projectId) {
68
+ async function fetchSites(params, pathParams) {
69
69
  try {
70
- const client = (0, _graphql.createConnector)(params, params.authToken, projectId);
70
+ const client = (0, _graphql.createConnector)(params, params.authToken, pathParams);
71
71
  const {
72
72
  data
73
73
  } = await client({
@@ -137,9 +137,9 @@ async function deletePersonalAccessToken(params) {
137
137
  }
138
138
  }
139
139
 
140
- async function createReadOnlyApiKey(params, projectId) {
140
+ async function createReadOnlyApiKey(params, pathParams) {
141
141
  try {
142
- const client = (0, _graphql.createAdminConnector)(params, params.authToken, projectId);
142
+ const client = (0, _graphql.createAdminConnector)(params, params.authToken, pathParams);
143
143
  return await createReadOnlyApiKeyMutation(client, {
144
144
  name: createKeyName()
145
145
  });
@@ -148,9 +148,9 @@ async function createReadOnlyApiKey(params, projectId) {
148
148
  }
149
149
  }
150
150
 
151
- async function deleteApiKey(params, projectId, apiKeyId) {
151
+ async function deleteApiKey(params, pathParams, apiKeyId) {
152
152
  try {
153
- const client = (0, _graphql.createAdminConnector)(params, params.authToken, projectId);
153
+ const client = (0, _graphql.createAdminConnector)(params, params.authToken, pathParams);
154
154
  return await deleteApiKeyMutation(client, {
155
155
  id: apiKeyId
156
156
  });
@@ -1,4 +1,5 @@
1
- import { AuthedHandler, Handler, LinkedHandler } from '../types';
2
- export declare function linkedCommand<Flags>(handler: LinkedHandler<Flags>): Handler<Flags>;
3
- export declare function loggedInCommand<Flags>(handler: AuthedHandler<Flags>): Handler<Flags>;
1
+ import { AuthedHandler, Handler, LinkedHandler, LoggedInAndLinkedHandler } from '../types';
2
+ export declare function linkedCommand(handler: LinkedHandler): Handler;
3
+ export declare function loggedInCommand(handler: AuthedHandler): Handler;
4
+ export declare function loggedInAndLinkedCommand(handler: LoggedInAndLinkedHandler): Handler;
4
5
  //# sourceMappingURL=linked-command.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"linked-command.d.ts","sourceRoot":"","sources":["../../../src/util/linked-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAa,OAAO,EAA0C,aAAa,EAAC,MAAM,UAAU,CAAC;AAGlH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CASlF;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CASpF"}
1
+ {"version":3,"file":"linked-command.d.ts","sourceRoot":"","sources":["../../../src/util/linked-command.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAEb,OAAO,EAGP,aAAa,EACb,wBAAwB,EAGzB,MAAM,UAAU,CAAC;AAkBlB,wBAAgB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAM7D;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAK/D;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAOnF"}
@@ -4,30 +4,45 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.linkedCommand = linkedCommand;
7
+ exports.loggedInAndLinkedCommand = loggedInAndLinkedCommand;
7
8
  exports.loggedInCommand = loggedInCommand;
8
9
 
9
10
  var _types = require("../types");
10
11
 
11
12
  var _log = require("../log");
12
13
 
13
- function linkedCommand(handler) {
14
- return async (command, params, flags) => {
15
- if (!(0, _types.isLinkedCliConfig)(params)) {
16
- (0, _log.logError)('Error: Missing project information not initialized please run `takeshape link`.');
17
- process.exit(1);
18
- }
14
+ function assertLinked(params) {
15
+ if (!(0, _types.isLinkedCliConfig)(params)) {
16
+ (0, _log.logError)('Error: Missing project information not initialized please run `takeshape link`.');
17
+ process.exit(1);
18
+ }
19
+ }
20
+
21
+ function assertLoggedIn(params) {
22
+ if (!(0, _types.isLoggedInCliConfig)(params)) {
23
+ (0, _log.logError)(`Error: You are not logged in to TakeShape. Please run 'takeshape login' to login.`);
24
+ process.exit(1);
25
+ }
26
+ }
19
27
 
20
- return handler(command, params, flags);
28
+ function linkedCommand(handler) {
29
+ return async (cli, params) => {
30
+ assertLinked(params);
31
+ return handler(cli, params);
21
32
  };
22
33
  }
23
34
 
24
35
  function loggedInCommand(handler) {
25
- return async (command, params, flags) => {
26
- if (!(0, _types.isLoggedInCliConfig)(params)) {
27
- (0, _log.logError)(`Error: You are not logged in to TakeShape. Please run 'takeshape login' to login.`);
28
- process.exit(1);
29
- }
36
+ return async (cli, params) => {
37
+ assertLoggedIn(params);
38
+ return handler(cli, params);
39
+ };
40
+ }
30
41
 
31
- return handler(command, params, flags);
42
+ function loggedInAndLinkedCommand(handler) {
43
+ return async (cli, params) => {
44
+ assertLoggedIn(params);
45
+ assertLinked(params);
46
+ return handler(cli, params);
32
47
  };
33
48
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@takeshape/cli",
3
- "version": "8.239.0",
3
+ "version": "8.241.0",
4
4
  "description": "TakeShape CLI",
5
5
  "homepage": "https://www.takeshape.io",
6
6
  "repository": {
@@ -25,16 +25,17 @@
25
25
  "@graphql-codegen/typescript": "^2.4.5",
26
26
  "@graphql-tools/graphql-file-loader": "^7.3.3",
27
27
  "@graphql-tools/load": "^7.5.1",
28
- "@takeshape/schema": "8.239.0",
29
- "@takeshape/ssg": "8.239.0",
30
- "@takeshape/streams": "8.239.0",
31
- "@takeshape/util": "8.239.0",
28
+ "@takeshape/schema": "8.241.0",
29
+ "@takeshape/ssg": "8.241.0",
30
+ "@takeshape/streams": "8.241.0",
31
+ "@takeshape/util": "8.241.0",
32
32
  "archiver": "^1.3.0",
33
33
  "async-retry": "^1.2.1",
34
34
  "bluebird": "^3.4.6",
35
35
  "chalk": "^2.4.2",
36
36
  "chokidar": "^2.1.5",
37
37
  "commander": "^2.9.0",
38
+ "date-fns": "^2.28.0",
38
39
  "dotenv": "^6.0.0",
39
40
  "dotenv-stringify": "^1.0.0",
40
41
  "email-validator": "^2.0.4",
@@ -54,6 +55,7 @@
54
55
  "open": "^7.0.3",
55
56
  "ora": "^3.4.0",
56
57
  "pretty-bytes": "^5.3.0",
58
+ "prettyjson": "^1.2.1",
57
59
  "pusher-js": "^7.1.1-beta",
58
60
  "request": "^2.88.0",
59
61
  "semver": "^6.3.0",
@@ -70,6 +72,7 @@
70
72
  "@types/lodash": "^4.14.165",
71
73
  "@types/node": "^12.7.1",
72
74
  "@types/node-fetch": "^2.5.6",
75
+ "@types/prettyjson": "^0.0.30",
73
76
  "@types/request": "^2.48.4",
74
77
  "@types/semver": "^6.0.1",
75
78
  "@types/stream-to-promise": "^2.2.1",