@awsless/awsless 0.0.362 → 0.0.364

package/dist/bin.js

@@ -13394,24 +13394,6 @@ var SharedData = class {
 };
 
 // src/app.ts
-var getFiltersWithDeps = (stacks, filters) => {
-  const list4 = [];
-  const walk = (deps) => {
-    deps.forEach((dep) => {
-      const stack = stacks.find((stack2) => stack2.name === dep);
-      if (stack) {
-        if (!list4.includes(dep)) {
-          list4.push(dep);
-          if (stack.depends) {
-            walk(stack.depends);
-          }
-        }
-      }
-    });
-  };
-  walk(filters);
-  return list4;
-};
 var assertDepsExists = (stack, stacks) => {
   for (const dep of stack.depends ?? []) {
     const found = stacks.find((i) => i.name === dep);
@@ -13420,7 +13402,7 @@ var assertDepsExists = (stack, stacks) => {
     }
   }
 };
-var createApp = (props, filters = []) => {
+var createApp = (props) => {
   const app = new App2(props.appConfig.name);
   const base2 = new Stack(app, "base");
   const shared = new SharedData();
@@ -13467,11 +13449,13 @@ var createApp = (props, filters = []) => {
       registerPolicy(policy) {
         globalPolicies.push(policy);
       },
-      registerTest(name, paths) {
-        tests.push({ name, paths });
-      },
       registerBuild(type, name, builder) {
-        builders.push({ type, name, builder });
+        builders.push({
+          stackName: base2.name,
+          type,
+          name,
+          builder
+        });
       },
       registerCommand(command) {
         commands7.push(command);
@@ -13496,12 +13480,7 @@ var createApp = (props, filters = []) => {
       }
     });
   }
-  let filterdStacks = props.stackConfigs;
-  if (filters.length > 0) {
-    const filtersWithDeps = getFiltersWithDeps(filterdStacks, filters);
-    filterdStacks = filterdStacks.filter((stack) => filtersWithDeps.includes(stack.name));
-  }
-  for (const stackConfig of filterdStacks) {
+  for (const stackConfig of props.stackConfigs) {
     const stack = new Stack(app, stackConfig.name);
     const localPolicyListeners = [];
     const localPolicies = [];
@@ -13536,10 +13515,19 @@ var createApp = (props, filters = []) => {
           localPolicies.push(policy);
         },
         registerTest(name, paths) {
-          tests.push({ name, paths });
+          tests.push({
+            stackName: stack.name,
+            name,
+            paths
+          });
         },
         registerBuild(type, name, builder) {
-          builders.push({ type, name, builder });
+          builders.push({
+            stackName: stack.name,
+            type,
+            name,
+            builder
+          });
         },
         registerConfig(name) {
           configs.add(name);
@@ -13591,7 +13579,7 @@ var createApp = (props, filters = []) => {
       listener(env.name, env.value);
     }
   }
-  for (const stackConfig of filterdStacks) {
+  for (const stackConfig of props.stackConfigs) {
     const policies = allLocalPolicies[stackConfig.name];
     const envListeners = allLocalEnvListeners[stackConfig.name];
     for (const dependency of stackConfig.depends ?? []) {
@@ -13628,7 +13616,7 @@ var createApp = (props, filters = []) => {
 // src/cli/ui/complex/build-assets.ts
 import { loadWorkspace } from "@awsless/ts-file-cache";
 import chalk3 from "chalk";
-var buildAssets = async (builders, showResult = false) => {
+var buildAssets = async (builders, stackFilters, showResult = false) => {
   if (builders.length === 0) {
     return;
   }
@@ -13636,6 +13624,11 @@ var buildAssets = async (builders, showResult = false) => {
   await task("Building assets", async (update) => {
     const workspace = await loadWorkspace(directories.root);
     for (const builder of builders) {
+      if (stackFilters && stackFilters.length > 0) {
+        if (!stackFilters.includes(builder.stackName)) {
+          continue;
+        }
+      }
       try {
         const result = await build(builder.type, builder.name, builder.builder, {
           workspace
@@ -13664,8 +13657,8 @@ var build2 = (program2) => {
     await layout("build", async ({ appConfig, stackConfigs }) => {
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, appConfig.region);
-      const { builders } = createApp({ appConfig, stackConfigs, accountId }, filters);
-      await buildAssets(builders, true);
+      const { builders } = createApp({ appConfig, stackConfigs, accountId });
+      await buildAssets(builders, filters, true);
       return "Build was successful.";
     });
   });
@@ -13820,8 +13813,8 @@ var del2 = (program2) => {
       const region = appConfig.region;
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
-      const { app } = createApp({ appConfig, stackConfigs, accountId }, filters);
-      const stackNames = [...app.stacks].map((stack) => stack.name);
+      const { app } = createApp({ appConfig, stackConfigs, accountId });
+      const stackNames = app.stacks.filter((stack) => filters.includes(stack.name)).map((s) => s.name);
       const formattedFilter = stackNames.map((i) => color.info(i)).join(color.dim(", "));
       debug("Stacks to delete", formattedFilter);
       if (!process.env.SKIP_PROMPT) {
@@ -13842,7 +13835,9 @@ var del2 = (program2) => {
         region
       });
       await task("Deleting the stacks to AWS", async (update) => {
-        await workspace.deleteApp(app);
+        await workspace.deleteApp(app, {
+          filters
+        });
         await pullRemoteState(app, stateProvider);
         update("Done deleting the stacks to AWS.");
       });
@@ -14166,10 +14161,15 @@ var runTest = async (stack, dir, filters) => {
   );
   return result.errors.length === 0;
 };
-var runTests = async (tests, filters = []) => {
+var runTests = async (tests, stackFilters = [], testFilters = []) => {
   for (const test2 of tests) {
+    if (stackFilters && stackFilters.length > 0) {
+      if (!stackFilters.includes(test2.stackName)) {
+        continue;
+      }
+    }
     for (const path of test2.paths) {
-      const result = await runTest(test2.name, path, filters);
+      const result = await runTest(test2.name, path, testFilters);
       if (!result) {
         return false;
       }
@@ -14186,8 +14186,8 @@ var deploy = (program2) => {
       const credentials = getCredentials(appConfig.profile);
       const accountId = await getAccountId(credentials, region);
       await bootstrapAwsless({ credentials, region, accountId });
-      const { app, tests, builders } = createApp({ appConfig, stackConfigs, accountId }, filters);
-      const stackNames = [...app.stacks].map((stack) => stack.name);
+      const { app, tests, builders } = createApp({ appConfig, stackConfigs, accountId });
+      const stackNames = app.stacks.filter((stack) => filters.includes(stack.name)).map((s) => s.name);
       const formattedFilter = stackNames.map((i) => color.info(i)).join(color.dim(", "));
       debug("Stacks to deploy", formattedFilter);
       if (!process.env.SKIP_PROMPT) {
@@ -14200,18 +14200,20 @@ var deploy = (program2) => {
           throw new Cancelled();
         }
       }
-      const passed = await runTests(tests);
+      const passed = await runTests(tests, filters);
       if (!passed) {
         throw new Cancelled();
       }
-      await buildAssets(builders);
+      await buildAssets(builders, filters);
       const { workspace, stateProvider } = createWorkSpace({
         credentials,
         accountId,
         region
       });
       await task("Deploying the stacks to AWS", async (update) => {
-        await workspace.deployApp(app);
+        await workspace.deployApp(app, {
+          filters
+        });
         await pullRemoteState(app, stateProvider);
         update("Done deploying the stacks to AWS.");
       });
@@ -14645,11 +14647,11 @@ var test = (program2) => {
       const region = props.appConfig.region;
       const credentials = getCredentials(props.appConfig.profile);
       const accountId = await getAccountId(credentials, region);
-      const { tests } = createApp({ ...props, accountId }, stacks);
+      const { tests } = createApp({ ...props, accountId });
       if (tests.length === 0) {
         return "No tests found.";
       }
-      await runTests(tests, options?.filters);
+      await runTests(tests, stacks, options?.filters);
       return "All tests finished.";
     });
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.362",
+  "version": "0.0.364",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -29,15 +29,15 @@
   },
   "peerDependencies": {
     "@awsless/iot": "^0.0.2",
-    "@awsless/open-search": "^0.0.15",
+    "@awsless/s3": "^0.0.18",
     "@awsless/lambda": "^0.0.26",
+    "@awsless/redis": "^0.0.12",
+    "@awsless/open-search": "^0.0.15",
     "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
-    "@awsless/validate": "^0.0.15",
     "@awsless/ssm": "^0.0.7",
-    "@awsless/s3": "^0.0.18",
-    "@awsless/weak-cache": "^0.0.1",
-    "@awsless/redis": "^0.0.12"
+    "@awsless/validate": "^0.0.15",
+    "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
     "@arcanyx/cidr-slicer": "^0.3.0",
@@ -109,11 +109,11 @@
     "zod-to-json-schema": "^3.22.3",
     "@awsless/code": "^0.0.10",
     "@awsless/duration": "^0.0.1",
-    "@awsless/size": "^0.0.1",
     "@awsless/graphql": "^0.0.9",
+    "@awsless/size": "^0.0.1",
     "@awsless/ts-file-cache": "^0.0.10",
     "@awsless/validate": "^0.0.15",
-    "@awsless/formation": "^0.0.55"
+    "@awsless/formation": "^0.0.56"
   },
   "scripts": {
     "test": "pnpm code test",