@solidxai/solidctl 0.1.28 → 0.1.29

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.
@@ -30,6 +30,11 @@ function buildAnswersFromOptions(options) {
30
30
  console.error(chalk_1.default.red(`Invalid --db-synchronize "${dbSynchronize}". Must be one of: ${setup_questions_1.SYNCHRONIZE_OPTIONS.join(', ')}`));
31
31
  process.exit(1);
32
32
  }
33
+ const dbExists = options.dbExists ?? setup_questions_1.SETUP_DEFAULTS.databaseExists;
34
+ if (options.dbExists !== undefined && !setup_questions_1.DATABASE_EXISTS_OPTIONS.includes(dbExists)) {
35
+ console.error(chalk_1.default.red(`Invalid --db-exists "${dbExists}". Must be one of: ${setup_questions_1.DATABASE_EXISTS_OPTIONS.join(', ')}`));
36
+ process.exit(1);
37
+ }
33
38
  const dbPortDefault = dbClient === 'PostgreSQL'
34
39
  ? setup_questions_1.SETUP_DEFAULTS.solidApiDatabasePortPostgres
35
40
  : dbClient === 'MySQL'
@@ -51,7 +56,7 @@ function buildAnswersFromOptions(options) {
51
56
  solidApiDatabaseUsername: options.dbUsername ?? setup_questions_1.SETUP_DEFAULTS.solidApiDatabaseUsername,
52
57
  solidApiDatabasePassword: options.dbPassword ?? setup_questions_1.SETUP_DEFAULTS.solidApiDatabasePassword,
53
58
  solidApiDatabaseSynchronize: dbSynchronize,
54
- databaseExists: true,
59
+ databaseExists: dbExists,
55
60
  solidUiPort: options.uiPort ?? setup_questions_1.SETUP_DEFAULTS.solidUiPort,
56
61
  };
57
62
  }
