carlin 1.34.2 → 1.36.0

package/dist/index.js

@@ -1,3 +1,4 @@
+import 'dotenv/config';
 import AWS from 'aws-sdk';
 import log5 from 'npmlog';
 import yaml4 from 'js-yaml';
@@ -2973,7 +2974,7 @@ var loadConfig = (entryPoint) => {
     format: "cjs",
     outfile,
     platform: "node",
-    target: typescriptConfig.target,
+    target: "ES2021",
     treeShaking: true
   });
   if (result.errors.length > 0) {
@@ -2989,7 +2990,8 @@ var loadConfig = (entryPoint) => {
   }
 };
 var readConfigFileSync = ({
-  configFilePath
+  configFilePath,
+  options: options9
 }) => {
   const extension = configFilePath.split(".").pop();
   if (extension === "yaml" || extension === "yml") {
@@ -3006,25 +3008,26 @@ var readConfigFileSync = ({
   if (extension === "ts") {
     let result = loadConfig(configFilePath);
     if (typeof result === "function") {
-      result = result();
+      result = result(options9);
     }
     return result;
   }
   throw new Error("Unsupported config file extension: " + extension);
 };
 var readConfigFile = async ({
-  configFilePath
+  configFilePath,
+  options: options9
 }) => {
   const extension = configFilePath.split(".").pop();
   if (extension === "ts") {
     let result = loadConfig(configFilePath);
     if (typeof result === "function") {
-      result = result();
+      result = result(options9);
     }
     result = await Promise.resolve(result);
     return result;
   }
-  return readConfigFileSync({ configFilePath });
+  return readConfigFileSync({ configFilePath, options: options9 });
 };
 
 // ../cloudformation/src/findAndReadCloudFormationTemplate.ts
@@ -3034,7 +3037,8 @@ var defaultTemplatePaths2 = ["ts", "js", "yaml", "yml", "json"].map(
   }
 );
 var findAndReadCloudFormationTemplate = async ({
-  templatePath: defaultTemplatePath
+  templatePath: defaultTemplatePath,
+  options: options9 = {}
 }) => {
   const templatePath = defaultTemplatePath || defaultTemplatePaths2.reduce((acc, cur) => {
     if (acc) {
@@ -3050,7 +3054,7 @@ var findAndReadCloudFormationTemplate = async ({
     return readCloudFormationYamlTemplate({ templatePath });
   }
   const configFilePath = path.resolve(process.cwd(), templatePath);
-  return readConfigFile({ configFilePath });
+  return readConfigFile({ configFilePath, options: options9 });
 };
 
 // src/deploy/lambda/getLambdaEntryPointsFromTemplate.ts
@@ -3071,25 +3075,42 @@ var getLambdaEntryPointsFromTemplate = (template) => {
 var logPrefix12 = "cloudformation";
 log5.addLevel("event", 1e4, { fg: "yellow" });
 log5.addLevel("output", 1e4, { fg: "blue" });
-var deployCloudFormation = async ({
-  lambdaDockerfile,
-  lambdaEntryPoints,
-  lambdaEntryPointsBaseDir,
-  lambdaImage,
-  lambdaExternal,
-  lambdaFormat,
-  lambdaOutdir,
-  parameters,
-  template,
-  templatePath
+var getCloudformationTemplateOptions = ({
+  cliOptions,
+  stackName
 }) => {
+  const options9 = {
+    ...cliOptions,
+    stackName,
+    environment: getEnvironment(),
+    packageName: getPackageName(),
+    projectName: getProjectName()
+  };
+  return options9;
+};
+var deployCloudFormation = async (cliOptions) => {
   try {
+    const {
+      lambdaDockerfile,
+      lambdaEntryPoints,
+      lambdaEntryPointsBaseDir,
+      lambdaImage,
+      lambdaExternal,
+      lambdaFormat,
+      lambdaOutdir,
+      parameters,
+      template,
+      templatePath
+    } = cliOptions;
     const { stackName } = await handleDeployInitialization({ logPrefix: logPrefix12 });
     const cloudFormationTemplate = await (async () => {
       if (template) {
         return { ...template };
       }
-      return findAndReadCloudFormationTemplate({ templatePath });
+      return findAndReadCloudFormationTemplate({
+        templatePath,
+        options: getCloudformationTemplateOptions({ stackName, cliOptions })
+      });
     })();
     parameters?.forEach((parameter) => {
       if (cloudFormationTemplate.Parameters?.[parameter.key]) {
@@ -4077,7 +4098,7 @@ var options5 = {
     type: "string"
   },
   /**
-   * This option has the format:
+   * This option has the format to match [CloudFormation parameter](https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_Parameter.html).
    *
    * ```ts
    * {
@@ -4087,9 +4108,47 @@ var options5 = {
    *  resolvedValue: string
    * }[]
    * ```
+   *
+   * For example:
+   *
+   * ```ts
+   * [
+   *  {
+   *    key: 'key1',
+   *    value: 'value1',
+   *  },
+   *  {
+   *    key: 'key2',
+   *    value: 'value2',
+   *  }
+   * ]
+   * ```
+   *
+   * If you want to simplify the usage, you can pass a object with key and value only:
+   *
+   * ```ts
+   * {
+   *  key1: 'value1',
+   *  key2: 'value2'
+   * }
+   * ```
    */
   parameters: {
     alias: "p",
+    coerce: (arg) => {
+      if (Array.isArray(arg)) {
+        return arg;
+      }
+      if (typeof arg === "object") {
+        return Object.entries(arg).map(([key, value]) => {
+          return {
+            key,
+            value
+          };
+        });
+      }
+      return [];
+    },
     default: [],
     describe: "A list of parameters that will be passed to CloudFormation Parameters when deploying."
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carlin",
-  "version": "1.34.2",
+  "version": "1.36.0",
   "description": "",
   "license": "GPL-3.0",
   "author": "Pedro Arantes <arantespp@gmail.com> (https://twitter.com/arantespp)",
@@ -45,9 +45,9 @@
     "uglify-js": "^3.17.4",
     "vercel": "^34.2.0",
     "yargs": "^17.7.2",
-    "@ttoss/cloudformation": "^0.9.8",
-    "@ttoss/read-config-file": "^1.0.3",
-    "@ttoss/config": "^1.32.4"
+    "@ttoss/config": "^1.32.4",
+    "@ttoss/cloudformation": "^0.10.0",
+    "@ttoss/read-config-file": "^1.1.0"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.5",