neonctl 0.2.1 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neonctl",
-    "version": "0.2.1",
+    "version": "0.3.0",
     "description": "CLI tool for NeonDB Cloud management",
     "main": "index.js",
     "author": "NeonDB",

package/src/commands/auth.js

@@ -38,7 +38,7 @@ const node_fs_1 = require("node:fs");
 const auth_1 = require("../auth");
 const log_1 = require("../log");
 const CREDENTIALS_FILE = 'credentials.json';
-const authFlow = ({ configDir, oauthHost, clientId, }) => __awaiter(void 0, void 0, void 0, function* () {
+const authFlow = ({ 'config-dir': configDir, 'oauth-host': oauthHost, 'client-id': clientId, }) => __awaiter(void 0, void 0, void 0, function* () {
     if (!clientId) {
         throw new Error('Missing client id');
     }
@@ -57,18 +57,19 @@ const ensureAuth = (props) => __awaiter(void 0, void 0, void 0, function* () {
     if (props._[0] === 'auth') {
         return;
     }
-    const credentialsPath = (0, node_path_1.join)(props.configDir, CREDENTIALS_FILE);
+    const credentialsPath = (0, node_path_1.join)(props['config-dir'], CREDENTIALS_FILE);
     if ((0, node_fs_1.existsSync)(credentialsPath)) {
         try {
             const token = (yield Promise.resolve().then(() => __importStar(require(credentialsPath)))).access_token;
             props.token = token;
+            return;
         }
         catch (e) {
-            throw new Error('Invalid credentials, please re-authenticate');
+            yield (0, exports.authFlow)(props);
         }
     }
     else {
-        throw new Error('No credentials found, please authenticate');
+        yield (0, exports.authFlow)(props);
     }
 });
 exports.ensureAuth = ensureAuth;

package/src/config.js

@@ -14,7 +14,7 @@ const node_path_1 = require("node:path");
 const node_fs_1 = require("node:fs");
 const DIR_NAME = '.neonctl';
 exports.defaultDir = (0, node_path_1.join)(process.cwd(), DIR_NAME);
-const ensureConfigDir = ({ configDir, }) => __awaiter(void 0, void 0, void 0, function* () {
+const ensureConfigDir = ({ 'config-dir': configDir, }) => __awaiter(void 0, void 0, void 0, function* () {
     if (!(0, node_fs_1.existsSync)(configDir)) {
         (0, node_fs_1.mkdirSync)(configDir);
     }

package/src/index.js

@@ -41,39 +41,41 @@ const gateway_1 = require("./api/gateway");
 const auth_1 = require("./commands/auth");
 const config_1 = require("./config");
 const log_1 = require("./log");
-const wrapWithHelp = (yargs) => __awaiter(void 0, void 0, void 0, function* () {
-    const { _ } = yield yargs.argv;
-    if (_.length === 1) {
+const showHelpMiddleware = (argv) => {
+    if (argv._.length === 1) {
         yargs.showHelp();
     }
-    return yargs;
-});
+};
 const builder = yargs
     .scriptName(package_json_1.default.name)
     .usage('usage: $0 <cmd> [args]')
     .help()
-    .option('apiHost', {
+    .option('json', {
+    describe: 'Set output format to JSON',
+    type: 'boolean',
+})
+    .option('api-host', {
     describe: 'The API host',
     default: 'https://console.neon.tech',
 })
     // Setup config directory
-    .option('configDir', {
+    .option('config-dir', {
     describe: 'Path to config directory',
     type: 'string',
     default: config_1.defaultDir,
 })
     .middleware(config_1.ensureConfigDir)
     // Auth flow
-    .command('auth', 'Authenticate user', (yargs) => yargs
-    .option('oauthHost', {
+    .option('oauth-host', {
     description: 'URL to Neon OAUTH host',
     default: 'https://oauth2.neon.tech',
 })
-    .option('clientId', {
+    .option('client-id', {
     description: 'OAuth client id',
     type: 'string',
-    demandOption: true,
-}), (args) => __awaiter(void 0, void 0, void 0, function* () {
+    default: 'neonctl',
+})
+    .command('auth', 'Authenticate user', (yargs) => yargs, (args) => __awaiter(void 0, void 0, void 0, function* () {
     (yield Promise.resolve().then(() => __importStar(require('./commands/auth')))).authFlow(args);
 }))
     // Ensure auth token
@@ -86,14 +88,23 @@ const builder = yargs
     .command('me', 'Get user info', (yargs) => yargs, (args) => __awaiter(void 0, void 0, void 0, function* () {
     yield (yield Promise.resolve().then(() => __importStar(require('./commands/users')))).me(args);
 }))
-    .command('projects', 'Manage projects', (yargs) => wrapWithHelp(yargs
-    .usage('usage: $0 projects <cmd> [args]')
-    .command('list', 'List projects', (yargs) => yargs, (args) => __awaiter(void 0, void 0, void 0, function* () {
-    yield (yield Promise.resolve().then(() => __importStar(require('./commands/projects')))).list(args);
+    .command('projects', 'Manage projects', (yargs) => __awaiter(void 0, void 0, void 0, function* () {
+    yargs
+        .usage('usage: $0 projects <cmd> [args]')
+        // .command(
+        //   'list',
+        //   'List projects',
+        //   (yargs) => yargs,
+        //   async (args) => {
+        //     await (await import('./commands/projects')).list(args);
+        //   }
+        // )
+        .command('create', 'Create a project', (yargs) => yargs, (args) => __awaiter(void 0, void 0, void 0, function* () {
+        yield (yield Promise.resolve().then(() => __importStar(require('./commands/projects')))).create(args);
+    }))
+        .middleware(showHelpMiddleware);
 }))
-    .command('create', 'Create a project', (yargs) => yargs, (args) => __awaiter(void 0, void 0, void 0, function* () {
-    yield (yield Promise.resolve().then(() => __importStar(require('./commands/projects')))).create(args);
-}))))
+    .strict()
     .fail((msg, err) => __awaiter(void 0, void 0, void 0, function* () {
     if (err instanceof gateway_1.ApiError) {
         log_1.log.error(yield err.getApiError());
@@ -104,7 +115,8 @@ const builder = yargs
     process.exit(1);
 }));
 (() => __awaiter(void 0, void 0, void 0, function* () {
-    if ((yield builder.argv)._.length === 0) {
+    const args = yield builder.argv;
+    if (args._.length === 0) {
         yargs.showHelp();
     }
 }))();