@awsless/awsless 0.0.22 → 0.0.24

package/dist/bin.cjs

@@ -453,10 +453,15 @@ var Stack = class {
     this.name = name;
     this.region = region;
   }
+  app;
   exports = /* @__PURE__ */ new Map();
   resources = /* @__PURE__ */ new Set();
   tags = /* @__PURE__ */ new Map();
   assets = /* @__PURE__ */ new Set();
+  setApp(app) {
+    this.app = app;
+    return this;
+  }
   add(...resources) {
     for (const item of resources) {
       if (item instanceof Asset) {
@@ -530,7 +535,9 @@ var Stack = class {
     for (const [name, value] of this.exports.entries()) {
       Object.assign(outputs, {
         [formatLogicalId(name)]: {
-          Export: { Name: name },
+          Export: {
+            Name: `${this.app?.name || "default"}-${name}`
+          },
           Value: value
         }
       });
@@ -827,6 +834,7 @@ var import_rollup_plugin_swc3 = require("rollup-plugin-swc3");
 var import_plugin_json = __toESM(require("@rollup/plugin-json"), 1);
 var import_plugin_commonjs = __toESM(require("@rollup/plugin-commonjs"), 1);
 var import_plugin_node_resolve = __toESM(require("@rollup/plugin-node-resolve"), 1);
+var import_path = require("path");
 var rollupBundle = async (input) => {
   const bundle = await (0, import_rollup.rollup)({
     input,
@@ -846,7 +854,10 @@ var rollupBundle = async (input) => {
       }),
       (0, import_rollup_plugin_swc3.swc)({
         minify: true,
-        jsc: { minify: { sourceMap: true } },
+        jsc: {
+          baseUrl: (0, import_path.dirname)(input),
+          minify: { sourceMap: true }
+        },
         sourceMaps: true
       }),
       (0, import_plugin_json.default)()
@@ -3827,7 +3838,10 @@ var App = class {
   }
   list = /* @__PURE__ */ new Map();
   add(...stacks) {
-    stacks.forEach((stack) => this.list.set(stack.name, stack));
+    stacks.forEach((stack) => {
+      this.list.set(stack.name, stack);
+      stack.setApp(this);
+    });
     return this;
   }
   find(resourceType) {
@@ -4048,7 +4062,7 @@ var toApp = async (config, filters) => {
 };
 
 // src/config.ts
-var import_path4 = require("path");
+var import_path5 = require("path");
 
 // src/util/account.ts
 var import_client_sts = require("@aws-sdk/client-sts");
@@ -4135,26 +4149,26 @@ var AppSchema = import_zod23.z.object({
 var import_rollup3 = require("rollup");
 var import_rollup_plugin_swc32 = require("rollup-plugin-swc3");
 var import_rollup_plugin_replace = __toESM(require("rollup-plugin-replace"), 1);
-var import_path2 = require("path");
+var import_path3 = require("path");
 var import_promises5 = require("fs/promises");
 
 // src/util/path.ts
 var import_promises4 = require("fs/promises");
-var import_path = require("path");
+var import_path2 = require("path");
 var root = process.cwd();
 var directories = {
   root,
   get output() {
-    return (0, import_path.join)(this.root, ".awsless");
+    return (0, import_path2.join)(this.root, ".awsless");
   },
   get cache() {
-    return (0, import_path.join)(this.output, "cache");
+    return (0, import_path2.join)(this.output, "cache");
   },
   get asset() {
-    return (0, import_path.join)(this.output, "asset");
+    return (0, import_path2.join)(this.output, "asset");
   },
   get template() {
-    return (0, import_path.join)(this.output, "template");
+    return (0, import_path2.join)(this.output, "template");
   }
 };
 var setRoot = (path = root) => {
@@ -4164,12 +4178,12 @@ var findRootDir = async (path, configFile, level = 5) => {
   if (!level) {
     throw new TypeError("No awsless project found");
   }
-  const file = (0, import_path.join)(path, configFile);
+  const file = (0, import_path2.join)(path, configFile);
   const exists = await fileExist(file);
   if (exists) {
     return path;
   }
-  return findRootDir((0, import_path.normalize)((0, import_path.join)(path, "..")), configFile, level - 1);
+  return findRootDir((0, import_path2.normalize)((0, import_path2.join)(path, "..")), configFile, level - 1);
 };
 var fileExist = async (file) => {
   try {
@@ -4188,17 +4202,17 @@ var importFile = async (path) => {
     input: path,
     plugins: [
       (0, import_rollup_plugin_replace.default)({
-        __dirname: (id) => `'${(0, import_path2.dirname)(id)}'`
+        __dirname: (id) => `'${(0, import_path3.dirname)(id)}'`
       }),
       (0, import_rollup_plugin_swc32.swc)({
         minify: false,
         jsc: {
-          baseUrl: (0, import_path2.dirname)(path)
+          baseUrl: (0, import_path3.dirname)(path)
         }
       })
     ]
   });
-  const outputFile = (0, import_path2.join)(directories.cache, "config.js");
+  const outputFile = (0, import_path3.join)(directories.cache, "config.js");
   const result = await bundle.generate({
     format: "esm",
     exports: "default"
@@ -4219,7 +4233,7 @@ var importConfig = async (options) => {
   setRoot(root2);
   debug("CWD:", style.info(root2));
   debug("Import config file");
-  const fileName = (0, import_path4.join)(root2, configFile);
+  const fileName = (0, import_path5.join)(root2, configFile);
   const module2 = await importFile(fileName);
   const appConfig = typeof module2.default === "function" ? await module2.default(options) : module2.default;
   debug("Validate config file");
@@ -4615,6 +4629,7 @@ var Renderer = class {
         }
       }
     }
+    await this.setCursor(0, size - start);
     this.screen = screen;
     this.flushing = false;
   }
@@ -4742,7 +4757,7 @@ var flexLine = (term, left, right, reserveSpace = 0) => {
 };
 
 // src/cli/ui/complex/builder.ts
-var import_path7 = require("path");
+var import_path8 = require("path");
 var assetBuilder = (app) => {
   return async (term) => {
     const assets = [];
@@ -4801,8 +4816,8 @@ var assetBuilder = (app) => {
         const timer = createTimer();
         const data = await asset.build({
           async write(file, data2) {
-            const fullpath = (0, import_path7.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
-            const basepath = (0, import_path7.dirname)(fullpath);
+            const fullpath = (0, import_path8.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
+            const basepath = (0, import_path8.dirname)(fullpath);
             await (0, import_promises6.mkdir)(basepath, { recursive: true });
             await (0, import_promises6.writeFile)(fullpath, data2);
           }
@@ -4841,14 +4856,14 @@ var cleanUp = async () => {
 
 // src/cli/ui/complex/template.ts
 var import_promises8 = require("fs/promises");
-var import_path10 = require("path");
+var import_path11 = require("path");
 var templateBuilder = (app) => {
   return async (term) => {
     const done = term.out.write(loadingDialog("Building stack templates..."));
     await Promise.all(app.stacks.map(async (stack) => {
       const template = stack.toString(true);
-      const path = (0, import_path10.join)(directories.template, app.name);
-      const file = (0, import_path10.join)(path, `${stack.name}.json`);
+      const path = (0, import_path11.join)(directories.template, app.name);
+      const file = (0, import_path11.join)(path, `${stack.name}.json`);
       await (0, import_promises8.mkdir)(path, { recursive: true });
       await (0, import_promises8.writeFile)(file, template);
     }));
@@ -4910,7 +4925,7 @@ var StackClient = class {
   maxWaitTime = 60 * 30;
   // 30 minutes
   maxDelay = 30;
-  // 30 seconds
+  // 10 seconds
   assetBucketName;
   getClient(region) {
     return new import_client_cloudformation.CloudFormationClient({
@@ -5311,7 +5326,7 @@ var status = (program2) => {
 
 // src/cli/ui/complex/publisher.ts
 var import_promises9 = require("fs/promises");
-var import_path12 = require("path");
+var import_path13 = require("path");
 var import_client_s32 = require("@aws-sdk/client-s3");
 var assetPublisher = (config, app) => {
   const client = new import_client_s32.S3Client({
@@ -5324,7 +5339,7 @@ var assetPublisher = (config, app) => {
       await Promise.all([...stack.assets].map(async (asset) => {
         await asset.publish?.({
           async read(file) {
-            const path = (0, import_path12.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
+            const path = (0, import_path13.join)(directories.asset, asset.type, app.name, stack.name, asset.id, file);
             const data = await (0, import_promises9.readFile)(path);
             return data;
           },

package/dist/bin.js

@@ -433,10 +433,15 @@ var Stack = class {
     this.name = name;
     this.region = region;
   }
+  app;
   exports = /* @__PURE__ */ new Map();
   resources = /* @__PURE__ */ new Set();
   tags = /* @__PURE__ */ new Map();
   assets = /* @__PURE__ */ new Set();
+  setApp(app) {
+    this.app = app;
+    return this;
+  }
   add(...resources) {
     for (const item of resources) {
       if (item instanceof Asset) {
@@ -510,7 +515,9 @@ var Stack = class {
     for (const [name, value] of this.exports.entries()) {
       Object.assign(outputs, {
         [formatLogicalId(name)]: {
-          Export: { Name: name },
+          Export: {
+            Name: `${this.app?.name || "default"}-${name}`
+          },
           Value: value
         }
       });
@@ -804,6 +811,7 @@ import { swc } from "rollup-plugin-swc3";
 import json from "@rollup/plugin-json";
 import commonjs from "@rollup/plugin-commonjs";
 import nodeResolve from "@rollup/plugin-node-resolve";
+import { dirname } from "path";
 var rollupBundle = async (input) => {
   const bundle = await rollup({
     input,
@@ -823,7 +831,10 @@ var rollupBundle = async (input) => {
       }),
       swc({
         minify: true,
-        jsc: { minify: { sourceMap: true } },
+        jsc: {
+          baseUrl: dirname(input),
+          minify: { sourceMap: true }
+        },
         sourceMaps: true
       }),
       json()
@@ -3804,7 +3815,10 @@ var App = class {
   }
   list = /* @__PURE__ */ new Map();
   add(...stacks) {
-    stacks.forEach((stack) => this.list.set(stack.name, stack));
+    stacks.forEach((stack) => {
+      this.list.set(stack.name, stack);
+      stack.setApp(this);
+    });
     return this;
   }
   find(resourceType) {
@@ -4112,7 +4126,7 @@ var AppSchema = z23.object({
 import { rollup as rollup2 } from "rollup";
 import { swc as swc2 } from "rollup-plugin-swc3";
 import replace from "rollup-plugin-replace";
-import { dirname, join as join2 } from "path";
+import { dirname as dirname2, join as join2 } from "path";
 import { mkdir, writeFile } from "fs/promises";
 
 // src/util/path.ts
@@ -4165,12 +4179,12 @@ var importFile = async (path) => {
     input: path,
     plugins: [
       replace({
-        __dirname: (id) => `'${dirname(id)}'`
+        __dirname: (id) => `'${dirname2(id)}'`
       }),
       swc2({
         minify: false,
         jsc: {
-          baseUrl: dirname(path)
+          baseUrl: dirname2(path)
         }
       })
     ]
@@ -4592,6 +4606,7 @@ var Renderer = class {
         }
       }
     }
+    await this.setCursor(0, size - start);
     this.screen = screen;
     this.flushing = false;
   }
@@ -4719,7 +4734,7 @@ var flexLine = (term, left, right, reserveSpace = 0) => {
 };
 
 // src/cli/ui/complex/builder.ts
-import { dirname as dirname2, join as join4 } from "path";
+import { dirname as dirname3, join as join4 } from "path";
 var assetBuilder = (app) => {
   return async (term) => {
     const assets = [];
@@ -4779,7 +4794,7 @@ var assetBuilder = (app) => {
         const data = await asset.build({
           async write(file, data2) {
             const fullpath = join4(directories.asset, asset.type, app.name, stack.name, asset.id, file);
-            const basepath = dirname2(fullpath);
+            const basepath = dirname3(fullpath);
             await mkdir2(basepath, { recursive: true });
             await writeFile2(fullpath, data2);
           }
@@ -4887,7 +4902,7 @@ var StackClient = class {
   maxWaitTime = 60 * 30;
   // 30 minutes
   maxDelay = 30;
-  // 30 seconds
+  // 10 seconds
   assetBucketName;
   getClient(region) {
     return new CloudFormationClient({

package/dist/index.d.ts

@@ -2320,11 +2320,13 @@ type ConstructorOf<C> = {
 declare class Stack {
     readonly name: string;
     readonly region: Region;
+    private app?;
     readonly exports: Map<string, string>;
     readonly resources: Set<Resource>;
     readonly tags: Map<string, string>;
     readonly assets: Set<Asset>;
     constructor(name: string, region: Region);
+    setApp(app: App): this;
     add(...resources: (Resource | Asset | Group)[]): this;
     export(name: string, value: string): this;
     get(name: string): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "license": "MIT",
   "type": "module",
   "repository": {