@zuplo/cli 6.49.2 → 6.49.3

package/dist/common/outdated.js.map

@@ -1 +1 @@
-{"version":3,"file":"outdated.js","sourceRoot":"","sources":["../../src/common/outdated.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable node/no-process-env */\nimport chalk from \"chalk\";\nimport { existsSync, mkdirSync } from \"node:fs\";\nimport { readFile, writeFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { gt, inc, lt } from \"semver\";\nimport { ZUPLO_VERSION_CHECK_FILE } from \"./constants.js\";\nimport { printWarningToConsole } from \"./output.js\";\nimport box from \"./utils/box.js\";\nimport { ZUPLO_XDG_STATE_HOME } from \"./xdg/lib.js\";\n\ninterface VersionCheckInfo {\n  lastCheck: number;\n  latestVersion: string;\n}\nexport async function warnNodeVersion(\n  currentCliVersion: string,\n  desiredNodeVersion: string\n) {\n  const currentNodeVersion = process.versions.node;\n  if (lt(currentNodeVersion, desiredNodeVersion)) {\n    const nextMajorCliVersion = inc(currentCliVersion, \"major\");\n    printWarningToConsole(\n      box(\n        `You are using Node.js ${currentNodeVersion}. The recommended version for the @zuplo/cli is ${nextMajorCliVersion} or greater.\n        Some features might not work as expected. Please update your Node.js version as soon as possible.`\n      )\n    );\n  }\n}\n\nexport async function warnIfOutdatedVersion(currentVersion: string) {\n  // Print update information, if available\n  if (\n    !process.env.ZUPLO_OVERRIDE_CI_TO_TEST &&\n    (process.env.CI || process.env.ZUPLO_DISABLE_UPDATE_CHECK)\n  ) {\n    return false;\n  }\n  const versionCheckInfo = await getVersionCheckInfo();\n  const shouldWarn = gt(versionCheckInfo.latestVersion, currentVersion);\n\n  if (shouldWarn) {\n    printWarningToConsole(\n      box(\n        `Update available! ${chalk.gray(`v${currentVersion}`)} ≫ ${chalk.green(\n          `v${versionCheckInfo.latestVersion}`\n        )}\nRun ${chalk.cyan(\"npm install zuplo@latest\")} to update.\n\n${chalk.gray(\"Older versions are unsupported and may not work as expected.\")}`\n      )\n    );\n  }\n\n  return shouldWarn;\n}\n\nasync function getLatestVersion(): Promise<string> {\n  const response = await fetch(\n    \"https://raw.githubusercontent.com/zuplo/zuplo/main/packages/zuplo/package.json\"\n  );\n  const result = await response.json();\n\n  return result.dependencies[\"@zuplo/cli\"];\n}\n\nasync function getVersionCheckInfo(): Promise<VersionCheckInfo> {\n  if (!existsSync(ZUPLO_XDG_STATE_HOME)) {\n    mkdirSync(ZUPLO_XDG_STATE_HOME, { recursive: true });\n  }\n  const versionCheckPath = join(ZUPLO_XDG_STATE_HOME, ZUPLO_VERSION_CHECK_FILE);\n\n  let versionCheckInfo: VersionCheckInfo | undefined;\n  if (existsSync(versionCheckPath)) {\n    try {\n      versionCheckInfo = await readFile(versionCheckPath, \"utf-8\").then(\n        JSON.parse\n      );\n    } catch {\n      // Error reading or parsing file, ignore it\n    }\n\n    // Check if the file is valid, if not ignore it\n    if (versionCheckInfo) {\n      if (\n        typeof versionCheckInfo.lastCheck !== \"number\" ||\n        typeof versionCheckInfo.latestVersion !== \"string\"\n      ) {\n        versionCheckInfo = undefined;\n      }\n    }\n  }\n\n  let shouldCheck = true;\n  if (versionCheckInfo) {\n    const now = Date.now();\n    const lastCheck = versionCheckInfo.lastCheck;\n    if (now - lastCheck < 1000 * 60 * 60 * 24) {\n      shouldCheck = false;\n    }\n  }\n\n  if (!versionCheckInfo || shouldCheck) {\n    const latestVersion = await getLatestVersion();\n\n    versionCheckInfo = {\n      lastCheck: Date.now(),\n      latestVersion,\n    };\n    await writeFile(\n      versionCheckPath,\n      JSON.stringify(versionCheckInfo),\n      \"utf-8\"\n    );\n  }\n\n  return versionCheckInfo;\n}\n"]}
+{"version":3,"file":"outdated.js","sourceRoot":"","sources":["../../src/common/outdated.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable node/no-process-env */\n\nimport { existsSync, mkdirSync } from \"node:fs\";\nimport { readFile, writeFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport chalk from \"chalk\";\nimport { gt, inc, lt } from \"semver\";\nimport { ZUPLO_VERSION_CHECK_FILE } from \"./constants.js\";\nimport { printWarningToConsole } from \"./output.js\";\nimport box from \"./utils/box.js\";\nimport { ZUPLO_XDG_STATE_HOME } from \"./xdg/lib.js\";\n\ninterface VersionCheckInfo {\n  lastCheck: number;\n  latestVersion: string;\n}\nexport async function warnNodeVersion(\n  currentCliVersion: string,\n  desiredNodeVersion: string\n) {\n  const currentNodeVersion = process.versions.node;\n  if (lt(currentNodeVersion, desiredNodeVersion)) {\n    const nextMajorCliVersion = inc(currentCliVersion, \"major\");\n    printWarningToConsole(\n      box(\n        `You are using Node.js ${currentNodeVersion}. The recommended version for the @zuplo/cli is ${nextMajorCliVersion} or greater.\n        Some features might not work as expected. Please update your Node.js version as soon as possible.`\n      )\n    );\n  }\n}\n\nexport async function warnIfOutdatedVersion(currentVersion: string) {\n  // Print update information, if available\n  if (\n    !process.env.ZUPLO_OVERRIDE_CI_TO_TEST &&\n    (process.env.CI || process.env.ZUPLO_DISABLE_UPDATE_CHECK)\n  ) {\n    return false;\n  }\n  const versionCheckInfo = await getVersionCheckInfo();\n  const shouldWarn = gt(versionCheckInfo.latestVersion, currentVersion);\n\n  if (shouldWarn) {\n    printWarningToConsole(\n      box(\n        `Update available! ${chalk.gray(`v${currentVersion}`)} ≫ ${chalk.green(\n          `v${versionCheckInfo.latestVersion}`\n        )}\nRun ${chalk.cyan(\"npm install zuplo@latest\")} to update.\n\n${chalk.gray(\"Older versions are unsupported and may not work as expected.\")}`\n      )\n    );\n  }\n\n  return shouldWarn;\n}\n\nasync function getLatestVersion(): Promise<string> {\n  const response = await fetch(\n    \"https://raw.githubusercontent.com/zuplo/zuplo/main/packages/zuplo/package.json\"\n  );\n  const result = await response.json();\n\n  return result.dependencies[\"@zuplo/cli\"];\n}\n\nasync function getVersionCheckInfo(): Promise<VersionCheckInfo> {\n  if (!existsSync(ZUPLO_XDG_STATE_HOME)) {\n    mkdirSync(ZUPLO_XDG_STATE_HOME, { recursive: true });\n  }\n  const versionCheckPath = join(ZUPLO_XDG_STATE_HOME, ZUPLO_VERSION_CHECK_FILE);\n\n  let versionCheckInfo: VersionCheckInfo | undefined;\n  if (existsSync(versionCheckPath)) {\n    try {\n      versionCheckInfo = await readFile(versionCheckPath, \"utf-8\").then(\n        JSON.parse\n      );\n    } catch {\n      // Error reading or parsing file, ignore it\n    }\n\n    // Check if the file is valid, if not ignore it\n    if (versionCheckInfo) {\n      if (\n        typeof versionCheckInfo.lastCheck !== \"number\" ||\n        typeof versionCheckInfo.latestVersion !== \"string\"\n      ) {\n        versionCheckInfo = undefined;\n      }\n    }\n  }\n\n  let shouldCheck = true;\n  if (versionCheckInfo) {\n    const now = Date.now();\n    const lastCheck = versionCheckInfo.lastCheck;\n    if (now - lastCheck < 1000 * 60 * 60 * 24) {\n      shouldCheck = false;\n    }\n  }\n\n  if (!versionCheckInfo || shouldCheck) {\n    const latestVersion = await getLatestVersion();\n\n    versionCheckInfo = {\n      lastCheck: Date.now(),\n      latestVersion,\n    };\n    await writeFile(\n      versionCheckPath,\n      JSON.stringify(versionCheckInfo),\n      \"utf-8\"\n    );\n  }\n\n  return versionCheckInfo;\n}\n"]}

package/dist/common/upgraders/tsconfig-upgrader.js

