@zuplo/cli 6.25.18 → 6.26.0

package/dist/common/middleware/user-configuration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-configuration.d.ts","sourceRoot":"","sources":["../../../src/common/middleware/user-configuration.ts"],"names":[],"mappings":"AA0BA,wBAAsB,SAAS,CAAC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,iBA6C/D"}
+{"version":3,"file":"user-configuration.d.ts","sourceRoot":"","sources":["../../../src/common/middleware/user-configuration.ts"],"names":[],"mappings":"AA0BA,wBAAsB,SAAS,CAAC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,iBA8C/D"}

package/dist/common/middleware/user-configuration.js

@@ -1,7 +1,7 @@
 import { parse } from "jsonc-parser";
 import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
-import { resolve } from "node:path";
+import { join, relative } from "node:path";
 import { ZUPLO_FALLBACK_JSON_FILE, ZUPLO_PREFERRED_JSON_FILE, } from "../constants.js";
 import { logger } from "../logger.js";
 import { printCriticalFailureToConsoleAndExit } from "../output.js";
@@ -17,7 +17,7 @@ export async function configure(argv) {
     if (whoAmIResponse.ok) {
         const apiKeyMetadata = await whoAmIResponse.json();
         Object.assign(argv, omitNull(apiKeyMetadata));
-        const { project: zuploJsoncProject } = await processZuploConfigurationFile();
+        const { project: zuploJsoncProject } = await processZuploConfigurationFile(argv.dir);
         if (zuploJsoncProject) {
             argv.project = zuploJsoncProject;
         }
@@ -28,9 +28,10 @@ export async function configure(argv) {
         await printCriticalFailureToConsoleAndExit("Error: Failed to validate the API key. Check your API key.");
     }
 }
-async function processZuploConfigurationFile() {
-    const preferredPath = resolve(".", ZUPLO_PREFERRED_JSON_FILE);
-    const fallbackPath = resolve(".", ZUPLO_FALLBACK_JSON_FILE);
+async function processZuploConfigurationFile(sourceDirectory) {
+    const normalizedDir = join(relative(process.cwd(), sourceDirectory ?? "."));
+    const preferredPath = join(normalizedDir, ZUPLO_PREFERRED_JSON_FILE);
+    const fallbackPath = join(normalizedDir, ZUPLO_FALLBACK_JSON_FILE);
     let fileContents = "{}";
     if (existsSync(preferredPath)) {
         fileContents = await readFile(preferredPath, "utf-8");

package/dist/common/middleware/user-configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-configuration.js","sourceRoot":"","sources":["../../../src/common/middleware/user-configuration.ts"],"names":[],"mappings":"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","sourcesContent":["import { ParseError, parse } from \"jsonc-parser\";\nimport { existsSync } from \"node:fs\";\nimport { readFile } from \"node:fs/promises\";\nimport { resolve } from \"node:path\";\nimport {\n  ZUPLO_FALLBACK_JSON_FILE,\n  ZUPLO_PREFERRED_JSON_FILE,\n} from \"../constants.js\";\nimport { logger } from \"../logger.js\";\nimport { printCriticalFailureToConsoleAndExit } from \"../output.js\";\nimport settings from \"../settings.js\";\n\n/**\n * This is the middleware to set the context for the CLI calls.\n *\n * It can be used to set sensible configurations such as account and project that are gotten from the API, zuplo.jsonc, --parameters\n *\n * The order of setting a configuration is\n * 1. API key\n * 2. zuplo.jsonc\n * 3. --parameters from the CLI invocation\n *\n * Note that --parameters objects can also come from .env file because of https://yargs.js.org/docs/#api-reference-envprefix\n *\n * @param argv - The yargs object\n */\nexport async function configure(argv: { [key: string]: unknown }) {\n  // Clone the original value (for merging at the end)\n  // The original is the most specific since it can only contain things from --parameters\n  // It will always be applied last to override anything from zuplo.jsonc or the API key\n  const cliParametersConfiguration = { ...argv };\n\n  // Make a call to the API key\n  const whoAmIResponse = await fetch(\n    `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`,\n    {\n      method: \"GET\",\n      headers: {\n        Authorization: `Bearer ${argv[\"api-key\"]}`,\n      },\n    }\n  );\n\n  if (whoAmIResponse.ok) {\n    // Note that the algorithms below are based on \"addition\"\n    // You cannot unset/remove a value from the configuration by setting it to null/undefined\n    // Do be mindful of parameters that might be the same value since things might be overridden\n\n    // Merge any non-null values from the API key\n    const apiKeyMetadata = await whoAmIResponse.json();\n    Object.assign(argv, omitNull(apiKeyMetadata));\n\n    // Merge any non-null values from zuplo.jsonc\n    // For now, only merge project since zuplo.jsonc could have many keys that might conflict\n    const { project: zuploJsoncProject } =\n      await processZuploConfigurationFile();\n    if (zuploJsoncProject) {\n      argv.project = zuploJsoncProject;\n    }\n\n    // Merge any non-null values from --parameters\n    Object.assign(argv, cliParametersConfiguration);\n  } else {\n    logger.trace(\n      { status: whoAmIResponse.status, statusText: whoAmIResponse.statusText },\n      \"Failed to determine who-am-i\"\n    );\n    await printCriticalFailureToConsoleAndExit(\n      \"Error: Failed to validate the API key. Check your API key.\"\n    );\n  }\n}\n\nasync function processZuploConfigurationFile() {\n  const preferredPath = resolve(\".\", ZUPLO_PREFERRED_JSON_FILE);\n  const fallbackPath = resolve(\".\", ZUPLO_FALLBACK_JSON_FILE);\n  let fileContents = \"{}\";\n  if (existsSync(preferredPath)) {\n    fileContents = await readFile(preferredPath, \"utf-8\");\n  } else if (existsSync(fallbackPath)) {\n    fileContents = await readFile(fallbackPath, \"utf-8\");\n  } else {\n    logger.trace(\"No zuplo.jsonc file found\");\n    return {};\n  }\n\n  // If we get here, we have a zuplo.jsonc (or, zuplo.json) file\n  // That means we should report any issues with it.\n  const errors: ParseError[] = [];\n  const data = parse(fileContents, errors, { allowTrailingComma: true });\n  if (errors.length > 0) {\n    logger.trace(errors[0], \"Failed to parse zuplo.jsonc\");\n    await printCriticalFailureToConsoleAndExit(\n      \"Error: Failed to parse the values from zuplo.jsonc. Check your zuplo.jsonc file.\"\n    );\n  }\n  return data;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst omitNull = (obj: any) => {\n  Object.keys(obj)\n    .filter((k) => obj[k] === null)\n    .forEach((k) => delete obj[k]);\n  return obj;\n};\n"]}
+{"version":3,"file":"user-configuration.js","sourceRoot":"","sources":["../../../src/common/middleware/user-configuration.ts"],"names":[],"mappings":"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","sourcesContent":["import { ParseError, parse } from \"jsonc-parser\";\nimport { existsSync } from \"node:fs\";\nimport { readFile } from \"node:fs/promises\";\nimport { join, relative } from \"node:path\";\nimport {\n  ZUPLO_FALLBACK_JSON_FILE,\n  ZUPLO_PREFERRED_JSON_FILE,\n} from \"../constants.js\";\nimport { logger } from \"../logger.js\";\nimport { printCriticalFailureToConsoleAndExit } from \"../output.js\";\nimport settings from \"../settings.js\";\n\n/**\n * This is the middleware to set the context for the CLI calls.\n *\n * It can be used to set sensible configurations such as account and project that are gotten from the API, zuplo.jsonc, --parameters\n *\n * The order of setting a configuration is\n * 1. API key\n * 2. zuplo.jsonc\n * 3. --parameters from the CLI invocation\n *\n * Note that --parameters objects can also come from .env file because of https://yargs.js.org/docs/#api-reference-envprefix\n *\n * @param argv - The yargs object\n */\nexport async function configure(argv: { [key: string]: unknown }) {\n  // Clone the original value (for merging at the end)\n  // The original is the most specific since it can only contain things from --parameters\n  // It will always be applied last to override anything from zuplo.jsonc or the API key\n  const cliParametersConfiguration = { ...argv };\n\n  // Make a call to the API key\n  const whoAmIResponse = await fetch(\n    `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/who-am-i`,\n    {\n      method: \"GET\",\n      headers: {\n        Authorization: `Bearer ${argv[\"api-key\"]}`,\n      },\n    }\n  );\n\n  if (whoAmIResponse.ok) {\n    // Note that the algorithms below are based on \"addition\"\n    // You cannot unset/remove a value from the configuration by setting it to null/undefined\n    // Do be mindful of parameters that might be the same value since things might be overridden\n\n    // Merge any non-null values from the API key\n    const apiKeyMetadata = await whoAmIResponse.json();\n    Object.assign(argv, omitNull(apiKeyMetadata));\n\n    // Merge any non-null values from zuplo.jsonc\n    // For now, only merge project since zuplo.jsonc could have many keys that might conflict\n    const { project: zuploJsoncProject } = await processZuploConfigurationFile(\n      argv.dir as string | undefined\n    );\n    if (zuploJsoncProject) {\n      argv.project = zuploJsoncProject;\n    }\n\n    // Merge any non-null values from --parameters\n    Object.assign(argv, cliParametersConfiguration);\n  } else {\n    logger.trace(\n      { status: whoAmIResponse.status, statusText: whoAmIResponse.statusText },\n      \"Failed to determine who-am-i\"\n    );\n    await printCriticalFailureToConsoleAndExit(\n      \"Error: Failed to validate the API key. Check your API key.\"\n    );\n  }\n}\n\nasync function processZuploConfigurationFile(\n  sourceDirectory: string | undefined\n) {\n  const normalizedDir = join(relative(process.cwd(), sourceDirectory ?? \".\"));\n  const preferredPath = join(normalizedDir, ZUPLO_PREFERRED_JSON_FILE);\n  const fallbackPath = join(normalizedDir, ZUPLO_FALLBACK_JSON_FILE);\n  let fileContents = \"{}\";\n  if (existsSync(preferredPath)) {\n    fileContents = await readFile(preferredPath, \"utf-8\");\n  } else if (existsSync(fallbackPath)) {\n    fileContents = await readFile(fallbackPath, \"utf-8\");\n  } else {\n    logger.trace(\"No zuplo.jsonc file found\");\n    return {};\n  }\n\n  // If we get here, we have a zuplo.jsonc (or, zuplo.json) file\n  // That means we should report any issues with it.\n  const errors: ParseError[] = [];\n  const data = parse(fileContents, errors, { allowTrailingComma: true });\n  if (errors.length > 0) {\n    logger.trace(errors[0], \"Failed to parse zuplo.jsonc\");\n    await printCriticalFailureToConsoleAndExit(\n      \"Error: Failed to parse the values from zuplo.jsonc. Check your zuplo.jsonc file.\"\n    );\n  }\n  return data;\n}\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nconst omitNull = (obj: any) => {\n  Object.keys(obj)\n    .filter((k) => obj[k] === null)\n    .forEach((k) => delete obj[k]);\n  return obj;\n};\n"]}

package/dist/common/validators/file-system-validator.d.ts

@@ -1,4 +1,7 @@
 import { CompositeValidator, Result, ValidationRule } from "./lib.js";
+export declare class GitBranchOrEnvironmentRequiredError extends Error {
+    constructor();
+}
 export declare class NotAGitRepoError extends Error {
     constructor();
 }
@@ -21,6 +24,14 @@ export declare class GitVersionControlValidator implements ValidationRule<{
         dir: string;
     }): Promise<Result>;
 }
