carlin 1.49.10 → 1.49.12

package/dist/index.js

@@ -1,16 +1,16 @@
 import { __name, __require } from './chunk-3GQAWCBQ.js';
-import 'dotenv/config';
 import * as path2 from 'path';
 import path2__default from 'path';
-import * as fs4 from 'fs';
-import fs4__default, { existsSync, statSync, chmodSync, createReadStream } from 'fs';
+import * as fs5 from 'fs';
+import fs5__default, { existsSync, statSync, chmodSync, createReadStream } from 'fs';
 import yaml5 from 'js-yaml';
+import { createRequire, builtinModules } from 'module';
 import * as esbuild from 'esbuild';
-import importSync from 'import-sync';
 import AWS2 from 'aws-sdk';
 import { pascalCase, constantCase, kebabCase, camelCase } from 'change-case';
 import deepEqual from 'deep-equal';
 import deepmerge from 'deepmerge';
+import dotenv from 'dotenv';
 import findUpSync from 'findup-sync';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
@@ -25,14 +25,18 @@ import { ListObjectsV2Command, ListObjectVersionsCommand, DeleteObjectsCommand,
 import { Upload } from '@aws-sdk/lib-storage';
 import { glob } from 'glob';
 import mime from 'mime-types';
-import { builtinModules } from 'module';
 import { typescriptConfig } from '@ttoss/config';
 import AdmZip from 'adm-zip';
 
+var nodeRequire = createRequire(import.meta.url);
 var loadConfig = /* @__PURE__ */ __name((entryPoint) => {
   const lastEntryPointName = entryPoint.split("/").pop();
   const filename = lastEntryPointName?.split(".")[0];
-  const outfile = path2__default.resolve(process.cwd(), "out", filename + ".js");
+  const entryFileStats = fs5__default.statSync(entryPoint, {
+    bigint: true
+  });
+  const entryFileVersion = `${entryFileStats.mtimeNs}-${entryFileStats.size}`;
+  const outfile = path2__default.resolve(process.cwd(), "out", `${filename}-${entryFileVersion}.cjs`);
   const result = esbuild.buildSync({
     bundle: true,
     entryPoints: [
@@ -55,7 +59,9 @@ var loadConfig = /* @__PURE__ */ __name((entryPoint) => {
     throw result.errors;
   }
   try {
-    const config = importSync(outfile);
+    const resolvedOutfile = nodeRequire.resolve(outfile);
+    delete nodeRequire.cache[resolvedOutfile];
+    const config = nodeRequire(resolvedOutfile);
     return config.default || config.config;
   } catch (error) {
     console.error("Failed importing build config file: ", filename);
@@ -67,11 +73,11 @@ var loadConfig = /* @__PURE__ */ __name((entryPoint) => {
 var readConfigFileSync = /* @__PURE__ */ __name(({ configFilePath, options: options10 }) => {
   const extension = configFilePath.split(".").pop();
   if (extension === "yaml" || extension === "yml") {
-    const file = fs4__default.readFileSync(configFilePath, "utf8");
+    const file = fs5__default.readFileSync(configFilePath, "utf8");
     return yaml5.load(file);
   }
   if (extension === "json") {
-    const file = fs4__default.readFileSync(configFilePath, "utf8");
+    const file = fs5__default.readFileSync(configFilePath, "utf8");
     return JSON.parse(file);
   }
   if (extension === "js") {
@@ -248,7 +254,7 @@ var readPackageJson = /* @__PURE__ */ __name(() => {
   if (!packageJsonDir) {
     return {};
   }
-  return JSON.parse(fs4__default.readFileSync(packageJsonDir).toString());
+  return JSON.parse(fs5__default.readFileSync(packageJsonDir).toString());
 }, "readPackageJson");
 var getPackageJsonProperty = /* @__PURE__ */ __name(({ property }) => {
   try {
@@ -579,7 +585,7 @@ var uploadFileToS3 = /* @__PURE__ */ __name(async ({ bucket, contentType, file,
     params.ContentType = contentType;
     params.Body = file;
   } else if (filePath) {
-    const readFile = await fs4__default.promises.readFile(filePath);
+    const readFile = await fs5__default.promises.readFile(filePath);
     params.ContentType = contentType || mime.contentType(path2__default.extname(filePath)) || void 0;
     params.Body = Buffer.from(readFile);
   }
@@ -601,7 +607,7 @@ var uploadFileToS3 = /* @__PURE__ */ __name(async ({ bucket, contentType, file,
 var getAllFilesInsideADirectory = /* @__PURE__ */ __name(async ({ directory }) => {
   const allFilesAndDirectories = await glob(`${directory}/**/*`);
   const allFiles = allFilesAndDirectories.filter((item) => {
-    return fs4__default.lstatSync(item).isFile();
+    return fs5__default.lstatSync(item).isFile();
   });
   return allFiles;
 }, "getAllFilesInsideADirectory");
@@ -913,13 +919,13 @@ var saveEnvironmentOutput = /* @__PURE__ */ __name(async ({ outputs, stackName }
     };
   }, {});
   const dotCarlinFolderPath = path2.join(process.cwd(), ".carlin");
-  if (!fs4.existsSync(dotCarlinFolderPath)) {
-    await fs4.promises.mkdir(dotCarlinFolderPath);
+  if (!fs5.existsSync(dotCarlinFolderPath)) {
+    await fs5.promises.mkdir(dotCarlinFolderPath);
   }
   const filePath = path2.join(dotCarlinFolderPath, `${stackName}.json`);
-  await fs4.promises.writeFile(filePath, JSON.stringify(envFile, null, 2));
+  await fs5.promises.writeFile(filePath, JSON.stringify(envFile, null, 2));
   const latestFilePath = path2.join(dotCarlinFolderPath, LATEST_DEPLOY_OUTPUTS_FILENAME);
-  await fs4.promises.writeFile(latestFilePath, JSON.stringify(envFile, null, 2));
+  await fs5.promises.writeFile(latestFilePath, JSON.stringify(envFile, null, 2));
 }, "saveEnvironmentOutput");
 var printStackOutputsAfterDeploy = /* @__PURE__ */ __name(async ({ stackName }) => {
   const { EnableTerminationProtection, StackName, Outputs = [] } = await describeStack({
@@ -2856,8 +2862,8 @@ var getCicdTemplate = /* @__PURE__ */ __name(({ pipelines: pipelines2 = [], cpu
 var logPrefix6 = "lambda";
 var buildLambdaCode = /* @__PURE__ */ __name(async ({ lambdaEntryPoints, lambdaEntryPointsBaseDir = ".", lambdaExternal = [], lambdaFormat = "esm", lambdaOutdir }) => {
   log6.info(logPrefix6, "Building Lambda single file...");
-  if (fs4__default.existsSync(lambdaOutdir)) {
-    fs4__default.rmSync(lambdaOutdir, {
+  if (fs5__default.existsSync(lambdaOutdir)) {
+    fs5__default.rmSync(lambdaOutdir, {
       recursive: true
     });
   }
@@ -3053,7 +3059,7 @@ var deployLambdaLayers = /* @__PURE__ */ __name(async ({ lambdaExternal = [] })
   log6.info(logPrefix8, `--lambda-externals [${lambdaExternal.join(", ")}] was found. Creating other layers...`);
   const { dependencies = {} } = (() => {
     try {
-      return JSON.parse(fs4.readFileSync(path2.resolve(process.cwd(), "package.json"), "utf8"));
+      return JSON.parse(fs5.readFileSync(path2.resolve(process.cwd(), "package.json"), "utf8"));
     } catch (err) {
       log6.error(logPrefix8, "Cannot read package.json. Error message: %j", err.message);
       return {};
@@ -3086,8 +3092,8 @@ var uploadCodeToS3 = /* @__PURE__ */ __name(async ({ stackName, lambdaOutdir })
   log6.info(logPrefix9, `Uploading code to S3...`);
   const zip = new AdmZip();
   const zipFile = `${lambdaOutdir}/${zipFileName}`;
-  if (fs4__default.existsSync(zipFile)) {
-    await fs4__default.promises.rm(zipFile);
+  if (fs5__default.existsSync(zipFile)) {
+    await fs5__default.promises.rm(zipFile);
   }
   zip.addLocalFolder(lambdaOutdir);
   zip.writeZip(`${lambdaOutdir}/${zipFileName}`);
@@ -3109,7 +3115,7 @@ var deployLambdaCode = /* @__PURE__ */ __name(async ({ lambdaDockerfile, lambdaE
   log6.info(logPrefix10, "Deploying Lambda code...");
   for (const entryPoint of lambdaEntryPoints) {
     const entryPointPath = path2__default.resolve(lambdaEntryPointsBaseDir, entryPoint);
-    if (!fs4__default.existsSync(entryPointPath)) {
+    if (!fs5__default.existsSync(entryPointPath)) {
       throw new Error(`Entry point ${entryPointPath} does not exist.`);
     }
   }
@@ -3159,10 +3165,10 @@ var getLambdaInput = /* @__PURE__ */ __name((extension) => {
 }, "getLambdaInput");
 var deployCicdLambdas = /* @__PURE__ */ __name(async ({ stackName }) => {
   const lambdaInput = (() => {
-    if (fs4.existsSync(getLambdaInput("js"))) {
+    if (fs5.existsSync(getLambdaInput("js"))) {
       return getLambdaInput("js");
     }
-    if (fs4.existsSync(getLambdaInput("ts"))) {
+    if (fs5.existsSync(getLambdaInput("ts"))) {
       return getLambdaInput("ts");
     }
     throw new Error("Cannot read CICD lambdas file.");
@@ -3246,7 +3252,7 @@ var deployCicd = /* @__PURE__ */ __name(async ({ cpu, memory, pipelines: pipelin
   }
 }, "deployCicd");
 var readSSHKey = /* @__PURE__ */ __name((dir) => {
-  return fs4.readFileSync(dir, "utf-8");
+  return fs5.readFileSync(dir, "utf-8");
 }, "readSSHKey");
 var logPrefix12 = "deploy-cicd";
 var deployCicdCommand = {
@@ -3414,14 +3420,14 @@ var getTypes = /* @__PURE__ */ __name(() => {
       options: {
         kind: "scalar",
         construct: /* @__PURE__ */ __name((filePath) => {
-          return fs4.readFileSync(path2.resolve(process.cwd(), filePath)).toString();
+          return fs5.readFileSync(path2.resolve(process.cwd(), filePath)).toString();
         }, "construct")
       }
     }
   ];
 }, "getTypes");
 var readCloudFormationYamlTemplate = /* @__PURE__ */ __name(({ templatePath }) => {
-  const template = fs4.readFileSync(templatePath).toString();
+  const template = fs5.readFileSync(templatePath).toString();
   const parsed = loadCloudFormationTemplate(template, getTypes());
   if (!parsed || typeof parsed === "string") {
     throw new Error("Cannot parse CloudFormation template.");
@@ -3444,7 +3450,7 @@ var findAndReadCloudFormationTemplate = /* @__PURE__ */ __name(async ({ template
     if (acc) {
       return acc;
     }
-    return fs4.existsSync(path2.resolve(process.cwd(), cur)) ? cur : acc;
+    return fs5.existsSync(path2.resolve(process.cwd(), cur)) ? cur : acc;
   }, "");
   if (!templatePath) {
     throw new Error("Cannot find a CloudFormation template.");
@@ -3781,7 +3787,7 @@ var deployLambdaLayerCommand = {
 };
 var readDockerfile = /* @__PURE__ */ __name((dockerfilePath) => {
   try {
-    return fs4.readFileSync(path2.join(process.cwd(), dockerfilePath), "utf8");
+    return fs5.readFileSync(path2.join(process.cwd(), dockerfilePath), "utf8");
   } catch {
     return "";
   }
@@ -3809,7 +3815,7 @@ var readAllDeployFiles = /* @__PURE__ */ __name(async () => {
   const results = [];
   for (const file of files) {
     try {
-      const raw = await fs4.promises.readFile(file, "utf-8");
+      const raw = await fs5.promises.readFile(file, "utf-8");
       const content = JSON.parse(raw);
       if (content.stackName && content.outputs) {
         results.push(content);
@@ -5176,14 +5182,14 @@ var deployCommand = {
 var logPrefix23 = "generate-env";
 var readEnvFile = /* @__PURE__ */ __name(async ({ envFileName, envsPath }) => {
   try {
-    const content = await fs4.promises.readFile(path2.resolve(process.cwd(), envsPath, envFileName), "utf8");
+    const content = await fs5.promises.readFile(path2.resolve(process.cwd(), envsPath, envFileName), "utf8");
     return content;
   } catch {
     return void 0;
   }
 }, "readEnvFile");
 var writeEnvFile = /* @__PURE__ */ __name(async ({ envFileName, content }) => {
-  return fs4.promises.writeFile(path2.resolve(process.cwd(), envFileName), content);
+  return fs5.promises.writeFile(path2.resolve(process.cwd(), envFileName), content);
 }, "writeEnvFile");
 var readDeployOutputLines = /* @__PURE__ */ __name(async ({ envFromDeployOutputs }) => {
   const lines = [];
@@ -5191,7 +5197,7 @@ var readDeployOutputLines = /* @__PURE__ */ __name(async ({ envFromDeployOutputs
     const latestDeployPath = path2.resolve(process.cwd(), dir, ".carlin", LATEST_DEPLOY_OUTPUTS_FILENAME);
     let latestDeploy;
     try {
-      const raw = await fs4.promises.readFile(latestDeployPath, "utf8");
+      const raw = await fs5.promises.readFile(latestDeployPath, "utf8");
       latestDeploy = JSON.parse(raw);
     } catch {
       log6.warn(logPrefix23, "Could not read latest-deploy.json from %s. Skipping.", latestDeployPath);
@@ -5408,7 +5414,38 @@ var readConfigFiles = /* @__PURE__ */ __name(() => {
   });
   return deepmerge.all(configs.reverse());
 }, "readConfigFiles");
+var loadDotEnv = /* @__PURE__ */ __name(() => {
+  const { environment } = getConfigFileOptions();
+  if (environment) {
+    const result = dotenv.config({
+      path: path2__default.resolve(process.cwd(), `.env.${environment}`)
+    });
+    if (result.error) {
+      dotenv.config();
+    }
+  } else {
+    dotenv.config();
+  }
+}, "loadDotEnv");
+var syncEnvironmentOption = /* @__PURE__ */ __name((argv) => {
+  const finalEnvironment = argv.environment || process.env.ENVIRONMENT;
+  if (finalEnvironment) {
+    setEnvVar("ENVIRONMENT", finalEnvironment);
+    const envKeys = [
+      "environment",
+      ...options9.environment.alias
+    ];
+    const envEntries = envKeys.map((key) => {
+      return [
+        key,
+        finalEnvironment
+      ];
+    });
+    Object.assign(argv, Object.fromEntries(envEntries));
+  }
+}, "syncEnvironmentOption");
 var cli = /* @__PURE__ */ __name(() => {
+  loadDotEnv();
   let finalConfig;
   const getConfig = /* @__PURE__ */ __name(() => {
     return finalConfig = readConfigFiles();
@@ -5433,23 +5470,7 @@ var cli = /* @__PURE__ */ __name(() => {
       }
     }
   }, "handleEnvironments");
-  return yargs(hideBin(process.argv)).strictCommands().scriptName(NAME).env(getEnv()).options(addGroupToOptions(options9, "Common Options")).middleware((argv) => {
-    const finalEnvironment = argv.environment || process.env.ENVIRONMENT;
-    if (finalEnvironment) {
-      setEnvVar("ENVIRONMENT", finalEnvironment);
-      const envKeys = [
-        "environment",
-        ...options9.environment.alias
-      ];
-      const envEntries = envKeys.map((key) => {
-        return [
-          key,
-          finalEnvironment
-        ];
-      });
-      Object.assign(argv, Object.fromEntries(envEntries));
-    }
-  }).middleware(handleEnvironments).middleware(({ environment }) => {
+  return yargs(hideBin(process.argv)).strictCommands().scriptName(NAME).env(getEnv()).options(addGroupToOptions(options9, "Common Options")).middleware(syncEnvironmentOption).middleware(handleEnvironments).middleware(({ environment }) => {
     if (![
       "string",
       "undefined"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carlin",
-  "version": "1.49.10",
+  "version": "1.49.12",
   "description": "",
   "keywords": [],
   "homepage": "https://ttoss.dev/docs/carlin/",
@@ -58,9 +58,9 @@
     "uglify-js": "^3.19.3",
     "vercel": "^39.1.1",
     "yargs": "^17.7.2",
-    "@ttoss/config": "^1.37.11",
-    "@ttoss/cloudformation": "^0.13.0",
-    "@ttoss/read-config-file": "^2.2.11"
+    "@ttoss/cloudformation": "^0.13.2",
+    "@ttoss/read-config-file": "^2.2.12",
+    "@ttoss/config": "^1.37.11"
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.6",