@@ -1,6 +1,6 @@
-import { parse } from "jsonc-parser";
 import { readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
+import { parse } from "jsonc-parser";
 import { format } from "prettier";
 import { printWarningToConsole } from "../output.js";
 import { StandardUpgrader } from "./lib.js";

package/dist/common/upgraders/tsconfig-upgrader.js.map

@@ -1 +1 @@
-{"version":3,"file":"tsconfig-upgrader.js","sourceRoot":"","sources":["../../../src/common/upgraders/tsconfig-upgrader.ts"],"names":[],"mappings":"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","sourcesContent":["import { parse } from \"jsonc-parser\";\nimport { readFile, writeFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { format } from \"prettier\";\n\nimport { printWarningToConsole } from \"../output.js\";\nimport { Result } from \"../validators/lib.js\";\nimport { StandardUpgrader } from \"./lib.js\";\n\nexport class FailedToParseTSConfigJson extends Error {\n  constructor() {\n    super(\"Invalid tsconfig.json: Failed to parse the tsconfig.json file.\");\n    Object.setPrototypeOf(this, FailedToParseTSConfigJson.prototype);\n  }\n}\n\nconst tsConfig = {\n  include: [\"modules/**/*\", \".zuplo/**/*\", \"tests/**/*\"],\n  exclude: [\"./node_modules\", \"./dist\"],\n  compilerOptions: {\n    module: \"ESNext\",\n    target: \"ES2022\",\n    moduleResolution: \"Bundler\",\n    lib: [\"ESNext\", \"WebWorker\", \"Webworker.Iterable\"],\n    preserveConstEnums: true,\n    useUnknownInCatchVariables: false,\n    forceConsistentCasingInFileNames: true,\n    importHelpers: true,\n    removeComments: true,\n    esModuleInterop: true,\n    strictNullChecks: true,\n    noEmit: true,\n  },\n};\n\nexport class InvalidTSConfigJson extends Error {\n  constructor(message: string) {\n    super(message);\n    Object.setPrototypeOf(this, InvalidTSConfigJson.prototype);\n  }\n}\n\nexport class TSConfigUpgrader extends StandardUpgrader {\n  async isApplicable(): Promise<Result> {\n    // Every project should be upgraded, must have tsconfig.json file\n    return { ok: true };\n  }\n\n  async needsUpgrade(): Promise<boolean> {\n    try {\n      // Read in the tsconfig.json file\n      const tsFilePath = join(this.normalizedDir, \"tsconfig.json\");\n      const tsConfigRaw = await readFile(tsFilePath, \"utf-8\");\n      const tsConfigJson = parse(tsConfigRaw);\n      // Validate the compilerOptions property\n      if (\n        !(\n          tsConfigJson &&\n          typeof tsConfigJson === \"object\" &&\n          \"compilerOptions\" in tsConfigJson\n        )\n      ) {\n        return true;\n      }\n\n      const libValue = [\"ESNext\", \"WebWorker\", \"Webworker.Iterable\"];\n      const includesAllLibs = (userLibs: string[]): boolean => {\n        const a = libValue.map((item) => item.toLowerCase());\n        const b = userLibs.map((item) => item.toLowerCase());\n        return a.every((item) => b.includes(item));\n      };\n\n      if (tsConfigJson.extends) {\n        printWarningToConsole(\n          \"This project uses an advanced tsconfig.json setup. You will need to manually upgrade this file.\"\n        );\n        return false;\n      } else {\n        const options = tsConfigJson.compilerOptions;\n        return (\n          options.module?.toLowerCase() !==\n            tsConfig.compilerOptions.module.toLowerCase() ||\n          options.target?.toLowerCase() !==\n            tsConfig.compilerOptions.target.toLowerCase() ||\n          options.moduleResolution?.toLowerCase() !==\n            tsConfig.compilerOptions.moduleResolution.toLowerCase() ||\n          !options.lib ||\n          options.baseUrl !== undefined ||\n          !includesAllLibs(tsConfigJson.compilerOptions.lib ?? [])\n        );\n      }\n    } catch {\n      return true;\n    }\n  }\n\n  async upgrade(): Promise<void> {\n    if (!(await this.needsUpgrade())) {\n      return;\n    }\n    const tsFilePath = join(this.normalizedDir, \"tsconfig.json\");\n\n    // Write out the new tsconfig.json\n    const formatted = await format(JSON.stringify(tsConfig), {\n      parser: \"json\",\n    });\n\n    await writeFile(tsFilePath, formatted);\n  }\n}\n"]}
+{"version":3,"file":"tsconfig-upgrader.js","sourceRoot":"","sources":["../../../src/common/upgraders/tsconfig-upgrader.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFile, writeFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { parse } from \"jsonc-parser\";\nimport { format } from \"prettier\";\n\nimport { printWarningToConsole } from \"../output.js\";\nimport { Result } from \"../validators/lib.js\";\nimport { StandardUpgrader } from \"./lib.js\";\n\nexport class FailedToParseTSConfigJson extends Error {\n  constructor() {\n    super(\"Invalid tsconfig.json: Failed to parse the tsconfig.json file.\");\n    Object.setPrototypeOf(this, FailedToParseTSConfigJson.prototype);\n  }\n}\n\nconst tsConfig = {\n  include: [\"modules/**/*\", \".zuplo/**/*\", \"tests/**/*\"],\n  exclude: [\"./node_modules\", \"./dist\"],\n  compilerOptions: {\n    module: \"ESNext\",\n    target: \"ES2022\",\n    moduleResolution: \"Bundler\",\n    lib: [\"ESNext\", \"WebWorker\", \"Webworker.Iterable\"],\n    preserveConstEnums: true,\n    useUnknownInCatchVariables: false,\n    forceConsistentCasingInFileNames: true,\n    importHelpers: true,\n    removeComments: true,\n    esModuleInterop: true,\n    strictNullChecks: true,\n    noEmit: true,\n  },\n};\n\nexport class InvalidTSConfigJson extends Error {\n  constructor(message: string) {\n    super(message);\n    Object.setPrototypeOf(this, InvalidTSConfigJson.prototype);\n  }\n}\n\nexport class TSConfigUpgrader extends StandardUpgrader {\n  async isApplicable(): Promise<Result> {\n    // Every project should be upgraded, must have tsconfig.json file\n    return { ok: true };\n  }\n\n  async needsUpgrade(): Promise<boolean> {\n    try {\n      // Read in the tsconfig.json file\n      const tsFilePath = join(this.normalizedDir, \"tsconfig.json\");\n      const tsConfigRaw = await readFile(tsFilePath, \"utf-8\");\n      const tsConfigJson = parse(tsConfigRaw);\n      // Validate the compilerOptions property\n      if (\n        !(\n          tsConfigJson &&\n          typeof tsConfigJson === \"object\" &&\n          \"compilerOptions\" in tsConfigJson\n        )\n      ) {\n        return true;\n      }\n\n      const libValue = [\"ESNext\", \"WebWorker\", \"Webworker.Iterable\"];\n      const includesAllLibs = (userLibs: string[]): boolean => {\n        const a = libValue.map((item) => item.toLowerCase());\n        const b = userLibs.map((item) => item.toLowerCase());\n        return a.every((item) => b.includes(item));\n      };\n\n      if (tsConfigJson.extends) {\n        printWarningToConsole(\n          \"This project uses an advanced tsconfig.json setup. You will need to manually upgrade this file.\"\n        );\n        return false;\n      } else {\n        const options = tsConfigJson.compilerOptions;\n        return (\n          options.module?.toLowerCase() !==\n            tsConfig.compilerOptions.module.toLowerCase() ||\n          options.target?.toLowerCase() !==\n            tsConfig.compilerOptions.target.toLowerCase() ||\n          options.moduleResolution?.toLowerCase() !==\n            tsConfig.compilerOptions.moduleResolution.toLowerCase() ||\n          !options.lib ||\n          options.baseUrl !== undefined ||\n          !includesAllLibs(tsConfigJson.compilerOptions.lib ?? [])\n        );\n      }\n    } catch {\n      return true;\n    }\n  }\n\n  async upgrade(): Promise<void> {\n    if (!(await this.needsUpgrade())) {\n      return;\n    }\n    const tsFilePath = join(this.normalizedDir, \"tsconfig.json\");\n\n    // Write out the new tsconfig.json\n    const formatted = await format(JSON.stringify(tsConfig), {\n      parser: \"json\",\n    });\n\n    await writeFile(tsFilePath, formatted);\n  }\n}\n"]}

package/dist/common/upgraders/vscode-settings-json-upgrader.js

@@ -1,7 +1,7 @@
-import { parse } from "jsonc-parser";
 import { existsSync } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
+import { parse } from "jsonc-parser";
 import { format } from "prettier";
 import { StandardUpgrader, VsCodeFolderMissing } from "./lib.js";
 const zuploSchemas = [

package/dist/common/upgraders/vscode-settings-json-upgrader.js.map

@@ -1 +1 @@
-{"version":3,"file":"vscode-settings-json-upgrader.js","sourceRoot":"","sources":["../../../src/common/upgraders/vscode-settings-json-upgrader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAEjE,MAAM,YAAY,GAAG;IACnB;QACE,SAAS,EAAE,CAAC,mBAAmB,CAAC;QAChC,GAAG,EAAE,uDAAuD;KAC7D;IACD;QACE,SAAS,EAAE,CAAC,sBAAsB,CAAC;QACnC,GAAG,EAAE,6CAA6C;KACnD;IACD;QACE,SAAS,EAAE,CAAC,wBAAwB,CAAC;QACrC,GAAG,EAAE,+CAA+C;KACrD;IACD;QACE,SAAS,EAAE,CAAC,mBAAmB,CAAC;QAChC,GAAG,EAAE,4CAA4C;KAClD;CACF,CAAC;AAEF,MAAM,OAAO,0BAA2B,SAAQ,gBAAgB;IAC9D,KAAK,CAAC,YAAY;QAChB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QACzD,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,mBAAmB,EAAE,EAAE,CAAC;QACzD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,kBAAkB,GAAG,IAAI,CAC7B,IAAI,CAAC,aAAa,EAClB,SAAS,EACT,eAAe,CAChB,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAEpC,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;EAoBpB,CAAC;YACG,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE;gBACtC,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,WAAW;aACxB,CAAC,CAAC;YACH,MAAM,SAAS,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YAGN,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;YAChE,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;YAE1E,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE,CAAC;gBAClC,MAAM,cAAc,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC,IAAI,CAEtD,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CACnD,CAAC;gBACF,IAAI,cAAc,EAAE,CAAC;oBACnB,cAAc,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;gBAClC,CAAC;qBAAM,CAAC;oBACN,YAAY,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;gBAC3D,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,WAAW;aACxB,CAAC,CAAC;YACH,MAAM,SAAS,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;CACF","sourcesContent":["import { parse } from \"jsonc-parser\";\nimport { existsSync } from \"node:fs\";\nimport { readFile, writeFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { format } from \"prettier\";\nimport { Result } from \"../validators/lib.js\";\nimport { StandardUpgrader, VsCodeFolderMissing } from \"./lib.js\";\n\nconst zuploSchemas = [\n  {\n    fileMatch: [\"config/*.oas.json\"],\n    url: \"https://cdn.zuplo.com/schemas/openapi-v3.1-zuplo.json\",\n  },\n  {\n    fileMatch: [\"config/policies.json\"],\n    url: \"https://cdn.zuplo.com/schemas/policies.json\",\n  },\n  {\n    fileMatch: [\"config/dev-portal.json\"],\n    url: \"https://cdn.zuplo.com/schemas/dev-portal.json\",\n  },\n  {\n    fileMatch: [\"docs/sidebar.json\"],\n    url: \"https://cdn.zuplo.com/schemas/sidebar.json\",\n  },\n];\n\nexport class VsCodeSettingsJsonUpgrader extends StandardUpgrader {\n  async isApplicable(): Promise<Result> {\n    const vsCodeFolder = join(this.normalizedDir, \".vscode\");\n    if (existsSync(vsCodeFolder)) {\n      return { ok: true };\n    } else {\n      return { ok: false, error: new VsCodeFolderMissing() };\n    }\n  }\n\n  async upgrade(): Promise<void> {\n    const vsCodeSettingsFile = join(\n      this.normalizedDir,\n      \".vscode\",\n      \"settings.json\"\n    );\n\n    if (!existsSync(vsCodeSettingsFile)) {\n      // Create a new one from scratch\n      const content = `\n{\n\"json.schemas\": [\n    {\n    \"fileMatch\": [\"config/*.oas.json\"],\n    \"url\": \"https://cdn.zuplo.com/schemas/openapi-v3.1-zuplo.json\"\n    },\n    {\n    \"fileMatch\": [\"config/policies.json\"],\n    \"url\": \"https://cdn.zuplo.com/schemas/policies.json\"\n    },\n    {\n    \"fileMatch\": [\"config/dev-portal.json\"],\n    \"url\": \"https://cdn.zuplo.com/schemas/dev-portal.json\"\n    },\n    {\n    \"fileMatch\": [\"docs/sidebar.json\"],\n    \"url\": \"https://cdn.zuplo.com/schemas/sidebar.json\"\n    }\n]\n}`;\n      const formatted = await format(content, {\n        parser: \"json\",\n        quoteProps: \"as-needed\",\n      });\n      await writeFile(vsCodeSettingsFile, formatted);\n    } else {\n      // Upgrade the existing one (safely)\n      // NOTE: For safety, I'm parsing this with comments. But, for simplicity, I'm not writing it back with comments.\n      const settingsRaw = await readFile(vsCodeSettingsFile, \"utf-8\");\n      const settingsJson = parse(settingsRaw, [], { allowTrailingComma: true });\n\n      for (const schema of zuploSchemas) {\n        const existingSchema = settingsJson[\"json.schemas\"].find(\n          // eslint-disable-next-line @typescript-eslint/no-explicit-any\n          (s: any) => s.fileMatch[0] === schema.fileMatch[0]\n        );\n        if (existingSchema) {\n          existingSchema.url = schema.url;\n        } else {\n          settingsJson[\"json.schemas\"].push(schema);\n        }\n      }\n\n      const formatted = await format(JSON.stringify(settingsJson), {\n        parser: \"json\",\n        quoteProps: \"as-needed\",\n      });\n      await writeFile(vsCodeSettingsFile, formatted);\n    }\n  }\n}\n"]}
+{"version":3,"file":"vscode-settings-json-upgrader.js","sourceRoot":"","sources":["../../../src/common/upgraders/vscode-settings-json-upgrader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAEjE,MAAM,YAAY,GAAG;IACnB;QACE,SAAS,EAAE,CAAC,mBAAmB,CAAC;QAChC,GAAG,EAAE,uDAAuD;KAC7D;IACD;QACE,SAAS,EAAE,CAAC,sBAAsB,CAAC;QACnC,GAAG,EAAE,6CAA6C;KACnD;IACD;QACE,SAAS,EAAE,CAAC,wBAAwB,CAAC;QACrC,GAAG,EAAE,+CAA+C;KACrD;IACD;QACE,SAAS,EAAE,CAAC,mBAAmB,CAAC;QAChC,GAAG,EAAE,4CAA4C;KAClD;CACF,CAAC;AAEF,MAAM,OAAO,0BAA2B,SAAQ,gBAAgB;IAC9D,KAAK,CAAC,YAAY;QAChB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;QACzD,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QACtB,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,mBAAmB,EAAE,EAAE,CAAC;QACzD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,kBAAkB,GAAG,IAAI,CAC7B,IAAI,CAAC,aAAa,EAClB,SAAS,EACT,eAAe,CAChB,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YAEpC,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;EAoBpB,CAAC;YACG,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,OAAO,EAAE;gBACtC,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,WAAW;aACxB,CAAC,CAAC;YACH,MAAM,SAAS,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YAGN,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;YAChE,MAAM,YAAY,GAAG,KAAK,CAAC,WAAW,EAAE,EAAE,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;YAE1E,KAAK,MAAM,MAAM,IAAI,YAAY,EAAE,CAAC;gBAClC,MAAM,cAAc,GAAG,YAAY,CAAC,cAAc,CAAC,CAAC,IAAI,CAEtD,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CACnD,CAAC;gBACF,IAAI,cAAc,EAAE,CAAC;oBACnB,cAAc,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;gBAClC,CAAC;qBAAM,CAAC;oBACN,YAAY,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBAC5C,CAAC;YACH,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE;gBAC3D,MAAM,EAAE,MAAM;gBACd,UAAU,EAAE,WAAW;aACxB,CAAC,CAAC;YACH,MAAM,SAAS,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;CACF","sourcesContent":["import { existsSync } from \"node:fs\";\nimport { readFile, writeFile } from \"node:fs/promises\";\nimport { join } from \"node:path\";\nimport { parse } from \"jsonc-parser\";\nimport { format } from \"prettier\";\nimport { Result } from \"../validators/lib.js\";\nimport { StandardUpgrader, VsCodeFolderMissing } from \"./lib.js\";\n\nconst zuploSchemas = [\n  {\n    fileMatch: [\"config/*.oas.json\"],\n    url: \"https://cdn.zuplo.com/schemas/openapi-v3.1-zuplo.json\",\n  },\n  {\n    fileMatch: [\"config/policies.json\"],\n    url: \"https://cdn.zuplo.com/schemas/policies.json\",\n  },\n  {\n    fileMatch: [\"config/dev-portal.json\"],\n    url: \"https://cdn.zuplo.com/schemas/dev-portal.json\",\n  },\n  {\n    fileMatch: [\"docs/sidebar.json\"],\n    url: \"https://cdn.zuplo.com/schemas/sidebar.json\",\n  },\n];\n\nexport class VsCodeSettingsJsonUpgrader extends StandardUpgrader {\n  async isApplicable(): Promise<Result> {\n    const vsCodeFolder = join(this.normalizedDir, \".vscode\");\n    if (existsSync(vsCodeFolder)) {\n      return { ok: true };\n    } else {\n      return { ok: false, error: new VsCodeFolderMissing() };\n    }\n  }\n\n  async upgrade(): Promise<void> {\n    const vsCodeSettingsFile = join(\n      this.normalizedDir,\n      \".vscode\",\n      \"settings.json\"\n    );\n\n    if (!existsSync(vsCodeSettingsFile)) {\n      // Create a new one from scratch\n      const content = `\n{\n\"json.schemas\": [\n    {\n    \"fileMatch\": [\"config/*.oas.json\"],\n    \"url\": \"https://cdn.zuplo.com/schemas/openapi-v3.1-zuplo.json\"\n    },\n    {\n    \"fileMatch\": [\"config/policies.json\"],\n    \"url\": \"https://cdn.zuplo.com/schemas/policies.json\"\n    },\n    {\n    \"fileMatch\": [\"config/dev-portal.json\"],\n    \"url\": \"https://cdn.zuplo.com/schemas/dev-portal.json\"\n    },\n    {\n    \"fileMatch\": [\"docs/sidebar.json\"],\n    \"url\": \"https://cdn.zuplo.com/schemas/sidebar.json\"\n    }\n]\n}`;\n      const formatted = await format(content, {\n        parser: \"json\",\n        quoteProps: \"as-needed\",\n      });\n      await writeFile(vsCodeSettingsFile, formatted);\n    } else {\n      // Upgrade the existing one (safely)\n      // NOTE: For safety, I'm parsing this with comments. But, for simplicity, I'm not writing it back with comments.\n      const settingsRaw = await readFile(vsCodeSettingsFile, \"utf-8\");\n      const settingsJson = parse(settingsRaw, [], { allowTrailingComma: true });\n\n      for (const schema of zuploSchemas) {\n        const existingSchema = settingsJson[\"json.schemas\"].find(\n          // eslint-disable-next-line @typescript-eslint/no-explicit-any\n          (s: any) => s.fileMatch[0] === schema.fileMatch[0]\n        );\n        if (existingSchema) {\n          existingSchema.url = schema.url;\n        } else {\n          settingsJson[\"json.schemas\"].push(schema);\n        }\n      }\n\n      const formatted = await format(JSON.stringify(settingsJson), {\n        parser: \"json\",\n        quoteProps: \"as-needed\",\n      });\n      await writeFile(vsCodeSettingsFile, formatted);\n    }\n  }\n}\n"]}

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

@@ -1,6 +1,6 @@
-import fg from "fast-glob";
 import { existsSync, readdirSync } from "node:fs";
 import { join } from "node:path";
+import fg from "fast-glob";
 import { simpleGit } from "simple-git";
 import { TEST_IN_FOLDER } from "../constants.js";
 import { CompositeValidator } from "./lib.js";

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":"AAAA,OAAO,EAAE,MAAM,WAAW,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAA0B,MAAM,UAAU,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAEpE,MAAM,OAAO,mCAAoC,SAAQ,KAAK;IAC5D;QACE,KAAK,CACH,gHAAgH,CACjH,CAAC;QACF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACzC;QACE,KAAK,CAAC,mEAAmE,CAAC,CAAC;QAC3E,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACzC;QACE,KAAK,CACH,8EAA8E,CAC/E,CAAC;QACF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IAC1D,CAAC;CACF;AAED,MAAM,OAAO,wBAAyB,SAAQ,KAAK;IACjD;QACE,KAAK,CACH,gKAAgK,CACjK,CAAC;QACF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,wBAAwB,CAAC,SAAS,CAAC,CAAC;IAClE,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,KAAK;IACrC;QACE,KAAK,CACH,wGAAwG,CACzG,CAAC;QACF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IACtD,CAAC;CACF;AAED,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACxC;QACE,KAAK,CACH,yGAAyG,CAC1G,CAAC;QACF,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,eAAe,CAAC,SAAS,CAAC,CAAC;IACzD,CAAC;CACF;AAED,MAAM,OAAO,0BAA0B;IAGrC,KAAK,CAAC,QAAQ,CAAC,MAAuB;QACpC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;YAC3C,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QAEtB,CAAC;QAAC,OAAO,IAAI,EAAE,CAAC;YACd,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,IAAI,gBAAgB,EAAE;aAC9B,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAMD,MAAM,OAAO,+BAA+B;IAG1C,KAAK,CAAC,QAAQ,CAAC,MAGd;QACC,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;QACpC,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;YACpC,OAAO;gBACL,EAAE,EAAE,IAAI;aACT,CAAC;QACJ,CAAC;QACD,IAAI,CAAC;YACH,IAAI,MAAM,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;gBACpD,MAAM,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;gBAC3C,MAAM,GAAG,GAAG,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;gBACxC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC;gBAClC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;oBACnB,OAAO;wBACL,EAAE,EAAE,IAAI;qBACT,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;QAET,CAAC;QACD,OAAO;YACL,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,IAAI,mCAAmC,EAAE;SACjD,CAAC;IACJ,CAAC;CACF;AAED,MAAM,OAAO,kBAAkB;IAC7B,KAAK,CAAC,QAAQ,CAAC,MAAuB;QACpC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;QACvB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YACxC,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;YAC/C,IAAI,OAAO,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;gBACxB,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,IAAI,YAAY,EAAE;iBAC1B,CAAC;YACJ,CAAC;YACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QAEtB,CAAC;QAAC,OAAO,IAAI,EAAE,CAAC;YACd,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,IAAI,YAAY,EAAE;aAC1B,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,kBAAkB;IAC7B,KAAK,CAAC,QAAQ,CAAC,MAAuB;QACpC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;QACvB,MAAM,GAAG,GAAG,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;QACxC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,IAAI,eAAe,EAAE;aAC7B,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACtB,CAAC;CACF;AAED,MAAM,OAAO,qBAAqB;IAChC,KAAK,CAAC,QAAQ,CAAC,OAAwB;QACrC,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC;YACH,IAAI,UAAU,CAAC,GAAG,GAAG,SAAS,CAAC,EAAE,CAAC;gBAChC,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;gBAC/C,MAAM,gBAAgB,GACpB,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC;gBACjE,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;oBAC9B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;gBACtB,CAAC;YACH,CAAC;YACD,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,IAAI,gBAAgB,EAAE;aAC9B,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,GAAG;aACX,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,MAAM,OAAO,6BAA6B;IAGxC,KAAK,CAAC,QAAQ,CAAC,MAAuB;QACpC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC;QACvB,IAAI,CAAC;YACH,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,cAAc,eAAe,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBACjE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;YACtB,CAAC;iBAAM,CAAC;gBACN,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,IAAI,wBAAwB,EAAE;iBACtC,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,GAAG;aACX,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,6BAA6B,GAAG,IAAI,kBAAkB,CAKjE,IAAI,qBAAqB,EAAE,EAC3B,IAAI,qBAAqB,EAAE,EAC3B,IAAI,+BAA+B,EAAE,CACtC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,IAAI,kBAAkB,CAE9D,IAAI,qBAAqB,EAAE,EAAE,IAAI,6BAA6B,EAAE,CAAC,CAAC","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"]}
+{"version":3,"file":"file-system-validator.js","sourceRoot":"","sources":["../../../src/common/validators/file-system-validator.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, readdirSync } from \"node:fs\";\nimport { join } from \"node:path\";\nimport fg from \"fast-glob\";\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/common/worker-output.d.ts

@@ -1,5 +1,5 @@
-import { LogLevel } from "@zuplo/core/cli";
 import { Readable } from "node:stream";
+import { LogLevel } from "@zuplo/core/cli";
 export declare function handleRuntimeStdio(stdout: Readable, stderr: Readable): void;
 export declare function logConsole(level: LogLevel, data: string, callDepth?: number): void;
 export declare function logConsoleAsync(level: LogLevel, data: string, callDepth?: number): Promise<void>;

package/dist/common/worker-output.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-output.d.ts","sourceRoot":"","sources":["../../src/common/worker-output.ts"],"names":[],"mappings":"AAEA,OAAO,EAAiC,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,QAkIpE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,SAAI,QAEtE;AAKD,wBAAsB,eAAe,CACnC,KAAK,EAAE,QAAQ,EACf,IAAI,EAAE,MAAM,EACZ,SAAS,SAAI,iBAwDd"}
+{"version":3,"file":"worker-output.d.ts","sourceRoot":"","sources":["../../src/common/worker-output.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAiC,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAI1E,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,QAkIpE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,SAAI,QAEtE;AAKD,wBAAsB,eAAe,CACnC,KAAK,EAAE,QAAQ,EACf,IAAI,EAAE,MAAM,EACZ,SAAS,SAAI,iBAwDd"}

package/dist/common/worker-output.js.map

@@ -1 +1 @@
-{"version":3,"file":"worker-output.js","sourceRoot":"","sources":["../../src/common/worker-output.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAG1E,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;AAExC,MAAM,UAAU,kBAAkB,CAAC,MAAgB,EAAE,MAAgB;IAKnE,MAAM,WAAW,GAAG;QAElB,MAAM,CAAC,KAAa;YAClB,MAAM,6BAA6B,GAAG,KAAK,CAAC,QAAQ,CAClD,kEAAkE,CACnE,CAAC;YACF,MAAM,mCAAmC,GAAG,KAAK,CAAC,QAAQ,CACxD,6BAA6B,CAC9B,CAAC;YAIF,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEpE,OAAO,CACL,6BAA6B;gBAC7B,mCAAmC;gBACnC,gBAAgB,CACjB,CAAC;QACJ,CAAC;QAED,cAAc,CAAC,KAAa;YAC1B,OAAO,KAAK,CAAC,QAAQ,CAAC,uCAAuC,CAAC,CAAC;QACjE,CAAC;QACD,SAAS,CAAC,KAAa;YACrB,OAAO,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC;QACD,kBAAkB,CAAC,KAAa;YAC9B,OAAO,mCAAmC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzD,CAAC;QACD,iBAAiB,CAAC,KAAa;YAC7B,OAAO,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QAC7C,CAAC;KACF,CAAC;IAEF,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAsB,EAAE,EAAE;QAC3C,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAW9B,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;aAGI,IAAI,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC5B,CAAC;aAGI,CAAC;YACJ,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAsB,EAAE,EAAE;QAC3C,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAK9B,IAAI,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CACzB,+CAA+C,CAChD,EAAE,CAAC,CAAC,CAAC,CAAC;gBAEP,UAAU,CACR,OAAO,EACP,2BAA2B,OAAO,oHAAoH,CACvJ,CAAC;gBAGF,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7B,CAAC;iBAII,IAAI,WAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9C,IAAI,KAAK,GAAG,+CAA+C,CAAC;gBAC5D,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;oBACjC,KAAK;wBACH,iGAAiG;4BACjG,qDAAqD;4BACrD,+EAA+E,CAAC;gBACpF,CAAC;gBACD,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAG3B,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7B,CAAC;iBAMI,CAAC;gBACJ,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;aAGI,IAAI,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC5B,CAAC;aAGI,IAAI,WAAW,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;QAEjD,CAAC;aAGI,CAAC;YACJ,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAe,EAAE,IAAY,EAAE,SAAS,GAAG,CAAC;IACrE,KAAK,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;AAC/C,CAAC;AAKD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,KAAe,EACf,IAAY,EACZ,SAAS,GAAG,CAAC;IAEb,IAAI,CAAC;QACH,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAGD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,OAAO,IAAI,OAAO,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;QAGD,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACrD,IAAI,QAAyB,CAAC;YAC9B,IAAI,CAAC;gBACH,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACjC,CAAC;YAAC,MAAM,CAAC;gBAGP,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;oBAGpB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAClC,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAChE,CAAC;oBACF,OAAO;gBACT,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;oBACrB,OAAO;gBACT,CAAC;YACH,CAAC;YACD,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAClC,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAChE,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;YACvB,CAAC,CAAC,CACH,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAEpD,MAAM,IAAI,GAAG,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACrD,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,GAAG,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAElD,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;AACH,CAAC","sourcesContent":["/* eslint-disable no-console */\n\nimport { ConsoleLogEntry, LogFormatter, LogLevel } from \"@zuplo/core/cli\";\nimport { Readable } from \"node:stream\";\n\nconst logFormatter = new LogFormatter();\n\nexport function handleRuntimeStdio(stdout: Readable, stderr: Readable) {\n  // ASSUMPTION: each chunk is a whole message from workerd\n  // This may not hold across OSes/architectures, but it seems to work on macOS M-line\n  // I'm going with this simple approach to avoid complicating this too early\n  // We can iterate on this heuristic in the future if it causes issues\n  const classifiers = {\n    // Is this chunk a big chonky barf from workerd that we want to hijack to cleanup/ignore?\n    isBarf(chunk: string) {\n      const containsLlvmSymbolizerWarning = chunk.includes(\n        \"Not symbolizing stack traces because $LLVM_SYMBOLIZER is not set\"\n      );\n      const containsRecursiveIsolateLockWarning = chunk.includes(\n        \"took recursive isolate lock\"\n      );\n      // Matches stack traces from workerd\n      //  - on unix: groups of 9 hex digits separated by spaces\n      //  - on windows: groups of 12 hex digits, or a single digit 0, separated by spaces\n      const containsHexStack = /stack:( (0|[a-f\\d]{4,})){3,}/.test(chunk);\n\n      return (\n        containsLlvmSymbolizerWarning ||\n        containsRecursiveIsolateLockWarning ||\n        containsHexStack\n      );\n    },\n    // Is this chunk an Address In Use error?\n    isAddressInUse(chunk: string) {\n      return chunk.includes(\"Address already in use; toString() = \");\n    },\n    isWarning(chunk: string) {\n      return /\\.c\\+\\+:\\d+: warning:/.test(chunk);\n    },\n    isCodeMovedWarning(chunk: string) {\n      return /CODE_MOVED for unknown code block/.test(chunk);\n    },\n    isAccessViolation(chunk: string) {\n      return chunk.includes(\"access violation;\");\n    },\n  };\n\n  stdout.on(\"data\", (chunk: Buffer | string) => {\n    chunk = chunk.toString().trim();\n\n    if (classifiers.isBarf(chunk)) {\n      // this is a big chonky barf from workerd that we want to hijack to cleanup/ignore\n\n      // CLEANABLE:\n      // there are no known cases to cleanup yet\n      // but, as they are identified, we will do that here\n\n      // IGNORABLE:\n      // anything else not handled above is considered ignorable\n      // so send it to the debug logs which are discarded unless\n      // the user explicitly sets a logLevel indicating they care\n      logConsole(\"debug\", chunk);\n    }\n\n    // known case: warnings are not info, log them as such\n    else if (classifiers.isWarning(chunk)) {\n      logConsole(\"warn\", chunk);\n    }\n\n    // anything not explicitly handled above should be logged as info (via stdout)\n    else {\n      logConsole(\"error\", chunk);\n    }\n  });\n\n  stderr.on(\"data\", (chunk: Buffer | string) => {\n    chunk = chunk.toString().trim();\n\n    if (classifiers.isBarf(chunk)) {\n      // this is a big chonky barf from workerd that we want to hijack to cleanup/ignore\n\n      // CLEANABLE:\n      // known case to cleanup: Address in use errors\n      if (classifiers.isAddressInUse(chunk)) {\n        const address = chunk.match(\n          /Address already in use; toString\\(\\) = (.+)\\n/\n        )?.[1];\n\n        logConsole(\n          \"error\",\n          `Address already in use (${address}). Please check that you are not already running a server on this address or specify a different port with --port.`\n        );\n\n        // Log the original error to the debug logs.\n        logConsole(\"debug\", chunk);\n      }\n      // In the past we have seen Access Violation errors on Windows, which may be caused by an outdated\n      // version of the Windows OS or the Microsoft Visual C++ Redistributable.\n      // See https://github.com/cloudflare/workers-sdk/issues/6170#issuecomment-2245209918\n      else if (classifiers.isAccessViolation(chunk)) {\n        let error = \"There was an access violation in the runtime.\";\n        if (process.platform === \"win32\") {\n          error +=\n            \"\\nOn Windows, this may be caused by an outdated Microsoft Visual C++ Redistributable library.\\n\" +\n            \"Check that you have the latest version installed.\\n\" +\n            \"See https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist.\";\n        }\n        logConsole(\"error\", error);\n\n        // Log the original error to the debug logs.\n        logConsole(\"debug\", chunk);\n      }\n\n      // IGNORABLE:\n      // anything else not handled above is considered ignorable\n      // so send it to the debug logs which are discarded unless\n      // the user explicitly sets a logLevel indicating they care\n      else {\n        logConsole(\"debug\", chunk);\n      }\n    }\n\n    // known case: warnings are not errors, log them as such\n    else if (classifiers.isWarning(chunk)) {\n      logConsole(\"warn\", chunk);\n    }\n\n    // known case: \"error: CODE_MOVED for unknown code block?\", warning for workerd devs, not application devs\n    else if (classifiers.isCodeMovedWarning(chunk)) {\n      // ignore entirely, don't even send it to the debug log file\n    }\n\n    // anything not explicitly handled above should be logged as an error (via stderr)\n    else {\n      logConsole(\"error\", chunk);\n    }\n  });\n}\n\nexport function logConsole(level: LogLevel, data: string, callDepth = 0) {\n  void logConsoleAsync(level, data, callDepth);\n}\n\n/**\n * This is what is logged when the runtime calls console.log, etc.\n */\nexport async function logConsoleAsync(\n  level: LogLevel,\n  data: string,\n  callDepth = 0\n) {\n  try {\n    if (!data) {\n      return;\n    }\n\n    // This shouldn't happen, but just in case\n    if (typeof data !== \"string\") {\n      console[level](data);\n      return;\n    }\n\n    let message = data?.trim();\n    if (!message || message?.length === 0) {\n      return;\n    }\n\n    // Probably a JSON object\n    if (message.startsWith(`{`) && message.endsWith(`}`)) {\n      let logEntry: ConsoleLogEntry;\n      try {\n        logEntry = JSON.parse(message);\n      } catch {\n        // If we are at a depth of 1 it means we are trying to handle the case\n        // where a chunk might be multiple JSON entries.\n        if (callDepth === 1) {\n          // We might have multiple log entries in a single chunk\n          // so split them and log each one\n          const lines = message.split(\"\\n\");\n          await Promise.all(\n            lines.map(async (line) => logConsole(level, line, callDepth++))\n          );\n          return;\n        } else {\n          console[level](data);\n          return;\n        }\n      }\n      await Promise.all(\n        logEntry.messages.map(async (msg) => {\n          const line = await logFormatter.formatStructured(logEntry, msg);\n          console[level](line);\n        })\n      );\n    } else {\n      message = await logFormatter.formatMessage(message);\n\n      const line = logFormatter.formatLine(level, message);\n      console[level](line);\n    }\n  } catch {\n    const line = logFormatter.formatLine(level, data);\n\n    console[level](line);\n  }\n}\n"]}
+{"version":3,"file":"worker-output.js","sourceRoot":"","sources":["../../src/common/worker-output.ts"],"names":[],"mappings":"AAGA,OAAO,EAAmB,YAAY,EAAY,MAAM,iBAAiB,CAAC;AAE1E,MAAM,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC;AAExC,MAAM,UAAU,kBAAkB,CAAC,MAAgB,EAAE,MAAgB;IAKnE,MAAM,WAAW,GAAG;QAElB,MAAM,CAAC,KAAa;YAClB,MAAM,6BAA6B,GAAG,KAAK,CAAC,QAAQ,CAClD,kEAAkE,CACnE,CAAC;YACF,MAAM,mCAAmC,GAAG,KAAK,CAAC,QAAQ,CACxD,6BAA6B,CAC9B,CAAC;YAIF,MAAM,gBAAgB,GAAG,8BAA8B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAEpE,OAAO,CACL,6BAA6B;gBAC7B,mCAAmC;gBACnC,gBAAgB,CACjB,CAAC;QACJ,CAAC;QAED,cAAc,CAAC,KAAa;YAC1B,OAAO,KAAK,CAAC,QAAQ,CAAC,uCAAuC,CAAC,CAAC;QACjE,CAAC;QACD,SAAS,CAAC,KAAa;YACrB,OAAO,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7C,CAAC;QACD,kBAAkB,CAAC,KAAa;YAC9B,OAAO,mCAAmC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzD,CAAC;QACD,iBAAiB,CAAC,KAAa;YAC7B,OAAO,KAAK,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;QAC7C,CAAC;KACF,CAAC;IAEF,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAsB,EAAE,EAAE;QAC3C,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAW9B,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;aAGI,IAAI,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC5B,CAAC;aAGI,CAAC;YACJ,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAsB,EAAE,EAAE;QAC3C,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QAEhC,IAAI,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;YAK9B,IAAI,WAAW,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;gBACtC,MAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CACzB,+CAA+C,CAChD,EAAE,CAAC,CAAC,CAAC,CAAC;gBAEP,UAAU,CACR,OAAO,EACP,2BAA2B,OAAO,oHAAoH,CACvJ,CAAC;gBAGF,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7B,CAAC;iBAII,IAAI,WAAW,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC9C,IAAI,KAAK,GAAG,+CAA+C,CAAC;gBAC5D,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;oBACjC,KAAK;wBACH,iGAAiG;4BACjG,qDAAqD;4BACrD,+EAA+E,CAAC;gBACpF,CAAC;gBACD,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAG3B,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7B,CAAC;iBAMI,CAAC;gBACJ,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC7B,CAAC;QACH,CAAC;aAGI,IAAI,WAAW,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;YACtC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC5B,CAAC;aAGI,IAAI,WAAW,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;QAEjD,CAAC;aAGI,CAAC;YACJ,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAe,EAAE,IAAY,EAAE,SAAS,GAAG,CAAC;IACrE,KAAK,eAAe,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;AAC/C,CAAC;AAKD,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,KAAe,EACf,IAAY,EACZ,SAAS,GAAG,CAAC;IAEb,IAAI,CAAC;QACH,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QAGD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;YACrB,OAAO;QACT,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;QAC3B,IAAI,CAAC,OAAO,IAAI,OAAO,EAAE,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,OAAO;QACT,CAAC;QAGD,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACrD,IAAI,QAAyB,CAAC;YAC9B,IAAI,CAAC;gBACH,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACjC,CAAC;YAAC,MAAM,CAAC;gBAGP,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;oBAGpB,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAClC,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC,CAChE,CAAC;oBACF,OAAO;gBACT,CAAC;qBAAM,CAAC;oBACN,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;oBACrB,OAAO;gBACT,CAAC;YACH,CAAC;YACD,MAAM,OAAO,CAAC,GAAG,CACf,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAClC,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,gBAAgB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAChE,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;YACvB,CAAC,CAAC,CACH,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,OAAO,GAAG,MAAM,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YAEpD,MAAM,IAAI,GAAG,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACrD,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,GAAG,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAElD,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;AACH,CAAC","sourcesContent":["/* eslint-disable no-console */\n\nimport { Readable } from \"node:stream\";\nimport { ConsoleLogEntry, LogFormatter, LogLevel } from \"@zuplo/core/cli\";\n\nconst logFormatter = new LogFormatter();\n\nexport function handleRuntimeStdio(stdout: Readable, stderr: Readable) {\n  // ASSUMPTION: each chunk is a whole message from workerd\n  // This may not hold across OSes/architectures, but it seems to work on macOS M-line\n  // I'm going with this simple approach to avoid complicating this too early\n  // We can iterate on this heuristic in the future if it causes issues\n  const classifiers = {\n    // Is this chunk a big chonky barf from workerd that we want to hijack to cleanup/ignore?\n    isBarf(chunk: string) {\n      const containsLlvmSymbolizerWarning = chunk.includes(\n        \"Not symbolizing stack traces because $LLVM_SYMBOLIZER is not set\"\n      );\n      const containsRecursiveIsolateLockWarning = chunk.includes(\n        \"took recursive isolate lock\"\n      );\n      // Matches stack traces from workerd\n      //  - on unix: groups of 9 hex digits separated by spaces\n      //  - on windows: groups of 12 hex digits, or a single digit 0, separated by spaces\n      const containsHexStack = /stack:( (0|[a-f\\d]{4,})){3,}/.test(chunk);\n\n      return (\n        containsLlvmSymbolizerWarning ||\n        containsRecursiveIsolateLockWarning ||\n        containsHexStack\n      );\n    },\n    // Is this chunk an Address In Use error?\n    isAddressInUse(chunk: string) {\n      return chunk.includes(\"Address already in use; toString() = \");\n    },\n    isWarning(chunk: string) {\n      return /\\.c\\+\\+:\\d+: warning:/.test(chunk);\n    },\n    isCodeMovedWarning(chunk: string) {\n      return /CODE_MOVED for unknown code block/.test(chunk);\n    },\n    isAccessViolation(chunk: string) {\n      return chunk.includes(\"access violation;\");\n    },\n  };\n\n  stdout.on(\"data\", (chunk: Buffer | string) => {\n    chunk = chunk.toString().trim();\n\n    if (classifiers.isBarf(chunk)) {\n      // this is a big chonky barf from workerd that we want to hijack to cleanup/ignore\n\n      // CLEANABLE:\n      // there are no known cases to cleanup yet\n      // but, as they are identified, we will do that here\n\n      // IGNORABLE:\n      // anything else not handled above is considered ignorable\n      // so send it to the debug logs which are discarded unless\n      // the user explicitly sets a logLevel indicating they care\n      logConsole(\"debug\", chunk);\n    }\n\n    // known case: warnings are not info, log them as such\n    else if (classifiers.isWarning(chunk)) {\n      logConsole(\"warn\", chunk);\n    }\n\n    // anything not explicitly handled above should be logged as info (via stdout)\n    else {\n      logConsole(\"error\", chunk);\n    }\n  });\n\n  stderr.on(\"data\", (chunk: Buffer | string) => {\n    chunk = chunk.toString().trim();\n\n    if (classifiers.isBarf(chunk)) {\n      // this is a big chonky barf from workerd that we want to hijack to cleanup/ignore\n\n      // CLEANABLE:\n      // known case to cleanup: Address in use errors\n      if (classifiers.isAddressInUse(chunk)) {\n        const address = chunk.match(\n          /Address already in use; toString\\(\\) = (.+)\\n/\n        )?.[1];\n\n        logConsole(\n          \"error\",\n          `Address already in use (${address}). Please check that you are not already running a server on this address or specify a different port with --port.`\n        );\n\n        // Log the original error to the debug logs.\n        logConsole(\"debug\", chunk);\n      }\n      // In the past we have seen Access Violation errors on Windows, which may be caused by an outdated\n      // version of the Windows OS or the Microsoft Visual C++ Redistributable.\n      // See https://github.com/cloudflare/workers-sdk/issues/6170#issuecomment-2245209918\n      else if (classifiers.isAccessViolation(chunk)) {\n        let error = \"There was an access violation in the runtime.\";\n        if (process.platform === \"win32\") {\n          error +=\n            \"\\nOn Windows, this may be caused by an outdated Microsoft Visual C++ Redistributable library.\\n\" +\n            \"Check that you have the latest version installed.\\n\" +\n            \"See https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist.\";\n        }\n        logConsole(\"error\", error);\n\n        // Log the original error to the debug logs.\n        logConsole(\"debug\", chunk);\n      }\n\n      // IGNORABLE:\n      // anything else not handled above is considered ignorable\n      // so send it to the debug logs which are discarded unless\n      // the user explicitly sets a logLevel indicating they care\n      else {\n        logConsole(\"debug\", chunk);\n      }\n    }\n\n    // known case: warnings are not errors, log them as such\n    else if (classifiers.isWarning(chunk)) {\n      logConsole(\"warn\", chunk);\n    }\n\n    // known case: \"error: CODE_MOVED for unknown code block?\", warning for workerd devs, not application devs\n    else if (classifiers.isCodeMovedWarning(chunk)) {\n      // ignore entirely, don't even send it to the debug log file\n    }\n\n    // anything not explicitly handled above should be logged as an error (via stderr)\n    else {\n      logConsole(\"error\", chunk);\n    }\n  });\n}\n\nexport function logConsole(level: LogLevel, data: string, callDepth = 0) {\n  void logConsoleAsync(level, data, callDepth);\n}\n\n/**\n * This is what is logged when the runtime calls console.log, etc.\n */\nexport async function logConsoleAsync(\n  level: LogLevel,\n  data: string,\n  callDepth = 0\n) {\n  try {\n    if (!data) {\n      return;\n    }\n\n    // This shouldn't happen, but just in case\n    if (typeof data !== \"string\") {\n      console[level](data);\n      return;\n    }\n\n    let message = data?.trim();\n    if (!message || message?.length === 0) {\n      return;\n    }\n\n    // Probably a JSON object\n    if (message.startsWith(`{`) && message.endsWith(`}`)) {\n      let logEntry: ConsoleLogEntry;\n      try {\n        logEntry = JSON.parse(message);\n      } catch {\n        // If we are at a depth of 1 it means we are trying to handle the case\n        // where a chunk might be multiple JSON entries.\n        if (callDepth === 1) {\n          // We might have multiple log entries in a single chunk\n          // so split them and log each one\n          const lines = message.split(\"\\n\");\n          await Promise.all(\n            lines.map(async (line) => logConsole(level, line, callDepth++))\n          );\n          return;\n        } else {\n          console[level](data);\n          return;\n        }\n      }\n      await Promise.all(\n        logEntry.messages.map(async (msg) => {\n          const line = await logFormatter.formatStructured(logEntry, msg);\n          console[level](line);\n        })\n      );\n    } else {\n      message = await logFormatter.formatMessage(message);\n\n      const line = logFormatter.formatLine(level, message);\n      console[level](line);\n    }\n  } catch {\n    const line = logFormatter.formatLine(level, data);\n\n    console[level](line);\n  }\n}\n"]}

package/dist/compile/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/compile/handler.ts"],"names":[],"mappings":"AAeA,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,OAAO,CAAC,IAAI,EAAE,SAAS,iBA2E5C"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/compile/handler.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,OAAO,CAAC,IAAI,EAAE,SAAS,iBA2E5C"}

package/dist/compile/handler.js

@@ -1,8 +1,8 @@
-import dotenv from "dotenv";
 import { randomUUID } from "node:crypto";
 import { cpSync, existsSync, readFileSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import dotenv from "dotenv";
 import { logger } from "../common/logger.js";
 import { ConsoleOutput, printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, printResultToConsoleAndExitGracefully, } from "../common/output.js";
 import { handleRuntimeStdio } from "../common/worker-output.js";

package/dist/compile/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/compile/handler.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EACL,aAAa,EACb,oCAAoC,EACpC,yBAAyB,EACzB,qCAAqC,GACtC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAUhE,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAe;IAC3C,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAMzE,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAC9B,mCAAmC,EACnC,MAAM,CAAC,IAAI,CAAC,GAAG,CAChB,CAAC;IACF,IAAI,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACjC,MAAM,CACJ,gBAAgB,EAChB,IAAI,CAAC,eAAe,EAAE,6BAA6B,CAAC,EACpD;YACE,SAAS,EAAE,IAAI;YACf,WAAW,EAAE,IAAI;SAClB,CACF,CAAC;IACJ,CAAC;IAGD,OAAO,CAAC,GAAG,CAAC,sBAAsB,GAAG,aAAa,CAChD,IAAI,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAC/C,CAAC;IAGF,IAAI,QAAQ,GAA6B,EAAE,CAAC;IAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IACzD,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;QAC5C,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAMD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;IAE1B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,UAAU,EAAE,CAAC;IAEjD,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,oBAAoB,CAAC;YAC9B,OAAO;YACP,MAAM,EAAE,IAAI,aAAa,EAAE;YAC3B,eAAe;YACf,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC;YAC/B,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC;YAC/B,+BAA+B,EAAE,QAAQ;gBACvC,CAAC,CAAC;oBACE,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;oBAC/C,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;oBAC/C,sBAAsB,EAAE,QAAQ,CAAC,sBAAsB;iBACxD;gBACH,CAAC;oBACC,SAAS;YACb,MAAM;YACN,kBAAkB;SACnB,CAAC,CAAC;QAEH,yBAAyB,CAAC,yCAAyC,CAAC,CAAC;QACrE,MAAM,qCAAqC,CACzC,8BAA8B,eAAe,SAAS,IAAI,CAAC,aAAa,CAAC,EAAE,CAC5E,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,yBAAyB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvC,MAAM,oCAAoC,CACxC,kCAAkC,CACnC,CAAC;IACJ,CAAC;AACH,CAAC","sourcesContent":["/* eslint-disable node/no-process-env */\nimport dotenv from \"dotenv\";\nimport { randomUUID } from \"node:crypto\";\nimport { cpSync, existsSync, readFileSync } from \"node:fs\";\nimport { join, relative, resolve } from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\nimport { logger } from \"../common/logger.js\";\nimport {\n  ConsoleOutput,\n  printCriticalFailureToConsoleAndExit,\n  printDiagnosticsToConsole,\n  printResultToConsoleAndExitGracefully,\n} from \"../common/output.js\";\nimport { handleRuntimeStdio } from \"../common/worker-output.js\";\n\nexport interface Arguments {\n  dir: string;\n  \"bundled-dir\": string;\n  port: number;\n  \"binary-name\": string;\n  \"build-id\": string;\n}\n\nexport async function compile(argv: Arguments) {\n  const sourceDirectory = resolve(join(relative(process.cwd(), argv.dir)));\n\n  // When we build, we MIGHT need to use the @zuplo/runtime from the node_modules if the user\n  // has installed our packages using https://www.npmjs.com/package/zuplo in a global directory\n\n  // Try to copy the @zuplo/runtime locally\n  const zuploRuntimePath = new URL(\n    \"../../node_modules/@zuplo/runtime\",\n    import.meta.url\n  );\n  if (existsSync(zuploRuntimePath)) {\n    cpSync(\n      zuploRuntimePath,\n      join(sourceDirectory, \"node_modules/@zuplo/runtime\"),\n      {\n        recursive: true,\n        dereference: true,\n      }\n    );\n  }\n\n  // Set GLOBAL_MODULE_LOCATION to the location of the CLIs node_modules\n  process.env.GLOBAL_MODULE_LOCATION = fileURLToPath(\n    new URL(\"../../node_modules\", import.meta.url)\n  );\n\n  // Check if the user has a .env.zuplo file\n  let envZuplo: dotenv.DotenvParseOutput = {};\n  const envZuploFile = join(sourceDirectory, \".env.zuplo\");\n  if (existsSync(envZuploFile)) {\n    const contents = readFileSync(envZuploFile);\n    envZuplo = dotenv.parse(contents);\n  }\n  // Set other variables using __ZUPLO_CONFIG as necessary\n  // const config = {\n  // };\n  // process.env.__ZUPLO_CONFIG = btoa(JSON.stringify(config));\n  // Use a dynamic import so that setting process.env has effect\n  const core = await import(\"@zuplo/core/cli\");\n\n  const zupPort = argv.port;\n\n  const buildId = argv[\"build-id\"] || randomUUID();\n\n  try {\n    await core.compileWorkerdServer({\n      buildId,\n      output: new ConsoleOutput(),\n      sourceDirectory,\n      bundledDir: argv[\"bundled-dir\"],\n      port: zupPort,\n      binaryName: argv[\"binary-name\"],\n      publicZuploEnvironmentVariables: envZuplo\n        ? {\n            ZUPLO_ACCOUNT_NAME: envZuplo.ZUPLO_ACCOUNT_NAME,\n            ZUPLO_PROJECT_NAME: envZuplo.ZUPLO_PROJECT_NAME,\n            ZUPLO_ENVIRONMENT_TYPE: envZuplo.ZUPLO_ENVIRONMENT_TYPE,\n          }\n        : // Leave this as undefined to simulate the old behavior\n          undefined,\n      logger,\n      handleRuntimeStdio,\n    });\n\n    printDiagnosticsToConsole(\"📦 Compiled a self-contained zup binary\");\n    await printResultToConsoleAndExitGracefully(\n      `The binary is available at ${sourceDirectory}/dist/${argv[\"binary-name\"]}`\n    );\n  } catch (err) {\n    printDiagnosticsToConsole(err.message);\n    await printCriticalFailureToConsoleAndExit(\n      \"Failed to compile the zup binary\"\n    );\n  }\n}\n"]}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/compile/handler.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EACL,aAAa,EACb,oCAAoC,EACpC,yBAAyB,EACzB,qCAAqC,GACtC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAUhE,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAe;IAC3C,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAMzE,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAC9B,mCAAmC,EACnC,MAAM,CAAC,IAAI,CAAC,GAAG,CAChB,CAAC;IACF,IAAI,UAAU,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACjC,MAAM,CACJ,gBAAgB,EAChB,IAAI,CAAC,eAAe,EAAE,6BAA6B,CAAC,EACpD;YACE,SAAS,EAAE,IAAI;YACf,WAAW,EAAE,IAAI;SAClB,CACF,CAAC;IACJ,CAAC;IAGD,OAAO,CAAC,GAAG,CAAC,sBAAsB,GAAG,aAAa,CAChD,IAAI,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAC/C,CAAC;IAGF,IAAI,QAAQ,GAA6B,EAAE,CAAC;IAC5C,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IACzD,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,CAAC;QAC5C,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAMD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAE7C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;IAE1B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,UAAU,EAAE,CAAC;IAEjD,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,oBAAoB,CAAC;YAC9B,OAAO;YACP,MAAM,EAAE,IAAI,aAAa,EAAE;YAC3B,eAAe;YACf,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC;YAC/B,IAAI,EAAE,OAAO;YACb,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC;YAC/B,+BAA+B,EAAE,QAAQ;gBACvC,CAAC,CAAC;oBACE,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;oBAC/C,kBAAkB,EAAE,QAAQ,CAAC,kBAAkB;oBAC/C,sBAAsB,EAAE,QAAQ,CAAC,sBAAsB;iBACxD;gBACH,CAAC;oBACC,SAAS;YACb,MAAM;YACN,kBAAkB;SACnB,CAAC,CAAC;QAEH,yBAAyB,CAAC,yCAAyC,CAAC,CAAC;QACrE,MAAM,qCAAqC,CACzC,8BAA8B,eAAe,SAAS,IAAI,CAAC,aAAa,CAAC,EAAE,CAC5E,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,yBAAyB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvC,MAAM,oCAAoC,CACxC,kCAAkC,CACnC,CAAC;IACJ,CAAC;AACH,CAAC","sourcesContent":["/* eslint-disable node/no-process-env */\n\nimport { randomUUID } from \"node:crypto\";\nimport { cpSync, existsSync, readFileSync } from \"node:fs\";\nimport { join, relative, resolve } from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\nimport dotenv from \"dotenv\";\nimport { logger } from \"../common/logger.js\";\nimport {\n  ConsoleOutput,\n  printCriticalFailureToConsoleAndExit,\n  printDiagnosticsToConsole,\n  printResultToConsoleAndExitGracefully,\n} from \"../common/output.js\";\nimport { handleRuntimeStdio } from \"../common/worker-output.js\";\n\nexport interface Arguments {\n  dir: string;\n  \"bundled-dir\": string;\n  port: number;\n  \"binary-name\": string;\n  \"build-id\": string;\n}\n\nexport async function compile(argv: Arguments) {\n  const sourceDirectory = resolve(join(relative(process.cwd(), argv.dir)));\n\n  // When we build, we MIGHT need to use the @zuplo/runtime from the node_modules if the user\n  // has installed our packages using https://www.npmjs.com/package/zuplo in a global directory\n\n  // Try to copy the @zuplo/runtime locally\n  const zuploRuntimePath = new URL(\n    \"../../node_modules/@zuplo/runtime\",\n    import.meta.url\n  );\n  if (existsSync(zuploRuntimePath)) {\n    cpSync(\n      zuploRuntimePath,\n      join(sourceDirectory, \"node_modules/@zuplo/runtime\"),\n      {\n        recursive: true,\n        dereference: true,\n      }\n    );\n  }\n\n  // Set GLOBAL_MODULE_LOCATION to the location of the CLIs node_modules\n  process.env.GLOBAL_MODULE_LOCATION = fileURLToPath(\n    new URL(\"../../node_modules\", import.meta.url)\n  );\n\n  // Check if the user has a .env.zuplo file\n  let envZuplo: dotenv.DotenvParseOutput = {};\n  const envZuploFile = join(sourceDirectory, \".env.zuplo\");\n  if (existsSync(envZuploFile)) {\n    const contents = readFileSync(envZuploFile);\n    envZuplo = dotenv.parse(contents);\n  }\n  // Set other variables using __ZUPLO_CONFIG as necessary\n  // const config = {\n  // };\n  // process.env.__ZUPLO_CONFIG = btoa(JSON.stringify(config));\n  // Use a dynamic import so that setting process.env has effect\n  const core = await import(\"@zuplo/core/cli\");\n\n  const zupPort = argv.port;\n\n  const buildId = argv[\"build-id\"] || randomUUID();\n\n  try {\n    await core.compileWorkerdServer({\n      buildId,\n      output: new ConsoleOutput(),\n      sourceDirectory,\n      bundledDir: argv[\"bundled-dir\"],\n      port: zupPort,\n      binaryName: argv[\"binary-name\"],\n      publicZuploEnvironmentVariables: envZuplo\n        ? {\n            ZUPLO_ACCOUNT_NAME: envZuplo.ZUPLO_ACCOUNT_NAME,\n            ZUPLO_PROJECT_NAME: envZuplo.ZUPLO_PROJECT_NAME,\n            ZUPLO_ENVIRONMENT_TYPE: envZuplo.ZUPLO_ENVIRONMENT_TYPE,\n          }\n        : // Leave this as undefined to simulate the old behavior\n          undefined,\n      logger,\n      handleRuntimeStdio,\n    });\n\n    printDiagnosticsToConsole(\"📦 Compiled a self-contained zup binary\");\n    await printResultToConsoleAndExitGracefully(\n      `The binary is available at ${sourceDirectory}/dist/${argv[\"binary-name\"]}`\n    );\n  } catch (err) {\n    printDiagnosticsToConsole(err.message);\n    await printCriticalFailureToConsoleAndExit(\n      \"Failed to compile the zup binary\"\n    );\n  }\n}\n"]}

package/dist/deploy/archive.js

@@ -1,9 +1,9 @@
-import ignore from "ignore";
-import { minimatch } from "minimatch";
 import { randomBytes } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, writeFileSync, } from "node:fs";
 import { tmpdir } from "node:os";
 import { join, relative, sep } from "node:path";
+import ignore from "ignore";
+import { minimatch } from "minimatch";
 import { simpleGit } from "simple-git";
 import * as tar from "tar";
 import { DEPLOYER_METADATA_FILE } from "../common/constants.js";

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 | 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 {\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  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 { randomBytes } from \"node:crypto\";\nimport {\n  Stats,\n  existsSync,\n  mkdirSync,\n  readFileSync,\n  writeFileSync,\n} from \"node:fs\";\nimport { tmpdir } from \"node:os\";\nimport { join, relative, sep } from \"node:path\";\nimport ignore from \"ignore\";\nimport { minimatch } from \"minimatch\";\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 {\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  writeFileSync(\n    `${dir}/.zuplo/${DEPLOYER_METADATA_FILE}`,\n    JSON.stringify(metadata, null, 2),\n    {\n      flag: \"w\",\n    }\n  );\n}\n"]}

package/dist/deploy/handler.js

@@ -7,7 +7,7 @@ import settings from "../common/settings.js";
 import { normalizeUrl } from "../common/utils/urls.js";
 import { pullSystemConfig } from "../link/populate.js";
 import { archive, generateMetadata } from "./archive.js";
-import { retrieveOrCreateEnvironment, UnableToAutoLinkToExistingProject, } from "./environments.js";
+import { UnableToAutoLinkToExistingProject, retrieveOrCreateEnvironment, } from "./environments.js";
 import { upload } from "./file-upload.js";
 import { pollBuild, pollDeployment } from "./poll-deployment.js";
 export async function deploy(argv) {

package/dist/deploy/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/deploy/handler.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, readFileSync, writeFileSync } from \"node:fs\";\nimport { join, relative } from \"node:path\";\nimport {\n  MAX_PRETTY_BRANCH_NAME as MAX_PRETTY_BRANCH_LENGTH,\n  ZUPLO_SYSTEM_ENV_VAR,\n} from \"../common/constants.js\";\nimport { logger } from \"../common/logger.js\";\nimport {\n  printCriticalFailureToConsoleAndExit,\n  printDiagnosticsToConsole,\n  printResultToConsoleAndExitGracefully,\n  printSpinnerToConsole,\n  printWarningToConsole,\n} from \"../common/output.js\";\nimport settings from \"../common/settings.js\";\nimport { RequiredProperties } from \"../common/utils/types.js\";\nimport { normalizeUrl } from \"../common/utils/urls.js\";\nimport { pullSystemConfig } from \"../link/populate.js\";\nimport { archive, generateMetadata } from \"./archive.js\";\nimport {\n  retrieveOrCreateEnvironment,\n  UnableToAutoLinkToExistingProject,\n} from \"./environments.js\";\nimport { upload } from \"./file-upload.js\";\nimport { pollBuild, pollDeployment } from \"./poll-deployment.js\";\n\nexport interface Arguments {\n  account: string;\n  project: string;\n  dir: string;\n  environment?: string;\n  authToken: string;\n  \"verify-remote\"?: boolean;\n  \"self-hosted-endpoint\"?: string;\n  \"override-repo-url\"?: string;\n}\n\nexport type SelfHostedArgs = RequiredProperties<\n  Arguments,\n  \"self-hosted-endpoint\"\n>;\n\nexport async function deploy(argv: Arguments) {\n  if (argv[\"self-hosted-endpoint\"]) {\n    const args = argv as SelfHostedArgs;\n    await deployToSelfHosted(args);\n  } else {\n    await deployToSaas(argv);\n  }\n}\n\nasync function deployToSaas(argv: Arguments) {\n  // 1. Create the tarball locally\n  const archiveMetadata = await archive(argv);\n  logger.debug(`Tarball created locally at ${archiveMetadata.tarball}`);\n\n  // 2. Build uploadUrl request\n  const { account, project } = argv;\n\n  const payload = {\n    accountName: account,\n    projectName: project,\n    environment: archiveMetadata.metadata.branch,\n    repositoryUrl: archiveMetadata.metadata.repoUrl,\n    sha: archiveMetadata.metadata.sha,\n  };\n\n  const uploadUrlResponse = await fetch(\n    `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/deployments/source-url`,\n    {\n      method: \"POST\",\n      headers: {\n        Authorization: `Bearer ${argv.authToken}`,\n      },\n      body: JSON.stringify(payload),\n    }\n  );\n\n  logger.debug(`Upload URL response: ${uploadUrlResponse.status}`);\n\n  if (uploadUrlResponse.ok) {\n    // 3. Upload to request URL\n    const { uploadUrl, deploymentId } = await uploadUrlResponse.json();\n\n    printDiagnosticsToConsole(\n      `Uploading source for deployment (${deploymentId})...`\n    );\n\n    const uploadResponse = await upload({\n      tarballPath: archiveMetadata.tarball,\n      uploadUrl,\n      deploymentId,\n      ...payload,\n    });\n\n    logger.debug(`Upload response: ${uploadResponse.status}`);\n\n    if (uploadResponse.ok) {\n      const spinner = printSpinnerToConsole(\n        `Deploying the '${payload.environment}' environment to '${project}' on account '${account}'...`\n      );\n\n      const { url, logUrl } = await pollDeployment(\n        argv,\n        deploymentId,\n        account,\n        project,\n        spinner\n      );\n      if (url) {\n        await printResultToConsoleAndExitGracefully(\n          `Deployed to ${url}`,\n          spinner\n        );\n      } else {\n        await printCriticalFailureToConsoleAndExit(\n          `Failed to deploy the environment ${\n            archiveMetadata.metadata.branch\n          } to project ${project} on account ${account}.\\nFor more information, check the deployment logs in the Zuplo dashboard.\\n\n          ${logUrl}`,\n          spinner\n        );\n      }\n    } else {\n      logger.error(\n        {\n          status: uploadResponse.status,\n          statusText: uploadResponse.statusText,\n        },\n        \"Failed to upload source to cloud storage\"\n      );\n      printDiagnosticsToConsole(\n        \"Error: Failed to upload deployment source. Please try again.\"\n      );\n    }\n  } else {\n    logger.error(\n      {\n        status: uploadUrlResponse.status,\n        statusText: uploadUrlResponse.statusText,\n      },\n      \"Failed to retrieve uploadUrl\"\n    );\n    await printCriticalFailureToConsoleAndExit(\n      \"Error: Failed to upload deployment source. Please try again.\"\n    );\n  }\n}\n\nasync function deployToSelfHosted(argv: SelfHostedArgs) {\n  const { account, project } = argv;\n\n  let existingZuploEnv: string | undefined;\n\n  try {\n    // 0. Finagle the URL first\n    const endpoint = normalizeUrl(argv[\"self-hosted-endpoint\"]);\n\n    // 1. Perform the link on-behalf-of-the-user\n    // Store the current .env.zuplo if there is one and restore it later\n    existingZuploEnv = retrieveExistingZuploEnv(argv);\n    const branch = (await generateMetadata(argv)).branch;\n    try {\n      const environmentToAutoLink = await retrieveOrCreateEnvironment(\n        branch,\n        argv\n      );\n      await pullSystemConfig({\n        dir: argv.dir,\n        environment: environmentToAutoLink.name,\n        authToken: argv.authToken,\n      });\n    } catch (error) {\n      if (\n        error instanceof UnableToAutoLinkToExistingProject &&\n        // eslint-disable-next-line node/no-process-env\n        process.env.ZUPLO_ALLOW_DEPLOY_WITH_EMPTY_VARS\n      ) {\n        printWarningToConsole(\n          `We are unable to fetch the environment variables from Zuplo for this project. \nDeployment will proceed because ZUPLO_ALLOW_DEPLOY_WITH_EMPTY_VARS is set. \nHowever, the environment variables will not be available. \nTo fix this, check that the project, ${argv.project} exists and this api-key has access to it.`\n        );\n      } else if (error instanceof UnableToAutoLinkToExistingProject) {\n        await printCriticalFailureToConsoleAndExit(\n          `We are unable to fetch the environment variables from Zuplo for this project. \nTo fix this, check that the project, ${argv.project} exists and this api-key has access to it.\nIf you want to force deployment without the environment variables, set ZUPLO_ALLOW_DEPLOY_WITH_EMPTY_VARS to true.`\n        );\n      } else {\n        logger.error(error, \"Failed to fetch environment variables\");\n        await printCriticalFailureToConsoleAndExit(\n          `We are unable to fetch the environment variables from Zuplo for this project. \nTo fix this, check that the project, ${argv.project} exists and this api-key has access to it.`\n        );\n      }\n    }\n\n    // 2. Create the tarball locally\n    const archiveMetadata = await archive(argv);\n    logger.debug(`Tarball created locally at ${archiveMetadata.tarball}`);\n\n    // 3. Build uploadUrl request\n    const form = new FormData();\n    const deploymentName = `${project}-${getPrettyBranch(\n      archiveMetadata.metadata.branch\n    )}`;\n    form.set(\n      \"file\",\n      new Blob([readFileSync(archiveMetadata.tarball)], {\n        type: \"application/gzip\",\n      })\n    );\n    form.set(\"projectName\", project);\n    form.set(\"deploymentName\", deploymentName);\n\n    const uploadUrlResponse = await fetch(`${endpoint}/v1/deployments/build`, {\n      method: \"POST\",\n      headers: {\n        Authorization: `Bearer ${argv.authToken}`,\n      },\n      body: form,\n    });\n\n    logger.debug(`Upload URL response: ${uploadUrlResponse.status}`);\n\n    if (uploadUrlResponse.ok) {\n      const spinner = printSpinnerToConsole(\n        `Deploying the current branch ${archiveMetadata.metadata.branch} to project ${project} on account ${account}...`\n      );\n\n      // 4. Poll for build\n      const { buildName } = await uploadUrlResponse.json();\n\n      logger.debug(`Deployment started for ${buildName}`);\n\n      const buildResult = await pollBuild(argv, endpoint, buildName, spinner);\n\n      if (buildResult.conditionType === \"Complete\") {\n        // Retrieve the deployment\n        const deploymentResponse = await fetch(\n          `${endpoint}/v1/deployments/${deploymentName}`,\n          {\n            method: \"GET\",\n            headers: {\n              Authorization: `Bearer ${argv.authToken}`,\n            },\n          }\n        );\n        const deploymentJSON: { deploymentUrl: string } =\n          await deploymentResponse.json();\n        restoreExistingZuploEnvAsNecessary(argv, existingZuploEnv);\n\n        await printResultToConsoleAndExitGracefully(\n          `Deployed to ${deploymentJSON.deploymentUrl}`,\n          spinner\n        );\n      } else {\n        restoreExistingZuploEnvAsNecessary(argv, existingZuploEnv);\n        await printCriticalFailureToConsoleAndExit(\n          `Failed to deploy the current environment. Here's the diagnostics: ${JSON.stringify(\n            buildResult\n          )}`,\n          spinner\n        );\n      }\n    } else {\n      logger.error(\n        await uploadUrlResponse.text(),\n        \"Failed to upload to self-hosted build endpoint\"\n      );\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: Failed to upload to self-hosted build endpoint\"\n      );\n    }\n  } catch (error) {\n    logger.error(error);\n  } finally {\n    restoreExistingZuploEnvAsNecessary(argv, existingZuploEnv);\n  }\n}\n\nfunction retrieveExistingZuploEnv(argv: SelfHostedArgs): string | undefined {\n  const dir = argv.dir;\n  const normalizedDir = join(relative(process.cwd(), dir));\n  const envFilePath = join(normalizedDir, ZUPLO_SYSTEM_ENV_VAR);\n  if (existsSync(envFilePath)) {\n    const envFileContent = readFileSync(envFilePath, \"utf-8\");\n    return envFileContent;\n  } else {\n    return undefined;\n  }\n}\n\nfunction restoreExistingZuploEnvAsNecessary(\n  argv: SelfHostedArgs,\n  originalValue: string | undefined\n) {\n  if (originalValue) {\n    const dir = argv.dir;\n    const normalizedDir = join(relative(process.cwd(), dir));\n    const envFilePath = join(normalizedDir, ZUPLO_SYSTEM_ENV_VAR);\n    writeFileSync(envFilePath, originalValue);\n  }\n}\n\nconst getPrettyBranch = (branch: string): string => {\n  // https://ricardometring.com/javascript-replace-special-characters\n  return (\n    branch\n      .normalize(\"NFD\")\n      .replace(/[\\u0300-\\u036f]/g, \"\") // Remove accents\n      .replace(/([^\\w]+|\\s+)/g, \"-\") // Replace space and other characters by hyphen\n      // eslint-disable-next-line no-useless-escape\n      .replace(/\\-\\-+/g, \"-\") // Replaces multiple hyphens by one hyphen\n      .replace(/(^-+|-+$)/, \"\") // Remove extra hyphens from beginning or end of the string\n      .replaceAll(\"_\", \"-\") // Replace underscores by hyphens (Url hosts cannot have underscores)\n      .toLowerCase()\n      .substring(0, MAX_PRETTY_BRANCH_LENGTH)\n  );\n};\n"]}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/deploy/handler.ts"],"names":[],"mappings":"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","sourcesContent":["import { existsSync, readFileSync, writeFileSync } from \"node:fs\";\nimport { join, relative } from \"node:path\";\nimport {\n  MAX_PRETTY_BRANCH_NAME as MAX_PRETTY_BRANCH_LENGTH,\n  ZUPLO_SYSTEM_ENV_VAR,\n} from \"../common/constants.js\";\nimport { logger } from \"../common/logger.js\";\nimport {\n  printCriticalFailureToConsoleAndExit,\n  printDiagnosticsToConsole,\n  printResultToConsoleAndExitGracefully,\n  printSpinnerToConsole,\n  printWarningToConsole,\n} from \"../common/output.js\";\nimport settings from \"../common/settings.js\";\nimport { RequiredProperties } from \"../common/utils/types.js\";\nimport { normalizeUrl } from \"../common/utils/urls.js\";\nimport { pullSystemConfig } from \"../link/populate.js\";\nimport { archive, generateMetadata } from \"./archive.js\";\nimport {\n  UnableToAutoLinkToExistingProject,\n  retrieveOrCreateEnvironment,\n} from \"./environments.js\";\nimport { upload } from \"./file-upload.js\";\nimport { pollBuild, pollDeployment } from \"./poll-deployment.js\";\n\nexport interface Arguments {\n  account: string;\n  project: string;\n  dir: string;\n  environment?: string;\n  authToken: string;\n  \"verify-remote\"?: boolean;\n  \"self-hosted-endpoint\"?: string;\n  \"override-repo-url\"?: string;\n}\n\nexport type SelfHostedArgs = RequiredProperties<\n  Arguments,\n  \"self-hosted-endpoint\"\n>;\n\nexport async function deploy(argv: Arguments) {\n  if (argv[\"self-hosted-endpoint\"]) {\n    const args = argv as SelfHostedArgs;\n    await deployToSelfHosted(args);\n  } else {\n    await deployToSaas(argv);\n  }\n}\n\nasync function deployToSaas(argv: Arguments) {\n  // 1. Create the tarball locally\n  const archiveMetadata = await archive(argv);\n  logger.debug(`Tarball created locally at ${archiveMetadata.tarball}`);\n\n  // 2. Build uploadUrl request\n  const { account, project } = argv;\n\n  const payload = {\n    accountName: account,\n    projectName: project,\n    environment: archiveMetadata.metadata.branch,\n    repositoryUrl: archiveMetadata.metadata.repoUrl,\n    sha: archiveMetadata.metadata.sha,\n  };\n\n  const uploadUrlResponse = await fetch(\n    `${settings.ZUPLO_DEVELOPER_API_ENDPOINT}/v1/deployments/source-url`,\n    {\n      method: \"POST\",\n      headers: {\n        Authorization: `Bearer ${argv.authToken}`,\n      },\n      body: JSON.stringify(payload),\n    }\n  );\n\n  logger.debug(`Upload URL response: ${uploadUrlResponse.status}`);\n\n  if (uploadUrlResponse.ok) {\n    // 3. Upload to request URL\n    const { uploadUrl, deploymentId } = await uploadUrlResponse.json();\n\n    printDiagnosticsToConsole(\n      `Uploading source for deployment (${deploymentId})...`\n    );\n\n    const uploadResponse = await upload({\n      tarballPath: archiveMetadata.tarball,\n      uploadUrl,\n      deploymentId,\n      ...payload,\n    });\n\n    logger.debug(`Upload response: ${uploadResponse.status}`);\n\n    if (uploadResponse.ok) {\n      const spinner = printSpinnerToConsole(\n        `Deploying the '${payload.environment}' environment to '${project}' on account '${account}'...`\n      );\n\n      const { url, logUrl } = await pollDeployment(\n        argv,\n        deploymentId,\n        account,\n        project,\n        spinner\n      );\n      if (url) {\n        await printResultToConsoleAndExitGracefully(\n          `Deployed to ${url}`,\n          spinner\n        );\n      } else {\n        await printCriticalFailureToConsoleAndExit(\n          `Failed to deploy the environment ${\n            archiveMetadata.metadata.branch\n          } to project ${project} on account ${account}.\\nFor more information, check the deployment logs in the Zuplo dashboard.\\n\n          ${logUrl}`,\n          spinner\n        );\n      }\n    } else {\n      logger.error(\n        {\n          status: uploadResponse.status,\n          statusText: uploadResponse.statusText,\n        },\n        \"Failed to upload source to cloud storage\"\n      );\n      printDiagnosticsToConsole(\n        \"Error: Failed to upload deployment source. Please try again.\"\n      );\n    }\n  } else {\n    logger.error(\n      {\n        status: uploadUrlResponse.status,\n        statusText: uploadUrlResponse.statusText,\n      },\n      \"Failed to retrieve uploadUrl\"\n    );\n    await printCriticalFailureToConsoleAndExit(\n      \"Error: Failed to upload deployment source. Please try again.\"\n    );\n  }\n}\n\nasync function deployToSelfHosted(argv: SelfHostedArgs) {\n  const { account, project } = argv;\n\n  let existingZuploEnv: string | undefined;\n\n  try {\n    // 0. Finagle the URL first\n    const endpoint = normalizeUrl(argv[\"self-hosted-endpoint\"]);\n\n    // 1. Perform the link on-behalf-of-the-user\n    // Store the current .env.zuplo if there is one and restore it later\n    existingZuploEnv = retrieveExistingZuploEnv(argv);\n    const branch = (await generateMetadata(argv)).branch;\n    try {\n      const environmentToAutoLink = await retrieveOrCreateEnvironment(\n        branch,\n        argv\n      );\n      await pullSystemConfig({\n        dir: argv.dir,\n        environment: environmentToAutoLink.name,\n        authToken: argv.authToken,\n      });\n    } catch (error) {\n      if (\n        error instanceof UnableToAutoLinkToExistingProject &&\n        // eslint-disable-next-line node/no-process-env\n        process.env.ZUPLO_ALLOW_DEPLOY_WITH_EMPTY_VARS\n      ) {\n        printWarningToConsole(\n          `We are unable to fetch the environment variables from Zuplo for this project. \nDeployment will proceed because ZUPLO_ALLOW_DEPLOY_WITH_EMPTY_VARS is set. \nHowever, the environment variables will not be available. \nTo fix this, check that the project, ${argv.project} exists and this api-key has access to it.`\n        );\n      } else if (error instanceof UnableToAutoLinkToExistingProject) {\n        await printCriticalFailureToConsoleAndExit(\n          `We are unable to fetch the environment variables from Zuplo for this project. \nTo fix this, check that the project, ${argv.project} exists and this api-key has access to it.\nIf you want to force deployment without the environment variables, set ZUPLO_ALLOW_DEPLOY_WITH_EMPTY_VARS to true.`\n        );\n      } else {\n        logger.error(error, \"Failed to fetch environment variables\");\n        await printCriticalFailureToConsoleAndExit(\n          `We are unable to fetch the environment variables from Zuplo for this project. \nTo fix this, check that the project, ${argv.project} exists and this api-key has access to it.`\n        );\n      }\n    }\n\n    // 2. Create the tarball locally\n    const archiveMetadata = await archive(argv);\n    logger.debug(`Tarball created locally at ${archiveMetadata.tarball}`);\n\n    // 3. Build uploadUrl request\n    const form = new FormData();\n    const deploymentName = `${project}-${getPrettyBranch(\n      archiveMetadata.metadata.branch\n    )}`;\n    form.set(\n      \"file\",\n      new Blob([readFileSync(archiveMetadata.tarball)], {\n        type: \"application/gzip\",\n      })\n    );\n    form.set(\"projectName\", project);\n    form.set(\"deploymentName\", deploymentName);\n\n    const uploadUrlResponse = await fetch(`${endpoint}/v1/deployments/build`, {\n      method: \"POST\",\n      headers: {\n        Authorization: `Bearer ${argv.authToken}`,\n      },\n      body: form,\n    });\n\n    logger.debug(`Upload URL response: ${uploadUrlResponse.status}`);\n\n    if (uploadUrlResponse.ok) {\n      const spinner = printSpinnerToConsole(\n        `Deploying the current branch ${archiveMetadata.metadata.branch} to project ${project} on account ${account}...`\n      );\n\n      // 4. Poll for build\n      const { buildName } = await uploadUrlResponse.json();\n\n      logger.debug(`Deployment started for ${buildName}`);\n\n      const buildResult = await pollBuild(argv, endpoint, buildName, spinner);\n\n      if (buildResult.conditionType === \"Complete\") {\n        // Retrieve the deployment\n        const deploymentResponse = await fetch(\n          `${endpoint}/v1/deployments/${deploymentName}`,\n          {\n            method: \"GET\",\n            headers: {\n              Authorization: `Bearer ${argv.authToken}`,\n            },\n          }\n        );\n        const deploymentJSON: { deploymentUrl: string } =\n          await deploymentResponse.json();\n        restoreExistingZuploEnvAsNecessary(argv, existingZuploEnv);\n\n        await printResultToConsoleAndExitGracefully(\n          `Deployed to ${deploymentJSON.deploymentUrl}`,\n          spinner\n        );\n      } else {\n        restoreExistingZuploEnvAsNecessary(argv, existingZuploEnv);\n        await printCriticalFailureToConsoleAndExit(\n          `Failed to deploy the current environment. Here's the diagnostics: ${JSON.stringify(\n            buildResult\n          )}`,\n          spinner\n        );\n      }\n    } else {\n      logger.error(\n        await uploadUrlResponse.text(),\n        \"Failed to upload to self-hosted build endpoint\"\n      );\n      await printCriticalFailureToConsoleAndExit(\n        \"Error: Failed to upload to self-hosted build endpoint\"\n      );\n    }\n  } catch (error) {\n    logger.error(error);\n  } finally {\n    restoreExistingZuploEnvAsNecessary(argv, existingZuploEnv);\n  }\n}\n\nfunction retrieveExistingZuploEnv(argv: SelfHostedArgs): string | undefined {\n  const dir = argv.dir;\n  const normalizedDir = join(relative(process.cwd(), dir));\n  const envFilePath = join(normalizedDir, ZUPLO_SYSTEM_ENV_VAR);\n  if (existsSync(envFilePath)) {\n    const envFileContent = readFileSync(envFilePath, \"utf-8\");\n    return envFileContent;\n  } else {\n    return undefined;\n  }\n}\n\nfunction restoreExistingZuploEnvAsNecessary(\n  argv: SelfHostedArgs,\n  originalValue: string | undefined\n) {\n  if (originalValue) {\n    const dir = argv.dir;\n    const normalizedDir = join(relative(process.cwd(), dir));\n    const envFilePath = join(normalizedDir, ZUPLO_SYSTEM_ENV_VAR);\n    writeFileSync(envFilePath, originalValue);\n  }\n}\n\nconst getPrettyBranch = (branch: string): string => {\n  // https://ricardometring.com/javascript-replace-special-characters\n  return (\n    branch\n      .normalize(\"NFD\")\n      .replace(/[\\u0300-\\u036f]/g, \"\") // Remove accents\n      .replace(/([^\\w]+|\\s+)/g, \"-\") // Replace space and other characters by hyphen\n      // eslint-disable-next-line no-useless-escape\n      .replace(/\\-\\-+/g, \"-\") // Replaces multiple hyphens by one hyphen\n      .replace(/(^-+|-+$)/, \"\") // Remove extra hyphens from beginning or end of the string\n      .replaceAll(\"_\", \"-\") // Replace underscores by hyphens (Url hosts cannot have underscores)\n      .toLowerCase()\n      .substring(0, MAX_PRETTY_BRANCH_LENGTH)\n  );\n};\n"]}

