neonctl 1.1.0 → 1.1.1

package/package.json

@@ -4,7 +4,7 @@
         "type": "git",
         "url": "git@github.com:neondatabase/neonctl.git"
     },
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "CLI tool for NeonDB Cloud management",
     "main": "index.js",
     "author": "NeonDB",
@@ -46,13 +46,13 @@
         "registry": "https://registry.npmjs.org/"
     },
     "scripts": {
-        "dev": "node dev.js",
+        "watch": "tsc --watch",
         "lint": "tsc --noEmit && eslint src --ext .ts",
-        "debug": "node --inspect-brk dev.js",
-        "build": "npm run clean && tsc && cp src/*.html dist/src/",
+        "debug": "node --inspect-brk dist/src",
+        "build": "npm run generateParams && npm run clean && tsc && cp src/*.html dist/src/",
         "clean": "rm -rf dist",
-        "start": "node index.js",
-        "postinstall": "ts-node ./generateParams.ts"
+        "generateParams": "ts-node generateParams.ts",
+        "start": "node src/index.js"
     },
     "lint-staged": {
         "*.ts": [

package/src/commands/auth.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureAuth = exports.authFlow = void 0;
+exports.ensureAuth = exports.authFlow = exports.handler = exports.builder = exports.describe = exports.command = void 0;
 const node_path_1 = require("node:path");
 const node_fs_1 = require("node:fs");
 const openid_client_1 = require("openid-client");
@@ -40,6 +40,14 @@ const auth_1 = require("../auth");
 const log_1 = require("../log");
 const api_1 = require("../api");
 const CREDENTIALS_FILE = 'credentials.json';
+exports.command = 'auth';
+exports.describe = 'Authenticate';
+const builder = (yargs) => yargs;
+exports.builder = builder;
+const handler = (args) => __awaiter(void 0, void 0, void 0, function* () {
+    yield (0, exports.authFlow)(args);
+});
+exports.handler = handler;
 const authFlow = ({ configDir, oauthHost, clientId, }) => __awaiter(void 0, void 0, void 0, function* () {
     if (!clientId) {
         throw new Error('Missing client id');
@@ -55,19 +63,6 @@ const authFlow = ({ configDir, oauthHost, clientId, }) => __awaiter(void 0, void
     return tokenSet.access_token || '';
 });
 exports.authFlow = authFlow;
-const validateToken = (props) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        const client = (0, api_1.getApiClient)(props);
-        yield client.getCurrentUserInfo();
-    }
-    catch (err) {
-        if ((0, api_1.isApiError)(err)) {
-            if (err.response.status === 401) {
-                throw new Error('Invalid token');
-            }
-        }
-    }
-});
 // updateCredentialsFile correctly sets needed permissions for the credentials file
 function updateCredentialsFile(path, contents) {
     (0, node_fs_1.writeFileSync)(path, contents, {

package/src/commands/projects.js

@@ -9,30 +9,58 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.update = exports.deleteProject = exports.create = exports.list = void 0;
+exports.builder = exports.describe = exports.command = void 0;
+const parameters_gen_1 = require("../parameters.gen");
+const utils_1 = require("../utils");
 const writer_1 = require("../writer");
 const PROJECT_FIELDS = ['id', 'name', 'region_id', 'created_at'];
+exports.command = 'projects <command>';
+exports.describe = 'Manage projects';
+const builder = (yargs) => yargs
+    .usage('usage: $0 projects <cmd> [args]')
+    .command('list', 'List projects', (yargs) => yargs, (args) => __awaiter(void 0, void 0, void 0, function* () {
+    yield list(args);
+}))
+    .command('create', 'Create a project', (yargs) => yargs.options(parameters_gen_1.projectCreateRequest), (args) => __awaiter(void 0, void 0, void 0, function* () {
+    yield create(args);
+}))
+    .command('update', 'Update a project', (yargs) => yargs
+    .option('project.id', {
+    describe: 'Project ID',
+    type: 'string',
+    demandOption: true,
+})
+    .options(parameters_gen_1.projectCreateRequest), (args) => __awaiter(void 0, void 0, void 0, function* () {
+    yield update(args);
+}))
+    .command('delete', 'Delete a project', (yargs) => yargs.options({
+    'project.id': {
+        describe: 'Project ID',
+        type: 'string',
+        demandOption: true,
+    },
+}), (args) => __awaiter(void 0, void 0, void 0, function* () {
+    yield deleteProject(args);
+}))
+    .middleware(utils_1.showHelpMiddleware);
+exports.builder = builder;
 const list = (props) => __awaiter(void 0, void 0, void 0, function* () {
     (0, writer_1.writeOut)(props)((yield props.apiClient.listProjects({})).data.projects, {
         fields: PROJECT_FIELDS,
     });
 });
-exports.list = list;
 const create = (props) => __awaiter(void 0, void 0, void 0, function* () {
     (0, writer_1.writeOut)(props)((yield props.apiClient.createProject({
         project: props.project,
     })).data.project, { fields: PROJECT_FIELDS });
 });
-exports.create = create;
 const deleteProject = (props) => __awaiter(void 0, void 0, void 0, function* () {
     (0, writer_1.writeOut)(props)((yield props.apiClient.deleteProject(props.project.id)).data.project, {
         fields: PROJECT_FIELDS,
     });
 });
-exports.deleteProject = deleteProject;
 const update = (props) => __awaiter(void 0, void 0, void 0, function* () {
     (0, writer_1.writeOut)(props)((yield props.apiClient.updateProject(props.project.id, {
         project: props.project,
     })).data.project, { fields: PROJECT_FIELDS });
 });
-exports.update = update;

package/src/commands/users.js

@@ -9,11 +9,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.me = void 0;
+exports.handler = exports.builder = exports.describe = exports.command = void 0;
 const writer_1 = require("../writer");
+exports.command = 'me';
+exports.describe = 'Show current user';
+const builder = (yargs) => yargs;
+exports.builder = builder;
+const handler = (args) => __awaiter(void 0, void 0, void 0, function* () {
+    yield me(args);
+});
+exports.handler = handler;
 const me = (props) => __awaiter(void 0, void 0, void 0, function* () {
     (0, writer_1.writeOut)(props)((yield props.apiClient.getCurrentUserInfo()).data, {
         fields: ['login', 'email', 'name', 'projects_limit'],
     });
 });
-exports.me = me;

package/src/index.js

@@ -36,20 +36,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const yargs = __importStar(require("yargs"));
+const node_path_1 = require("node:path");
 const package_json_1 = __importDefault(require("../package.json"));
 const auth_1 = require("./commands/auth");
 const config_1 = require("./config");
 const log_1 = require("./log");
 const auth_2 = require("./auth");
 const api_1 = require("./api");
-const parameters_gen_1 = require("./parameters.gen");
 const utils_1 = require("./utils");
-const showHelpMiddleware = (argv) => {
-    if (argv._.length === 1) {
-        yargs.showHelp();
-        process.exit(0);
-    }
-};
 const builder = yargs
     .scriptName(package_json_1.default.name)
     .usage('usage: $0 <cmd> [args]')
@@ -81,9 +75,6 @@ const builder = yargs
     type: 'string',
     default: auth_2.defaultClientID,
 })
-    .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);
-}))
     .option('api-key', {
     describe: 'API key',
     type: 'string',
@@ -96,38 +87,7 @@ const builder = yargs
 })
     .middleware((args) => (0, utils_1.fillInArgs)(args), true)
     .middleware(auth_1.ensureAuth)
