@awsless/awsless 0.0.602 → 0.0.604

package/dist/bin.js

@@ -185,8 +185,8 @@ import promiseLimit from "p-limit";
 import { z } from "zod";
 import "@aws-sdk/signature-v4-crt";
 var ImportKeys = createCustomResourceClass("cloudfront-kvs", "import-keys");
-var createCloudFrontKvsProvider = ({ profile, region }) => {
-  const client = new CloudFrontKeyValueStoreClient({ profile, region });
+var createCloudFrontKvsProvider = ({ credentials, region }) => {
+  const client = new CloudFrontKeyValueStoreClient({ credentials, region });
   const queues = {};
   const getConcurrencyQueue = (arn) => {
     if (!queues[arn]) {
@@ -340,8 +340,8 @@ var Invalidation = createCustomResourceClass2(
   "cloudfront",
   "invalidation"
 );
-var createCloudFrontProvider = ({ profile, region }) => {
-  const cloudFront = new CloudFrontClient({ profile, region });
+var createCloudFrontProvider = ({ credentials, region }) => {
+  const cloudFront = new CloudFrontClient({ credentials, region });
   return createCustomProvider2("cloudfront", {
     invalidation: {
       async updateResource(props) {
@@ -413,8 +413,8 @@ import { createCustomProvider as createCustomProvider4, createCustomResourceClas
 import { resolveNs } from "node:dns/promises";
 import { z as z4 } from "zod";
 var NsCheck = createCustomResourceClass4("nameservers", "check");
-var createNameServersProvider = ({ profile, region }) => {
-  const client = new Route53Client({ profile, region });
+var createNameServersProvider = ({ credentials, region }) => {
+  const client = new Route53Client({ credentials, region });
   return createCustomProvider4("nameservers", {
     check: {
       async createResource(props) {
@@ -532,8 +532,8 @@ var findRootDir = async (path, configFiles, level = 5) => {
 };
 var fileExist = async (file) => {
   try {
-    const stat5 = await lstat(file);
-    if (stat5.isFile()) {
+    const stat4 = await lstat(file);
+    if (stat4.isFile()) {
       return true;
     }
   } catch (error) {
@@ -561,6 +561,7 @@ var createWorkSpace = async (props) => {
     enableDebug();
   }
   await aws.install();
+  const cred = await props.credentials();
   const workspace = new WorkSpace({
     providers: [
       createLambdaProvider(props),
@@ -569,7 +570,10 @@ var createWorkSpace = async (props) => {
       createNameServersProvider(props),
       aws(
         {
-          profile: props.profile,
+          accessKey: cred.accessKeyId,
+          secretKey: cred.secretAccessKey,
+          // token: cred.sessionToken,
+          // profile: props.profile,
           region: props.region,
           maxRetries: 5
         }
@@ -579,7 +583,10 @@ var createWorkSpace = async (props) => {
       ),
       aws(
         {
-          profile: props.profile,
+          accessKey: cred.accessKeyId,
+          secretKey: cred.secretAccessKey,
+          // token: cred.sessionToken,
+          // profile: props.profile,
           region: "us-east-1",
           maxRetries: 5
         },
@@ -2144,8 +2151,8 @@ var stats = {
 };
 var WhereSchema = z40.union([
   z40.string().regex(/(count|avg|sum|min|max) (>|>=|<|<=) (\d)/, "Invalid where query").transform((where) => {
-    const [stat5, op, value] = where.split(" ");
-    return { stat: stat5, op, value: parseFloat(value) };
+    const [stat4, op, value] = where.split(" ");
+    return { stat: stat4, op, value: parseFloat(value) };
   }),
   z40.object({
     stat: z40.enum(["count", "avg", "sum", "min", "max"]),
@@ -3204,14 +3211,14 @@ var createHashFromFile = (file) => {
 var listAllFiles = async (list3) => {
   const files = [];
   for (const entry of list3) {
-    const stat5 = await lstat2(entry);
-    if (stat5.isDirectory()) {
+    const stat4 = await lstat2(entry);
+    if (stat4.isDirectory()) {
       const dirents = await readdir(entry, {
         recursive: true,
         withFileTypes: true
       });
       files.push(...dirents.filter((d) => d.isFile()).map((file) => join7(file.path, file.name)));
-    } else if (stat5.isFile()) {
+    } else if (stat4.isFile()) {
       files.push(entry);
     }
   }
@@ -7697,15 +7704,14 @@ var playErrorSound = () => {
 // src/cli/ui/app.ts
 import { log as log3 } from "@awsless/clui";
 var logApp = (app, opt) => {
-  const data = {
+  log3.list("App Config", {
     App: app.name,
     Region: app.region,
-    Profile: app.profile
-  };
-  if (opt.stage) {
-    data.Stage = color.warning(opt.stage);
-  }
-  log3.list("App Config", data);
+    Profile: app.profile,
+    ...opt.stage ? {
+      Stage: color.warning(opt.stage)
+    } : {}
+  });
 };
 
 // src/cli/ui/error/error.ts
@@ -7751,12 +7757,12 @@ var formatOperation = (operation) => {
     case "import":
       return color.success.bold.inverse(value);
     case "update":
+    case "replace":
       return color.warning.bold.inverse(value);
     case "delete":
       return color.error.bold.inverse(value);
-    case "heal":
-      return color.warning.bold.inverse(value);
     case "get":
+    case "resolve":
       return color.info.bold.inverse(value);
   }
   return color.primary.bold.inverse(value);
@@ -8413,7 +8419,6 @@ var set = (program2) => {
       const { workspace } = await createWorkSpace({
         credentials,
         accountId,
-        profile,
         region
       });
       const params = new SsmStore({
@@ -8631,7 +8636,6 @@ var del2 = (program2) => {
       const { workspace, state: state2 } = await createWorkSpace({
         credentials,
         accountId,
-        profile,
         region
       });
       await task("Deleting the stacks to AWS", async (update2) => {
@@ -8653,80 +8657,17 @@ import wildstring4 from "wildstring";
 
 // src/cli/ui/complex/run-tests.ts
 import { log as log16 } from "@awsless/clui";
-import { mkdir as mkdir4, readFile as readFile6, writeFile as writeFile3 } from "fs/promises";
-import { join as join19 } from "path";
+import { mkdir as mkdir4, readFile as readFile5, writeFile as writeFile3 } from "fs/promises";
+import { join as join18 } from "path";
 import wildstring3 from "wildstring";
-
-// src/build/__fingerprint.ts
-import { createHash as createHash6 } from "crypto";
-import { readdir as readdir4, readFile as readFile5, stat as stat4 } from "fs/promises";
-import { basename as basename4, dirname as dirname9, extname as extname4, join as join17 } from "path";
-import parseStaticImports from "parse-static-imports";
-var extensions = ["js", "mjs", "jsx", "ts", "mts", "tsx"];
-var generateFileHashes = async (file, hashes) => {
-  if (hashes.has(file)) {
-    return;
-  }
-  const code = await readModuleFile(file);
-  const deps = await findDependencies(file, code);
-  const hash = createHash6("sha1").update(code).digest();
-  hashes.set(file, hash);
-  for (const dep of deps) {
-    if (dep.startsWith("/")) {
-      await generateFileHashes(dep, hashes);
-    }
-  }
-};
-var fingerprintFromDirectory = async (dir) => {
-  const hashes = /* @__PURE__ */ new Map();
-  const files = await readdir4(dir, { recursive: true });
-  for (const file of files) {
-    if (extensions.includes(extname4(file).substring(1)) && file.at(0) !== "_") {
-      await generateFileHashes(join17(dir, file), hashes);
-    }
-  }
-  const merge = Buffer.concat(Array.from(hashes.values()).sort());
-  return createHash6("sha1").update(merge).digest("hex");
-};
-var readModuleFile = (file) => {
-  if (file.endsWith(".js")) {
-    return readFiles([file, file.substring(0, file.length - 3) + ".ts"]);
-  }
-  if (!basename4(file).includes(".")) {
-    return readFiles([
-      file,
-      ...extensions.map((exp) => `${file}.${exp}`),
-      ...extensions.map((exp) => join17(file, `/index.${exp}`))
-    ]);
-  }
-  return readFile5(file, "utf8");
-};
-var readFiles = async (files) => {
-  for (const file of files) {
-    try {
-      const s = await stat4(file);
-      if (s.isFile()) {
-        return readFile5(file, "utf8");
-      }
-    } catch (_) {
-      continue;
-    }
-  }
-  throw new Error(`No such file: ${files.join(", ")}`);
-};
-var findDependencies = async (file, code) => {
-  const imports = await parseStaticImports(code);
-  return imports.map((entry) => entry.moduleName).filter(Boolean).map((value) => value?.startsWith(".") ? join17(dirname9(file), value) : value);
-};
-
-// src/cli/ui/complex/run-tests.ts
 import { parse as parse4, stringify } from "@awsless/json";
+import { generateFolderHash, loadWorkspace as loadWorkspace2 } from "@awsless/ts-file-cache";
 
 // src/test/start.ts
 import commonjs from "@rollup/plugin-commonjs";
 import json from "@rollup/plugin-json";
 import nodeResolve from "@rollup/plugin-node-resolve";
-import { dirname as dirname10, join as join18 } from "path";
+import { dirname as dirname9, join as join17 } from "path";
 import { swc } from "rollup-plugin-swc3";
 import { fileURLToPath as fileURLToPath4 } from "url";
 import { configDefaults } from "vitest/config";
@@ -8734,7 +8675,7 @@ import { startVitest } from "vitest/node";
 var NullReporter = class {
 };
 var startTest = async (props) => {
-  const __dirname4 = dirname10(fileURLToPath4(import.meta.url));
+  const __dirname4 = dirname9(fileURLToPath4(import.meta.url));
   const startTime = process.hrtime.bigint();
   process.noDeprecation = true;
   const vitest = await startVitest(
@@ -8757,7 +8698,7 @@ var startTest = async (props) => {
       // },
       setupFiles: [
         //
-        join18(__dirname4, "test-global-setup.js")
+        join17(__dirname4, "test-global-setup.js")
       ]
       // globalSetup: [
       // 	//
@@ -8948,14 +8889,14 @@ var logTestErrors = (event) => {
     }
   }
 };
-var runTest = async (stack, dir, filters, opts) => {
+var runTest = async (stack, dir, filters, workspace, opts) => {
   await mkdir4(directories.test, { recursive: true });
-  const file = join19(directories.test, `${stack}.json`);
-  const fingerprint = await fingerprintFromDirectory(dir);
+  const file = join18(directories.test, `${stack}.json`);
+  const fingerprint = await generateFolderHash(workspace, dir);
   if (!process.env.NO_CACHE) {
     const exists = await fileExist(file);
     if (exists) {
-      const raw = await readFile6(file, { encoding: "utf8" });
+      const raw = await readFile5(file, { encoding: "utf8" });
       const data = parse4(raw);
       if (data.fingerprint === fingerprint) {
         log16.step(
@@ -9008,6 +8949,7 @@ var runTest = async (stack, dir, filters, opts) => {
   return result.errors.length === 0 && result.failed === 0;
 };
 var runTests = async (tests, stackFilters = [], testFilters = [], opts) => {
+  const workspace = await loadWorkspace2(directories.root);
   for (const test2 of tests) {
     if (stackFilters && stackFilters.length > 0) {
       const found = stackFilters.find((f) => wildstring3.match(f, test2.stackName));
@@ -9016,7 +8958,7 @@ var runTests = async (tests, stackFilters = [], testFilters = [], opts) => {
       }
     }
     for (const path of test2.paths) {
-      const result = await runTest(test2.name, path, testFilters, opts);
+      const result = await runTest(test2.name, path, testFilters, workspace, opts);
       if (!result) {
         return false;
       }
@@ -9095,7 +9037,6 @@ var deploy = (program2) => {
       const { workspace, state: state2 } = await createWorkSpace({
         credentials,
         accountId,
-        profile,
         region
       });
       await log18.task({
@@ -9151,7 +9092,6 @@ var create = (program2) => {
           const { workspace } = await createWorkSpace({
             credentials,
             accountId,
-            profile,
             region
           });
           await workspace.hydrate(app);
@@ -9292,7 +9232,6 @@ var update = (program2) => {
           const { workspace } = await createWorkSpace({
             credentials,
             accountId,
-            profile,
             region
           });
           await workspace.hydrate(app);
@@ -9469,7 +9408,6 @@ var del3 = (program2) => {
           const { workspace } = await createWorkSpace({
             credentials,
             accountId,
-            profile,
             region
           });
           await workspace.hydrate(app);
@@ -9553,7 +9491,6 @@ var bind = (program2) => {
       const { workspace } = await createWorkSpace({
         credentials,
         accountId,
-        profile,
         region
       });
       await workspace.hydrate(app);
@@ -9635,7 +9572,7 @@ import { log as log23 } from "@awsless/clui";
 
 // src/type-gen/generate.ts
 import { mkdir as mkdir5, writeFile as writeFile4 } from "fs/promises";
-import { dirname as dirname11, join as join20, relative as relative7 } from "path";
+import { dirname as dirname10, join as join19, relative as relative7 } from "path";
 var generateTypes = async (props) => {
   const files = [];
   await Promise.all(
@@ -9644,12 +9581,12 @@ var generateTypes = async (props) => {
         ...props,
         async write(file, data, include = false) {
           const code = data?.toString("utf8");
-          const path = join20(directories.types, file);
+          const path = join19(directories.types, file);
           if (code) {
             if (include) {
               files.push(relative7(directories.root, path));
             }
-            await mkdir5(dirname11(path), { recursive: true });
+            await mkdir5(dirname10(path), { recursive: true });
             await writeFile4(path, code);
           }
         }
@@ -9658,7 +9595,7 @@ var generateTypes = async (props) => {
   );
   if (files.length) {
     const code = files.map((file) => `/// <reference path='${file}' />`).join("\n");
-    await writeFile4(join20(directories.root, `awsless.d.ts`), code);
+    await writeFile4(join19(directories.root, `awsless.d.ts`), code);
   }
 };
 
@@ -9682,7 +9619,9 @@ var dev = (program2) => {
           logError(error);
         }
       );
-      await new Promise(() => {
+      await new Promise((resolve) => {
+        process.once("exit", resolve);
+        process.once("SIGINT", resolve);
       });
     });
   });
@@ -9704,7 +9643,6 @@ var resources = (program2) => {
       const { workspace } = await createWorkSpace({
         credentials,
         accountId,
-        profile,
         region
       });
       const stacks = await workspace.status(app);
@@ -9819,7 +9757,7 @@ var pull = (program2) => {
       const credentials = await getCredentials(profile);
       const accountId = await getAccountId(credentials, region);
       const { app } = createApp({ appConfig, stackConfigs, accountId });
-      const { state: state2 } = await createWorkSpace({ credentials, region, accountId, profile });
+      const { state: state2 } = await createWorkSpace({ credentials, region, accountId });
       await pullRemoteState(app, state2);
       return "State pull was successful.";
     });
@@ -9836,7 +9774,7 @@ var push = (program2) => {
       const credentials = await getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
       const { app } = createApp({ appConfig, stackConfigs, accountId });
-      const { state: state2 } = await createWorkSpace({ credentials, region, accountId, profile });
+      const { state: state2 } = await createWorkSpace({ credentials, region, accountId });
       const ok = await prompt12.confirm({
         message: "Pushing up the local state might corrupt your remote state. Are you sure?",
         initialValue: false
@@ -9860,7 +9798,7 @@ var unlock = (program2) => {
       const credentials = await getCredentials(profile);
       const accountId = await getAccountId(credentials, region);
       const { app } = createApp({ appConfig, stackConfigs, accountId });
-      const { lock } = await createWorkSpace({ credentials, region, accountId, profile });
+      const { lock } = await createWorkSpace({ credentials, region, accountId });
       const isLocked = await lock.locked(app.urn);
       if (!isLocked) {
         return "No lock is exists.";
@@ -9932,7 +9870,6 @@ var list2 = (program2) => {
       const { workspace } = await createWorkSpace({
         credentials,
         accountId,
-        profile,
         region
       });
       await workspace.hydrate(app);
@@ -9969,7 +9906,6 @@ var deploy2 = (program2) => {
       const { workspace } = await createWorkSpace({
         credentials,
         accountId,
-        profile,
         region
       });
       await log26.task({
@@ -10025,7 +9961,6 @@ var logs = (program2) => {
       const { workspace } = await createWorkSpace({
         credentials,
         accountId,
-        profile,
         region
       });
       await workspace.hydrate(app);
@@ -10043,12 +9978,12 @@ var logs = (program2) => {
         credentials,
         region
       });
-      const abort = new AbortController();
+      const controller = new AbortController();
       process.once("exit", () => {
-        abort.abort();
+        controller.abort();
       });
       process.once("SIGINT", () => {
-        abort.abort();
+        controller.abort();
       });
       const streams = await log27.task({
         initialMessage: "Connecting to the log stream...",
@@ -10060,7 +9995,7 @@ var logs = (program2) => {
                 logGroupIdentifiers: arns
               });
               const response = await client.send(command, {
-                abortSignal: abort.signal
+                abortSignal: controller.signal
               });
               if (!response.responseStream) {
                 throw new Error("Failed to connect to the log stream.");
@@ -10200,7 +10135,6 @@ var clearCache = (program2) => {
       const { workspace } = await createWorkSpace({
         credentials,
         accountId,
-        profile,
         region
       });
       await workspace.hydrate(app);
@@ -10334,7 +10268,6 @@ var clearCache2 = (program2) => {
       const { workspace } = await createWorkSpace({
         credentials,
         accountId,
-        profile,
         region
       });
       await workspace.hydrate(app);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.602",
+  "version": "0.0.604",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -36,20 +36,20 @@
     "@awsless/big-float": "^0.1.5",
     "@awsless/cloudwatch": "^0.0.1",
     "@awsless/duration": "^0.0.4",
-    "@awsless/clui": "^0.0.8",
-    "@awsless/json": "^0.0.10",
     "@awsless/dynamodb": "^0.3.8",
+    "@awsless/json": "^0.0.10",
     "@awsless/iot": "^0.0.3",
     "@awsless/lambda": "^0.0.35",
     "@awsless/mqtt": "^0.0.2",
-    "@awsless/s3": "^0.0.21",
     "@awsless/open-search": "^0.0.21",
-    "@awsless/redis": "^0.0.14",
-    "@awsless/sqs": "^0.0.16",
+    "@awsless/s3": "^0.0.21",
     "@awsless/sns": "^0.0.10",
+    "@awsless/sqs": "^0.0.16",
     "@awsless/validate": "^0.1.3",
     "@awsless/ssm": "^0.0.7",
-    "@awsless/weak-cache": "^0.0.1"
+    "@awsless/clui": "^0.0.8",
+    "@awsless/weak-cache": "^0.0.1",
+    "@awsless/redis": "^0.0.14"
   },
   "dependencies": {
     "@arcanyx/cidr-slicer": "^0.3.0",
@@ -142,13 +142,13 @@
     "@awsless/big-float": "^0.1.5",
     "@awsless/cloudwatch": "^0.0.1",
     "@awsless/clui": "^0.0.8",
-    "@awsless/duration": "^0.0.4",
-    "@awsless/graphql": "^0.0.9",
     "@awsless/json": "^0.0.10",
+    "@awsless/scheduler": "^0.0.4",
     "@awsless/size": "^0.0.2",
-    "@awsless/validate": "^0.1.3",
     "@awsless/ts-file-cache": "^0.0.12",
-    "@awsless/scheduler": "^0.0.4"
+    "@awsless/validate": "^0.1.3",
+    "@awsless/duration": "^0.0.4",
+    "@awsless/graphql": "^0.0.9"
   },
   "devDependencies": {
     "@hono/node-server": "1.19.9",