@catladder/cli 1.27.0 → 1.29.1

package/package.json

@@ -16,7 +16,7 @@
     "catladder": "./bin/catladder"
   },
   "dependencies": {
-    "@catladder/pipeline": "1.27.0",
+    "@catladder/pipeline": "1.29.1",
     "@kubernetes/client-node": "^0.16.2",
     "child-process-promise": "^2.2.1",
     "command-exists-promise": "^2.0.2",
@@ -55,5 +55,5 @@
     "eslint": "^8.7.0",
     "typescript": "^4.5.4"
   },
-  "version": "1.27.0"
+  "version": "1.29.1"
 }

package/src/apps/catenv/catenv.ts

@@ -14,21 +14,29 @@ const getCurrentComponentName = async (
 
 const sanitizeEnvVarName = (name: string) => name.replace(/[\s\-.]+/g, "_");
 
-const getAllVariablesToPrint = async (config: Config) => {
+const getAllVariablesToPrint = async (
+  config: Config,
+  choice?: {
+    env?: string;
+    componentName?: string;
+  }
+) => {
+  const env = choice?.env ?? "local";
   const { components } = config;
 
-  const currentComponent = await getCurrentComponentName(components);
+  const currentComponent =
+    choice?.componentName ?? (await getCurrentComponentName(components));
 
   let variables = {};
   if (currentComponent) {
-    variables = await getEnvVars(null, "local", currentComponent);
+    variables = await getEnvVars(null, env, currentComponent);
   } else {
     // when in a monorep and not in a subapp, merge all env vars.
     // this is not 100% correct, but better than not exporting any vars at all
     // so we also add prefixed variants
     variables = await Object.keys(components).reduce(
       async (acc, componentName) => {
-        const subappvars = await getEnvVars(null, "local", componentName);
+        const subappvars = await getEnvVars(null, env, componentName);
         return {
           ...(await acc),
           ...subappvars,
@@ -46,13 +54,12 @@ const getAllVariablesToPrint = async (config: Config) => {
   }
   return variables;
 };
-export default async () => {
+export default async (choice?: { env?: string; componentName?: string }) => {
   const config = await getProjectConfig();
   if (!config) {
     return;
   }
-
-  const variables = await getAllVariablesToPrint(config);
+  const variables = await getAllVariablesToPrint(config, choice);
 
   console.log(
     Object.entries(variables)

package/src/catenv.ts

@@ -1,7 +1,11 @@
 import catenv from "./apps/catenv/catenv";
-import { $ } from "zx";
+import { $, argv } from "zx";
+import { parseChoice } from "./config/getProjectConfig";
+
+const choice = argv._[0] ? parseChoice(argv._[0]) : null;
+
 $.verbose = false;
-catenv().then(() => {
+catenv(choice).then(() => {
   // we have to exit manually, because we have some file watches
   process.exit();
 });

package/src/config/getProjectConfig.ts

@@ -60,7 +60,7 @@ export const getProjectComponents = async () => {
 };
 
 export const parseChoice = (envComponent: string) => {
-  const [env, componentName] = envComponent.split(":");
+  const [env, componentName] = envComponent.split(":").map((x) => x || null);
   return { env, componentName };
 };