package/dist/dev/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/dev/handler.ts"],"names":[],"mappings":"AAgBA,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,EAAE,OAAO,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,GAAG,CAAC,IAAI,EAAE,SAAS,iBAgKxC"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/dev/handler.ts"],"names":[],"mappings":"AAiBA,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,cAAc,EAAE,OAAO,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,GAAG,CAAC,IAAI,EAAE,SAAS,iBAgKxC"}

package/dist/dev/handler.js

@@ -1,8 +1,8 @@
-import dotenv from "dotenv";
 import { randomUUID } from "node:crypto";
 import { cpSync, existsSync, readFileSync } from "node:fs";
 import { join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import dotenv from "dotenv";
 import { logger } from "../common/logger.js";
 import { ConsoleOutput, printCriticalFailureToConsoleAndExit, printDiagnosticsToConsole, } from "../common/output.js";
 import { isPortAvailable } from "../common/utils/ports.js";

package/dist/dev/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/dev/handler.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable node/no-process-env */\nimport dotenv from \"dotenv\";\nimport { randomUUID } from \"node:crypto\";\nimport { cpSync, existsSync, readFileSync } from \"node:fs\";\nimport { join, relative, resolve } from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\nimport { logger } from \"../common/logger.js\";\nimport {\n  ConsoleOutput,\n  printCriticalFailureToConsoleAndExit,\n  printDiagnosticsToConsole,\n} from \"../common/output.js\";\nimport { isPortAvailable } from \"../common/utils/ports.js\";\nimport { handleRuntimeStdio } from \"../common/worker-output.js\";\nimport { ApiServer } from \"../editor/server/server.js\";\n\nexport interface Arguments {\n  dir: string;\n  \"start-editor\": boolean;\n  port: number;\n  editorPort: number;\n  debugPort?: number;\n}\n\nexport async function dev(argv: Arguments) {\n  const sourceDirectory = resolve(join(relative(process.cwd(), argv.dir)));\n\n  // When we build, we MIGHT need to use the @zuplo/runtime from the node_modules if the user\n  // has installed our packages using https://www.npmjs.com/package/zuplo in a global directory\n\n  // Try to copy the @zuplo/runtime locally\n  const zuploRuntimePath = new URL(\n    \"../../node_modules/@zuplo/runtime\",\n    import.meta.url\n  );\n  if (existsSync(zuploRuntimePath)) {\n    cpSync(\n      zuploRuntimePath,\n      join(sourceDirectory, \"node_modules/@zuplo/runtime\"),\n      {\n        recursive: true,\n        dereference: true,\n      }\n    );\n  }\n\n  // Set GLOBAL_MODULE_LOCATION to the location of the CLIs node_modules\n  process.env.GLOBAL_MODULE_LOCATION = fileURLToPath(\n    new URL(\"../../node_modules\", import.meta.url)\n  );\n\n  const loadedEnvFiles: string[] = [];\n\n  // Check if the user has a .env file\n  const envFile = join(sourceDirectory, \".env\");\n  if (existsSync(envFile)) {\n    loadedEnvFiles.push(\".env\");\n  }\n\n  // Check if the user has a .env.zuplo file\n  let envZuplo: dotenv.DotenvParseOutput | undefined;\n  const envZuploFile = join(sourceDirectory, \".env.zuplo\");\n  if (existsSync(envZuploFile)) {\n    const contents = readFileSync(envZuploFile);\n    envZuplo = dotenv.parse(contents);\n    loadedEnvFiles.push(\".env.zuplo\");\n  }\n\n  // Set other variables using __ZUPLO_CONFIG as necessary\n  // const config = {\n  // };\n  // process.env.__ZUPLO_CONFIG = btoa(JSON.stringify(config));\n  process.env.ZUPLO_IS_LOCAL_DEVELOPMENT = \"true\";\n\n  // Use a dynamic import so that setting process.env has effect\n  const core = await import(\"@zuplo/core/cli\");\n\n  const zupPort = argv.port;\n  const zupEditorPort = argv.editorPort;\n  const zupDebugPort = argv.debugPort;\n\n  const isZupPortAvailable = await isPortAvailable(\"localhost\", zupPort);\n  if (!isZupPortAvailable) {\n    await printCriticalFailureToConsoleAndExit(\n      `Port ${zupPort} is already in use. Please specify a different port using --port.`\n    );\n  }\n\n  const isZupEditorPortAvailable = await isPortAvailable(\n    \"localhost\",\n    zupEditorPort\n  );\n  if (!isZupEditorPortAvailable) {\n    await printCriticalFailureToConsoleAndExit(\n      `Port ${zupEditorPort} is already in use. Please specify a different port using --editor-port.`\n    );\n  }\n\n  if (zupDebugPort) {\n    const isZupDebugPortAvailable = await isPortAvailable(\n      \"localhost\",\n      zupDebugPort\n    );\n    if (!isZupDebugPortAvailable) {\n      await printCriticalFailureToConsoleAndExit(\n        `Port ${zupDebugPort} is already in use. Please specify a different port using --debug-port.`\n      );\n    }\n  }\n\n  const buildId = randomUUID();\n\n  let firstLoad = true;\n\n  await core.startDevServer({\n    buildId,\n    output: new ConsoleOutput(),\n    sourceDirectory,\n    port: zupPort,\n    debugPort: argv.debugPort ?? undefined,\n    publicZuploEnvironmentVariables: envZuplo\n      ? {\n          ZUPLO_ACCOUNT_NAME: envZuplo.ZUPLO_ACCOUNT_NAME,\n          ZUPLO_PROJECT_NAME: envZuplo.ZUPLO_PROJECT_NAME,\n          ZUPLO_ENVIRONMENT_TYPE: envZuplo.ZUPLO_ENVIRONMENT_TYPE,\n        }\n      : // Leave this as undefined to simulate the old behavior\n        undefined,\n    logger,\n    handleRuntimeStdio,\n    onReload: () => {\n      if (firstLoad) {\n        firstLoad = false;\n      } else {\n        printDiagnosticsToConsole(\"Code changed. Server reloaded...\");\n      }\n    },\n  });\n\n  let editor: ApiServer;\n\n  if (argv[\"start-editor\"]) {\n    editor = new ApiServer({\n      cliArgs: argv,\n      workingDir: sourceDirectory,\n      port: argv.editorPort,\n      isStandalone: false,\n    });\n    editor.start().catch((err) => logger.error(err));\n  }\n\n  printDiagnosticsToConsole(\"Started local development setup\");\n  printDiagnosticsToConsole(\"Ctrl+C to exit\");\n  printDiagnosticsToConsole(\"\");\n  printDiagnosticsToConsole(`🚀 Zuplo Gateway: http://localhost:${zupPort}`);\n  if (argv[\"start-editor\"]) {\n    printDiagnosticsToConsole(\n      `📘 Route Designer: http://localhost:${argv.editorPort}`\n    );\n  }\n  if (loadedEnvFiles.length > 0) {\n    printDiagnosticsToConsole(\n      `⚙️  Loaded env files: \\n    - ${loadedEnvFiles.join(\" \\n    - \")}`\n    );\n  }\n  printDiagnosticsToConsole(\"\");\n  printDiagnosticsToConsole(\"\");\n\n  return new Promise<void>((resolve) => {\n    async function exit() {\n      printDiagnosticsToConsole(\"\");\n      printDiagnosticsToConsole(\"Stopping local development server...\");\n\n      if (argv[\"start-editor\"]) {\n        await editor.close();\n      }\n      resolve();\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-misused-promises\n    process.on(\"SIGTERM\", exit);\n    // eslint-disable-next-line @typescript-eslint/no-misused-promises\n    process.on(\"SIGINT\", exit);\n  });\n}\n"]}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/dev/handler.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable node/no-process-env */\n\nimport { randomUUID } from \"node:crypto\";\nimport { cpSync, existsSync, readFileSync } from \"node:fs\";\nimport { join, relative, resolve } from \"node:path\";\nimport { fileURLToPath } from \"node:url\";\nimport dotenv from \"dotenv\";\nimport { logger } from \"../common/logger.js\";\nimport {\n  ConsoleOutput,\n  printCriticalFailureToConsoleAndExit,\n  printDiagnosticsToConsole,\n} from \"../common/output.js\";\nimport { isPortAvailable } from \"../common/utils/ports.js\";\nimport { handleRuntimeStdio } from \"../common/worker-output.js\";\nimport { ApiServer } from \"../editor/server/server.js\";\n\nexport interface Arguments {\n  dir: string;\n  \"start-editor\": boolean;\n  port: number;\n  editorPort: number;\n  debugPort?: number;\n}\n\nexport async function dev(argv: Arguments) {\n  const sourceDirectory = resolve(join(relative(process.cwd(), argv.dir)));\n\n  // When we build, we MIGHT need to use the @zuplo/runtime from the node_modules if the user\n  // has installed our packages using https://www.npmjs.com/package/zuplo in a global directory\n\n  // Try to copy the @zuplo/runtime locally\n  const zuploRuntimePath = new URL(\n    \"../../node_modules/@zuplo/runtime\",\n    import.meta.url\n  );\n  if (existsSync(zuploRuntimePath)) {\n    cpSync(\n      zuploRuntimePath,\n      join(sourceDirectory, \"node_modules/@zuplo/runtime\"),\n      {\n        recursive: true,\n        dereference: true,\n      }\n    );\n  }\n\n  // Set GLOBAL_MODULE_LOCATION to the location of the CLIs node_modules\n  process.env.GLOBAL_MODULE_LOCATION = fileURLToPath(\n    new URL(\"../../node_modules\", import.meta.url)\n  );\n\n  const loadedEnvFiles: string[] = [];\n\n  // Check if the user has a .env file\n  const envFile = join(sourceDirectory, \".env\");\n  if (existsSync(envFile)) {\n    loadedEnvFiles.push(\".env\");\n  }\n\n  // Check if the user has a .env.zuplo file\n  let envZuplo: dotenv.DotenvParseOutput | undefined;\n  const envZuploFile = join(sourceDirectory, \".env.zuplo\");\n  if (existsSync(envZuploFile)) {\n    const contents = readFileSync(envZuploFile);\n    envZuplo = dotenv.parse(contents);\n    loadedEnvFiles.push(\".env.zuplo\");\n  }\n\n  // Set other variables using __ZUPLO_CONFIG as necessary\n  // const config = {\n  // };\n  // process.env.__ZUPLO_CONFIG = btoa(JSON.stringify(config));\n  process.env.ZUPLO_IS_LOCAL_DEVELOPMENT = \"true\";\n\n  // Use a dynamic import so that setting process.env has effect\n  const core = await import(\"@zuplo/core/cli\");\n\n  const zupPort = argv.port;\n  const zupEditorPort = argv.editorPort;\n  const zupDebugPort = argv.debugPort;\n\n  const isZupPortAvailable = await isPortAvailable(\"localhost\", zupPort);\n  if (!isZupPortAvailable) {\n    await printCriticalFailureToConsoleAndExit(\n      `Port ${zupPort} is already in use. Please specify a different port using --port.`\n    );\n  }\n\n  const isZupEditorPortAvailable = await isPortAvailable(\n    \"localhost\",\n    zupEditorPort\n  );\n  if (!isZupEditorPortAvailable) {\n    await printCriticalFailureToConsoleAndExit(\n      `Port ${zupEditorPort} is already in use. Please specify a different port using --editor-port.`\n    );\n  }\n\n  if (zupDebugPort) {\n    const isZupDebugPortAvailable = await isPortAvailable(\n      \"localhost\",\n      zupDebugPort\n    );\n    if (!isZupDebugPortAvailable) {\n      await printCriticalFailureToConsoleAndExit(\n        `Port ${zupDebugPort} is already in use. Please specify a different port using --debug-port.`\n      );\n    }\n  }\n\n  const buildId = randomUUID();\n\n  let firstLoad = true;\n\n  await core.startDevServer({\n    buildId,\n    output: new ConsoleOutput(),\n    sourceDirectory,\n    port: zupPort,\n    debugPort: argv.debugPort ?? undefined,\n    publicZuploEnvironmentVariables: envZuplo\n      ? {\n          ZUPLO_ACCOUNT_NAME: envZuplo.ZUPLO_ACCOUNT_NAME,\n          ZUPLO_PROJECT_NAME: envZuplo.ZUPLO_PROJECT_NAME,\n          ZUPLO_ENVIRONMENT_TYPE: envZuplo.ZUPLO_ENVIRONMENT_TYPE,\n        }\n      : // Leave this as undefined to simulate the old behavior\n        undefined,\n    logger,\n    handleRuntimeStdio,\n    onReload: () => {\n      if (firstLoad) {\n        firstLoad = false;\n      } else {\n        printDiagnosticsToConsole(\"Code changed. Server reloaded...\");\n      }\n    },\n  });\n\n  let editor: ApiServer;\n\n  if (argv[\"start-editor\"]) {\n    editor = new ApiServer({\n      cliArgs: argv,\n      workingDir: sourceDirectory,\n      port: argv.editorPort,\n      isStandalone: false,\n    });\n    editor.start().catch((err) => logger.error(err));\n  }\n\n  printDiagnosticsToConsole(\"Started local development setup\");\n  printDiagnosticsToConsole(\"Ctrl+C to exit\");\n  printDiagnosticsToConsole(\"\");\n  printDiagnosticsToConsole(`🚀 Zuplo Gateway: http://localhost:${zupPort}`);\n  if (argv[\"start-editor\"]) {\n    printDiagnosticsToConsole(\n      `📘 Route Designer: http://localhost:${argv.editorPort}`\n    );\n  }\n  if (loadedEnvFiles.length > 0) {\n    printDiagnosticsToConsole(\n      `⚙️  Loaded env files: \\n    - ${loadedEnvFiles.join(\" \\n    - \")}`\n    );\n  }\n  printDiagnosticsToConsole(\"\");\n  printDiagnosticsToConsole(\"\");\n\n  return new Promise<void>((resolve) => {\n    async function exit() {\n      printDiagnosticsToConsole(\"\");\n      printDiagnosticsToConsole(\"Stopping local development server...\");\n\n      if (argv[\"start-editor\"]) {\n        await editor.close();\n      }\n      resolve();\n    }\n\n    // eslint-disable-next-line @typescript-eslint/no-misused-promises\n    process.on(\"SIGTERM\", exit);\n    // eslint-disable-next-line @typescript-eslint/no-misused-promises\n    process.on(\"SIGINT\", exit);\n  });\n}\n"]}

