@awsless/awsless 0.0.1 → 0.0.2

package/dist/bin.cjs

@@ -206,6 +206,9 @@ var toStack = ({ config: config2, assets, app, stackConfig, plugins }) => {
     ],
     resources: [
       import_aws_cdk_lib.Arn.format({
+        region: config2.region,
+        account: config2.account,
+        partition: "aws",
         service: "ssm",
         resource: "parameter",
         resourceName: configParameterPrefix(config2)
@@ -1194,7 +1197,7 @@ var footer = () => {
 };
 
 // src/config.ts
-var import_path7 = require("path");
+var import_path9 = require("path");
 
 // src/util/account.ts
 var import_client_sts = require("@aws-sdk/client-sts");
@@ -1212,9 +1215,6 @@ var getCredentials = (profile) => {
   });
 };
 
-// src/config.ts
-var import_ts_import = require("ts-import");
-
 // src/schema/app.ts
 var import_zod23 = require("zod");
 
@@ -1268,17 +1268,64 @@ var AppSchema = import_zod23.z.object({
   plugins: import_zod23.z.array(PluginSchema).optional()
 });
 
+// src/util/import.ts
+var import_core3 = require("@swc/core");
+var import_path7 = require("path");
+var import_promises4 = require("fs/promises");
+var resolveFileNameExtension = async (path) => {
+  const options = [
+    "",
+    ".ts",
+    ".js",
+    "/index.ts",
+    "/index.js"
+  ];
+  for (const option of options) {
+    const file = path + option;
+    let stat;
+    try {
+      stat = await (0, import_promises4.lstat)(file);
+    } catch (error) {
+      continue;
+    }
+    if (stat.isFile()) {
+      return file;
+    }
+  }
+  throw new Error(`Failed to load file: ${path}`);
+};
+var resolveDir = (path) => {
+  return (0, import_path7.dirname)(path).replace(rootDir + "/", "");
+};
+var importFile = async (path) => {
+  const load = async (file) => {
+    let { code: code2 } = await (0, import_core3.transformFile)(file);
+    const path2 = (0, import_path7.dirname)(file);
+    const dir = resolveDir(file);
+    code2 = code2.replaceAll("__dirname", `"${dir}"`);
+    const matches = code2.match(/import\s*{\s*[a-z0-9_]+\s*}\s*from\s*('|")(\.[\/a-z0-9_]+)('|");?/ig);
+    if (!matches)
+      return code2;
+    await Promise.all(matches?.map(async (match) => {
+      const parts = /('|")(\.[\/a-z0-9_]+)('|")/ig.exec(match);
+      const from = parts[2];
+      const file2 = await resolveFileNameExtension((0, import_path7.join)(path2, from));
+      const result = await load(file2);
+      code2 = code2.replace(match, result);
+    }));
+    return code2;
+  };
+  const code = await load(path);
+  const outputFile = (0, import_path7.join)(outDir, "config.js");
+  await (0, import_promises4.writeFile)(outputFile, code);
+  return import(outputFile);
+};
+
 // src/config.ts
 var importConfig = async (options) => {
   debug("Import config file");
-  const fileName = (0, import_path7.join)(process.cwd(), options.configFile || "awsless.config.ts");
-  const module2 = await (0, import_ts_import.load)(fileName, {
-    transpileOptions: {
-      cache: {
-        dir: (0, import_path7.join)(outDir, "config")
-      }
-    }
-  });
+  const fileName = (0, import_path9.join)(process.cwd(), options.configFile || "awsless.config.ts");
+  const module2 = await importFile(fileName);
   const appConfig = typeof module2.default === "function" ? await module2.default({
     profile: options.profile,
     region: options.region,
@@ -1296,7 +1343,6 @@ var importConfig = async (options) => {
     }
   }
   const config2 = await schema2.parseAsync(appConfig);
-  debug("Final config:", config2.stacks);
   debug("Load credentials", style.info(config2.profile));
   const credentials = getCredentials(config2.profile);
   debug("Load AWS account ID");
@@ -1391,16 +1437,18 @@ var createSpinner = () => {
 };
 
 // src/cli/ui/layout/dialog.ts
+var import_wrap_ansi = __toESM(require("wrap-ansi"), 1);
 var dialog = (type, lines) => {
   const padding = 3;
   const icon = style[type](symbol[type].padEnd(padding));
-  return lines.map((line, i) => {
-    if (i === 0) {
-      return icon + line;
-    } else {
-      return " ".repeat(padding) + line;
-    }
-  }).join(br()) + br();
+  return (term) => {
+    term.out.write(lines.map((line, i) => {
+      if (i === 0) {
+        return icon + (0, import_wrap_ansi.default)(line, term.out.width(), { hard: true });
+      }
+      return (0, import_wrap_ansi.default)(" ".repeat(padding) + line, term.out.width(), { hard: true });
+    }).join(br()) + br());
+  };
 };
 var loadingDialog = (message) => {
   const [icon, stop] = createSpinner();
@@ -1730,19 +1778,19 @@ var assetBuilder = (assets) => {
 };
 
 // src/util/cleanup.ts
-var import_promises4 = require("fs/promises");
+var import_promises5 = require("fs/promises");
 var cleanUp = async () => {
   debug("Clean up assembly & asset files");
   const paths = [
     assemblyDir,
     functionDir
   ];
-  await Promise.all(paths.map((path) => (0, import_promises4.rm)(path, {
+  await Promise.all(paths.map((path) => (0, import_promises5.rm)(path, {
     recursive: true,
     force: true,
     maxRetries: 2
   })));
-  await Promise.all(paths.map((path) => (0, import_promises4.mkdir)(path, {
+  await Promise.all(paths.map((path) => (0, import_promises5.mkdir)(path, {
     recursive: true
   })));
 };

package/dist/bin.js

@@ -187,6 +187,9 @@ var toStack = ({ config: config2, assets, app, stackConfig, plugins }) => {
     ],
     resources: [
       Arn.format({
+        region: config2.region,
+        account: config2.account,
+        partition: "aws",
         service: "ssm",
         resource: "parameter",
         resourceName: configParameterPrefix(config2)
@@ -1172,7 +1175,7 @@ var footer = () => {
 };
 
 // src/config.ts
-import { join as join4 } from "path";
+import { join as join5 } from "path";
 
 // src/util/account.ts
 import { STSClient, GetCallerIdentityCommand } from "@aws-sdk/client-sts";
@@ -1190,9 +1193,6 @@ var getCredentials = (profile) => {
   });
 };
 
-// src/config.ts
-import { load } from "ts-import";
-
 // src/schema/app.ts
 import { z as z23 } from "zod";
 
@@ -1246,17 +1246,64 @@ var AppSchema = z23.object({
   plugins: z23.array(PluginSchema).optional()
 });
 
+// src/util/import.ts
+import { transformFile } from "@swc/core";
+import { dirname, join as join4 } from "path";
+import { lstat, writeFile as writeFile2 } from "fs/promises";
+var resolveFileNameExtension = async (path) => {
+  const options = [
+    "",
+    ".ts",
+    ".js",
+    "/index.ts",
+    "/index.js"
+  ];
+  for (const option of options) {
+    const file = path + option;
+    let stat;
+    try {
+      stat = await lstat(file);
+    } catch (error) {
+      continue;
+    }
+    if (stat.isFile()) {
+      return file;
+    }
+  }
+  throw new Error(`Failed to load file: ${path}`);
+};
+var resolveDir = (path) => {
+  return dirname(path).replace(rootDir + "/", "");
+};
+var importFile = async (path) => {
+  const load = async (file) => {
+    let { code: code2 } = await transformFile(file);
+    const path2 = dirname(file);
+    const dir = resolveDir(file);
+    code2 = code2.replaceAll("__dirname", `"${dir}"`);
+    const matches = code2.match(/import\s*{\s*[a-z0-9_]+\s*}\s*from\s*('|")(\.[\/a-z0-9_]+)('|");?/ig);
+    if (!matches)
+      return code2;
+    await Promise.all(matches?.map(async (match) => {
+      const parts = /('|")(\.[\/a-z0-9_]+)('|")/ig.exec(match);
+      const from = parts[2];
+      const file2 = await resolveFileNameExtension(join4(path2, from));
+      const result = await load(file2);
+      code2 = code2.replace(match, result);
+    }));
+    return code2;
+  };
+  const code = await load(path);
+  const outputFile = join4(outDir, "config.js");
+  await writeFile2(outputFile, code);
+  return import(outputFile);
+};
+
 // src/config.ts
 var importConfig = async (options) => {
   debug("Import config file");
-  const fileName = join4(process.cwd(), options.configFile || "awsless.config.ts");
-  const module = await load(fileName, {
-    transpileOptions: {
-      cache: {
-        dir: join4(outDir, "config")
-      }
-    }
-  });
+  const fileName = join5(process.cwd(), options.configFile || "awsless.config.ts");
+  const module = await importFile(fileName);
   const appConfig = typeof module.default === "function" ? await module.default({
     profile: options.profile,
     region: options.region,
@@ -1274,7 +1321,6 @@ var importConfig = async (options) => {
     }
   }
   const config2 = await schema2.parseAsync(appConfig);
-  debug("Final config:", config2.stacks);
   debug("Load credentials", style.info(config2.profile));
   const credentials = getCredentials(config2.profile);
   debug("Load AWS account ID");
@@ -1369,16 +1415,18 @@ var createSpinner = () => {
 };
 
 // src/cli/ui/layout/dialog.ts
+import wrapAnsi from "wrap-ansi";
 var dialog = (type, lines) => {
   const padding = 3;
   const icon = style[type](symbol[type].padEnd(padding));
-  return lines.map((line, i) => {
-    if (i === 0) {
-      return icon + line;
-    } else {
-      return " ".repeat(padding) + line;
-    }
-  }).join(br()) + br();
+  return (term) => {
+    term.out.write(lines.map((line, i) => {
+      if (i === 0) {
+        return icon + wrapAnsi(line, term.out.width(), { hard: true });
+      }
+      return wrapAnsi(" ".repeat(padding) + line, term.out.width(), { hard: true });
+    }).join(br()) + br());
+  };
 };
 var loadingDialog = (message) => {
   const [icon, stop] = createSpinner();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "license": "MIT",
   "type": "module",
   "repository": {
@@ -30,20 +30,15 @@
     "@aws-sdk/client-ssm": "3.329.0",
     "@aws-sdk/client-sts": "^3.369.0",
     "@aws-sdk/credential-providers": "^3.369.0",
-    "@types/react": "^18.2.15",
+    "@swc/core": "^1.3.70",
     "aws-cdk-lib": "^2.87.0",
     "aws-cron-expression-validator": "^1.0.5",
     "chalk": "^5.3.0",
     "change-case": "^4.1.2",
     "commander": "^9.4.1",
     "filesize": "^10.0.7",
-    "ink": "^4.3.0",
-    "ink-spinner": "^5.0.0",
-    "ink-table": "^3.0.0",
-    "ink-text-input": "^5.0.1",
     "jszip": "^3.10.1",
-    "react": "^18.2.0",
-    "ts-import": "5.0.0-beta.0",
+    "wrap-ansi": "^8.1.0",
     "zod": "^3.21.4",
     "@awsless/code": "^0.0.10"
   },