@awsless/awsless 0.0.124 → 0.0.126

package/dist/bin.js

@@ -6291,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);
@@ -6300,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";
@@ -6309,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 {
@@ -6327,15 +6352,14 @@ 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);
+    const stackConfig = await readConfig(file);
     setLocalBasePath(join7(process.cwd(), dirname5(file)));
     try {
       const stack = await StackSchema.parseAsync(stackConfig);
@@ -6810,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("  | "),
@@ -6844,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();
@@ -6890,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();
@@ -6905,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") {
@@ -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) => {
@@ -7640,6 +7669,7 @@ var status = (program2) => {
     await layout(async (config2, write) => {
       const { app, deploymentLine } = await toApp(config2, filters);
       await cleanUp();
+      await write(typesGenerator(config2));
       await write(assetBuilder(app));
       await write(templateBuilder(app));
       const doneLoading = write(loadingDialog("Loading stack information..."));
@@ -8295,7 +8325,8 @@ var watchConfig = async (options, resolve, reject) => {
   setRoot(root2);
   debug("CWD:", style.info(root2));
   debug("Start watching...");
-  const watcher = watch(["app.json", "**/stack.json", "**/*.stack.json"], {
+  const ext = "{json,jsonc,json5}";
+  const watcher = watch([`app.${ext}`, `**/stack.${ext}`, `**/*.stack.${ext}`], {
     cwd: root2,
     ignored: ["**/node_modules/**", "**/dist/**"]
   });
@@ -8313,17 +8344,21 @@ var watchConfig = async (options, resolve, reject) => {
 // src/cli/command/dev.ts
 var dev = (program2) => {
   program2.command("dev").description("Start the development service").action(async () => {
-    await layout(async (_, write) => {
+    await layout(async (config2, write) => {
       const options = program2.optsWithGlobals();
-      await watchConfig(
+      await cleanUp();
+      await write(typesGenerator(config2));
+      const watcher = await watchConfig(
         options,
-        async (config2) => {
+        async (config3) => {
           await cleanUp();
-          await write(typesGenerator(config2));
+          await write(typesGenerator(config3));
         },
         (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") {
@@ -8333,6 +8368,8 @@ var dev = (program2) => {
           }
         }
       );
+      await new Promise(() => {
+      });
     });
   });
 };

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.124",
+  "version": "0.0.126",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -29,11 +29,11 @@
   },
   "peerDependencies": {
     "@awsless/lambda": "^0.0.15",
-    "@awsless/redis": "^0.0.8",
-    "@awsless/sqs": "^0.0.7",
+    "@awsless/redis": "^0.0.10",
     "@awsless/sns": "^0.0.7",
-    "@awsless/ssm": "^0.0.7",
+    "@awsless/sqs": "^0.0.7",
     "@awsless/validate": "^0.0.10",
+    "@awsless/ssm": "^0.0.7",
     "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
@@ -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",
@@ -84,8 +85,8 @@
     "wrap-ansi": "^8.1.0",
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
-    "@awsless/code": "^0.0.10",
-    "@awsless/graphql": "^0.0.6"
+    "@awsless/graphql": "^0.0.6",
+    "@awsless/code": "^0.0.10"
   },
   "scripts": {
     "test": "pnpm code test",