@awsless/awsless 0.0.315 → 0.0.317

package/dist/bin.js

@@ -457,7 +457,9 @@ var ArchitectureSchema = z5.enum(["x86_64", "arm64"]).describe("The instruction
 var RetryAttemptsSchema = z5.number().int().min(0).max(2).describe(
   "The maximum number of times to retry when the function returns an error. You can specify a number from 0 to 2."
 );
-var RuntimeSchema = z5.enum(["nodejs18.x", "nodejs20.x"]).describe("The identifier of the function's runtime.");
+var NodeRuntimeSchema = z5.enum(["nodejs18.x", "nodejs20.x"]).describe("The identifier of the function's runtime.");
+var ContainerRuntimeSchema = z5.literal("container").describe("The identifier of the function's runtime.");
+var RuntimeSchema = NodeRuntimeSchema.or(ContainerRuntimeSchema);
 var ActionSchema = z5.string();
 var ActionsSchema = z5.union([ActionSchema.transform((v) => [v]), ActionSchema.array()]);
 var ArnSchema = z5.string().startsWith("arn:").transform((v) => v);
@@ -500,7 +502,7 @@ var LayersSchema = ArnSchema.array().describe(
   `A list of function layers to add to the function's execution environment. Specify each layer by its ARN, including the version.`
 );
 var BuildSchema = z5.object({
-  // minify: z.boolean().optional().describe('')
+  minify: MinifySchema.default(true),
   external: z5.string().array().optional().describe(`A list of external packages that won't be included in the bundle.`)
 }).describe(`Options for the function bundler`);
 var FunctionSchema = z5.union([
@@ -509,29 +511,36 @@ var FunctionSchema = z5.union([
   })),
   z5.object({
     file: FileSchema,
-    description: DescriptionSchema.optional(),
+    // node
     handler: HandlerSchema.optional(),
-    minify: MinifySchema.optional(),
+    build: BuildSchema.optional(),
+    // container
+    // ...
+    runtime: RuntimeSchema.optional(),
+    description: DescriptionSchema.optional(),
     warm: WarmSchema.optional(),
     vpc: VPCSchema.optional(),
     log: LogSchema.optional(),
     timeout: TimeoutSchema.optional(),
-    runtime: RuntimeSchema.optional(),
     memorySize: MemorySizeSchema.optional(),
     architecture: ArchitectureSchema.optional(),
     ephemeralStorageSize: EphemeralStorageSizeSchema.optional(),
     retryAttempts: RetryAttemptsSchema.optional(),
     reserved: ReservedConcurrentExecutionsSchema.optional(),
     layers: LayersSchema.optional(),
-    build: BuildSchema.optional(),
     environment: EnvironmentSchema.optional(),
     permissions: PermissionsSchema.optional()
   })
 ]);
 var FunctionsSchema = z5.record(ResourceIdSchema, FunctionSchema).optional().describe("Define the functions in your stack.");
 var FunctionDefaultSchema = z5.object({
+  runtime: RuntimeSchema.default("nodejs20.x"),
+  // node
   handler: HandlerSchema.default("index.default"),
-  minify: MinifySchema.default(true),
+  build: BuildSchema.default({
+    minify: true
+  }),
+  // container
   warm: WarmSchema.default(0),
   vpc: VPCSchema.default(false),
   log: LogSchema.default({
@@ -541,14 +550,12 @@ var FunctionDefaultSchema = z5.object({
     format: "json"
   }),
   timeout: TimeoutSchema.default("10 seconds"),
-  runtime: RuntimeSchema.default("nodejs20.x"),
   memorySize: MemorySizeSchema.default("128 MB"),
   architecture: ArchitectureSchema.default("arm64"),
   ephemeralStorageSize: EphemeralStorageSizeSchema.default("512 MB"),
   retryAttempts: RetryAttemptsSchema.default(2),
   reserved: ReservedConcurrentExecutionsSchema.optional(),
   layers: LayersSchema.optional(),
-  build: BuildSchema.optional(),
   environment: EnvironmentSchema.optional(),
   permissions: PermissionsSchema.optional()
 }).default({});
@@ -1961,7 +1968,7 @@ var formatLocalResourceName = (appName, stackName, ns, id, seperator = "--") =>
 import { Asset, aws as aws2 } from "@awsless/formation";
 import { generateFileHash } from "@awsless/ts-file-cache";
 import deepmerge from "deepmerge";
-import { basename as basename3, dirname as dirname6, extname as extname2 } from "path";
+import { dirname as dirname6 } from "path";
 import { exec } from "promisify-child-process";
 
 // src/build/index.ts
@@ -2160,36 +2167,9 @@ var createLambdaFunction = (group, ctx, ns, id, local2) => {
     name = formatGlobalResourceName(ctx.appConfig.name, ns, id);
   }
   const props = deepmerge(ctx.appConfig.defaults.function, local2);
-  const ext = extname2(props.file);
   let code;
   let sourceCodeHash;
-  if ([".ts", ".js", ".tsx", ".sx"].includes(ext)) {
-    ctx.registerBuild("function", name, async (build3, { packageVersions }) => {
-      const version = await generateFileHash(props.file, {
-        packageVersions
-      });
-      return build3(version, async (write) => {
-        const bundle = await bundleTypeScript({
-          file: props.file,
-          external: props.build?.external
-        });
-        const archive = await zipFiles(bundle.files);
-        await Promise.all([
-          write("bundle.zip", archive),
-          ...bundle.files.map((file) => write(`files/${file.name}`, file.code)),
-          ...bundle.files.map((file) => file.map && write(`files/${file.name}.map`, file.map))
-        ]);
-        return {
-          size: formatByteSize(archive.byteLength)
-        };
-      });
-    });
-    code = new aws2.s3.BucketObject(group, "code", {
-      bucket: ctx.shared.get("function-bucket-name"),
-      key: `/lambda/${name}.zip`,
-      body: Asset.fromFile(getBuildPath("function", name, "bundle.zip"))
-    });
-  } else if (basename3(props.file) === "dockerfile") {
+  if (props.runtime === "container") {
     ctx.registerBuild("function", name, async (build3) => {
       const basePath2 = dirname6(props.file);
       const version = await hashElement(basePath2, {
@@ -2199,7 +2179,8 @@ var createLambdaFunction = (group, ctx, ns, id, local2) => {
       });
       return build3(version.hash, async (write) => {
         const repoName = formatGlobalResourceName(ctx.appConfig.name, "function", "repository", "-");
-        await exec(`docker build -t ${name} .`, {
+        const platform = props.architecture === "arm64" ? "linux/arm64" : "linux/x86_64";
+        await exec(`docker buildx build --platform ${platform} -t ${name} .`, {
           cwd: basePath2
         });
         await exec(
@@ -2223,7 +2204,32 @@ var createLambdaFunction = (group, ctx, ns, id, local2) => {
       imageUri: image.uri
     };
   } else {
-    throw new Error("Unknown Lambda Function type.");
+    ctx.registerBuild("function", name, async (build3, { packageVersions }) => {
+      const version = await generateFileHash(props.file, {
+        packageVersions
+      });
+      return build3(version, async (write) => {
+        const bundle = await bundleTypeScript({
+          file: props.file,
+          external: props.build.external,
+          minify: props.build.minify
+        });
+        const archive = await zipFiles(bundle.files);
+        await Promise.all([
+          write("bundle.zip", archive),
+          ...bundle.files.map((file) => write(`files/${file.name}`, file.code)),
+          ...bundle.files.map((file) => file.map && write(`files/${file.name}.map`, file.map))
+        ]);
+        return {
+          size: formatByteSize(archive.byteLength)
+        };
+      });
+    });
+    code = new aws2.s3.BucketObject(group, "code", {
+      bucket: ctx.shared.get("function-bucket-name"),
+      key: `/lambda/${name}.zip`,
+      body: Asset.fromFile(getBuildPath("function", name, "bundle.zip"))
+    });
   }
   const role = new aws2.iam.Role(group, "role", {
     name,
@@ -2248,6 +2254,7 @@ var createLambdaFunction = (group, ctx, ns, id, local2) => {
     role: role.arn,
     code,
     sourceCodeHash,
+    runtime: props.runtime === "container" ? void 0 : props.runtime,
     // Remove conflicting props.
     vpc: void 0,
     log: props.log
@@ -2827,6 +2834,7 @@ var domainFeature = defineFeature({
 import { aws as aws7, Node as Node6 } from "@awsless/formation";
 import { camelCase as camelCase3 } from "change-case";
 import { relative } from "path";
+import deepmerge2 from "deepmerge";
 var typeGenCode2 = `
 import { InvokeOptions, InvokeResponse } from '@awsless/lambda'
 import type { PartialDeep } from 'type-fest'
@@ -2865,14 +2873,17 @@ var functionFeature = defineFeature({
       const resource2 = new TypeObject(2);
       const mock = new TypeObject(2);
       const mockResponse = new TypeObject(2);
-      for (const [name, props] of Object.entries(stack.functions || {})) {
-        const varName = camelCase3(`${stack.name}-${name}`);
-        const funcName = formatLocalResourceName(ctx.appConfig.name, stack.name, "function", name);
-        const relFile = relative(directories.types, props.file);
-        types2.addImport(varName, relFile);
-        resource2.addType(name, `Invoke<'${funcName}', typeof ${varName}>`);
-        mock.addType(name, `MockBuilder<typeof ${varName}>`);
-        mockResponse.addType(name, `MockObject<typeof ${varName}>`);
+      for (const [name, local2] of Object.entries(stack.functions || {})) {
+        const props = deepmerge2(ctx.appConfig.defaults.function, local2);
+        if (props.runtime !== "container") {
+          const varName = camelCase3(`${stack.name}-${name}`);
+          const funcName = formatLocalResourceName(ctx.appConfig.name, stack.name, "function", name);
+          const relFile = relative(directories.types, props.file);
+          types2.addImport(varName, relFile);
+          resource2.addType(name, `Invoke<'${funcName}', typeof ${varName}>`);
+          mock.addType(name, `MockBuilder<typeof ${varName}>`);
+          mockResponse.addType(name, `MockObject<typeof ${varName}>`);
+        }
       }
       mocks.addType(stack.name, mock);
       resources.addType(stack.name, resource2);
@@ -3705,7 +3716,7 @@ var pubsubFeature = defineFeature({
 // src/feature/queue/index.ts
 import { aws as aws13, Node as Node12 } from "@awsless/formation";
 import { camelCase as camelCase5, constantCase as constantCase7 } from "change-case";
-import deepmerge2 from "deepmerge";
+import deepmerge3 from "deepmerge";
 import { relative as relative3 } from "path";
 var typeGenCode3 = `
 import { SendMessageOptions, SendMessageBatchOptions, BatchItem } from '@awsless/sqs'
@@ -3757,7 +3768,7 @@ var queueFeature = defineFeature({
   },
   onStack(ctx) {
     for (const [id, local2] of Object.entries(ctx.stackConfig.queues || {})) {
-      const props = deepmerge2(ctx.appConfig.defaults.queue, local2);
+      const props = deepmerge3(ctx.appConfig.defaults.queue, local2);
       const group = new Node12(ctx.stack, "queue", id);
       const queue2 = new aws13.sqs.Queue(group, "queue", {
         name: formatLocalResourceName(ctx.appConfig.name, ctx.stack.name, "queue", id),
@@ -3949,7 +3960,7 @@ import { join as join7 } from "path";
 
 // src/feature/site/util.ts
 import { lookup, contentType } from "mime-types";
-import { extname as extname3 } from "path";
+import { extname as extname2 } from "path";
 var getCacheControl = (file) => {
   switch (lookup(file)) {
     case false:
@@ -3964,7 +3975,7 @@ var getCacheControl = (file) => {
   }
 };
 var getContentType = (file) => {
-  return contentType(extname3(file)) || "text/html; charset=utf-8";
+  return contentType(extname2(file)) || "text/html; charset=utf-8";
 };
 
 // src/feature/site/index.ts
@@ -4212,7 +4223,10 @@ var storeFeature = defineFeature({
       for (const [event, funcProps] of Object.entries(props.events ?? {})) {
         const eventGroup = new Node16(group, "event", event);
         const eventId = paramCase6(`${id}-${shortId(event)}`);
-        const { lambda } = createAsyncLambdaFunction(eventGroup, ctx, `store`, eventId, funcProps);
+        const { lambda } = createAsyncLambdaFunction(eventGroup, ctx, `store`, eventId, {
+          ...funcProps,
+          description: `${id} event "${event}"`
+        });
         new aws17.lambda.Permission(eventGroup, "permission", {
           action: "lambda:InvokeFunction",
           principal: "s3.amazonaws.com",
@@ -5053,7 +5067,7 @@ import { join as join10 } from "path";
 // src/build/__fingerprint.ts
 import { createHash as createHash4 } from "crypto";
 import { readdir, readFile as readFile5, stat as stat3 } from "fs/promises";
-import { basename as basename4, dirname as dirname9, extname as extname4, join as join8 } from "path";
+import { basename as basename3, dirname as dirname9, extname as extname3, join as join8 } from "path";
 import parseStaticImports from "parse-static-imports";
 var extensions = ["js", "mjs", "jsx", "ts", "mts", "tsx"];
 var generateFileHashes = async (file, hashes) => {
@@ -5074,7 +5088,7 @@ var fingerprintFromDirectory = async (dir) => {
   const hashes = /* @__PURE__ */ new Map();
   const files = await readdir(dir, { recursive: true });
   for (const file of files) {
-    if (extensions.includes(extname4(file).substring(1)) && file.at(0) !== "_") {
+    if (extensions.includes(extname3(file).substring(1)) && file.at(0) !== "_") {
       await generateFileHashes(join8(dir, file), hashes);
     }
   }
@@ -5085,7 +5099,7 @@ var readModuleFile = (file) => {
   if (file.endsWith(".js")) {
     return readFiles([file, file.substring(0, file.length - 3) + ".ts"]);
   }
-  if (!basename4(file).includes(".")) {
+  if (!basename3(file).includes(".")) {
     return readFiles([
       file,
       ...extensions.map((exp) => `${file}.${exp}`),
@@ -5821,7 +5835,7 @@ var state = (program2) => {
 // src/cli/command/test.ts
 var test = (program2) => {
   program2.command("test").argument("[stacks...]", "Optionally filter stacks to test").option("-f --filters <string...>", "Optionally filter test files").description("Test your app").action(async (stacks, options) => {
-    await layout("test", async (props) => {
+    await layout(`test ${stacks ?? ""}`, async (props) => {
       const region = props.appConfig.region;
       const credentials = getCredentials(props.appConfig.profile);
       const accountId = await getAccountId(credentials, region);

package/dist/build-json-schema.js

@@ -114,7 +114,9 @@ var ArchitectureSchema = z5.enum(["x86_64", "arm64"]).describe("The instruction
 var RetryAttemptsSchema = z5.number().int().min(0).max(2).describe(
   "The maximum number of times to retry when the function returns an error. You can specify a number from 0 to 2."
 );
-var RuntimeSchema = z5.enum(["nodejs18.x", "nodejs20.x"]).describe("The identifier of the function's runtime.");
+var NodeRuntimeSchema = z5.enum(["nodejs18.x", "nodejs20.x"]).describe("The identifier of the function's runtime.");
+var ContainerRuntimeSchema = z5.literal("container").describe("The identifier of the function's runtime.");
+var RuntimeSchema = NodeRuntimeSchema.or(ContainerRuntimeSchema);
 var ActionSchema = z5.string();
 var ActionsSchema = z5.union([ActionSchema.transform((v) => [v]), ActionSchema.array()]);
 var ArnSchema = z5.string().startsWith("arn:").transform((v) => v);
@@ -157,7 +159,7 @@ var LayersSchema = ArnSchema.array().describe(
   `A list of function layers to add to the function's execution environment. Specify each layer by its ARN, including the version.`
 );
 var BuildSchema = z5.object({
-  // minify: z.boolean().optional().describe('')
+  minify: MinifySchema.default(true),
   external: z5.string().array().optional().describe(`A list of external packages that won't be included in the bundle.`)
 }).describe(`Options for the function bundler`);
 var FunctionSchema = z5.union([
@@ -166,29 +168,36 @@ var FunctionSchema = z5.union([
   })),
   z5.object({
     file: FileSchema,
-    description: DescriptionSchema.optional(),
+    // node
     handler: HandlerSchema.optional(),
-    minify: MinifySchema.optional(),
+    build: BuildSchema.optional(),
+    // container
+    // ...
+    runtime: RuntimeSchema.optional(),
+    description: DescriptionSchema.optional(),
     warm: WarmSchema.optional(),
     vpc: VPCSchema.optional(),
     log: LogSchema.optional(),
     timeout: TimeoutSchema.optional(),
-    runtime: RuntimeSchema.optional(),
     memorySize: MemorySizeSchema.optional(),
     architecture: ArchitectureSchema.optional(),
     ephemeralStorageSize: EphemeralStorageSizeSchema.optional(),
     retryAttempts: RetryAttemptsSchema.optional(),
     reserved: ReservedConcurrentExecutionsSchema.optional(),
     layers: LayersSchema.optional(),
-    build: BuildSchema.optional(),
     environment: EnvironmentSchema.optional(),
     permissions: PermissionsSchema.optional()
   })
 ]);
 var FunctionsSchema = z5.record(ResourceIdSchema, FunctionSchema).optional().describe("Define the functions in your stack.");
 var FunctionDefaultSchema = z5.object({
+  runtime: RuntimeSchema.default("nodejs20.x"),
+  // node
   handler: HandlerSchema.default("index.default"),
-  minify: MinifySchema.default(true),
+  build: BuildSchema.default({
+    minify: true
+  }),
+  // container
   warm: WarmSchema.default(0),
   vpc: VPCSchema.default(false),
   log: LogSchema.default({
@@ -198,14 +207,12 @@ var FunctionDefaultSchema = z5.object({
     format: "json"
   }),
   timeout: TimeoutSchema.default("10 seconds"),
-  runtime: RuntimeSchema.default("nodejs20.x"),
   memorySize: MemorySizeSchema.default("128 MB"),
   architecture: ArchitectureSchema.default("arm64"),
   ephemeralStorageSize: EphemeralStorageSizeSchema.default("512 MB"),
   retryAttempts: RetryAttemptsSchema.default(2),
   reserved: ReservedConcurrentExecutionsSchema.optional(),
   layers: LayersSchema.optional(),
-  build: BuildSchema.optional(),
   environment: EnvironmentSchema.optional(),
   permissions: PermissionsSchema.optional()
 }).default({});