package/dist/editor/server/cors-plugin.js

@@ -1,5 +1,5 @@
-import fp from "fastify-plugin";
 import cors from "@fastify/cors";
+import fp from "fastify-plugin";
 export const corsPlugin = fp(async function (fastify, opts) {
     fastify.register(cors, () => {
         return (req, callback) => {

package/dist/editor/server/cors-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"cors-plugin.js","sourceRoot":"","sources":["../../../src/editor/server/cors-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAChC,OAAO,IAAI,MAAM,eAAe,CAAC;AAGjC,MAAM,CAAC,MAAM,UAAU,GAAG,EAAE,CAAC,KAAK,WAChC,OAAO,EAEP,IAAyB;IAEzB,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE;QAE1B,OAAO,CAAC,GAAmB,EAAE,QAAa,EAAE,EAAE;YAC5C,MAAM,WAAW,GAAG;gBAElB,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAC;YAGF,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;gBAClD,WAAW,CAAC,MAAM,GAAG,KAAK,CAAC;YAC7B,CAAC;YAGD,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC9B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import fp from \"fastify-plugin\";\nimport cors from \"@fastify/cors\";\nimport { FastifyRequest } from \"fastify\";\n\nexport const corsPlugin = fp(async function (\n  fastify,\n  // origin=true is NOT recommended for production as it enables reflection exploits\n  opts: { origin: boolean }\n) {\n  fastify.register(cors, () => {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return (req: FastifyRequest, callback: any) => {\n      const corsOptions = {\n        // This is NOT recommended for production as it enables reflection exploits\n        origin: opts.origin,\n      };\n\n      // do not include CORS headers for requests from localhost\n      if (/^localhost$/m.test(req.headers.origin ?? \"\")) {\n        corsOptions.origin = false;\n      }\n\n      // callback expects two parameters: error and options\n      callback(null, corsOptions);\n    };\n  });\n});\n"]}
+{"version":3,"file":"cors-plugin.js","sourceRoot":"","sources":["../../../src/editor/server/cors-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,eAAe,CAAC;AAEjC,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEhC,MAAM,CAAC,MAAM,UAAU,GAAG,EAAE,CAAC,KAAK,WAChC,OAAO,EAEP,IAAyB;IAEzB,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE;QAE1B,OAAO,CAAC,GAAmB,EAAE,QAAa,EAAE,EAAE;YAC5C,MAAM,WAAW,GAAG;gBAElB,MAAM,EAAE,IAAI,CAAC,MAAM;aACpB,CAAC;YAGF,IAAI,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;gBAClD,WAAW,CAAC,MAAM,GAAG,KAAK,CAAC;YAC7B,CAAC;YAGD,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAC9B,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC","sourcesContent":["import cors from \"@fastify/cors\";\nimport { FastifyRequest } from \"fastify\";\nimport fp from \"fastify-plugin\";\n\nexport const corsPlugin = fp(async function (\n  fastify,\n  // origin=true is NOT recommended for production as it enables reflection exploits\n  opts: { origin: boolean }\n) {\n  fastify.register(cors, () => {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return (req: FastifyRequest, callback: any) => {\n      const corsOptions = {\n        // This is NOT recommended for production as it enables reflection exploits\n        origin: opts.origin,\n      };\n\n      // do not include CORS headers for requests from localhost\n      if (/^localhost$/m.test(req.headers.origin ?? \"\")) {\n        corsOptions.origin = false;\n      }\n\n      // callback expects two parameters: error and options\n      callback(null, corsOptions);\n    };\n  });\n});\n"]}

package/dist/editor/server/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/editor/server/server.ts"],"names":[],"mappings":"AAEA,OAAgB,EAAqB,eAAe,EAAE,MAAM,SAAS,CAAC;AA8BtE,UAAU,aAAa;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,qBAAa,SAAS;IACb,OAAO,EAAE,eAAe,CAAC;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,OAAO,CAAqB;IAEpC,OAAO,CAAC,UAAU,CAAM;IAExB,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,YAAY,CAAU;gBAG5B,OAAO,GAAE,aAKR;IAgBH,IAAI,QAAa,OAAO,CAAC,IAAI,CAAC,CAiP5B;IAEF,KAAK,QAAa,OAAO,CAAC,IAAI,CAAC,CAkC7B;IAEF,KAAK,QAAa,OAAO,CAAC,IAAI,CAAC,CAE7B;IAEF,KAAK,QAAa,OAAO,CAAC,IAAI,CAAC,CAsB7B;CACH"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/editor/server/server.ts"],"names":[],"mappings":"AAKA,OAAgB,EAAqB,eAAe,EAAE,MAAM,SAAS,CAAC;AA2BtE,UAAU,aAAa;IACrB,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;CACvB;AAED,qBAAa,SAAS;IACb,OAAO,EAAE,eAAe,CAAC;IAChC,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,OAAO,CAAqB;IAEpC,OAAO,CAAC,UAAU,CAAM;IAExB,OAAO,CAAC,OAAO,CAAU;IACzB,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,YAAY,CAAU;gBAG5B,OAAO,GAAE,aAKR;IAgBH,IAAI,QAAa,OAAO,CAAC,IAAI,CAAC,CAiP5B;IAEF,KAAK,QAAa,OAAO,CAAC,IAAI,CAAC,CAkC7B;IAEF,KAAK,QAAa,OAAO,CAAC,IAAI,CAAC,CAE7B;IAEF,KAAK,QAAa,OAAO,CAAC,IAAI,CAAC,CAsB7B;CACH"}