@strapi/cloud-cli 0.0.0-next.80375f19ecbd1a8f298515d011c3ddb5ed05f924 → 0.0.0-next.840550dc97a3782302ddf918d3a0d07e59dd11eb

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 (52) hide show
  1. package/dist/index.js +543 -148
  2. package/dist/index.js.map +1 -1
  3. package/dist/index.mjs +543 -145
  4. package/dist/index.mjs.map +1 -1
  5. package/dist/src/cloud/command.d.ts +3 -0
  6. package/dist/src/cloud/command.d.ts.map +1 -0
  7. package/dist/src/create-project/action.d.ts.map +1 -1
  8. package/dist/src/create-project/command.d.ts.map +1 -1
  9. package/dist/src/create-project/utils/get-project-name-from-pkg.d.ts +3 -0
  10. package/dist/src/create-project/utils/get-project-name-from-pkg.d.ts.map +1 -0
  11. package/dist/src/create-project/utils/project-questions.utils.d.ts +20 -0
  12. package/dist/src/create-project/utils/project-questions.utils.d.ts.map +1 -0
  13. package/dist/src/deploy-project/action.d.ts.map +1 -1
  14. package/dist/src/deploy-project/command.d.ts.map +1 -1
  15. package/dist/src/environment/command.d.ts +3 -0
  16. package/dist/src/environment/command.d.ts.map +1 -0
  17. package/dist/src/environment/list/action.d.ts +4 -0
  18. package/dist/src/environment/list/action.d.ts.map +1 -0
  19. package/dist/src/environment/list/command.d.ts +4 -0
  20. package/dist/src/environment/list/command.d.ts.map +1 -0
  21. package/dist/src/environment/list/index.d.ts +7 -0
  22. package/dist/src/environment/list/index.d.ts.map +1 -0
  23. package/dist/src/index.d.ts +3 -0
  24. package/dist/src/index.d.ts.map +1 -1
  25. package/dist/src/link/action.d.ts +4 -0
  26. package/dist/src/link/action.d.ts.map +1 -0
  27. package/dist/src/link/command.d.ts +7 -0
  28. package/dist/src/link/command.d.ts.map +1 -0
  29. package/dist/src/link/index.d.ts +7 -0
  30. package/dist/src/link/index.d.ts.map +1 -0
  31. package/dist/src/list-projects/action.d.ts +4 -0
  32. package/dist/src/list-projects/action.d.ts.map +1 -0
  33. package/dist/src/list-projects/command.d.ts +7 -0
  34. package/dist/src/list-projects/command.d.ts.map +1 -0
  35. package/dist/src/list-projects/index.d.ts +7 -0
  36. package/dist/src/list-projects/index.d.ts.map +1 -0
  37. package/dist/src/login/action.d.ts.map +1 -1
  38. package/dist/src/login/command.d.ts.map +1 -1
  39. package/dist/src/logout/action.d.ts.map +1 -1
  40. package/dist/src/logout/command.d.ts.map +1 -1
  41. package/dist/src/services/build-logs.d.ts.map +1 -1
  42. package/dist/src/services/cli-api.d.ts +44 -7
  43. package/dist/src/services/cli-api.d.ts.map +1 -1
  44. package/dist/src/services/strapi-info-save.d.ts +1 -1
  45. package/dist/src/services/strapi-info-save.d.ts.map +1 -1
  46. package/dist/src/types.d.ts +5 -1
  47. package/dist/src/types.d.ts.map +1 -1
  48. package/dist/src/utils/analytics.d.ts +4 -0
  49. package/dist/src/utils/analytics.d.ts.map +1 -0
  50. package/dist/src/utils/compress-files.d.ts.map +1 -1
  51. package/dist/src/utils/pkg.d.ts.map +1 -1
  52. package/package.json +9 -8
package/dist/index.mjs CHANGED
@@ -1,12 +1,12 @@
1
1
  import crypto$1 from "crypto";
2
- import fse from "fs-extra";
2
+ import * as fse from "fs-extra";
3
+ import fse__default from "fs-extra";
3
4
  import * as path from "path";
4
5
  import path__default from "path";
5
6
  import chalk from "chalk";
6
7
  import axios, { AxiosError } from "axios";
7
8
  import * as crypto from "node:crypto";
8
9
  import { env } from "@strapi/utils";
9
- import * as fs from "fs";
10
10
  import * as tar from "tar";
11
11
  import { minimatch } from "minimatch";
12
12
  import inquirer from "inquirer";
@@ -18,10 +18,10 @@ import jwt from "jsonwebtoken";
18
18
  import stringify from "fast-safe-stringify";
19
19
  import ora from "ora";
20
20
  import * as cliProgress from "cli-progress";
21
- import EventSource from "eventsource";
22
- import fs$1 from "fs/promises";
23
21
  import pkgUp from "pkg-up";
24
22
  import * as yup from "yup";
