@zuplo/cli 1.42.0 → 1.44.0

package/dist/cli.js

@@ -24,6 +24,7 @@ if (gte(process.versions.node, MIN_NODE_VERSION)) {
         .command(variable)
         .demandCommand()
         .strictCommands()
+        .version()
         .help().argv;
 }
 else {

package/dist/cmds/delete.js

@@ -1,5 +1,7 @@
 import { configure } from "../common/middleware/user-configuration.js";
 import setBlocking from "../common/output.js";
+import { YargsChecker } from "../common/validators/lib.js";
+import { ProjectIsSetValidator } from "../common/validators/project-name-validator.js";
 import { deleteZup } from "../delete/handler.js";
 export default {
     desc: "Deletes the zup at the URL",
@@ -25,7 +27,10 @@ export default {
         })
             .boolean("wait")
             .demandOption(["api-key", "url"])
-            .middleware([setBlocking, configure]);
+            .middleware([setBlocking, configure])
+            .check(async (argv) => {
+            return await new YargsChecker(new ProjectIsSetValidator()).check(argv);
+        });
     },
     handler: async (argv) => {
         await deleteZup(argv);

package/dist/cmds/deploy.js

@@ -12,6 +12,11 @@ export default {
             type: "string",
             describe: "The API Key from Zuplo",
             envVar: "API_KEY",
+        })
+            .option("project", {
+            type: "string",
+            hidden: true,
+            describe: "The project name",
         })
             .option("dir", {
             type: "string",
@@ -27,10 +32,10 @@ export default {
         })
             .demandOption(["api-key"])
             .boolean("verify-remote")
+            .middleware([setBlocking, configure])
             .check(async (argv) => {
-            return await new YargsChecker(validDeployDirectoryValidator).check(argv.dir);
-        })
-            .middleware([setBlocking, configure]);
+            return await new YargsChecker(validDeployDirectoryValidator).check(argv);
+        });
     },
     handler: async (argv) => {
         await deploy(argv);

package/dist/cmds/list.js

@@ -1,5 +1,7 @@
 import { configure } from "../common/middleware/user-configuration.js";
 import setBlocking from "../common/output.js";
+import { YargsChecker } from "../common/validators/lib.js";
+import { ProjectIsSetValidator } from "../common/validators/project-name-validator.js";
 import { list } from "../list/handler.js";
 export default {
     desc: "Lists all deployed zups",
@@ -16,7 +18,10 @@ export default {
             describe: "The project name",
         })
             .demandOption(["api-key"])
-            .middleware([setBlocking, configure]);
+            .middleware([setBlocking, configure])
+            .check(async (argv) => {
+            return await new YargsChecker(new ProjectIsSetValidator()).check(argv);
+        });
     },
     handler: async (argv) => {
         await list(argv);

package/dist/cmds/test.js

@@ -23,7 +23,7 @@ export default {
             hidden: true,
         })
             .check(async (argv) => {
-            return await new YargsChecker(validTestDirectoryValidator).check(argv.dir);
+            return await new YargsChecker(validTestDirectoryValidator).check(argv);
         })
             .middleware([setBlocking]);
     },

package/dist/cmds/variable/create.js

@@ -1,5 +1,7 @@
 import { configure } from "../../common/middleware/user-configuration.js";
 import setBlocking from "../../common/output.js";
+import { YargsChecker } from "../../common/validators/lib.js";
+import { ProjectIsSetValidator } from "../../common/validators/project-name-validator.js";
 import { create } from "../../variable/create/handler.js";
 export default {
     desc: "Creates a new variable for a branch",
@@ -32,7 +34,10 @@ export default {
             describe: "The project name",
         })
             .demandOption(["api-key", "name", "value", "is-secret", "branch"])
