@awsless/awsless 0.0.123 → 0.0.125

package/dist/bin.js

@@ -5597,13 +5597,10 @@ var setLocalBasePath = (path) => {
   basePath = path;
 };
 var resolvePath = (path) => {
-  if (path.startsWith(".")) {
-    return join6(basePath ?? directories.root, path);
+  if (path.startsWith(".") && basePath) {
+    return join6(basePath, path);
   }
-  if (path.startsWith("/")) {
-    return join6(directories.root, path);
-  }
-  return path;
+  return join6(directories.root, path);
 };
 var LocalFileSchema = z5.string().transform((path) => resolvePath(path)).refine(async (path) => {
   try {
@@ -6294,7 +6291,7 @@ var StackSchema = z28.object({
   tests: TestsSchema
 });
 
-// src/config/load.ts
+// src/cli/error.ts
 var ConfigError = class extends Error {
   constructor(file, error, data) {
     super(error.message);
@@ -6303,6 +6300,32 @@ var ConfigError = class extends Error {
     this.data = data;
   }
 };
+var FileError = class extends Error {
+  constructor(file, message) {
+    super(message);
+    this.file = file;
+  }
+};
+var Cancelled = class extends Error {
+  constructor() {
+    super("Cancelled");
+  }
+};
+
+// src/config/load.ts
+import JSON5 from "json5";
+var readConfig = async (file) => {
+  try {
+    const json4 = await readFile5(file, "utf8");
+    const data = JSON5.parse(json4);
+    return data;
+  } catch (error) {
+    if (error instanceof Error) {
+      throw new FileError(file, error.message);
+    }
+    throw error;
+  }
+};
 var loadConfig = async (options) => {
   debug("Find the root directory");
   const configFile = options.configFile || "app.json";
@@ -6312,8 +6335,7 @@ var loadConfig = async (options) => {
   debug("CWD:", style.info(root2));
   debug("Load app config file");
   const appFileName = join7(root2, configFile);
-  const appJson = await readFile5(appFileName, "utf8");
-  const appConfig = JSON.parse(appJson);
+  const appConfig = await readConfig(appFileName);
   debug("Validate app config file");
   let app;
   try {
@@ -6330,16 +6352,15 @@ var loadConfig = async (options) => {
   const account = await getAccountId(credentials, app.region);
   debug("Account ID:", style.info(account));
   debug("Load stacks config files");
-  const stackFiles = await glob(["**/stack.json", "**/*.stack.json"], {
+  const stackFiles = await glob(["**/stack.{json,jsonc,json5}", "**/*.stack.{json,jsonc,json5}"], {
     ignore: ["**/node_modules/**", "**/dist/**"],
     cwd: root2
   });
   const stacks = [];
   for (const file of stackFiles) {
     debug(`Load stack: ${style.info(file)}`);
-    const stackJson = await readFile5(file, "utf8");
-    const stackConfig = JSON.parse(stackJson);
-    setLocalBasePath(dirname5(file));
+    const stackConfig = await readConfig(file);
+    setLocalBasePath(join7(process.cwd(), dirname5(file)));
     try {
       const stack = await StackSchema.parseAsync(stackConfig);
       stacks.push(stack);
@@ -6813,7 +6834,7 @@ var logs = () => {
   };
 };
 
-// src/cli/ui/layout/zod-error.ts
+// src/cli/ui/error/config.ts
 var line = (value, level = 0, highlight = false) => {
   return [
     highlight ? style.error(symbol.pointerSmall) + style.placeholder(" | ") : style.placeholder.dim("  | "),
@@ -6847,7 +6868,7 @@ var format = (value) => {
   }
   return "";
 };
-var zodError = (error) => {
+var configError = (error) => {
   return (term) => {
     for (const issue of error.error.issues) {
       term.out.gap();
@@ -6893,6 +6914,16 @@ var zodError = (error) => {
   };
 };
 
+// src/cli/ui/error/file.ts
+var fileError = (error) => {
+  return (term) => {
+    term.out.gap();
+    term.out.write(dialog("error", [style.error(error.message)]));
+    term.out.write("  " + style.placeholder(error.file));
+    term.out.gap();
+  };
+};
+
 // src/cli/ui/layout/layout.ts
 var layout = async (cb) => {
   const term = createTerminal();
@@ -6908,8 +6939,10 @@ var layout = async (cb) => {
     await cb(config2, term.out.write.bind(term.out), term);
   } catch (error) {
     term.out.gap();
-    if (error instanceof ConfigError) {
-      term.out.write(zodError(error));
+    if (error instanceof FileError) {
+      term.out.write(fileError(error));
+    } else if (error instanceof ConfigError) {
+      term.out.write(configError(error));
     } else if (error instanceof Error) {
       term.out.write(dialog("error", [error.message]));
     } else if (typeof error === "string") {
@@ -7024,13 +7057,12 @@ var assetBuilder = (app) => {
               return join8(directories.asset, asset.type, app.name, stack.name, asset.id, file);
             };
             const getFingerPrint = async () => {
-              let value;
               try {
-                value = await readFile6(getFullPath("FINGER_PRINT"), "utf8");
+                const value = await readFile6(getFullPath("FINGER_PRINT"), "utf8");
+                return value;
               } catch (_) {
                 return void 0;
               }
-              return value;
             };
             try {
               const data = await asset.build({
@@ -7039,16 +7071,20 @@ var assetBuilder = (app) => {
                   if (prev === fingerprint && !process.env.NO_CACHE) {
                     return;
                   }
+                  try {
+                    await cb(async (file2, data2) => {
+                      const fullpath = getFullPath(file2);
+                      const basepath2 = dirname6(fullpath);
+                      await mkdir2(basepath2, { recursive: true });
+                      await writeFile2(fullpath, data2);
+                    });
+                  } catch (error) {
+                    throw error;
+                  }
                   const file = getFullPath("FINGER_PRINT");
                   const basepath = dirname6(file);
                   await mkdir2(basepath, { recursive: true });
                   await writeFile2(file, fingerprint);
-                  await cb(async (file2, data2) => {
-                    const fullpath = getFullPath(file2);
-                    const basepath2 = dirname6(fullpath);
-                    await mkdir2(basepath2, { recursive: true });
-                    await writeFile2(fullpath, data2);
-                  });
                 },
                 async read(fingerprint, files) {
                   const prev = await getFingerPrint();
@@ -7448,13 +7484,6 @@ var StackClient = class {
   }
 };
 
-// src/cli/error.ts
-var Cancelled = class extends Error {
-  constructor() {
-    super("Cancelled");
-  }
-};
-
 // src/cli/ui/prompt/toggle.ts
 var togglePrompt = (label, options = {}) => {
   return (term) => new Promise((resolve) => {
@@ -8322,8 +8351,10 @@ var dev = (program2) => {
           await write(typesGenerator(config2));
         },
         (error) => {
-          if (error instanceof ConfigError) {
-            write(zodError(error));
+          if (error instanceof FileError) {
+            write(fileError(error));
+          } else if (error instanceof ConfigError) {
+            write(configError(error));
           } else if (error instanceof Error) {
             write(dialog("error", [error.message]));
           } else if (typeof error === "string") {

package/dist/index.js

@@ -125,7 +125,7 @@ import {
 import { constantCase as constantCase2 } from "change-case";
 var getQueueName = getLocalResourceName;
 var getQueueUrl = (name, stack = STACK) => {
-  return process.env[`QUEUE_${constantCase2(stack)}_${constantCase2(name)}_URL`];
+  return process.env[`QUEUE_${constantCase2(stack)}_${constantCase2(name)}_URL`] || name;
 };
 var Queue = /* @__PURE__ */ createProxy((stack) => {
   return createProxy((queue2) => {

package/dist/json.js

@@ -116,13 +116,10 @@ var directories = {
 import { join as join2 } from "path";
 var basePath;
 var resolvePath = (path) => {
-  if (path.startsWith(".")) {
-    return join2(basePath ?? directories.root, path);
+  if (path.startsWith(".") && basePath) {
+    return join2(basePath, path);
   }
-  if (path.startsWith("/")) {
-    return join2(directories.root, path);
-  }
-  return path;
+  return join2(directories.root, path);
 };
 var LocalFileSchema = z3.string().transform((path) => resolvePath(path)).refine(async (path) => {
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.123",
+  "version": "0.0.125",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -29,8 +29,8 @@
   },
   "peerDependencies": {
     "@awsless/lambda": "^0.0.15",
-    "@awsless/redis": "^0.0.8",
     "@awsless/sns": "^0.0.7",
+    "@awsless/redis": "^0.0.10",
     "@awsless/sqs": "^0.0.7",
     "@awsless/ssm": "^0.0.7",
     "@awsless/validate": "^0.0.10",
@@ -70,6 +70,7 @@
     "filesize": "^10.0.7",
     "glob": "^10.3.9",
     "graphql": "^16.7.1",
+    "json5": "^2.2.3",
     "jszip": "^3.10.1",
     "mime-types": "^2.1.35",
     "parse-imports": "^1.1.2",