+export declare class GitBranchOrEnvironmentValidator implements ValidationRule<{
+    dir: string;
+}> {
+    validate(option: {
+        dir: string;
+        environment: string | undefined;
+    }): Promise<Result>;
+}
 export declare class GitCommitValidator implements ValidationRule<{
     dir: string;
 }> {
@@ -52,6 +63,7 @@ export declare class ZuploProjectHasTestsValidator implements ValidationRule<{
 export declare const validDeployDirectoryValidator: CompositeValidator<{
     dir: string;
     project: string | undefined;
+    environment: string | undefined;
 }>;
 export declare const validTestDirectoryValidator: CompositeValidator<{
     dir: string;

package/dist/common/validators/file-system-validator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-system-validator.d.ts","sourceRoot":"","sources":["../../../src/common/validators/file-system-validator.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAGtE,qBAAa,gBAAiB,SAAQ,KAAK;;CAK1C;AAED,qBAAa,gBAAiB,SAAQ,KAAK;;CAO1C;AAED,qBAAa,wBAAyB,SAAQ,KAAK;;CAOlD;AAED,qBAAa,YAAa,SAAQ,KAAK;;CAOtC;AAED,qBAAa,eAAgB,SAAQ,KAAK;;CAOzC;AAED,qBAAa,0BACX,YAAW,cAAc,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;IAEpC,QAAQ,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAazD;AAED,qBAAa,kBAAmB,YAAW,cAAc,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;IAClE,QAAQ,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAoBzD;AAED,qBAAa,kBAAmB,YAAW,cAAc,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;IAClE,QAAQ,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAazD;AAED,qBAAa,qBAAsB,YAAW,cAAc,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;IACrE,QAAQ,CAAC,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAsB1D;AAED,qBAAa,6BACX,YAAW,cAAc,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;IAEpC,QAAQ,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAkBzD;AAED,eAAO,MAAM,6BAA6B;SACnC,MAAM;aACF,MAAM,GAAG,SAAS;EAO5B,CAAC;AAEF,eAAO,MAAM,2BAA2B;SACjC,MAAM;EACuD,CAAC"}
+{"version":3,"file":"file-system-validator.d.ts","sourceRoot":"","sources":["../../../src/common/validators/file-system-validator.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAGtE,qBAAa,mCAAoC,SAAQ,KAAK;;CAO7D;AAED,qBAAa,gBAAiB,SAAQ,KAAK;;CAK1C;AAED,qBAAa,gBAAiB,SAAQ,KAAK;;CAO1C;AAED,qBAAa,wBAAyB,SAAQ,KAAK;;CAOlD;AAED,qBAAa,YAAa,SAAQ,KAAK;;CAOtC;AAED,qBAAa,eAAgB,SAAQ,KAAK;;CAOzC;AAED,qBAAa,0BACX,YAAW,cAAc,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;IAEpC,QAAQ,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAazD;AAMD,qBAAa,+BACX,YAAW,cAAc,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;IAEpC,QAAQ,CAAC,MAAM,EAAE;QACrB,GAAG,EAAE,MAAM,CAAC;QACZ,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;KACjC,GAAG,OAAO,CAAC,MAAM,CAAC;CA0BpB;AAED,qBAAa,kBAAmB,YAAW,cAAc,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;IAClE,QAAQ,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAoBzD;AAED,qBAAa,kBAAmB,YAAW,cAAc,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;IAClE,QAAQ,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAazD;AAED,qBAAa,qBAAsB,YAAW,cAAc,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;IACrE,QAAQ,CAAC,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAsB1D;AAED,qBAAa,6BACX,YAAW,cAAc,CAAC;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;IAEpC,QAAQ,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC;CAkBzD;AAED,eAAO,MAAM,6BAA6B;SACnC,MAAM;aACF,MAAM,GAAG,SAAS;iBACd,MAAM,GAAG,SAAS;EAKhC,CAAC;AAEF,eAAO,MAAM,2BAA2B;SACjC,MAAM;EACuD,CAAC"}

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

@@ -5,27 +5,33 @@ 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 GitBranchOrEnvironmentRequiredError extends Error {
+    constructor() {
+        super("Invalid arguments: The project directory is not a Git repository, you must specify the `environment` argument.");
+        Object.setPrototypeOf(this, NotAGitRepoError.prototype);
+    }
+}
 export class NotAGitRepoError extends Error {
     constructor() {
-        super("Invalid directory: The current directory is not a Git repository.");
+        super("Invalid directory: The project directory is not a Git repository.");
         Object.setPrototypeOf(this, NotAGitRepoError.prototype);
     }
 }
 export class NotAZuploProject extends Error {
     constructor() {
-        super("Invalid directory: The current directory is not the root of a Zuplo project.");
+        super("Invalid directory: The project directory is not the root of a Zuplo project.");
         Object.setPrototypeOf(this, NotAZuploProject.prototype);
     }
 }
 export class ZuploProjectMissingTests extends Error {
     constructor() {
-        super("Invalid directory: The current directory does not contain any tests (*.test.ts) in the /tests folder. Create a at least one test of the form some-name.test.ts");
+        super("Invalid directory: The project directory does not contain any tests (*.test.ts) in the /tests folder. Create a at least one test of the form some-name.test.ts");
         Object.setPrototypeOf(this, ZuploProjectMissingTests.prototype);
     }
 }
 export class NoGitCommits extends Error {
     constructor() {
-        super("Invalid Git state: The current directory does not contain any commits. Make a commit before deploying.");
+        super("Invalid Git state: The project directory does not contain any commits. Make a commit before deploying.");
         Object.setPrototypeOf(this, NoGitCommits.prototype);
     }
 }
@@ -50,6 +56,34 @@ export class GitVersionControlValidator {
         }
     }
 }
+export class GitBranchOrEnvironmentValidator {
+    async validate(option) {
+        const { dir, environment } = option;
+        if (typeof environment === "string") {
+            return {
+                ok: true,
+            };
+        }
+        try {
+            if (await simpleGit({ baseDir: dir }).checkIsRepo()) {
+                await simpleGit({ baseDir: dir }).status();
+                const git = simpleGit({ baseDir: dir });
+                const branch = await git.branch();
+                if (branch.current) {
+                    return {
+                        ok: true,
+                    };
+                }
+            }
+        }
+        catch {
+        }
+        return {
+            ok: false,
+            error: new GitBranchOrEnvironmentRequiredError(),
+        };
+    }
+}
 export class GitCommitValidator {
     async validate(option) {
         const { dir } = option;
@@ -132,6 +166,6 @@ export class ZuploProjectHasTestsValidator {
         }
     }
 }
-export const validDeployDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new GitVersionControlValidator(), new GitCommitValidator(), new GitBranchValidator(), new ProjectIsSetValidator());
+export const validDeployDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new ProjectIsSetValidator(), new GitBranchOrEnvironmentValidator());
 export const validTestDirectoryValidator = new CompositeValidator(new ZuploProjectValidator(), new ZuploProjectHasTestsValidator());
 //# sourceMappingURL=file-system-validator.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"file-system-validator.js","sourceRoot":"","sources":["../../../src/common/validators/file-system-validator.ts"],"names":[],"mappings":"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","sourcesContent":["import fg from \"fast-glob\";\nimport { existsSync, readdirSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport { simpleGit } from \"simple-git\";\nimport { TEST_IN_FOLDER } from \"../constants.js\";\nimport { CompositeValidator, Result, ValidationRule } from \"./lib.js\";\nimport { ProjectIsSetValidator } from \"./project-name-validator.js\";\n\nexport class NotAGitRepoError extends Error {\n  constructor() {\n    super(\"Invalid directory: The current directory is not a Git repository.\");\n    Object.setPrototypeOf(this, NotAGitRepoError.prototype);\n  }\n}\n\nexport class NotAZuploProject extends Error {\n  constructor() {\n    super(\n      \"Invalid directory: The current directory is not the root of a Zuplo project.\"\n    );\n    Object.setPrototypeOf(this, NotAZuploProject.prototype);\n  }\n}\n\nexport class ZuploProjectMissingTests extends Error {\n  constructor() {\n    super(\n      \"Invalid directory: The current directory does not contain any tests (*.test.ts) in the /tests folder. Create a at least one test of the form some-name.test.ts\"\n    );\n    Object.setPrototypeOf(this, ZuploProjectMissingTests.prototype);\n  }\n}\n\nexport class NoGitCommits extends Error {\n  constructor() {\n    super(\n      \"Invalid Git state: The current directory does not contain any commits. Make a commit before deploying.\"\n    );\n    Object.setPrototypeOf(this, NoGitCommits.prototype);\n  }\n}\n\nexport class NotOnAGitBranch extends Error {\n  constructor() {\n    super(\n      \"Invalid Git state: You are not on a branch. Run `git checkout -b <branch-name>` to create a new branch.\"\n    );\n    Object.setPrototypeOf(this, NotOnAGitBranch.prototype);\n  }\n}\n\nexport class GitVersionControlValidator\n  implements ValidationRule<{ dir: string }>\n{\n  async validate(option: { dir: string }): Promise<Result> {\n    const { dir } = option;\n    try {\n      await simpleGit({ baseDir: dir }).status();\n      return { ok: true };\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    } catch (_err) {\n      return {\n        ok: false,\n        error: new NotAGitRepoError(),\n      };\n    }\n  }\n}\n\nexport class GitCommitValidator implements ValidationRule<{ dir: string }> {\n  async validate(option: { dir: string }): Promise<Result> {\n    const { dir } = option;\n    try {\n      const git = simpleGit({ baseDir: dir });\n      const commits = await git.log({ maxCount: 1 });\n      if (commits.total === 0) {\n        return {\n          ok: false,\n          error: new NoGitCommits(),\n        };\n      }\n      return { ok: true };\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    } catch (_err) {\n      return {\n        ok: false,\n        error: new NoGitCommits(),\n      };\n    }\n  }\n}\n\nexport class GitBranchValidator implements ValidationRule<{ dir: string }> {\n  async validate(option: { dir: string }): Promise<Result> {\n    const { dir } = option;\n    const git = simpleGit({ baseDir: dir });\n    const branch = await git.branch();\n    if (!branch.current) {\n      return {\n        ok: false,\n        error: new NotOnAGitBranch(),\n      };\n    }\n\n    return { ok: true };\n  }\n}\n\nexport class ZuploProjectValidator implements ValidationRule<{ dir: string }> {\n  async validate(options: { dir: string }): Promise<Result> {\n    const { dir } = options;\n    try {\n      if (existsSync(`${dir}/config`)) {\n        const files = readdirSync(join(dir, \"config\"));\n        const existingOASFiles =\n          files.filter((file) => file.endsWith(\".oas.json\")).length >= 1;\n        if (existingOASFiles === true) {\n          return { ok: true };\n        }\n      }\n      return {\n        ok: false,\n        error: new NotAZuploProject(),\n      };\n    } catch (err) {\n      return {\n        ok: false,\n        error: err,\n      };\n    }\n  }\n}\n\nexport class ZuploProjectHasTestsValidator\n  implements ValidationRule<{ dir: string }>\n{\n  async validate(option: { dir: string }): Promise<Result> {\n    const { dir } = option;\n    try {\n      if (fg.sync(`${dir}/${TEST_IN_FOLDER}/**/*.test.ts`).length >= 1) {\n        return { ok: true };\n      } else {\n        return {\n          ok: false,\n          error: new ZuploProjectMissingTests(),\n        };\n      }\n    } catch (err) {\n      return {\n        ok: false,\n        error: err,\n      };\n    }\n  }\n}\n\nexport const validDeployDirectoryValidator = new CompositeValidator<{\n  dir: string;\n  project: string | undefined;\n}>(\n  new ZuploProjectValidator(),\n  new GitVersionControlValidator(),\n  new GitCommitValidator(),\n  new GitBranchValidator(),\n  new ProjectIsSetValidator()\n);\n\nexport const validTestDirectoryValidator = new CompositeValidator<{\n  dir: string;\n}>(new ZuploProjectValidator(), new ZuploProjectHasTestsValidator());\n"]}
