@ttoss/cloudformation 0.9.5 → 0.9.6

package/dist/esm/index.js

@@ -1,7 +1,7 @@
 /** Powered by @ttoss/config. https://ttoss.dev/docs/modules/packages/config/ */
 
 // src/findAndReadCloudFormationTemplate.ts
-import * as fs3 from "fs";
+import * as fs2 from "fs";
 import * as path2 from "path";
 
 // src/readCloudFormationYamlTemplate.ts
@@ -161,80 +161,32 @@ var readCloudFormationYamlTemplate = ({
   return parsed;
 };
 
-// src/readObjectFile.ts
-import { createRequire } from "node:module";
-import { register } from "ts-node";
-import fs2 from "fs";
-import yaml2 from "js-yaml";
-var readYaml = ({
-  path: path3
-}) => {
-  const template = fs2.readFileSync(path3, "utf8") || JSON.stringify({});
-  return yaml2.load(template);
-};
-var readObjectFile = ({
-  path: path3
-}) => {
-  if (!fs2.existsSync(path3)) {
-    return {};
-  }
-  const require2 = createRequire(require('url').pathToFileURL(__filename).toString());
-  const extension = path3.split(".").pop();
-  if (extension === "ts") {
-    register({
-      compilerOptions: {
-        moduleResolution: "node",
-        module: "commonjs"
-      },
-      moduleTypes: {
-        "carlin.*": "cjs"
-      },
-      transpileOnly: true
-    });
-    const tsObj = require2(path3);
-    const obj = tsObj.default || tsObj;
-    return typeof obj === "function" ? obj() : obj;
-  }
-  if (extension === "js") {
-    const obj = require2(path3);
-    return typeof obj === "function" ? obj() : obj;
-  }
-  if (extension === "json") {
-    return require2(path3);
-  }
-  if (extension === "yml" || extension === "yaml") {
-    return readYaml({
-      path: path3
-    });
-  }
-  return {};
-};
-
 // src/findAndReadCloudFormationTemplate.ts
+import { readConfigFile } from "@ttoss/read-config-file";
 var defaultTemplatePaths = ["ts", "js", "yaml", "yml", "json"].map(extension => {
   return `./src/cloudformation.${extension}`;
 });
-var findAndReadCloudFormationTemplate = ({
+var findAndReadCloudFormationTemplate = async ({
   templatePath: defaultTemplatePath
 }) => {
   const templatePath = defaultTemplatePath || defaultTemplatePaths.reduce((acc, cur) => {
     if (acc) {
       return acc;
     }
-    return fs3.existsSync(path2.resolve(process.cwd(), cur)) ? cur : acc;
+    return fs2.existsSync(path2.resolve(process.cwd(), cur)) ? cur : acc;
   }, "");
   if (!templatePath) {
     throw new Error("Cannot find a CloudFormation template.");
   }
   const extension = templatePath?.split(".").pop();
-  const fullPath = path2.resolve(process.cwd(), templatePath);
   if (["yaml", "yml"].includes(extension)) {
     return readCloudFormationYamlTemplate({
       templatePath
     });
   }
-  return readObjectFile({
-    path: fullPath
+  const configFilePath = path2.resolve(process.cwd(), templatePath);
+  return readConfigFile({
+    configFilePath
   });
 };
-export { findAndReadCloudFormationTemplate, readObjectFile as unstable_readObjectFile };
+export { findAndReadCloudFormationTemplate };

package/dist/{index.d.mts → index.d.cts}

@@ -78,10 +78,6 @@ type CloudFormationTemplate = {
 
 declare const findAndReadCloudFormationTemplate: ({ templatePath: defaultTemplatePath, }: {
     templatePath?: string;
-}) => CloudFormationTemplate;
+}) => Promise<CloudFormationTemplate>;
 
-declare const readObjectFile: ({ path }: {
-    path: string;
-}) => any;
-
-export { type CloudFormationTemplate, type IAMRoleResource, type Output, type Outputs, type Parameter, type Parameters, type Policy, type Resource, type Resources, findAndReadCloudFormationTemplate, readObjectFile as unstable_readObjectFile };
+export { type CloudFormationTemplate, type IAMRoleResource, type Output, type Outputs, type Parameter, type Parameters, type Policy, type Resource, type Resources, findAndReadCloudFormationTemplate };

package/dist/index.d.ts

@@ -78,10 +78,6 @@ type CloudFormationTemplate = {
 
 declare const findAndReadCloudFormationTemplate: ({ templatePath: defaultTemplatePath, }: {
     templatePath?: string;
-}) => CloudFormationTemplate;
+}) => Promise<CloudFormationTemplate>;
 
-declare const readObjectFile: ({ path }: {
-    path: string;
-}) => any;
-
-export { type CloudFormationTemplate, type IAMRoleResource, type Output, type Outputs, type Parameter, type Parameters, type Policy, type Resource, type Resources, findAndReadCloudFormationTemplate, readObjectFile as unstable_readObjectFile };
+export { type CloudFormationTemplate, type IAMRoleResource, type Output, type Outputs, type Parameter, type Parameters, type Policy, type Resource, type Resources, findAndReadCloudFormationTemplate };

package/dist/index.js

@@ -38,21 +38,20 @@ var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  findAndReadCloudFormationTemplate: () => findAndReadCloudFormationTemplate,
-  unstable_readObjectFile: () => readObjectFile
+  findAndReadCloudFormationTemplate: () => findAndReadCloudFormationTemplate
 });
 module.exports = __toCommonJS(src_exports);
 
 // src/findAndReadCloudFormationTemplate.ts
-var fs3 = __toESM(require("fs"));
-var path2 = __toESM(require("path"));
+var fs2 = __toESM(require("fs"), 1);
+var path2 = __toESM(require("path"), 1);
 
 // src/readCloudFormationYamlTemplate.ts
-var fs = __toESM(require("fs"));
-var path = __toESM(require("path"));
+var fs = __toESM(require("fs"), 1);
+var path = __toESM(require("path"), 1);
 
 // src/cloudFormationYamlTemplate.ts
-var import_js_yaml = __toESM(require("js-yaml"));
+var import_js_yaml = __toESM(require("js-yaml"), 1);
 var cloudFormationTypes = [{
   tag: "!Equals",
   options: {
@@ -204,85 +203,35 @@ var readCloudFormationYamlTemplate = ({
   return parsed;
 };
 
-// src/readObjectFile.ts
-var import_node_module = require("module");
-var import_ts_node = require("ts-node");
-var import_fs = __toESM(require("fs"));
-var import_js_yaml2 = __toESM(require("js-yaml"));
-var import_meta = {};
-var readYaml = ({
-  path: path3
-}) => {
-  const template = import_fs.default.readFileSync(path3, "utf8") || JSON.stringify({});
-  return import_js_yaml2.default.load(template);
-};
-var readObjectFile = ({
-  path: path3
-}) => {
-  if (!import_fs.default.existsSync(path3)) {
-    return {};
-  }
-  const require2 = (0, import_node_module.createRequire)(import_meta.url);
-  const extension = path3.split(".").pop();
-  if (extension === "ts") {
-    (0, import_ts_node.register)({
-      compilerOptions: {
-        moduleResolution: "node",
-        module: "commonjs"
-      },
-      moduleTypes: {
-        "carlin.*": "cjs"
-      },
-      transpileOnly: true
-    });
-    const tsObj = require2(path3);
-    const obj = tsObj.default || tsObj;
-    return typeof obj === "function" ? obj() : obj;
-  }
-  if (extension === "js") {
-    const obj = require2(path3);
-    return typeof obj === "function" ? obj() : obj;
-  }
-  if (extension === "json") {
-    return require2(path3);
-  }
-  if (extension === "yml" || extension === "yaml") {
-    return readYaml({
-      path: path3
-    });
-  }
-  return {};
-};
-
 // src/findAndReadCloudFormationTemplate.ts
+var import_read_config_file = require("@ttoss/read-config-file");
 var defaultTemplatePaths = ["ts", "js", "yaml", "yml", "json"].map(extension => {
   return `./src/cloudformation.${extension}`;
 });
-var findAndReadCloudFormationTemplate = ({
+var findAndReadCloudFormationTemplate = async ({
   templatePath: defaultTemplatePath
 }) => {
   const templatePath = defaultTemplatePath || defaultTemplatePaths.reduce((acc, cur) => {
     if (acc) {
       return acc;
     }
-    return fs3.existsSync(path2.resolve(process.cwd(), cur)) ? cur : acc;
+    return fs2.existsSync(path2.resolve(process.cwd(), cur)) ? cur : acc;
   }, "");
   if (!templatePath) {
     throw new Error("Cannot find a CloudFormation template.");
   }
   const extension = templatePath?.split(".").pop();
-  const fullPath = path2.resolve(process.cwd(), templatePath);
   if (["yaml", "yml"].includes(extension)) {
     return readCloudFormationYamlTemplate({
       templatePath
     });
   }
-  return readObjectFile({
-    path: fullPath
+  const configFilePath = path2.resolve(process.cwd(), templatePath);
+  return (0, import_read_config_file.readConfigFile)({
+    configFilePath
   });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  findAndReadCloudFormationTemplate,
-  unstable_readObjectFile
+  findAndReadCloudFormationTemplate
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ttoss/cloudformation",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "description": "CloudFormation utils.",
   "author": "ttoss",
   "contributors": [
@@ -11,10 +11,10 @@
     "url": "https://github.com/ttoss/ttoss.git",
     "directory": "packages/cloudformation"
   },
+  "type": "module",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",
-      "require": "./dist/index.js",
       "types": "./dist/index.d.ts"
     }
   },
@@ -24,7 +24,7 @@
   ],
   "dependencies": {
     "js-yaml": "^4.1.0",
-    "ts-node": "^10.9.2"
+    "@ttoss/read-config-file": "^1.0.1"
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
@@ -32,8 +32,8 @@
     "@types/node": "^20.12.7",
     "jest": "^29.7.0",
     "tsup": "^8.0.2",
-    "@ttoss/config": "^1.32.2",
-    "@ttoss/test-utils": "^2.1.5"
+    "@ttoss/test-utils": "^2.1.6",
+    "@ttoss/config": "^1.32.3"
   },
   "keywords": [],
   "publishConfig": {

package/src/findAndReadCloudFormationTemplate.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { CloudFormationTemplate } from './CloudFormationTemplate';
 import { readCloudFormationYamlTemplate } from './readCloudFormationYamlTemplate';
-import { readObjectFile } from './readObjectFile';
+import { readConfigFile } from '@ttoss/read-config-file';
 
 export const defaultTemplatePaths = ['ts', 'js', 'yaml', 'yml', 'json'].map(
   (extension) => {
@@ -10,11 +10,11 @@ export const defaultTemplatePaths = ['ts', 'js', 'yaml', 'yml', 'json'].map(
   }
 );
 
-export const findAndReadCloudFormationTemplate = ({
+export const findAndReadCloudFormationTemplate = async ({
   templatePath: defaultTemplatePath,
 }: {
   templatePath?: string;
-}): CloudFormationTemplate => {
+}): Promise<CloudFormationTemplate> => {
   const templatePath =
     defaultTemplatePath ||
     defaultTemplatePaths
@@ -37,8 +37,6 @@ export const findAndReadCloudFormationTemplate = ({
 
   const extension = templatePath?.split('.').pop() as string;
 
-  const fullPath = path.resolve(process.cwd(), templatePath);
-
   /**
    * We need to read Yaml first because CloudFormation specific tags aren't
    * recognized when parsing a simple Yaml file. I.e., a possible error:
@@ -48,5 +46,7 @@ export const findAndReadCloudFormationTemplate = ({
     return readCloudFormationYamlTemplate({ templatePath });
   }
 
-  return readObjectFile({ path: fullPath });
+  const configFilePath = path.resolve(process.cwd(), templatePath);
+
+  return readConfigFile({ configFilePath });
 };

package/src/index.ts

@@ -1,7 +1,2 @@
 export { findAndReadCloudFormationTemplate } from './findAndReadCloudFormationTemplate';
 export * from './CloudFormationTemplate';
-
-/**
- * Unstable API.
- */
-export { readObjectFile as unstable_readObjectFile } from './readObjectFile';

package/src/readObjectFile.ts

@@ -1,49 +0,0 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-import { createRequire } from 'node:module';
-import { register } from 'ts-node';
-import fs from 'fs';
-import yaml from 'js-yaml';
-
-export const readYaml = ({ path }: { path: string }) => {
-  const template = fs.readFileSync(path, 'utf8') || JSON.stringify({});
-  return yaml.load(template);
-};
-
-export const readObjectFile = ({ path }: { path: string }) => {
-  if (!fs.existsSync(path)) {
-    return {};
-  }
-
-  const require = createRequire(import.meta.url);
-
-  const extension = path.split('.').pop();
-
-  if (extension === 'ts') {
-    register({
-      compilerOptions: { moduleResolution: 'node', module: 'commonjs' },
-      moduleTypes: {
-        'carlin.*': 'cjs',
-      },
-      transpileOnly: true,
-    });
-
-    const tsObj = require(path);
-    const obj = tsObj.default || tsObj;
-    return typeof obj === 'function' ? obj() : obj;
-  }
-
-  if (extension === 'js') {
-    const obj = require(path);
-    return typeof obj === 'function' ? obj() : obj;
-  }
-
-  if (extension === 'json') {
-    return require(path);
-  }
-
-  if (extension === 'yml' || extension === 'yaml') {
-    return readYaml({ path });
-  }
-
-  return {};
-};