@awsless/awsless 0.0.438 → 0.0.440

package/dist/bin.js

@@ -7759,11 +7759,11 @@ var BundleCodeSchema = z8.object({
   bundle: LocalDirectorySchema.describe("The directory that needs to be bundled.")
 });
 var CodeSchema = z8.union([
-  LocalFileSchema.transform((file) => ({
-    file,
-    minify: true,
-    external: []
-  })),
+  LocalFileSchema.transform(
+    (file) => FileCodeSchema.parse({
+      file
+    })
+  ),
   FileCodeSchema,
   BundleCodeSchema
 ]).describe("Specify the code of your function.");
@@ -7792,11 +7792,9 @@ var FnSchema = z8.object({
 });
 var FunctionSchema = z8.union([
   LocalFileSchema.transform((file) => ({
-    code: {
-      file,
-      minify: true,
-      external: []
-    }
+    code: FileCodeSchema.parse({
+      file
+    })
   })),
   FnSchema
 ]);
@@ -8166,10 +8164,10 @@ var QueueDefaultSchema = z18.object({
 var QueuesSchema = z18.record(
   ResourceIdSchema,
   z18.union([
-    LocalFileSchema.transform((file) => ({
-      consumer: {
-        file
-      }
+    LocalFileSchema.transform((code) => ({
+      consumer: FunctionSchema.parse({
+        code
+      })
     })),
     z18.object({
       consumer: FunctionSchema.describe("The consuming lambda function properties."),
@@ -10290,27 +10288,31 @@ var findImports = async (file, code) => {
     syntax: "typescript"
   });
   const importing = /* @__PURE__ */ new Set();
-  simple2(ast, {
-    ImportDeclaration(node) {
-      importing.add(node.source.value);
-    },
-    ExportAllDeclaration(node) {
-      importing.add(node.source.value);
-    },
-    ExportNamedDeclaration(node) {
-      if (node.source) {
+  try {
+    simple2(ast, {
+      ImportDeclaration(node) {
         importing.add(node.source.value);
-      }
-    },
-    CallExpression(node) {
-      if (node.callee.type === "Import") {
-        const first = node.arguments.at(0);
-        if (first && first.expression.type === "StringLiteral") {
-          importing.add(first.expression.value);
+      },
+      ExportAllDeclaration(node) {
+        importing.add(node.source.value);
+      },
+      ExportNamedDeclaration(node) {
+        if (node.source) {
+          importing.add(node.source.value);
+        }
+      },
+      CallExpression(node) {
+        if (node.callee.type === "Import") {
+          const first = node.arguments.at(0);
+          if (first && first.expression.type === "StringLiteral") {
+            importing.add(first.expression.value);
+          }
         }
       }
-    }
-  });
+    });
+  } catch (_) {
+    return [];
+  }
   return [...importing].map((importee) => {
     if (importee.startsWith(".")) {
       return resolve(dirname4(file), importee);
@@ -12037,11 +12039,12 @@ var httpFeature = defineFeature({
         if (!(id in api)) api[id] = {};
         for (const [route, props] of Object.entries(routes)) {
           const { path, method } = parseRoute(route);
-          const file = typeof props === "string" ? props : props.file;
-          if (!(method in api[id])) {
-            api[id][method] = {};
+          if (props && "file" in props.code) {
+            if (!(method in api[id])) {
+              api[id][method] = {};
+            }
+            api[id][method][path] = props.code.file;
           }
-          api[id][method][path] = file;
         }
       }
     }
@@ -12566,7 +12569,7 @@ var queueFeature = defineFeature({
       const resource2 = new TypeObject(2);
       const mock = new TypeObject(2);
       const mockResponse = new TypeObject(2);
-      for (const [name, fileOrProps] of Object.entries(stack.queues || {})) {
+      for (const [name, props] of Object.entries(stack.queues || {})) {
         const varName = camelCase5(`${stack.name}-${name}`);
         const queueName = formatLocalResourceName({
           appName: ctx.appConfig.name,
@@ -12574,12 +12577,13 @@ var queueFeature = defineFeature({
           resourceType: "queue",
           resourceName: name
         });
-        const file = typeof fileOrProps === "string" ? fileOrProps : typeof fileOrProps.consumer === "string" ? fileOrProps.consumer : fileOrProps.consumer.file;
-        const relFile = relative5(directories.types, file);
-        gen.addImport(varName, relFile);
-        mock.addType(name, `MockBuilder<typeof ${varName}>`);
-        resource2.addType(name, `Send<'${queueName}', typeof ${varName}>`);
-        mockResponse.addType(name, `MockObject<typeof ${varName}>`);
+        if ("file" in props.consumer.code) {
+          const relFile = relative5(directories.types, props.consumer.code.file);
+          gen.addImport(varName, relFile);
+          mock.addType(name, `MockBuilder<typeof ${varName}>`);
+          resource2.addType(name, `Send<'${queueName}', typeof ${varName}>`);
+          mockResponse.addType(name, `MockObject<typeof ${varName}>`);
+        }
       }
       mocks.addType(stack.name, mock);
       resources.addType(stack.name, resource2);
@@ -12882,10 +12886,12 @@ var rpcFeature = defineFeature({
       const schema = new TypeObject(2);
       for (const stack of ctx.stackConfigs) {
         for (const [name, props] of Object.entries(stack.rpc?.[id] ?? {})) {
-          const relFile = relative6(directories.types, props.file);
-          const varName = camelCase6(`${stack.name}-${name}`);
-          types2.addImport(varName, relFile);
-          schema.addType(name, `Handle<typeof ${varName}>`);
+          if ("file" in props.code) {
+            const relFile = relative6(directories.types, props.code.file);
+            const varName = camelCase6(`${stack.name}-${name}`);
+            types2.addImport(varName, relFile);
+            schema.addType(name, `Handle<typeof ${varName}>`);
+          }
         }
       }
       schemas.addType(id, schema);

package/dist/build-json-schema.js

@@ -206,11 +206,11 @@ var BundleCodeSchema = z6.object({
   bundle: LocalDirectorySchema.describe("The directory that needs to be bundled.")
 });
 var CodeSchema = z6.union([
-  LocalFileSchema.transform((file) => ({
-    file,
-    minify: true,
-    external: []
-  })),
+  LocalFileSchema.transform(
+    (file) => FileCodeSchema.parse({
+      file
+    })
+  ),
   FileCodeSchema,
   BundleCodeSchema
 ]).describe("Specify the code of your function.");
@@ -239,11 +239,9 @@ var FnSchema = z6.object({
 });
 var FunctionSchema = z6.union([
   LocalFileSchema.transform((file) => ({
-    code: {
-      file,
-      minify: true,
-      external: []
-    }
+    code: FileCodeSchema.parse({
+      file
+    })
   })),
   FnSchema
 ]);
@@ -668,10 +666,10 @@ var QueueDefaultSchema = z18.object({
 var QueuesSchema = z18.record(
   ResourceIdSchema,
   z18.union([
-    LocalFileSchema.transform((file) => ({
-      consumer: {
-        file
-      }
+    LocalFileSchema.transform((code) => ({
+      consumer: FunctionSchema.parse({
+        code
+      })
     })),
     z18.object({
       consumer: FunctionSchema.describe("The consuming lambda function properties."),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.438",
+  "version": "0.0.440",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -28,19 +28,19 @@
     }
   },
   "peerDependencies": {
-    "@awsless/json": "^0.0.7",
-    "@awsless/lambda": "^0.0.30",
-    "@awsless/open-search": "^0.0.17",
-    "@awsless/mqtt": "^0.0.2",
     "@awsless/dynamodb": "^0.1.5",
+    "@awsless/json": "^0.0.7",
     "@awsless/iot": "^0.0.3",
+    "@awsless/open-search": "^0.0.17",
     "@awsless/redis": "^0.0.13",
+    "@awsless/s3": "^0.0.20",
+    "@awsless/sqs": "^0.0.8",
+    "@awsless/ssm": "^0.0.7",
     "@awsless/sns": "^0.0.10",
     "@awsless/validate": "^0.0.17",
     "@awsless/weak-cache": "^0.0.1",
-    "@awsless/ssm": "^0.0.7",
-    "@awsless/s3": "^0.0.20",
-    "@awsless/sqs": "^0.0.8"
+    "@awsless/lambda": "^0.0.30",
+    "@awsless/mqtt": "^0.0.2"
   },
   "dependencies": {
     "@arcanyx/cidr-slicer": "^0.3.0",
@@ -116,14 +116,14 @@
     "zip-a-folder": "^3.1.6",
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
-    "@awsless/formation": "^0.0.59",
+    "@awsless/code": "^0.0.10",
     "@awsless/duration": "^0.0.1",
-    "@awsless/size": "^0.0.1",
+    "@awsless/graphql": "^0.0.9",
+    "@awsless/formation": "^0.0.59",
     "@awsless/json": "^0.0.7",
     "@awsless/validate": "^0.0.17",
-    "@awsless/code": "^0.0.10",
-    "@awsless/graphql": "^0.0.9",
-    "@awsless/ts-file-cache": "^0.0.11"
+    "@awsless/size": "^0.0.1",
+    "@awsless/ts-file-cache": "^0.0.12"
   },
   "devDependencies": {
     "@node-rs/bcrypt": "^1.10.5"