@@ -70,6 +75,7 @@ function registerCreateAppCommand(program) {
70
75
  .option('--db-username <username>', `Database username (default: ${setup_questions_1.SETUP_DEFAULTS.solidApiDatabaseUsername})`)
71
76
  .option('--db-password <password>', `Database password (default: ${setup_questions_1.SETUP_DEFAULTS.solidApiDatabasePassword})`)
72
77
  .option('--db-synchronize <yes|no>', `Auto-sync DB schema: Yes or No (default: ${setup_questions_1.SETUP_DEFAULTS.solidApiDatabaseSynchronize})`)
78
+ .option('--db-exists <yes|no>', `Database already exists: Yes or No (default: ${setup_questions_1.SETUP_DEFAULTS.databaseExists})`)
73
79
  .option('--ui-port <port>', `Frontend port (default: ${setup_questions_1.SETUP_DEFAULTS.solidUiPort})`)
74
80
  .action(async (options) => {
75
81
  try {
@@ -83,7 +89,7 @@ function registerCreateAppCommand(program) {
83
89
  console.log(chalk_1.default.cyan("Hello, Let's setup your SolidX project!"));
84
90
  answers = await inquirer_1.default.prompt(setup_questions_1.setupQuestions);
85
91
  }
86
- if (!answers.databaseExists) {
92
+ if (answers.databaseExists === 'No') {
87
93
  const dbSpinner = (0, ora_1.default)(`Creating database "${answers.solidApiDatabaseName}"...`).start();
88
94
  try {
89
95
  await (0, helpers_1.createDatabaseIfNotExists)(answers);
@@ -1 +1 @@
1
- {"version":3,"file":"create-app.command.js","sourceRoot":"","sources":["../../../src/commands/create-app/create-app.command.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"create-app.command.js","sourceRoot":"","sources":["../../../src/commands/create-app/create-app.command.ts"],"names":[],"mappings":"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"}
@@ -8,7 +8,7 @@ export interface SetupAnswers {
8
8
  solidApiDatabaseUsername: string;
9
9
  solidApiDatabasePassword: string;
10
10
  solidApiDatabaseSynchronize: string;
11
- databaseExists: boolean;
11
+ databaseExists: string;
12
12
  solidUiPort: string;
13
13
  }
14
14
  export declare const SETUP_DEFAULTS: {
@@ -23,10 +23,12 @@ export declare const SETUP_DEFAULTS: {
23
23
  readonly solidApiDatabaseUsername: "solidx_app_user";
24
24
  readonly solidApiDatabasePassword: "strongpassword";
25
25
  readonly solidApiDatabaseSynchronize: "Yes";
26
+ readonly databaseExists: "Yes";
26
27
  readonly solidUiPort: "3001";
27
28
  };
28
29
  export declare const DATABASE_CLIENTS: readonly ["PostgreSQL", "MySQL", "MSSQL"];
29
30
  export declare const SYNCHRONIZE_OPTIONS: readonly ["Yes", "No"];
31
+ export declare const DATABASE_EXISTS_OPTIONS: readonly ["Yes", "No"];
30
32
  export declare const setupQuestions: ({
31
33
  type: string;
32
34
  name: string;
@@ -45,10 +47,4 @@ export declare const setupQuestions: ({
45
47
  message: string;
46
48
  default: (answers: SetupAnswers) => "5432" | "1433" | "3306";
47
49
  choices?: undefined;
48
- } | {
49
- type: string;
50
- name: string;
51
- message: string;
52
- default: boolean;
53
- choices?: undefined;
54
50
  })[];
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.setupQuestions = exports.SYNCHRONIZE_OPTIONS = exports.DATABASE_CLIENTS = exports.SETUP_DEFAULTS = void 0;
3
+ exports.setupQuestions = exports.DATABASE_EXISTS_OPTIONS = exports.SYNCHRONIZE_OPTIONS = exports.DATABASE_CLIENTS = exports.SETUP_DEFAULTS = void 0;
4
4
  exports.SETUP_DEFAULTS = {
5
5
  projectName: 'my-solid-app',
6
6
  solidApiPort: '3000',
@@ -13,10 +13,12 @@ exports.SETUP_DEFAULTS = {
13
13
  solidApiDatabaseUsername: 'solidx_app_user',
14
14
  solidApiDatabasePassword: 'strongpassword',
15
15
  solidApiDatabaseSynchronize: 'Yes',
16
+ databaseExists: 'Yes',
16
17
  solidUiPort: '3001',
17
18
  };
18
19
  exports.DATABASE_CLIENTS = ['PostgreSQL', 'MySQL', 'MSSQL'];
19
20
  exports.SYNCHRONIZE_OPTIONS = ['Yes', 'No'];
21
+ exports.DATABASE_EXISTS_OPTIONS = ['Yes', 'No'];
20
22
  exports.setupQuestions = [
21
23
  {
22
24
  type: 'input',
@@ -81,10 +83,11 @@ exports.setupQuestions = [
81
83
  default: 'Yes',
82
84
  },
83
85
  {
84
- type: 'confirm',
86
+ type: 'list',
85
87
  name: 'databaseExists',
86
88
  message: 'Does this database already exist?',
87
- default: true,
89
+ choices: ['Yes', 'No'],
90
+ default: 'Yes',
88
91
  },
89
92
  {
90
93
  type: 'input',
@@ -1 +1 @@
1
- {"version":3,"file":"setup-questions.js","sourceRoot":"","sources":["../../../src/commands/create-app/setup-questions.ts"],"names":[],"mappings":";;;AAca,QAAA,cAAc,GAAG;IAC5B,WAAW,EAAmB,cAAc;IAC5C,YAAY,EAAkB,MAAM;IACpC,sBAAsB,EAAQ,YAAY;IAC1C,oBAAoB,EAAU,WAAW;IACzC,4BAA4B,EAAE,MAAM;IACpC,yBAAyB,EAAK,MAAM;IACpC,yBAAyB,EAAK,MAAM;IACpC,oBAAoB,EAAU,eAAe;IAC7C,wBAAwB,EAAM,iBAAiB;IAC/C,wBAAwB,EAAM,gBAAgB;IAC9C,2BAA2B,EAAG,KAAK;IACnC,WAAW,EAAmB,MAAM;CAC5B,CAAC;AAEE,QAAA,gBAAgB,GAAG,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAU,CAAC;AAC7D,QAAA,mBAAmB,GAAG,CAAC,KAAK,EAAE,IAAI,CAAU,CAAC;AAE7C,QAAA,cAAc,GAAG;IAC5B;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE,cAAc;KACxB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,cAAc;QACpB,OAAO,EAAE,6BAA6B;QACtC,OAAO,EAAE,MAAM;KAChB;IACD;QACE,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,uBAAuB;QAChC,OAAO,EAAE,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC;QACzC,OAAO,EAAE,YAAY;KACtB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,0BAA0B;QACnC,OAAO,EAAE,WAAW;KACrB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,0BAA0B;QACnC,OAAO,EAAE,CAAC,OAAqB,EAAE,EAAE;YACjC,IAAI,OAAO,CAAC,sBAAsB,KAAK,YAAY;gBAAE,OAAO,MAAM,CAAC;YACnE,IAAI,OAAO,CAAC,sBAAsB,KAAK,OAAO;gBAAE,OAAO,MAAM,CAAC;YAC9D,OAAO,MAAM,CAAC;QAChB,CAAC;KACF;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,0BAA0B;QACnC,OAAO,EAAE,eAAe;KACzB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,8BAA8B;QACvC,OAAO,EAAE,iBAAiB;KAC3B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,8BAA8B;QACvC,OAAO,EAAE,gBAAgB;KAC1B;IACD;QACE,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,6BAA6B;QACnC,OAAO,EACL,2FAA2F;QAC7F,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;QACtB,OAAO,EAAE,KAAK;KACf;IACD;QACE,IAAI,EAAE,SAAS;QACf,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE,IAAI;KACd;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,8BAA8B;QACvC,OAAO,EAAE,MAAM;KAChB;CACF,CAAC"}
1
+ {"version":3,"file":"setup-questions.js","sourceRoot":"","sources":["../../../src/commands/create-app/setup-questions.ts"],"names":[],"mappings":";;;AAca,QAAA,cAAc,GAAG;IAC5B,WAAW,EAAmB,cAAc;IAC5C,YAAY,EAAkB,MAAM;IACpC,sBAAsB,EAAQ,YAAY;IAC1C,oBAAoB,EAAU,WAAW;IACzC,4BAA4B,EAAE,MAAM;IACpC,yBAAyB,EAAK,MAAM;IACpC,yBAAyB,EAAK,MAAM;IACpC,oBAAoB,EAAU,eAAe;IAC7C,wBAAwB,EAAM,iBAAiB;IAC/C,wBAAwB,EAAM,gBAAgB;IAC9C,2BAA2B,EAAG,KAAK;IACnC,cAAc,EAAgB,KAAK;IACnC,WAAW,EAAmB,MAAM;CAC5B,CAAC;AAEE,QAAA,gBAAgB,GAAG,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAU,CAAC;AAC7D,QAAA,mBAAmB,GAAG,CAAC,KAAK,EAAE,IAAI,CAAU,CAAC;AAC7C,QAAA,uBAAuB,GAAG,CAAC,KAAK,EAAE,IAAI,CAAU,CAAC;AAEjD,QAAA,cAAc,GAAG;IAC5B;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE,cAAc;KACxB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,cAAc;QACpB,OAAO,EAAE,6BAA6B;QACtC,OAAO,EAAE,MAAM;KAChB;IACD;QACE,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,wBAAwB;QAC9B,OAAO,EAAE,uBAAuB;QAChC,OAAO,EAAE,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC;QACzC,OAAO,EAAE,YAAY;KACtB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,0BAA0B;QACnC,OAAO,EAAE,WAAW;KACrB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,0BAA0B;QACnC,OAAO,EAAE,CAAC,OAAqB,EAAE,EAAE;YACjC,IAAI,OAAO,CAAC,sBAAsB,KAAK,YAAY;gBAAE,OAAO,MAAM,CAAC;YACnE,IAAI,OAAO,CAAC,sBAAsB,KAAK,OAAO;gBAAE,OAAO,MAAM,CAAC;YAC9D,OAAO,MAAM,CAAC;QAChB,CAAC;KACF;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,sBAAsB;QAC5B,OAAO,EAAE,0BAA0B;QACnC,OAAO,EAAE,eAAe;KACzB;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,8BAA8B;QACvC,OAAO,EAAE,iBAAiB;KAC3B;IACD;QACE,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,0BAA0B;QAChC,OAAO,EAAE,8BAA8B;QACvC,OAAO,EAAE,gBAAgB;KAC1B;IACD;QACE,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,6BAA6B;QACnC,OAAO,EACL,2FAA2F;QAC7F,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;QACtB,OAAO,EAAE,KAAK;KACf;IACD;QACE,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,gBAAgB;QACtB,OAAO,EAAE,mCAAmC;QAC5C,OAAO,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC;QACtB,OAAO,EAAE,KAAK;KACf;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,8BAA8B;QACvC,OAAO,EAAE,MAAM;KAChB;CACF,CAAC"}