@awsless/awsless 0.0.590 → 0.0.592

package/dist/bin.js

@@ -3072,7 +3072,7 @@ import { aws as aws5 } from "@terraforge/aws";
 // src/feature/function/util.ts
 import { generateFileHash } from "@awsless/ts-file-cache";
 import { aws as aws4 } from "@terraforge/aws";
-import { Future, Group as Group3, resolveInputs } from "@terraforge/core";
+import { findInputDeps, Group as Group3, Output as Output4, resolveInputs } from "@terraforge/core";
 import deepmerge from "deepmerge";
 import { basename as basename3 } from "path";
 
@@ -3114,13 +3114,11 @@ var build = (type, name, builder, props) => {
     const cacheFile = getBuildPath(type, name, "cache.json");
     const cache = await readCache(cacheFile);
     if (cache && cache.version === version && !process.env.NO_CACHE) {
-      console.log("RETURN CACHE");
       return {
         ...cache.data,
         cached: true
       };
     }
-    console.log("UN CACHE");
     const time = createTimer();
     const meta = await callback(async (file, data2) => {
       const path = getBuildPath(type, name, file);
@@ -3478,8 +3476,12 @@ var createLambdaFunction = (parentGroup, ctx, ns, id, local) => {
     })
   });
   const statements = [];