-            .middleware([setBlocking, configure]);
+            .middleware([setBlocking, configure])
+            .check(async (argv) => {
+            return await new YargsChecker(new ProjectIsSetValidator()).check(argv);
+        });
     },
     handler: async (argv) => {
         create(argv);

package/dist/cmds/variable/update.js

@@ -1,5 +1,7 @@
 import { configure } from "../../common/middleware/user-configuration.js";
 import setBlocking from "../../common/output.js";
+import { YargsChecker } from "../../common/validators/lib.js";
+import { ProjectIsSetValidator } from "../../common/validators/project-name-validator.js";
 import { update } from "../../variable/update/handler.js";
 export default {
     desc: "Updates an existing variable for a branch",
@@ -23,7 +25,10 @@ export default {
             describe: "The project name",
         })
             .demandOption(["api-key", "name", "value", "branch"])
-            .middleware([setBlocking, configure]);
+            .middleware([setBlocking, configure])
+            .check(async (argv) => {
+            return await new YargsChecker(new ProjectIsSetValidator()).check(argv);
+        });
     },
     handler: async (argv) => {
         update(argv);

package/dist/common/validators/file-system-validator.js

@@ -4,6 +4,7 @@ import { join } from "node:path";
 import { simpleGit } from "simple-git";
 import { TEST_IN_FOLDER } from "../constants.js";
 import { CompositeValidator } from "./lib.js";
+import { ProjectIsSetValidator } from "./project-name-validator.js";
 export class NotAGitRepoError extends Error {
     constructor() {
         super("Invalid directory: The current directory is not a Git repository.");
@@ -41,7 +42,8 @@ export class MissingGitRemote extends Error {
     }
 }
 export class GitVersionControlValidator {
-    async validate(dir) {
+    async validate(option) {
+        const { dir } = option;
         try {
             await simpleGit({ baseDir: dir }).status();
             return { ok: true };
@@ -55,7 +57,8 @@ export class GitVersionControlValidator {
     }
 }
 export class GitCommitValidator {
-    async validate(dir) {
+    async validate(option) {
+        const { dir } = option;
         try {
             const git = simpleGit({ baseDir: dir });
             const commits = await git.log({ maxCount: 1 });
@@ -76,7 +79,8 @@ export class GitCommitValidator {
     }
 }
 export class GitBranchValidator {
-    async validate(dir) {
+    async validate(option) {
+        const { dir } = option;
         const git = simpleGit({ baseDir: dir });
         const branch = await git.branch();
         if (!branch.current) {
@@ -89,7 +93,8 @@ export class GitBranchValidator {
     }
 }
 export class GitRemoteValidator {
-    async validate(dir) {
+    async validate(option) {
+        const { dir } = option;
         const git = simpleGit({ baseDir: dir });
         const remotes = await git.getRemotes(true);
         const origin = remotes.find((r) => r.name === "origin");
@@ -103,12 +108,13 @@ export class GitRemoteValidator {
     }
 }
 export class ZuploProjectValidator {
-    async validate(dir) {
+    async validate(options) {
+        const { dir } = options;
         try {
             if (existsSync(`${dir}/config/routes.json`)) {
                 return { ok: true };
             }
-            else {
+            else if (existsSync(`${dir}/config`)) {
                 const files = readdirSync(join(dir, "config"));
                 const existingOASFiles = files.filter((file) => file.endsWith(".oas.json")).length >= 1;
                 if (existingOASFiles === true) {
@@ -129,7 +135,8 @@ export class ZuploProjectValidator {
     }
 }
 export class ZuploProjectHasTestsValidator {
-    async validate(dir) {
+    async validate(option) {
+        const { dir } = option;
         try {
             if (fg.sync(`${dir}/${TEST_IN_FOLDER}/**/*.test.ts`).length >= 1) {
                 return { ok: true };
@@ -149,6 +156,6 @@ export class ZuploProjectHasTestsValidator {
         }
     }
 }
-export const validDeployDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new GitVersionControlValidator(), new GitCommitValidator(), new GitBranchValidator(), new GitRemoteValidator());
+export const validDeployDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new GitVersionControlValidator(), new GitCommitValidator(), new GitBranchValidator(), new GitRemoteValidator(), new ProjectIsSetValidator());
 export const validTestDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new ZuploProjectHasTestsValidator());
 //# sourceMappingURL=file-system-validator.js.map

package/dist/common/validators/project-name-validator.js

@@ -0,0 +1,30 @@
+export class ProjectIsNotSet extends Error {
+    constructor() {
+        super(`Missing project name. This command requires a project to be specified. Either specify it using --project or set it in zuplo.jsonc.
+
+zuplo.jsonc should look like this:
+
+{
+    "version": 1,
+    "project": "<name-of-your-project>",
+    "compatibilityDate": "2023-03-14"
+}
+        
+`);
+        Object.setPrototypeOf(this, ProjectIsNotSet.prototype);
+    }
+}
+export class ProjectIsSetValidator {
+    async validate(argv) {
+        if (!argv.project) {
+            return {
+                ok: false,
+                error: new ProjectIsNotSet(),
+            };
+        }
+        else {
+            return { ok: true };
+        }
+    }
+}
+//# sourceMappingURL=project-name-validator.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "1.42.0",
+  "version": "1.44.0",
   "type": "module",
   "repository": "https://github.com/zuplo/cli",
   "author": "Zuplo, Inc.",