+{"version":3,"file":"file-system-validator.js","sourceRoot":"","sources":["../../../src/common/validators/file-system-validator.ts"],"names":[],"mappings":"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","sourcesContent":["import fg from \"fast-glob\";\nimport { existsSync, readdirSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport { simpleGit } from \"simple-git\";\nimport { TEST_IN_FOLDER } from \"../constants.js\";\nimport { CompositeValidator, Result, ValidationRule } from \"./lib.js\";\nimport { ProjectIsSetValidator } from \"./project-name-validator.js\";\n\nexport class GitBranchOrEnvironmentRequiredError extends Error {\n  constructor() {\n    super(\n      \"Invalid arguments: The project directory is not a Git repository, you must specify the `environment` argument.\"\n    );\n    Object.setPrototypeOf(this, NotAGitRepoError.prototype);\n  }\n}\n\nexport class NotAGitRepoError extends Error {\n  constructor() {\n    super(\"Invalid directory: The project directory is not a Git repository.\");\n    Object.setPrototypeOf(this, NotAGitRepoError.prototype);\n  }\n}\n\nexport class NotAZuploProject extends Error {\n  constructor() {\n    super(\n      \"Invalid directory: The project directory is not the root of a Zuplo project.\"\n    );\n    Object.setPrototypeOf(this, NotAZuploProject.prototype);\n  }\n}\n\nexport class ZuploProjectMissingTests extends Error {\n  constructor() {\n    super(\n      \"Invalid directory: The project directory does not contain any tests (*.test.ts) in the /tests folder. Create a at least one test of the form some-name.test.ts\"\n    );\n    Object.setPrototypeOf(this, ZuploProjectMissingTests.prototype);\n  }\n}\n\nexport class NoGitCommits extends Error {\n  constructor() {\n    super(\n      \"Invalid Git state: The project directory does not contain any commits. Make a commit before deploying.\"\n    );\n    Object.setPrototypeOf(this, NoGitCommits.prototype);\n  }\n}\n\nexport class NotOnAGitBranch extends Error {\n  constructor() {\n    super(\n      \"Invalid Git state: You are not on a branch. Run `git checkout -b <branch-name>` to create a new branch.\"\n    );\n    Object.setPrototypeOf(this, NotOnAGitBranch.prototype);\n  }\n}\n\nexport class GitVersionControlValidator\n  implements ValidationRule<{ dir: string }>\n{\n  async validate(option: { dir: string }): Promise<Result> {\n    const { dir } = option;\n    try {\n      await simpleGit({ baseDir: dir }).status();\n      return { ok: true };\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    } catch (_err) {\n      return {\n        ok: false,\n        error: new NotAGitRepoError(),\n      };\n    }\n  }\n}\n\n/**\n * Checks if either the current branch is set as the environment or if\n * the environment is explicitly set\n */\nexport class GitBranchOrEnvironmentValidator\n  implements ValidationRule<{ dir: string }>\n{\n  async validate(option: {\n    dir: string;\n    environment: string | undefined;\n  }): Promise<Result> {\n    const { dir, environment } = option;\n    if (typeof environment === \"string\") {\n      return {\n        ok: true,\n      };\n    }\n    try {\n      if (await simpleGit({ baseDir: dir }).checkIsRepo()) {\n        await simpleGit({ baseDir: dir }).status();\n        const git = simpleGit({ baseDir: dir });\n        const branch = await git.branch();\n        if (branch.current) {\n          return {\n            ok: true,\n          };\n        }\n      }\n    } catch {\n      // Ignore\n    }\n    return {\n      ok: false,\n      error: new GitBranchOrEnvironmentRequiredError(),\n    };\n  }\n}\n\nexport class GitCommitValidator implements ValidationRule<{ dir: string }> {\n  async validate(option: { dir: string }): Promise<Result> {\n    const { dir } = option;\n    try {\n      const git = simpleGit({ baseDir: dir });\n      const commits = await git.log({ maxCount: 1 });\n      if (commits.total === 0) {\n        return {\n          ok: false,\n          error: new NoGitCommits(),\n        };\n      }\n      return { ok: true };\n      // eslint-disable-next-line @typescript-eslint/no-unused-vars\n    } catch (_err) {\n      return {\n        ok: false,\n        error: new NoGitCommits(),\n      };\n    }\n  }\n}\n\nexport class GitBranchValidator implements ValidationRule<{ dir: string }> {\n  async validate(option: { dir: string }): Promise<Result> {\n    const { dir } = option;\n    const git = simpleGit({ baseDir: dir });\n    const branch = await git.branch();\n    if (!branch.current) {\n      return {\n        ok: false,\n        error: new NotOnAGitBranch(),\n      };\n    }\n\n    return { ok: true };\n  }\n}\n\nexport class ZuploProjectValidator implements ValidationRule<{ dir: string }> {\n  async validate(options: { dir: string }): Promise<Result> {\n    const { dir } = options;\n    try {\n      if (existsSync(`${dir}/config`)) {\n        const files = readdirSync(join(dir, \"config\"));\n        const existingOASFiles =\n          files.filter((file) => file.endsWith(\".oas.json\")).length >= 1;\n        if (existingOASFiles === true) {\n          return { ok: true };\n        }\n      }\n      return {\n        ok: false,\n        error: new NotAZuploProject(),\n      };\n    } catch (err) {\n      return {\n        ok: false,\n        error: err,\n      };\n    }\n  }\n}\n\nexport class ZuploProjectHasTestsValidator\n  implements ValidationRule<{ dir: string }>\n{\n  async validate(option: { dir: string }): Promise<Result> {\n    const { dir } = option;\n    try {\n      if (fg.sync(`${dir}/${TEST_IN_FOLDER}/**/*.test.ts`).length >= 1) {\n        return { ok: true };\n      } else {\n        return {\n          ok: false,\n          error: new ZuploProjectMissingTests(),\n        };\n      }\n    } catch (err) {\n      return {\n        ok: false,\n        error: err,\n      };\n    }\n  }\n}\n\nexport const validDeployDirectoryValidator = new CompositeValidator<{\n  dir: string;\n  project: string | undefined;\n  environment: string | undefined;\n}>(\n  new ZuploProjectValidator(),\n  new ProjectIsSetValidator(),\n  new GitBranchOrEnvironmentValidator()\n);\n\nexport const validTestDirectoryValidator = new CompositeValidator<{\n  dir: string;\n}>(new ZuploProjectValidator(), new ZuploProjectHasTestsValidator());\n"]}