23
+ import EventSource from "eventsource";
24
+ import { createCommand } from "commander";
25
25
  const apiConfig = {
26
26
  apiBaseUrl: env("STRAPI_CLI_CLOUD_API", "https://cloud-cli-api.strapi.io"),
27
27
  dashboardBaseUrl: env("STRAPI_CLI_CLOUD_DASHBOARD", "https://cloud.strapi.io")
@@ -40,23 +40,6 @@ const IGNORED_PATTERNS = [
40
40
  "**/.idea/**",
41
41
  "**/.vscode/**"
42
42
  ];
43
- const getFiles = (dirPath, ignorePatterns = [], arrayOfFiles = [], subfolder = "") => {
44
- const entries = fs.readdirSync(path.join(dirPath, subfolder));
45
- entries.forEach((entry) => {
46
- const entryPathFromRoot = path.join(subfolder, entry);
47
- const entryPath = path.relative(dirPath, entryPathFromRoot);
48
- const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
49
- if (isIgnored) {
50
- return;
51
- }
52
- if (fs.statSync(entryPath).isDirectory()) {
53
- getFiles(dirPath, ignorePatterns, arrayOfFiles, entryPathFromRoot);
54
- } else {
55
- arrayOfFiles.push(entryPath);
56
- }
57
- });
58
- return arrayOfFiles;
59
- };
60
43
  const isIgnoredFile = (folderPath, file, ignorePatterns) => {
61
44
  ignorePatterns.push(...IGNORED_PATTERNS);
62
45
  const relativeFilePath = path.join(folderPath, file);
@@ -74,16 +57,35 @@ const isIgnoredFile = (folderPath, file, ignorePatterns) => {
74
57
  }
75
58
  return isIgnored;
76
59
  };
77
- const readGitignore = (folderPath) => {
60
+ const getFiles = async (dirPath, ignorePatterns = [], subfolder = "") => {
61
+ const arrayOfFiles = [];
62
+ const entries = await fse.readdir(path.join(dirPath, subfolder));
63
+ for (const entry of entries) {
64
+ const entryPathFromRoot = path.join(subfolder, entry);
65
+ const entryPath = path.relative(dirPath, entryPathFromRoot);
66
+ const isIgnored = isIgnoredFile(dirPath, entryPathFromRoot, ignorePatterns);
67
+ if (!isIgnored) {
68
+ if (fse.statSync(entryPath).isDirectory()) {
69
+ const subFiles = await getFiles(dirPath, ignorePatterns, entryPathFromRoot);
70
+ arrayOfFiles.push(...subFiles);
71
+ } else {
72
+ arrayOfFiles.push(entryPath);
73
+ }
74
+ }
75
+ }
76
+ return arrayOfFiles;
77
+ };
78
+ const readGitignore = async (folderPath) => {
78
79
  const gitignorePath = path.resolve(folderPath, ".gitignore");
79
- if (!fs.existsSync(gitignorePath))
80
+ const pathExist = await fse.pathExists(gitignorePath);
81
+ if (!pathExist)
80
82
  return [];
81
- const gitignoreContent = fs.readFileSync(gitignorePath, "utf8");
83
+ const gitignoreContent = await fse.readFile(gitignorePath, "utf8");
82
84
  return gitignoreContent.split(/\r?\n/).filter((line) => Boolean(line.trim()) && !line.startsWith("#"));
83
85
  };
84
86
  const compressFilesToTar = async (storagePath, folderToCompress, filename) => {
85
- const ignorePatterns = readGitignore(folderToCompress);
86
- const filesToCompress = getFiles(folderToCompress, ignorePatterns);
87
+ const ignorePatterns = await readGitignore(folderToCompress);
88
+ const filesToCompress = await getFiles(folderToCompress, ignorePatterns);
87
89
  return tar.c(
88
90
  {
89
91
  gzip: true,
@@ -96,7 +98,7 @@ const APP_FOLDER_NAME = "com.strapi.cli";
96
98
  const CONFIG_FILENAME = "config.json";
97
99
  async function checkDirectoryExists(directoryPath) {
98
100
  try {
99
- const fsStat = await fse.lstat(directoryPath);
101
+ const fsStat = await fse__default.lstat(directoryPath);
100
102
  return fsStat.isDirectory();
101
103
  } catch (e) {
102
104
  return false;
@@ -104,14 +106,14 @@ async function checkDirectoryExists(directoryPath) {
104
106
  }
105
107
  async function getTmpStoragePath() {
106
108
  const storagePath = path__default.join(os.tmpdir(), APP_FOLDER_NAME);
107
- await fse.ensureDir(storagePath);
109
+ await fse__default.ensureDir(storagePath);
108
110
  return storagePath;
109
111
  }
110
112
  async function getConfigPath() {
111
113
  const configDirs = XDGAppPaths(APP_FOLDER_NAME).configDirs();
112
114
  const configPath = configDirs.find(checkDirectoryExists);
113
115
  if (!configPath) {
114
- await fse.ensureDir(configDirs[0]);
116
+ await fse__default.ensureDir(configDirs[0]);
115
117
  return configDirs[0];
116
118
  }
117
119
  return configPath;
@@ -119,9 +121,9 @@ async function getConfigPath() {
119
121
  async function getLocalConfig() {
120
122
  const configPath = await getConfigPath();
121
123
  const configFilePath = path__default.join(configPath, CONFIG_FILENAME);
122
- await fse.ensureFile(configFilePath);
124
+ await fse__default.ensureFile(configFilePath);
123
125
  try {
124
- return await fse.readJSON(configFilePath, { encoding: "utf8", throws: true });
126
+ return await fse__default.readJSON(configFilePath, { encoding: "utf8", throws: true });
125
127
  } catch (e) {
126
128
  return {};
127
129
  }
@@ -129,10 +131,10 @@ async function getLocalConfig() {
129
131
  async function saveLocalConfig(data) {
130
132
  const configPath = await getConfigPath();
131
133
  const configFilePath = path__default.join(configPath, CONFIG_FILENAME);
132
- await fse.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
134
+ await fse__default.writeJson(configFilePath, data, { encoding: "utf8", spaces: 2, mode: 384 });
133
135
  }
134
136
  const name = "@strapi/cloud-cli";
135
- const version = "4.25.2";
137
+ const version = "5.0.2";
136
138
  const description = "Commands to interact with the Strapi Cloud";
137
139
  const keywords = [
138
140
  "strapi",
@@ -173,17 +175,18 @@ const scripts = {
173
175
  build: "pack-up build",
174
176
  clean: "run -T rimraf ./dist",
175
177
  lint: "run -T eslint .",
178
+ "test:unit": "run -T jest",
176
179
  watch: "pack-up watch"
177
180
  };
178
181
  const dependencies = {
179
- "@strapi/utils": "4.25.2",
180
- axios: "1.6.0",
182
+ "@strapi/utils": "workspace:*",
183
+ axios: "1.7.4",
181
184
  chalk: "4.1.2",
182
185
  "cli-progress": "3.12.0",
183
186
  commander: "8.3.0",
184
187
  eventsource: "2.0.2",
185
188
  "fast-safe-stringify": "2.1.1",
186
- "fs-extra": "10.0.0",
189
+ "fs-extra": "11.2.0",
187
190
  inquirer: "8.2.5",
188
191
  jsonwebtoken: "9.0.0",
189
192
  "jwks-rsa": "3.1.0",
@@ -192,7 +195,7 @@ const dependencies = {
192
195
  open: "8.4.0",
193
196
  ora: "5.4.1",
194
197
  "pkg-up": "3.1.0",
195
- tar: "6.1.13",
198
+ tar: "6.2.1",
196
199
  "xdg-app-paths": "8.3.0",
197
200
  yup: "0.32.9"
198
201
  };
@@ -201,8 +204,8 @@ const devDependencies = {
201
204
  "@types/cli-progress": "3.11.5",
202
205
  "@types/eventsource": "1.1.15",
203
206
  "@types/lodash": "^4.14.191",
204
- "eslint-config-custom": "4.25.2",
205
- tsconfig: "4.25.2"
207
+ "eslint-config-custom": "workspace:*",
208
+ tsconfig: "workspace:*"
206
209
  };
207
210
  const engines = {
208
211
  node: ">=18.0.0 <=20.x.x",
@@ -255,7 +258,7 @@ async function cloudApiFactory({ logger }, token) {
255
258
  deploy({ filePath, project }, { onUploadProgress }) {
256
259
  return axiosCloudAPI.post(
257
260
  `/deploy/${project.name}`,
258
- { file: fse.createReadStream(filePath) },
261
+ { file: fse__default.createReadStream(filePath) },
259
262
  {
260
263
  headers: {
261
264
  "Content-Type": "multipart/form-data"
@@ -298,8 +301,61 @@ async function cloudApiFactory({ logger }, token) {
298
301
  throw error;
299
302
  }
300
303
  },
301
- listProjects() {
302
- return axiosCloudAPI.get("/projects");
304
+ async listProjects() {
305
+ try {
306
+ const response = await axiosCloudAPI.get("/projects");
307
+ if (response.status !== 200) {
308
+ throw new Error("Error fetching cloud projects from the server.");
309
+ }
310
+ return response;
311
+ } catch (error) {
312
+ logger.debug(
313
+ "🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
314
+ );
315
+ throw error;
316
+ }
317
+ },
318
+ async listLinkProjects() {
319
+ try {
320
+ const response = await axiosCloudAPI.get("/projects-linkable");
321
+ if (response.status !== 200) {
322
+ throw new Error("Error fetching cloud projects from the server.");
323
+ }
324
+ return response;
325
+ } catch (error) {
326
+ logger.debug(
327
+ "🥲 Oops! Couldn't retrieve your project's list from the server. Please try again."
328
+ );
329
+ throw error;
330
+ }
331
+ },
332
+ async listEnvironments({ name: name2 }) {
333
+ try {
334
+ const response = await axiosCloudAPI.get(`/projects/${name2}/environments`);
335
+ if (response.status !== 200) {
336
+ throw new Error("Error fetching cloud environments from the server.");
337
+ }
338
+ return response;
339
+ } catch (error) {
340
+ logger.debug(
341
+ "🥲 Oops! Couldn't retrieve your project's environments from the server. Please try again."
342
+ );
343
+ throw error;
344
+ }
345
+ },
346
+ async getProject({ name: name2 }) {
347
+ try {
348
+ const response = await axiosCloudAPI.get(`/projects/${name2}`);
349
+ if (response.status !== 200) {
350
+ throw new Error("Error fetching project's details.");
351
+ }
352
+ return response;
353
+ } catch (error) {
354
+ logger.debug(
355
+ "🥲 Oops! There was a problem retrieving your project's details. Please try again."
356
+ );
357
+ throw error;
358
+ }
303
359
  },
304
360
  track(event, payload = {}) {
305
361
  return axiosCloudAPI.post("/track", {
@@ -314,18 +370,18 @@ async function save(data, { directoryPath } = {}) {
314
370
  const alreadyInFileData = await retrieve({ directoryPath });
315
371
  const storedData = { ...alreadyInFileData, ...data };
316
372
  const pathToFile = path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
317
- await fse.ensureDir(path__default.dirname(pathToFile));
318
- await fse.writeJson(pathToFile, storedData, { encoding: "utf8" });
373
+ await fse__default.ensureDir(path__default.dirname(pathToFile));
374
+ await fse__default.writeJson(pathToFile, storedData, { encoding: "utf8" });
319
375
  }
320
376
  async function retrieve({
321
377
  directoryPath
322
378
  } = {}) {
323
379
  const pathToFile = path__default.join(directoryPath || process.cwd(), LOCAL_SAVE_FILENAME);
324
- const pathExists = await fse.pathExists(pathToFile);
380
+ const pathExists = await fse__default.pathExists(pathToFile);
325
381
  if (!pathExists) {
326
382
  return {};
327
383
  }
328
- return fse.readJSON(pathToFile, { encoding: "utf8" });
384
+ return fse__default.readJSON(pathToFile, { encoding: "utf8" });
329
385
  }
330
386
  const strapiInfoSave = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
331
387
  __proto__: null,
@@ -570,6 +626,56 @@ const index = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePropert
570
626
  local: strapiInfoSave,
571
627
  tokenServiceFactory
572
628
  }, Symbol.toStringTag, { value: "Module" }));
629
+ yup.object({
630
+ name: yup.string().required(),
631
+ exports: yup.lazy(
632
+ (value) => yup.object(
633
+ typeof value === "object" ? Object.entries(value).reduce(
634
+ (acc, [key, value2]) => {
635
+ if (typeof value2 === "object") {
636
+ acc[key] = yup.object({
637
+ types: yup.string().optional(),
638
+ source: yup.string().required(),
639
+ module: yup.string().optional(),
640
+ import: yup.string().required(),
641
+ require: yup.string().required(),
642
+ default: yup.string().required()
643
+ }).noUnknown(true);
644
+ } else {
645
+ acc[key] = yup.string().matches(/^\.\/.*\.json$/).required();
646
+ }
647
+ return acc;
648
+ },
649
+ {}
650
+ ) : void 0
651
+ ).optional()
652
+ )
653
+ });
654
+ const loadPkg = async ({ cwd, logger }) => {
655
+ const pkgPath = await pkgUp({ cwd });
656
+ if (!pkgPath) {
657
+ throw new Error("Could not find a package.json in the current directory");
658
+ }
659
+ const buffer = await fse.readFile(pkgPath);
660
+ const pkg = JSON.parse(buffer.toString());
661
+ logger.debug("Loaded package.json:", os.EOL, pkg);
662
+ return pkg;
663
+ };
664
+ async function getProjectNameFromPackageJson(ctx) {
665
+ try {
666
+ const packageJson2 = await loadPkg(ctx);
667
+ return packageJson2.name || "my-strapi-project";
668
+ } catch (e) {
669
+ return "my-strapi-project";
670
+ }
671
+ }
672
+ const trackEvent = async (ctx, cloudApiService, eventName, eventData) => {
673
+ try {
674
+ await cloudApiService.track(eventName, eventData);
675
+ } catch (e) {
676
+ ctx.logger.debug(`Failed to track ${eventName}`, e);
677
+ }
678
+ };
573
679
  const openModule$1 = import("open");
574
680
  async function promptLogin(ctx) {
575
681
  const response = await inquirer.prompt([
@@ -590,13 +696,6 @@ async function loginAction(ctx) {
590
696
  const tokenService = await tokenServiceFactory(ctx);
591
697
  const existingToken = await tokenService.retrieveToken();
592
698
  const cloudApiService = await cloudApiFactory(ctx, existingToken || void 0);
593
- const trackFailedLogin = async () => {
594
- try {
595
- await cloudApiService.track("didNotLogin", { loginMethod: "cli" });
596
- } catch (e) {
597
- logger.debug("Failed to track failed login", e);
598
- }
599
- };
600
699
  if (existingToken) {
601
700
  const isTokenValid = await tokenService.isTokenValid(existingToken);
602
701
  if (isTokenValid) {
@@ -628,11 +727,7 @@ async function loginAction(ctx) {
628
727
  logger.debug(e);
629
728
  return false;
630
729
  }
631
- try {
632
- await cloudApiService.track("willLoginAttempt", {});
633
- } catch (e) {
634
- logger.debug("Failed to track login attempt", e);
635
- }
730
+ await trackEvent(ctx, cloudApiService, "willLoginAttempt", {});
636
731
  logger.debug("🔐 Creating device authentication request...", {
637
732
  client_id: cliConfig2.clientId,
638
733
  scope: cliConfig2.scope,
@@ -712,13 +807,13 @@ async function loginAction(ctx) {
712
807
  "There seems to be a problem with your login information. Please try logging in again."
713
808
  );
714
809
  spinnerFail();
715
- await trackFailedLogin();
810
+ await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
716
811
  return false;
717
812
  }
718
813
  if (e.response?.data.error && !["authorization_pending", "slow_down"].includes(e.response.data.error)) {
719
814
  logger.debug(e);
720
815
  spinnerFail();
721
- await trackFailedLogin();
816
+ await trackEvent(ctx, cloudApiService, "didNotLogin", { loginMethod: "cli" });
722
817
  return false;
723
818
  }
724
819
  await new Promise((resolve) => {
@@ -732,15 +827,50 @@ async function loginAction(ctx) {
732
827
  "To access your dashboard, please copy and paste the following URL into your web browser:"
733
828
  );
734
829
  logger.log(chalk.underline(`${apiConfig.dashboardBaseUrl}/projects`));
735
- try {
736
- await cloudApiService.track("didLogin", { loginMethod: "cli" });
737
- } catch (e) {
738
- logger.debug("Failed to track login", e);
739
- }
830
+ await trackEvent(ctx, cloudApiService, "didLogin", { loginMethod: "cli" });
740
831
  };
741
832
  await authenticate();
742
833
  return isAuthenticated;
743
834
  }
835
+ function questionDefaultValuesMapper(questionsMap) {
836
+ return (questions) => {
837
+ return questions.map((question) => {
838
+ const questionName = question.name;
839
+ if (questionName in questionsMap) {
840
+ const questionDefault = questionsMap[questionName];
841
+ if (typeof questionDefault === "function") {
842
+ return {
843
+ ...question,
844
+ default: questionDefault(question)
845
+ };
846
+ }
847
+ return {
848
+ ...question,
849
+ default: questionDefault
850
+ };
851
+ }
852
+ return question;
853
+ });
854
+ };
855
+ }
856
+ function getDefaultsFromQuestions(questions) {
857
+ return questions.reduce((acc, question) => {
858
+ if (question.default && question.name) {
859
+ return { ...acc, [question.name]: question.default };
860
+ }
861
+ return acc;
862
+ }, {});
863
+ }
864
+ function getProjectNodeVersionDefault(question) {
865
+ const currentNodeVersion = process.versions.node.split(".")[0];
866
+ if (question.type === "list" && Array.isArray(question.choices)) {
867
+ const choice = question.choices.find((choice2) => choice2.value === currentNodeVersion);
868
+ if (choice) {
869
+ return choice.value;
870
+ }
871
+ }
872
+ return question.default;
873
+ }
744
874
  async function handleError(ctx, error) {
745
875
  const { logger } = ctx;
746
876
  logger.debug(error);
@@ -785,7 +915,7 @@ async function createProject$1(ctx, cloudApi, projectInput) {
785
915
  throw e;
786
916
  }
787
917
  }
788
- const action$2 = async (ctx) => {
918
+ const action$5 = async (ctx) => {
789
919
  const { logger } = ctx;
790
920
  const { getValidToken, eraseToken } = await tokenServiceFactory(ctx);
791
921
  const token = await getValidToken(ctx, promptLogin);
@@ -794,7 +924,16 @@ const action$2 = async (ctx) => {
794
924
  }
795
925
  const cloudApi = await cloudApiFactory(ctx, token);
796
926
  const { data: config } = await cloudApi.config();
797
- const { questions, defaults: defaultValues } = config.projectCreation;
927
+ const projectName = await getProjectNameFromPackageJson(ctx);
928
+ const defaultAnswersMapper = questionDefaultValuesMapper({
929
+ name: projectName,
930
+ nodeVersion: getProjectNodeVersionDefault
931
+ });
932
+ const questions = defaultAnswersMapper(config.projectCreation.questions);
933
+ const defaultValues = {
934
+ ...config.projectCreation.defaults,
935
+ ...getDefaultsFromQuestions(questions)
936
+ };
798
937
  const projectAnswersDefaulted = defaults(defaultValues);
799
938
  const projectAnswers = await inquirer.prompt(questions);
800
939
  const projectInput = projectAnswersDefaulted(projectAnswers);
@@ -843,38 +982,6 @@ function notificationServiceFactory({ logger }) {
843
982
  };
844
983
  };
845
984
  }
846
- yup.object({
847
- name: yup.string().required(),
848
- exports: yup.lazy(
849
- (value) => yup.object(
850
- typeof value === "object" ? Object.entries(value).reduce((acc, [key, value2]) => {
851
- if (typeof value2 === "object") {
852
- acc[key] = yup.object({
853
- types: yup.string().optional(),
854
- source: yup.string().required(),
855
- module: yup.string().optional(),
856
- import: yup.string().required(),
857
- require: yup.string().required(),
858
- default: yup.string().required()
859
- }).noUnknown(true);
860
- } else {
861
- acc[key] = yup.string().matches(/^\.\/.*\.json$/).required();
862
- }
863
- return acc;
864
- }, {}) : void 0
865
- ).optional()
866
- )
867
- });
868
- const loadPkg = async ({ cwd, logger }) => {
869
- const pkgPath = await pkgUp({ cwd });
870
- if (!pkgPath) {
871
- throw new Error("Could not find a package.json in the current directory");
872
- }
873
- const buffer = await fs$1.readFile(pkgPath);
874
- const pkg = JSON.parse(buffer.toString());
875
- logger.debug("Loaded package.json:", os.EOL, pkg);
876
- return pkg;
877
- };
878
985
  const buildLogsServiceFactory = ({ logger }) => {
879
986
  return async (url, token, cliConfig2) => {
880
987
  const CONN_TIMEOUT = Number(cliConfig2.buildLogsConnectionTimeout);
@@ -928,6 +1035,7 @@ const buildLogsServiceFactory = ({ logger }) => {
928
1035
  if (retries > MAX_RETRIES) {
929
1036
  spinner.fail("We were unable to connect to the server to get build logs at this time.");
930
1037
  es.close();
1038
+ clearExistingTimeout();
931
1039
  reject(new Error("Max retries reached"));
932
1040
  }
933
1041
  };
@@ -970,13 +1078,13 @@ async function upload(ctx, project, token, maxProjectFileSize) {
970
1078
  process.exit(1);
971
1079
  }
972
1080
  const tarFilePath = path__default.resolve(storagePath, compressedFilename);
973
- const fileStats = await fse.stat(tarFilePath);
1081
+ const fileStats = await fse__default.stat(tarFilePath);
974
1082
  if (fileStats.size > maxProjectFileSize) {
975
1083
  ctx.logger.log(
976
1084
  "Unable to proceed: Your project is too big to be transferred, please use a git repo instead."
977
1085
  );
978
1086
  try {
979
- await fse.remove(tarFilePath);
1087
+ await fse__default.remove(tarFilePath);
980
1088
  } catch (e) {
981
1089
  ctx.logger.log("Unable to remove file: ", tarFilePath);
982
1090
  ctx.logger.debug(e);
@@ -1002,20 +1110,10 @@ async function upload(ctx, project, token, maxProjectFileSize) {
1002
1110
  return data.build_id;
1003
1111
  } catch (e) {
1004
1112
  progressBar.stop();
1005
- if (e instanceof AxiosError && e.response?.data) {
1006
- if (e.response.status === 404) {
1007
- ctx.logger.error(
1008
- `The project does not exist. Remove the ${LOCAL_SAVE_FILENAME} file and try again.`
1009
- );
1010
- } else {
1011
- ctx.logger.error(e.response.data);
1012
- }
1013
- } else {
1014
- ctx.logger.error("An error occurred while deploying the project. Please try again later.");
1015
- }
1113
+ ctx.logger.error("An error occurred while deploying the project. Please try again later.");
1016
1114
  ctx.logger.debug(e);
1017
1115
  } finally {
1018
- await fse.remove(tarFilePath);
1116
+ await fse__default.remove(tarFilePath);
1019
1117
  }
1020
1118
  process.exit(0);
1021
1119
  } catch (e) {
@@ -1024,11 +1122,11 @@ async function upload(ctx, project, token, maxProjectFileSize) {
1024
1122
  process.exit(1);
1025
1123
  }
1026
1124
  }
1027
- async function getProject(ctx) {
1125
+ async function getProject$1(ctx) {
1028
1126
  const { project } = await retrieve();
1029
1127
  if (!project) {
1030
1128
  try {
1031
- return await action$2(ctx);
1129
+ return await action$5(ctx);
1032
1130
  } catch (e) {
1033
1131
  ctx.logger.error("An error occurred while deploying the project. Please try again later.");
1034
1132
  ctx.logger.debug(e);
@@ -1037,25 +1135,73 @@ async function getProject(ctx) {
1037
1135
  }
1038
1136
  return project;
1039
1137
  }
1040
- const action$1 = async (ctx) => {
1138
+ async function getConfig({
1139
+ ctx,
1140
+ cloudApiService
1141
+ }) {
1142
+ try {
1143
+ const { data: cliConfig2 } = await cloudApiService.config();
1144
+ return cliConfig2;
1145
+ } catch (e) {
1146
+ ctx.logger.debug("Failed to get cli config", e);
1147
+ return null;
1148
+ }
1149
+ }
1150
+ const action$4 = async (ctx) => {
1041
1151
  const { getValidToken } = await tokenServiceFactory(ctx);
1042
1152
  const token = await getValidToken(ctx, promptLogin);
1043
1153
  if (!token) {
1044
1154
  return;
1045
1155
  }
1046
- const project = await getProject(ctx);
1156
+ const project = await getProject$1(ctx);
1047
1157
  if (!project) {
1048
1158
  return;
1049
1159
  }
1050
- const cloudApiService = await cloudApiFactory(ctx);
1160
+ const cloudApiService = await cloudApiFactory(ctx, token);
1051
1161
  try {
1052
- await cloudApiService.track("willDeployWithCLI", { projectInternalName: project.name });
1162
+ const {
1163
+ data: { data: projectData, metadata }
1164
+ } = await cloudApiService.getProject({ name: project.name });
1165
+ const isProjectSuspended = projectData.suspendedAt;
1166
+ if (isProjectSuspended) {
1167
+ ctx.logger.log(
1168
+ "\n Oops! This project has been suspended. \n\n Please reactivate it from the dashboard to continue deploying: "
1169
+ );
1170
+ ctx.logger.log(chalk.underline(`${metadata.dashboardUrls.project}`));
1171
+ return;
1172
+ }
1053
1173
  } catch (e) {
1054
- ctx.logger.debug("Failed to track willDeploy", e);
1174
+ if (e instanceof AxiosError && e.response?.data) {
1175
+ if (e.response.status === 404) {
1176
+ ctx.logger.warn(
1177
+ `The project associated with this folder does not exist in Strapi Cloud.
1178
+ Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
1179
+ "link"
1180
+ )} command before deploying.`
1181
+ );
1182
+ } else {
1183
+ ctx.logger.error(e.response.data);
1184
+ }
1185
+ } else {
1186
+ ctx.logger.error(
1187
+ "An error occurred while retrieving the project's information. Please try again later."
1188
+ );
1189
+ }
1190
+ ctx.logger.debug(e);
1191
+ return;
1055
1192
  }
1193
+ await trackEvent(ctx, cloudApiService, "willDeployWithCLI", {
1194
+ projectInternalName: project.name
1195
+ });
1056
1196
  const notificationService = notificationServiceFactory(ctx);
1057
1197
  const buildLogsService = buildLogsServiceFactory(ctx);
1058
- const { data: cliConfig2 } = await cloudApiService.config();
1198
+ const cliConfig2 = await getConfig({ ctx, cloudApiService });
1199
+ if (!cliConfig2) {
1200
+ ctx.logger.error(
1201
+ "An error occurred while retrieving data from Strapi Cloud. Please check your network or try again later."
1202
+ );
1203
+ return;
1204
+ }
1059
1205
  let maxSize = parseInt(cliConfig2.maxProjectFileSize, 10);
1060
1206
  if (Number.isNaN(maxSize)) {
1061
1207
  ctx.logger.debug(
@@ -1077,10 +1223,11 @@ const action$1 = async (ctx) => {
1077
1223
  chalk.underline(`${apiConfig.dashboardBaseUrl}/projects/${project.name}/deployments`)
1078
1224
  );
1079
1225
  } catch (e) {
1226
+ ctx.logger.debug(e);
1080
1227
  if (e instanceof Error) {
1081
1228
  ctx.logger.error(e.message);
1082
1229
  } else {
1083
- throw e;
1230
+ ctx.logger.error("An error occurred while deploying the project. Please try again later.");
1084
1231
  }
1085
1232
  }
1086
1233
  };
@@ -1111,17 +1258,163 @@ const runAction = (name2, action2) => (...args) => {
1111
1258
  process.exit(1);
1112
1259
  });
1113
1260
  };
1114
- const command$3 = ({ command: command2, ctx }) => {
1115
- command2.command("cloud:deploy").alias("deploy").description("Deploy a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("deploy", action$1)(ctx));
1261
+ const command$6 = ({ ctx }) => {
1262
+ return createCommand("cloud:deploy").alias("deploy").description("Deploy a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("deploy", action$4)(ctx));
1116
1263
  };
1117
1264
  const deployProject = {
1118
1265
  name: "deploy-project",
1119
1266
  description: "Deploy a Strapi Cloud project",
1120
- action: action$1,
1121
- command: command$3
1267
+ action: action$4,
1268
+ command: command$6
1122
1269
  };
1123
- const command$2 = ({ command: command2, ctx }) => {
1124
- command2.command("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
1270
+ const QUIT_OPTION = "Quit";
1271
+ async function getExistingConfig(ctx) {
1272
+ try {
1273
+ return await retrieve();
1274
+ } catch (e) {
1275
+ ctx.logger.debug("Failed to get project config", e);
1276
+ ctx.logger.error("An error occurred while retrieving config data from your local project.");
1277
+ return null;
1278
+ }
1279
+ }
1280
+ async function promptForRelink(ctx, cloudApiService, existingConfig) {
1281
+ if (existingConfig && existingConfig.project) {
1282
+ const { shouldRelink } = await inquirer.prompt([
1283
+ {
1284
+ type: "confirm",
1285
+ name: "shouldRelink",
1286
+ message: `A project named ${chalk.cyan(
1287
+ existingConfig.project.displayName ? existingConfig.project.displayName : existingConfig.project.name
1288
+ )} is already linked to this local folder. Do you want to update the link?`,
1289
+ default: false
1290
+ }
1291
+ ]);
1292
+ if (!shouldRelink) {
1293
+ await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
1294
+ currentProjectName: existingConfig.project?.name
1295
+ });
1296
+ return false;
1297
+ }
1298
+ }
1299
+ return true;
1300
+ }
1301
+ async function getProjectsList(ctx, cloudApiService, existingConfig) {
1302
+ const spinner = ctx.logger.spinner("Fetching your projects...\n").start();
1303
+ try {
1304
+ const {
1305
+ data: { data: projectList }
1306
+ } = await cloudApiService.listLinkProjects();
1307
+ spinner.succeed();
1308
+ if (!Array.isArray(projectList)) {
1309
+ ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
1310
+ return null;
1311
+ }
1312
+ const projects = projectList.filter(
1313
+ (project) => !(project.isMaintainer || project.name === existingConfig?.project?.name)
1314
+ ).map((project) => {
1315
+ return {
1316
+ name: project.displayName,
1317
+ value: { name: project.name, displayName: project.displayName }
1318
+ };
1319
+ });
1320
+ if (projects.length === 0) {
1321
+ ctx.logger.log("We couldn't find any projects available for linking in Strapi Cloud");
1322
+ return null;
1323
+ }
1324
+ return projects;
1325
+ } catch (e) {
1326
+ spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
1327
+ ctx.logger.debug("Failed to list projects", e);
1328
+ return null;
1329
+ }
1330
+ }
1331
+ async function getUserSelection(ctx, projects) {
1332
+ const { logger } = ctx;
1333
+ try {
1334
+ const answer = await inquirer.prompt([
1335
+ {
1336
+ type: "list",
1337
+ name: "linkProject",
1338
+ message: "Which project do you want to link?",
1339
+ choices: [...projects, { name: chalk.grey(`(${QUIT_OPTION})`), value: null }]
1340
+ }
1341
+ ]);
1342
+ if (!answer.linkProject) {
1343
+ return null;
1344
+ }
1345
+ return answer;
1346
+ } catch (e) {
1347
+ logger.debug("Failed to get user input", e);
1348
+ logger.error("An error occurred while trying to get your input.");
1349
+ return null;
1350
+ }
1351
+ }
1352
+ const action$3 = async (ctx) => {
1353
+ const { getValidToken } = await tokenServiceFactory(ctx);
1354
+ const token = await getValidToken(ctx, promptLogin);
1355
+ const { logger } = ctx;
1356
+ if (!token) {
1357
+ return;
1358
+ }
1359
+ const cloudApiService = await cloudApiFactory(ctx, token);
1360
+ const existingConfig = await getExistingConfig(ctx);
1361
+ const shouldRelink = await promptForRelink(ctx, cloudApiService, existingConfig);
1362
+ if (!shouldRelink) {
1363
+ return;
1364
+ }
1365
+ await trackEvent(ctx, cloudApiService, "willLinkProject", {});
1366
+ const projects = await getProjectsList(
1367
+ ctx,
1368
+ cloudApiService,
1369
+ existingConfig
1370
+ );
1371
+ if (!projects) {
1372
+ return;
1373
+ }
1374
+ const answer = await getUserSelection(ctx, projects);
1375
+ if (!answer) {
1376
+ return;
1377
+ }
1378
+ try {
1379
+ const { confirmAction } = await inquirer.prompt([
1380
+ {
1381
+ type: "confirm",
1382
+ name: "confirmAction",
1383
+ message: "Warning: Once linked, deploying from CLI will replace the existing project and its data. Confirm to proceed:",
1384
+ default: false
1385
+ }
1386
+ ]);
1387
+ if (!confirmAction) {
1388
+ await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
1389
+ cancelledProjectName: answer.linkProject.name,
1390
+ currentProjectName: existingConfig ? existingConfig.project?.name : null
1391
+ });
1392
+ return;
1393
+ }
1394
+ await save({ project: answer.linkProject });
1395
+ logger.log(`Project ${chalk.cyan(answer.linkProject.displayName)} linked successfully.`);
1396
+ await trackEvent(ctx, cloudApiService, "didLinkProject", {
1397
+ projectInternalName: answer.linkProject
1398
+ });
1399
+ } catch (e) {
1400
+ logger.debug("Failed to link project", e);
1401
+ logger.error("An error occurred while linking the project.");
1402
+ await trackEvent(ctx, cloudApiService, "didNotLinkProject", {
1403
+ projectInternalName: answer.linkProject
1404
+ });
1405
+ }
1406
+ };
1407
+ const command$5 = ({ command: command2, ctx }) => {
1408
+ command2.command("cloud:link").alias("link").description("Link a local directory to a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("link", action$3)(ctx));
1409
+ };
1410
+ const link = {
1411
+ name: "link-project",
1412
+ description: "Link a local directory to a Strapi Cloud project",
1413
+ action: action$3,
1414
+ command: command$5
1415
+ };
1416
+ const command$4 = ({ ctx }) => {
1417
+ return createCommand("cloud:login").alias("login").description("Strapi Cloud Login").addHelpText(
1125
1418
  "after",
1126
1419
  "\nAfter running this command, you will be prompted to enter your authentication information."
1127
1420
  ).option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("login", loginAction)(ctx));
@@ -1130,10 +1423,10 @@ const login = {
1130
1423
  name: "login",
1131
1424
  description: "Strapi Cloud Login",
1132
1425
  action: loginAction,
1133
- command: command$2
1426
+ command: command$4
1134
1427
  };
1135
1428
  const openModule = import("open");
1136
- const action = async (ctx) => {
1429
+ const action$2 = async (ctx) => {
1137
1430
  const { logger } = ctx;
1138
1431
  const { retrieveToken, eraseToken } = await tokenServiceFactory(ctx);
1139
1432
  const token = await retrieveToken();
@@ -1163,37 +1456,139 @@ const action = async (ctx) => {
1163
1456
  logger.error("🥲 Oops! Something went wrong while logging you out. Please try again.");
1164
1457
  logger.debug(e);
1165
1458
  }
1166
- try {
1167
- await cloudApiService.track("didLogout", { loginMethod: "cli" });
1168
- } catch (e) {
1169
- logger.debug("Failed to track logout event", e);
1170
- }
1459
+ await trackEvent(ctx, cloudApiService, "didLogout", { loginMethod: "cli" });
1171
1460
  };
1172
- const command$1 = ({ command: command2, ctx }) => {
1173
- command2.command("cloud:logout").alias("logout").description("Strapi Cloud Logout").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("logout", action)(ctx));
1461
+ const command$3 = ({ ctx }) => {
1462
+ return createCommand("cloud:logout").alias("logout").description("Strapi Cloud Logout").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("logout", action$2)(ctx));
1174
1463
  };
1175
1464
  const logout = {
1176
1465
  name: "logout",
1177
1466
  description: "Strapi Cloud Logout",
1178
- action,
1179
- command: command$1
1467
+ action: action$2,
1468
+ command: command$3
1180
1469
  };
1181
- const command = ({ command: command2, ctx }) => {
1182
- command2.command("cloud:create-project").description("Create a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("cloud:create-project", action$2)(ctx));
1470
+ const command$2 = ({ ctx }) => {
1471
+ return createCommand("cloud:create-project").description("Create a Strapi Cloud project").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("cloud:create-project", action$5)(ctx));
1183
1472
  };
1184
1473
  const createProject = {
1185
1474
  name: "create-project",
1186
1475
  description: "Create a new project",
1187
- action: action$2,
1476
+ action: action$5,
1477
+ command: command$2
1478
+ };
1479
+ const action$1 = async (ctx) => {
1480
+ const { getValidToken } = await tokenServiceFactory(ctx);
1481
+ const token = await getValidToken(ctx, promptLogin);
1482
+ const { logger } = ctx;
1483
+ if (!token) {
1484
+ return;
1485
+ }
1486
+ const cloudApiService = await cloudApiFactory(ctx, token);
1487
+ const spinner = logger.spinner("Fetching your projects...").start();
1488
+ try {
1489
+ const {
1490
+ data: { data: projectList }
1491
+ } = await cloudApiService.listProjects();
1492
+ spinner.succeed();
1493
+ logger.log(projectList);
1494
+ } catch (e) {
1495
+ ctx.logger.debug("Failed to list projects", e);
1496
+ spinner.fail("An error occurred while fetching your projects from Strapi Cloud.");
1497
+ }
1498
+ };
1499
+ const command$1 = ({ command: command2, ctx }) => {
1500
+ command2.command("cloud:projects").alias("projects").description("List Strapi Cloud projects").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("projects", action$1)(ctx));
1501
+ };
1502
+ const listProjects = {
1503
+ name: "list-projects",
1504
+ description: "List Strapi Cloud projects",
1505
+ action: action$1,
1506
+ command: command$1
1507
+ };
1508
+ async function getProject(ctx) {
1509
+ const { project } = await retrieve();
1510
+ if (!project) {
1511
+ ctx.logger.warn(
1512
+ `
1513
+ We couldn't find a valid local project config.
1514
+ Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
1515
+ "link"
1516
+ )} command`
1517
+ );
1518
+ process.exit(1);
1519
+ }
1520
+ return project;
1521
+ }
1522
+ const action = async (ctx) => {
1523
+ const { getValidToken } = await tokenServiceFactory(ctx);
1524
+ const token = await getValidToken(ctx, promptLogin);
1525
+ const { logger } = ctx;
1526
+ if (!token) {
1527
+ return;
1528
+ }
1529
+ const project = await getProject(ctx);
1530
+ if (!project) {
1531
+ ctx.logger.debug(`No valid local project configuration was found.`);
1532
+ return;
1533
+ }
1534
+ const cloudApiService = await cloudApiFactory(ctx, token);
1535
+ const spinner = logger.spinner("Fetching environments...").start();
1536
+ await trackEvent(ctx, cloudApiService, "willListEnvironment", {
1537
+ projectInternalName: project.name
1538
+ });
1539
+ try {
1540
+ const {
1541
+ data: { data: environmentsList }
1542
+ } = await cloudApiService.listEnvironments({ name: project.name });
1543
+ spinner.succeed();
1544
+ logger.log(environmentsList);
1545
+ await trackEvent(ctx, cloudApiService, "didListEnvironment", {
1546
+ projectInternalName: project.name
1547
+ });
1548
+ } catch (e) {
1549
+ if (e.response && e.response.status === 404) {
1550
+ spinner.succeed();
1551
+ logger.warn(
1552
+ `
1553
+ The project associated with this folder does not exist in Strapi Cloud.
1554
+ Please link your local project to an existing Strapi Cloud project using the ${chalk.cyan(
1555
+ "link"
1556
+ )} command`
1557
+ );
1558
+ } else {
1559
+ spinner.fail("An error occurred while fetching environments data from Strapi Cloud.");
1560
+ logger.debug("Failed to list environments", e);
1561
+ }
1562
+ await trackEvent(ctx, cloudApiService, "didNotListEnvironment", {
1563
+ projectInternalName: project.name
1564
+ });
1565
+ }
1566
+ };
1567
+ function defineCloudNamespace(command2) {
1568
+ return command2.command("cloud").description("Manage Strapi Cloud projects");
1569
+ }
1570
+ const command = ({ command: command2, ctx }) => {
1571
+ const cloud = defineCloudNamespace(command2);
1572
+ cloud.command("environments").description("Alias for cloud environment list").action(() => runAction("list", action)(ctx));
1573
+ const environment = cloud.command("environment").description("Manage environments for a Strapi Cloud project");
1574
+ environment.command("list").description("List Strapi Cloud project environments").option("-d, --debug", "Enable debugging mode with verbose logs").option("-s, --silent", "Don't log anything").action(() => runAction("list", action)(ctx));
1575
+ };
1576
+ const listEnvironments = {
1577
+ name: "list-environments",
1578
+ description: "List Strapi Cloud environments",
1579
+ action,
1188
1580
  command
1189
1581
  };
1190
1582
  const cli = {
1191
1583
  deployProject,
1584
+ link,
1192
1585
  login,
1193
1586
  logout,
1194
- createProject
1587
+ createProject,
1588
+ listProjects,
1589
+ listEnvironments
1195
1590
  };
1196
- const cloudCommands = [deployProject, login, logout];
1591
+ const cloudCommands = [deployProject, link, login, logout, listProjects, listEnvironments];
1197
1592
  async function initCloudCLIConfig() {
1198
1593
  const localConfig = await getLocalConfig();
1199
1594
  if (!localConfig.deviceId) {
@@ -1209,7 +1604,10 @@ async function buildStrapiCloudCommands({
1209
1604
  await initCloudCLIConfig();
1210
1605
  for (const cloudCommand of cloudCommands) {
1211
1606
  try {
1212
- await cloudCommand.command({ command: command2, ctx, argv });
1607
+ const subCommand = await cloudCommand.command({ command: command2, ctx, argv });
1608
+ if (subCommand) {
1609
+ command2.addCommand(subCommand);
1610
+ }
1213
1611
  } catch (e) {
1214
1612
  console.error(`Failed to load command ${cloudCommand.name}`, e);
1215
1613
  }