+  const statementDeps = /* @__PURE__ */ new Set();
   const addPermission = (...permissions) => {
     statements.push(...permissions);
+    for (const dep of findInputDeps(permissions)) {
+      statementDeps.add(dep);
+    }
   };
   ctx.onPermission((statement) => {
     addPermission(statement);
@@ -3487,7 +3489,7 @@ var createLambdaFunction = (parentGroup, ctx, ns, id, local) => {
   const policy = new aws4.iam.RolePolicy(group, "policy", {
     role: role.name,
     name: "lambda-policy",
-    policy: new Future(async (resolve) => {
+    policy: new Output4(statementDeps, async (resolve) => {
       const list3 = await resolveInputs(statements);
       resolve(
         JSON.stringify({
@@ -4574,7 +4576,7 @@ import { fileURLToPath } from "node:url";
 import { days as days6, seconds as seconds6, toDays as toDays5, toSeconds as toSeconds5 } from "@awsless/duration";
 import { mebibytes as mebibytes2, toMebibytes as toMebibytes3 } from "@awsless/size";
 import { aws as aws13 } from "@terraforge/aws";
-import { Future as Future2, resolveInputs as resolveInputs2 } from "@terraforge/core";
+import { Output as Output5, findInputDeps as findInputDeps2, resolveInputs as resolveInputs2 } from "@terraforge/core";
 import { pascalCase as pascalCase2 } from "change-case";
 var createPrebuildLambdaFunction = (group, ctx, ns, id, props) => {
   let name;
@@ -4629,8 +4631,12 @@ var createPrebuildLambdaFunction = (group, ctx, ns, id, props) => {
     })
   });
   const statements = [];
+  const statementDeps = /* @__PURE__ */ new Set();
   const addPermission = (...permissions) => {
     statements.push(...permissions);
+    for (const dep of findInputDeps2(permissions)) {
+      statementDeps.add(dep);
+    }
   };
   ctx.onPermission((statement) => {
     addPermission(statement);
@@ -4638,7 +4644,7 @@ var createPrebuildLambdaFunction = (group, ctx, ns, id, props) => {
   const policy = new aws13.iam.RolePolicy(group, "policy", {
     role: role.name,
     name: "lambda-policy",
-    policy: new Future2(async (resolve) => {
+    policy: new Output5(statementDeps, async (resolve) => {
       const list3 = await resolveInputs2(statements);
       resolve(
         JSON.stringify({
@@ -6504,7 +6510,7 @@ import { toDays as toDays8, toSeconds as toSeconds8 } from "@awsless/duration";
 import { toMebibytes as toMebibytes4 } from "@awsless/size";
 import { generateFileHash as generateFileHash2 } from "@awsless/ts-file-cache";
 import { aws as aws26 } from "@terraforge/aws";
-import { Future as Future3, Group as Group25, resolveInputs as resolveInputs3 } from "@terraforge/core";
+import { Group as Group25, Output as Output7, findInputDeps as findInputDeps3, resolveInputs as resolveInputs3 } from "@terraforge/core";
 import { constantCase as constantCase11, pascalCase as pascalCase3 } from "change-case";
 import deepmerge4 from "deepmerge";
 import { join as join16 } from "path";
@@ -6635,10 +6641,11 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
     }
   );
   const statements = [];
+  const statementDeps = /* @__PURE__ */ new Set();
   const policy = new aws26.iam.RolePolicy(group, "policy", {
     role: role.name,
     name: "task-policy",
-    policy: new Future3(async (resolve) => {
+    policy: new Output7(statementDeps, async (resolve) => {
       const list3 = await resolveInputs3(statements);
       resolve(
         JSON.stringify({
@@ -6652,8 +6659,14 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
       );
     })
   });
+  const addPermission = (...permissions) => {
+    statements.push(...permissions);
+    for (const dep of findInputDeps3(permissions)) {
+      statementDeps.add(dep);
+    }
+  };
   ctx.onPermission((statement) => {
-    statements.push(statement);
+    addPermission(statement);
   });
   let logGroup;
   if (props.log.retention && props.log.retention.value > 0n) {
@@ -6679,6 +6692,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
     STACK: ctx.stackConfig.name
   };
   const variables = {};
+  const variableDeps = /* @__PURE__ */ new Set();
   const task2 = new aws26.ecs.TaskDefinition(
     group,
     "task",
@@ -6695,7 +6709,7 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
         operatingSystemFamily: "LINUX"
       },
       trackLatest: true,
-      containerDefinitions: new Future3(async (resolve) => {
+      containerDefinitions: new Output7(variableDeps, async (resolve) => {
         const data = await resolveInputs3(variables);
         const { s3Bucket, s3Key } = await resolveInputs3({
           s3Bucket: code.bucket,
@@ -6840,6 +6854,9 @@ var createFargateTask = (parentGroup, ctx, ns, id, local) => {
   );
   ctx.onEnv((name2, value) => {
     variables[name2] = value;
+    for (const dep of findInputDeps3([value])) {
+      variableDeps.add(dep);
+    }
   });
   variables.APP = ctx.appConfig.name;
   variables.APP_ID = ctx.appId;
@@ -7025,7 +7042,7 @@ var metricFeature = defineFeature({
 
 // src/feature/router/index.ts
 import { days as days7, seconds as seconds9, toSeconds as toSeconds10, years } from "@awsless/duration";
-import { Future as Future4, Group as Group28 } from "@terraforge/core";
+import { Future, Group as Group28 } from "@terraforge/core";
 import { aws as aws29 } from "@terraforge/aws";
 import { camelCase as camelCase7, constantCase as constantCase13 } from "change-case";
 
@@ -7580,7 +7597,7 @@ var routerFeature = defineFeature({
             {
               distributionId: distribution.id,
               paths,
-              version: new Future4((resolve) => {
+              version: new Future((resolve) => {
                 $combine(...versions).then((versions2) => {
                   const combined = versions2.filter((v) => !!v).sort().join(",");
                   const version = createHash5("sha1").update(combined).digest("hex");
@@ -8284,7 +8301,7 @@ var createApp = (props) => {
 };
 
 // src/cli/ui/complex/build-assets.ts
-import { color as color2, log as log10 } from "@awsless/clui";
+import { log as log10 } from "@awsless/clui";
 import { loadWorkspace } from "@awsless/ts-file-cache";
 import { capitalCase as capitalCase3 } from "change-case";
 import wildstring from "wildstring";
@@ -8303,14 +8320,16 @@ var buildAssets = async (builders, stackFilters, showResult = false) => {
   }
   const results = [];
   await log10.task({
-    initialMessage: `Building (1/${filteredBuilders.length}) assets...`,
+    initialMessage: `Building assets...`,
     successMessage: "Done building assets.",
     errorMessage: "Failed building assets.",
     async task(ctx) {
       const workspace = await loadWorkspace(directories.root);
       let i = 0;
       for (const builder of filteredBuilders) {
-        ctx.updateMessage(`Building (${++i}/${filteredBuilders.length}) assets...`);
+        ctx.updateMessage(
+          `Building (${++i}/${filteredBuilders.length}) ${color.info(builder.name)} ${builder.type}...`
+        );
         try {
           const result = await build(builder.type, builder.name, builder.builder, {
             workspace
@@ -8329,7 +8348,7 @@ var buildAssets = async (builders, stackFilters, showResult = false) => {
   if (showResult) {
     log10.table({
       head: ["Type", "Resource", ...Object.keys(results.at(0)?.result ?? {})].map((v) => capitalCase3(v)),
-      body: results.map((r) => [color2.magenta(r.type), r.name, ...Object.values(r.result ?? {})])
+      body: results.map((r) => [color.info(r.type), r.name, ...Object.values(r.result ?? {})])
     });
   }
 };

package/dist/prebuild.js

@@ -6,7 +6,7 @@ import { join as join2 } from "path";
 import { days, seconds, toDays, toSeconds } from "@awsless/duration";
 import { mebibytes, toMebibytes } from "@awsless/size";
 import { aws } from "@terraforge/aws";
-import { Future, resolveInputs } from "@terraforge/core";
+import { Output, findInputDeps, resolveInputs } from "@terraforge/core";
 import { pascalCase } from "change-case";
 import { writeFile } from "fs/promises";
 import { join } from "path";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.590",
+  "version": "0.0.592",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -35,21 +35,21 @@
   "peerDependencies": {
     "@awsless/cloudwatch": "^0.0.1",
     "@awsless/big-float": "^0.1.5",
+    "@awsless/clui": "^0.0.8",
     "@awsless/duration": "^0.0.4",
     "@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/json": "^0.0.10",
-    "@awsless/clui": "^0.0.8",
     "@awsless/open-search": "^0.0.21",
+    "@awsless/lambda": "^0.0.35",
     "@awsless/s3": "^0.0.21",
-    "@awsless/sns": "^0.0.10",
     "@awsless/redis": "^0.0.14",
-    "@awsless/validate": "^0.1.3",
     "@awsless/sqs": "^0.0.16",
-    "@awsless/ssm": "^0.0.7",
-    "@awsless/weak-cache": "^0.0.1"
+    "@awsless/sns": "^0.0.10",
+    "@awsless/validate": "^0.1.3",
+    "@awsless/weak-cache": "^0.0.1",
+    "@awsless/ssm": "^0.0.7"
   },
   "dependencies": {
     "@arcanyx/cidr-slicer": "^0.3.0",
@@ -140,14 +140,14 @@
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
     "@awsless/big-float": "^0.1.5",
+    "@awsless/cloudwatch": "^0.0.1",
     "@awsless/clui": "^0.0.8",
     "@awsless/duration": "^0.0.4",
-    "@awsless/json": "^0.0.10",
     "@awsless/graphql": "^0.0.9",
+    "@awsless/json": "^0.0.10",
     "@awsless/size": "^0.0.2",
     "@awsless/scheduler": "^0.0.4",
     "@awsless/ts-file-cache": "^0.0.12",
-    "@awsless/cloudwatch": "^0.0.1",
     "@awsless/validate": "^0.1.3"
   },
   "devDependencies": {