package/dist/deploy/archive.d.ts

@@ -5,13 +5,13 @@ export declare function archive(argv: Arguments): Promise<{
     metadata: {
         branch: string;
         repoUrl: string | undefined;
-        sha: string;
+        sha: string | undefined;
     };
 }>;
 export declare function createIgnoreFunction(normalizedDir: string): any;
 export declare function generateMetadata(argv: Arguments): Promise<{
     branch: string;
     repoUrl: string | undefined;
-    sha: string;
+    sha: string | undefined;
 }>;
 //# sourceMappingURL=archive.d.ts.map

package/dist/deploy/archive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../../src/deploy/archive.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAS3C,wBAAsB,OAAO,CAAC,IAAI,EAAE,SAAS;;;;;;;GA6D5C;AAID,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,OA2BzD;AAeD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,SAAS;;;;GA8DrD"}
+{"version":3,"file":"archive.d.ts","sourceRoot":"","sources":["../../src/deploy/archive.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAS3C,wBAAsB,OAAO,CAAC,IAAI,EAAE,SAAS;;;;;;;GA6D5C;AAID,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,OA2BzD;AAeD,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,SAAS;;;;GAmErD"}

package/dist/deploy/archive.js

@@ -83,11 +83,12 @@ async function prepareDeployerMetadata(argv) {
 export async function generateMetadata(argv) {
     const dir = argv.dir;
     const git = simpleGit({ baseDir: dir });
+    const isRepo = await git.checkIsRepo();
     let branch;
     if (argv.environment) {
         branch = argv.environment;
     }
-    else {
+    else if (isRepo) {
         const status = await git.status();
         if (!status.current) {
             throw new Error("Invalid state: Directory is in detached head state.");
@@ -111,12 +112,16 @@ export async function generateMetadata(argv) {
             }
         }
     }
-    const sha = (await git.revparse(["HEAD"])).trim();
+    else {
+        throw new Error("The argument `environment` is required when not in a git repository.");
+    }
+    let sha;
     let repoUrl;
     if (argv["override-repo-url"]) {
         repoUrl = argv["override-repo-url"];
     }
-    else {
+    else if (isRepo) {
+        sha = (await git.revparse(["HEAD"])).trim();
         try {
             repoUrl = (await git.listRemote(["--get-url"])).trim();
         }

package/dist/deploy/archive.js.map

@@ -1 +1 @@
-{"version":3,"file":"archive.js","sourceRoot":"","sources":["../../src/deploy/archive.ts"],"names":[],"mappings":"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","sourcesContent":["import ignore from \"ignore\";\nimport { minimatch } from \"minimatch\";\nimport { randomBytes } from \"node:crypto\";\nimport {\n  existsSync,\n  mkdirSync,\n  readFileSync,\n  Stats,\n  writeFileSync,\n} from \"node:fs\";\nimport { tmpdir } from \"node:os\";\nimport { join, relative, sep } from \"node:path\";\nimport { simpleGit } from \"simple-git\";\nimport * as tar from \"tar\";\nimport { DEPLOYER_METADATA_FILE } from \"../common/constants.js\";\nimport { logger } from \"../common/logger.js\";\nimport { Arguments } from \"./handler.js\";\n\nexport const ARCHIVE_EXTENSION = \".tar.gz\";\n\nfunction createTempFileWithSuffix(suffix = ARCHIVE_EXTENSION) {\n  const tempDir = tmpdir();\n  const randomName = randomBytes(16).toString(\"hex\");\n  const tempFilePath = join(tempDir, `${randomName}${suffix}`);\n  return tempFilePath;\n}\n\nexport async function archive(argv: Arguments) {\n  const tarball = createTempFileWithSuffix();\n  const dir = argv.dir;\n  const ignoreFn = createIgnoreFunction(dir);\n  const normalizedDir = join(relative(process.cwd(), dir));\n\n  const metadata = await prepareDeployerMetadata(argv);\n\n  await tar.create(\n    {\n      gzip: true,\n      file: tarball,\n      filter: (path, stat) => {\n        const stats = stat as unknown as Stats;\n        const normalizedPath = stats.isDirectory()\n          ? join(relative(process.cwd(), path), sep) // add / to help the ignore module determine that this is a folder\n          : join(relative(process.cwd(), path));\n\n        // special case to allow for processing of the root by tar (./)\n        if (minimatch(normalizedPath, \"/\", { windowsPathsNoEscape: true })) {\n          return true;\n        }\n\n        if (\n          minimatch(normalizedPath, \".zuplo/\", { windowsPathsNoEscape: true })\n        ) {\n          // Need to return true to allow this to process the entries of the directory\n          return true;\n        }\n\n        if (\n          minimatch(normalizedPath, `.zuplo/${DEPLOYER_METADATA_FILE}`, {\n            windowsPathsNoEscape: true,\n          })\n        ) {\n          // Now on the second round when it enters the .zuplo folder, we specifically look for this file\n          return true;\n        }\n\n        // We special case the .env files to allow for the self-hosted endpoint to be passed in\n        if (normalizedPath === \".env\" || normalizedPath === \".env.zuplo\") {\n          if (argv[\"self-hosted-endpoint\"]) {\n            return true;\n          }\n        }\n\n        const result = ignoreFn.ignores(normalizedPath);\n        logger.trace(`${normalizedPath} ignored: ${result}`);\n\n        // The way `tar` interprets true|false is \"opposite\" from ignore\n        // When ignore returns true, it means that the .ignore file doesn't want it.\n        // When tar return true, it means that we want it.\n        return !result;\n      },\n    },\n    [normalizedDir]\n  );\n  return {\n    tarball,\n    metadata,\n  };\n}\n\n// Note that we do not recursively create an ignore function for each dir\n// We only create one for the top-level of the directory\nexport function createIgnoreFunction(normalizedDir: string) {\n  // Most ignore files forget to ignore the .git directory\n\n  // Need to do this conversion because of some weird confusion with the d.ts for ignore package in esm\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const baseIgnore = (ignore as any)().add(\".git/\");\n\n  if (existsSync(`${normalizedDir}/.zupignore`)) {\n    const zupignorePath = `${normalizedDir}/.zupignore`;\n    logger.debug(`Using ${zupignorePath} to filter out files`);\n    return baseIgnore.add(readFileSync(zupignorePath).toString());\n  } else if (existsSync(`${normalizedDir}/.gitignore`)) {\n    const gitignorePath = `${normalizedDir}/.gitignore`;\n    logger.debug(`Using ${gitignorePath} to filter out files`);\n    const gitIgnoreContent = readFileSync(gitignorePath).toString();\n    // @NOTE - we should always include the .zuplo folder\n    const gitIgnoreContentDotZuploRemoved = gitIgnoreContent.replace(\n      /\\.zuplo[/]/,\n      \"\"\n    );\n    return baseIgnore.add(gitIgnoreContentDotZuploRemoved);\n  } else {\n    logger.debug(\n      \"Didn't find a .gitignore or .zupignore file. Defaulting to ignoring .git and node_modules.\"\n    );\n    return baseIgnore.add(\"node_modules/\");\n  }\n}\n\ninterface DeployerMetadata {\n  branch: string;\n  repoUrl: string | undefined;\n  sha: string;\n}\n\nasync function prepareDeployerMetadata(argv: Arguments) {\n  const dir = argv.dir;\n  const metadata = await generateMetadata(argv);\n  await writeGeneratedMetadata(dir, metadata);\n  return metadata;\n}\n\nexport async function generateMetadata(argv: Arguments) {\n  const dir = argv.dir;\n  const git = simpleGit({ baseDir: dir });\n\n  let branch: string;\n  if (argv.environment) {\n    branch = argv.environment;\n  } else {\n    // Get the current branch from Git\n    const status = await git.status();\n    if (!status.current) {\n      throw new Error(\"Invalid state: Directory is in detached head state.\");\n    }\n    branch = status.current.trim();\n\n    // @NOTE - gitlab returns HEAD as the current branch when running git.status()\n    // https://forum.gitlab.com/t/why-i-cant-get-the-branch-name/72462/6\n    if (branch === \"HEAD\") {\n      // Fetch remote branches to ensure the latest information\n      await git.fetch([\"--all\"]);\n\n      const branchCommit = await git.branch([\"-a\"]);\n      const brancheRef = await git.branch([\n        \"-r\",\n        \"--contains\",\n        branchCommit.current,\n      ]);\n      if (brancheRef && brancheRef.all && brancheRef.all[0]) {\n        const originBranch = brancheRef.all[0];\n        const cleanOriginBranch = originBranch.replace(/^origin\\//, \"\");\n        if (!cleanOriginBranch) {\n          throw new Error(\n            \"Invalid state: Directory is in detached head state.\"\n          );\n        }\n        branch = cleanOriginBranch.trim();\n      }\n    }\n  }\n\n  // Get the current sha\n  const sha = (await git.revparse([\"HEAD\"])).trim();\n\n  let repoUrl: string | undefined;\n  if (argv[\"override-repo-url\"]) {\n    repoUrl = argv[\"override-repo-url\"];\n  } else {\n    try {\n      repoUrl = (await git.listRemote([\"--get-url\"])).trim();\n    } catch (err) {\n      logger.debug(\n        \"Failed to get the remote URL from the git repository. This can happen if there is no remote configured.\"\n      );\n      repoUrl = undefined;\n    }\n  }\n\n  return {\n    branch,\n    repoUrl,\n    sha,\n  };\n}\n\nasync function writeGeneratedMetadata(dir: string, metadata: DeployerMetadata) {\n  try {\n    mkdirSync(`${dir}/.zuplo`);\n  } catch (err) {\n    if (err.code === \"EEXIST\") {\n      // this is fine, which means that we don't create it and move on\n    } else {\n      throw err;\n    }\n  }\n  await writeFileSync(\n    `${dir}/.zuplo/${DEPLOYER_METADATA_FILE}`,\n    JSON.stringify(metadata, null, 2),\n    {\n      flag: \"w\",\n    }\n  );\n}\n"]}
+{"version":3,"file":"archive.js","sourceRoot":"","sources":["../../src/deploy/archive.ts"],"names":[],"mappings":"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","sourcesContent":["import ignore from \"ignore\";\nimport { minimatch } from \"minimatch\";\nimport { randomBytes } from \"node:crypto\";\nimport {\n  existsSync,\n  mkdirSync,\n  readFileSync,\n  Stats,\n  writeFileSync,\n} from \"node:fs\";\nimport { tmpdir } from \"node:os\";\nimport { join, relative, sep } from \"node:path\";\nimport { simpleGit } from \"simple-git\";\nimport * as tar from \"tar\";\nimport { DEPLOYER_METADATA_FILE } from \"../common/constants.js\";\nimport { logger } from \"../common/logger.js\";\nimport { Arguments } from \"./handler.js\";\n\nexport const ARCHIVE_EXTENSION = \".tar.gz\";\n\nfunction createTempFileWithSuffix(suffix = ARCHIVE_EXTENSION) {\n  const tempDir = tmpdir();\n  const randomName = randomBytes(16).toString(\"hex\");\n  const tempFilePath = join(tempDir, `${randomName}${suffix}`);\n  return tempFilePath;\n}\n\nexport async function archive(argv: Arguments) {\n  const tarball = createTempFileWithSuffix();\n  const dir = argv.dir;\n  const ignoreFn = createIgnoreFunction(dir);\n  const normalizedDir = join(relative(process.cwd(), dir));\n\n  const metadata = await prepareDeployerMetadata(argv);\n\n  await tar.create(\n    {\n      gzip: true,\n      file: tarball,\n      filter: (path, stat) => {\n        const stats = stat as unknown as Stats;\n        const normalizedPath = stats.isDirectory()\n          ? join(relative(process.cwd(), path), sep) // add / to help the ignore module determine that this is a folder\n          : join(relative(process.cwd(), path));\n\n        // special case to allow for processing of the root by tar (./)\n        if (minimatch(normalizedPath, \"/\", { windowsPathsNoEscape: true })) {\n          return true;\n        }\n\n        if (\n          minimatch(normalizedPath, \".zuplo/\", { windowsPathsNoEscape: true })\n        ) {\n          // Need to return true to allow this to process the entries of the directory\n          return true;\n        }\n\n        if (\n          minimatch(normalizedPath, `.zuplo/${DEPLOYER_METADATA_FILE}`, {\n            windowsPathsNoEscape: true,\n          })\n        ) {\n          // Now on the second round when it enters the .zuplo folder, we specifically look for this file\n          return true;\n        }\n\n        // We special case the .env files to allow for the self-hosted endpoint to be passed in\n        if (normalizedPath === \".env\" || normalizedPath === \".env.zuplo\") {\n          if (argv[\"self-hosted-endpoint\"]) {\n            return true;\n          }\n        }\n\n        const result = ignoreFn.ignores(normalizedPath);\n        logger.trace(`${normalizedPath} ignored: ${result}`);\n\n        // The way `tar` interprets true|false is \"opposite\" from ignore\n        // When ignore returns true, it means that the .ignore file doesn't want it.\n        // When tar return true, it means that we want it.\n        return !result;\n      },\n    },\n    [normalizedDir]\n  );\n  return {\n    tarball,\n    metadata,\n  };\n}\n\n// Note that we do not recursively create an ignore function for each dir\n// We only create one for the top-level of the directory\nexport function createIgnoreFunction(normalizedDir: string) {\n  // Most ignore files forget to ignore the .git directory\n\n  // Need to do this conversion because of some weird confusion with the d.ts for ignore package in esm\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const baseIgnore = (ignore as any)().add(\".git/\");\n\n  if (existsSync(`${normalizedDir}/.zupignore`)) {\n    const zupignorePath = `${normalizedDir}/.zupignore`;\n    logger.debug(`Using ${zupignorePath} to filter out files`);\n    return baseIgnore.add(readFileSync(zupignorePath).toString());\n  } else if (existsSync(`${normalizedDir}/.gitignore`)) {\n    const gitignorePath = `${normalizedDir}/.gitignore`;\n    logger.debug(`Using ${gitignorePath} to filter out files`);\n    const gitIgnoreContent = readFileSync(gitignorePath).toString();\n    // @NOTE - we should always include the .zuplo folder\n    const gitIgnoreContentDotZuploRemoved = gitIgnoreContent.replace(\n      /\\.zuplo[/]/,\n      \"\"\n    );\n    return baseIgnore.add(gitIgnoreContentDotZuploRemoved);\n  } else {\n    logger.debug(\n      \"Didn't find a .gitignore or .zupignore file. Defaulting to ignoring .git and node_modules.\"\n    );\n    return baseIgnore.add(\"node_modules/\");\n  }\n}\n\ninterface DeployerMetadata {\n  branch: string;\n  repoUrl: string | undefined;\n  sha: string | undefined;\n}\n\nasync function prepareDeployerMetadata(argv: Arguments) {\n  const dir = argv.dir;\n  const metadata = await generateMetadata(argv);\n  await writeGeneratedMetadata(dir, metadata);\n  return metadata;\n}\n\nexport async function generateMetadata(argv: Arguments) {\n  const dir = argv.dir;\n  const git = simpleGit({ baseDir: dir });\n\n  const isRepo = await git.checkIsRepo();\n  let branch: string;\n  if (argv.environment) {\n    branch = argv.environment;\n  } else if (isRepo) {\n    // Get the current branch from Git\n    const status = await git.status();\n    if (!status.current) {\n      throw new Error(\"Invalid state: Directory is in detached head state.\");\n    }\n    branch = status.current.trim();\n\n    // @NOTE - gitlab returns HEAD as the current branch when running git.status()\n    // https://forum.gitlab.com/t/why-i-cant-get-the-branch-name/72462/6\n    if (branch === \"HEAD\") {\n      // Fetch remote branches to ensure the latest information\n      await git.fetch([\"--all\"]);\n\n      const branchCommit = await git.branch([\"-a\"]);\n      const brancheRef = await git.branch([\n        \"-r\",\n        \"--contains\",\n        branchCommit.current,\n      ]);\n      if (brancheRef && brancheRef.all && brancheRef.all[0]) {\n        const originBranch = brancheRef.all[0];\n        const cleanOriginBranch = originBranch.replace(/^origin\\//, \"\");\n        if (!cleanOriginBranch) {\n          throw new Error(\n            \"Invalid state: Directory is in detached head state.\"\n          );\n        }\n        branch = cleanOriginBranch.trim();\n      }\n    }\n  } else {\n    throw new Error(\n      \"The argument `environment` is required when not in a git repository.\"\n    );\n  }\n\n  // Get the current sha\n  let sha: string | undefined;\n  let repoUrl: string | undefined;\n  if (argv[\"override-repo-url\"]) {\n    repoUrl = argv[\"override-repo-url\"];\n  } else if (isRepo) {\n    sha = (await git.revparse([\"HEAD\"])).trim();\n    try {\n      repoUrl = (await git.listRemote([\"--get-url\"])).trim();\n    } catch (err) {\n      logger.debug(\n        \"Failed to get the remote URL from the git repository. This can happen if there is no remote configured.\"\n      );\n      repoUrl = undefined;\n    }\n  }\n\n  return {\n    branch,\n    repoUrl,\n    sha,\n  };\n}\n\nasync function writeGeneratedMetadata(dir: string, metadata: DeployerMetadata) {\n  try {\n    mkdirSync(`${dir}/.zuplo`);\n  } catch (err) {\n    if (err.code === \"EEXIST\") {\n      // this is fine, which means that we don't create it and move on\n    } else {\n      throw err;\n    }\n  }\n  await writeFileSync(\n    `${dir}/.zuplo/${DEPLOYER_METADATA_FILE}`,\n    JSON.stringify(metadata, null, 2),\n    {\n      flag: \"w\",\n    }\n  );\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zuplo/cli",
-  "version": "6.25.18",
+  "version": "6.26.0",
   "repository": "https://github.com/zuplo/zuplo",
   "author": "Zuplo, Inc.",
   "type": "module",
@@ -29,8 +29,8 @@
     "@opentelemetry/api": "^1.8.0",
     "@sentry/node": "^8.47.0",
     "@swc/core": "1.7.22",
-    "@zuplo/core": "^6.25.18",
-    "@zuplo/runtime": "^6.25.18",
+    "@zuplo/core": "^6.26.0",
+    "@zuplo/runtime": "^6.26.0",
     "as-table": "^1.0.55",
     "chalk": "^5.3.0",
     "chokidar": "^3.5.3",