-    .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) => __awaiter(void 0, void 0, void 0, function* () {
-    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('create', 'Create a project', (yargs) => yargs.options(parameters_gen_1.ProjectCreateRequest), (args) => __awaiter(void 0, void 0, void 0, function* () {
-        yield (yield Promise.resolve().then(() => __importStar(require('./commands/projects')))).create(args);
-    }))
-        .command('update', 'Update a project', (yargs) => yargs
-        .option('project.id', {
-        describe: 'Project ID',
-        type: 'string',
-        demandOption: true,
-    })
-        .options(parameters_gen_1.ProjectCreateRequest), (args) => __awaiter(void 0, void 0, void 0, function* () {
-        yield (yield Promise.resolve().then(() => __importStar(require('./commands/projects')))).update(args);
-    }))
-        .command('delete', 'Delete a project', (yargs) => yargs.options({
-        'project.id': {
-            describe: 'Project ID',
-            type: 'string',
-            demandOption: true,
-        },
-    }), (args) => __awaiter(void 0, void 0, void 0, function* () {
-        yield (yield Promise.resolve().then(() => __importStar(require('./commands/projects')))).deleteProject(args);
-    }))
-        .middleware(showHelpMiddleware);
-}))
+    .commandDir((0, node_path_1.join)(__dirname, './commands'))
     .fail((msg, err) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if ((0, api_1.isApiError)(err)) {

package/src/parameters.gen.js

@@ -1,8 +1,8 @@
 "use strict";
 // FILE IS GENERATED, DO NOT EDIT
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProjectCreateRequest = void 0;
-exports.ProjectCreateRequest = {
+exports.projectCreateRequest = void 0;
+exports.projectCreateRequest = {
     'project.settings.quota.active_time_seconds': {
         type: 'number',
         description: "The total amount of wall-clock time allowed to be spent by project's compute endpoints.",

package/src/utils.js

@@ -1,9 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fillInArgs = void 0;
-// This middleware is needed to fill in the args for nested objects,
-// so that required arguments would work
-// otherwise yargs just throws an error
+exports.showHelpMiddleware = exports.fillInArgs = void 0;
+const yargs_1 = __importDefault(require("yargs"));
+/**
+ * This middleware is needed to fill in the args for nested objects,
+ * so that required arguments would work
+ * otherwise yargs just throws an error
+ */
 const fillInArgs = (args, currentArgs = args, acc = []) => {
     Object.entries(currentArgs).forEach(([k, v]) => {
         if (k === '_') {
@@ -20,3 +26,10 @@ const fillInArgs = (args, currentArgs = args, acc = []) => {
     });
 };
 exports.fillInArgs = fillInArgs;
+const showHelpMiddleware = (argv) => {
+    if (argv._.length === 1) {
+        yargs_1.default.showHelp();
+        process.exit(0);
+    }
+};
+exports.showHelpMiddleware = showHelpMiddleware;