@awsless/awsless 0.0.426 → 0.0.428

package/dist/bin.js

@@ -3189,7 +3189,7 @@ var require_Schema = __commonJS({
     var string = require_string();
     var tags = require_tags();
     var sortMapEntriesByKey = (a, b) => a.key < b.key ? -1 : a.key > b.key ? 1 : 0;
-    var Schema = class _Schema {
+    var Schema2 = class _Schema {
       constructor({ compat, customTags, merge: merge2, resolveKnownTags, schema, sortMapEntries, toStringDefaults }) {
         this.compat = Array.isArray(compat) ? tags.getTags(compat, "compat") : compat ? tags.getTags(null, compat) : null;
         this.merge = !!merge2;
@@ -3208,7 +3208,7 @@ var require_Schema = __commonJS({
         return copy;
       }
     };
-    exports.Schema = Schema;
+    exports.Schema = Schema2;
   }
 });
 
@@ -3301,7 +3301,7 @@ var require_Document = __commonJS({
     var identity = require_identity();
     var Pair = require_Pair();
     var toJS = require_toJS();
-    var Schema = require_Schema();
+    var Schema2 = require_Schema();
     var stringifyDocument = require_stringifyDocument();
     var anchors = require_anchors();
     var applyReviver = require_applyReviver();
@@ -3551,7 +3551,7 @@ var require_Document = __commonJS({
         if (options.schema instanceof Object)
           this.schema = options.schema;
         else if (opt)
-          this.schema = new Schema.Schema(Object.assign(opt, options));
+          this.schema = new Schema2.Schema(Object.assign(opt, options));
         else
           throw new Error(`With a null YAML version, the { schema: Schema } option is required`);
       }
@@ -7151,7 +7151,7 @@ var require_dist = __commonJS({
     "use strict";
     var composer = require_composer();
     var Document = require_Document();
-    var Schema = require_Schema();
+    var Schema2 = require_Schema();
     var errors = require_errors();
     var Alias = require_Alias();
     var identity = require_identity();
@@ -7167,7 +7167,7 @@ var require_dist = __commonJS({
     var visit = require_visit();
     exports.Composer = composer.Composer;
     exports.Document = Document.Document;
-    exports.Schema = Schema.Schema;
+    exports.Schema = Schema2.Schema;
     exports.YAMLError = errors.YAMLError;
     exports.YAMLParseError = errors.YAMLParseError;
     exports.YAMLWarning = errors.YAMLWarning;
@@ -8013,6 +8013,7 @@ var InstancesSchema = z13.record(
 ).optional().describe("Define the instances in your stack.");
 
 // src/feature/layer/schema.ts
+import { paramCase as paramCase3 } from "change-case";
 import { z as z15 } from "zod";
 
 // src/config/schema/lambda.ts
@@ -8021,18 +8022,24 @@ var ArchitectureSchema2 = z14.enum(["x86_64", "arm64"]).describe("The instructio
 var NodeRuntimeSchema2 = z14.enum(["nodejs18.x", "nodejs20.x", "nodejs22.x"]).describe("The identifier of the function's runtime.");
 
 // src/feature/layer/schema.ts
+var Schema = z15.object({
+  file: LocalFileSchema,
+  description: z15.string().optional().describe("A description of the lambda layer."),
+  runtimes: NodeRuntimeSchema2.array().optional(),
+  architecture: ArchitectureSchema2.optional(),
+  packages: z15.string().array().optional().describe(
+    "Define the package names that are available bundled in the layer. Those packages are not bundled while bundling the lambda."
+  )
+});
+var LayerIdSchema = z15.string().min(2).max(214).regex(/^[a-z0-9\-@.]+$/i, "Invalid layer ID").transform((value) => paramCase3(value));
 var LayerSchema = z15.record(
-  ResourceIdSchema,
+  LayerIdSchema,
   z15.union([
     LocalFileSchema.transform((file) => ({
-      file
+      file,
+      description: void 0
     })),
-    z15.object({
-      file: LocalFileSchema,
-      description: z15.string().optional().describe("A description of the lambda layer."),
-      runtimes: NodeRuntimeSchema2.array().optional(),
-      architectures: ArchitectureSchema2.array().optional()
-    })
+    Schema
   ])
 ).optional().describe("Define the lambda layers in your stack.");
 
@@ -8744,9 +8751,9 @@ import { z as z35 } from "zod";
 var TestsSchema = z35.union([LocalDirectorySchema.transform((v) => [v]), LocalDirectorySchema.array()]).describe("Define the location of your tests for your stack.").optional();
 
 // src/feature/topic/schema.ts
-import { paramCase as paramCase3 } from "change-case";
+import { paramCase as paramCase4 } from "change-case";
 import { z as z36 } from "zod";
-var TopicNameSchema = z36.string().min(3).max(256).regex(/^[a-z0-9\-]+$/i, "Invalid topic name").transform((value) => paramCase3(value)).describe("Define event topic name.");
+var TopicNameSchema = z36.string().min(3).max(256).regex(/^[a-z0-9\-]+$/i, "Invalid topic name").transform((value) => paramCase4(value)).describe("Define event topic name.");
 var TopicsSchema = z36.array(TopicNameSchema).refine((topics) => {
   return topics.length === new Set(topics).size;
 }, "Must be a list of unique topic names").optional().describe("Define the event topics to publish too in your stack.");
@@ -8993,7 +9000,7 @@ var TypeObject = class {
 };
 
 // src/util/name.ts
-import { paramCase as paramCase4 } from "change-case";
+import { paramCase as paramCase5 } from "change-case";
 import { createHmac } from "crypto";
 var formatGlobalResourceName = (opt) => {
   return [
@@ -9003,7 +9010,7 @@ var formatGlobalResourceName = (opt) => {
     opt.resourceType,
     opt.resourceName,
     opt.postfix
-  ].filter((v) => typeof v === "string").map((v) => paramCase4(v) || v).join(opt.seperator ?? "--");
+  ].filter((v) => typeof v === "string").map((v) => paramCase5(v) || v).join(opt.seperator ?? "--");
 };
 var formatLocalResourceName = (opt) => {
   return [
@@ -9014,7 +9021,7 @@ var formatLocalResourceName = (opt) => {
     opt.resourceType,
     opt.resourceName,
     opt.postfix
-  ].filter((v) => typeof v === "string").map((v) => paramCase4(v) || v).join(opt.seperator ?? "--");
+  ].filter((v) => typeof v === "string").map((v) => paramCase5(v) || v).join(opt.seperator ?? "--");
 };
 var generateGlobalAppId = (opt) => {
   return createHmac("sha1", "awsless").update(opt.accountId).update(opt.region).update(opt.appName).digest("hex").substring(0, 8);
@@ -10701,7 +10708,10 @@ var createLambdaFunction = (group, ctx, ns, id, local2) => {
         const temp = await createTempFolder(`function--${name}`);
         const bundle = await bundleTypeScript({
           file: local2.file,
-          external: [...props.build.external ?? [], ...props.layers ?? []],
+          external: [
+            ...props.build.external ?? [],
+            ...(props.layers ?? []).flatMap((id2) => ctx.shared.get(`layer-${id2}-packages`))
+          ],
           minify: props.build.minify,
           nativeDir: temp.path
         });
@@ -11087,7 +11097,7 @@ var commandFeature = defineFeature({
 });
 
 // src/feature/config/index.ts
-import { paramCase as paramCase5 } from "change-case";
+import { paramCase as paramCase6 } from "change-case";
 
 // src/util/ssm.ts
 import {
@@ -11248,7 +11258,7 @@ var configFeature = defineFeature({
           resources: configs.map(
             (name) => `arn:aws:ssm:${ctx.appConfig.region}:${ctx.accountId}:parameter${configParameterPrefix(
               ctx.app.name
-            )}/${paramCase5(name)}`
+            )}/${paramCase6(name)}`
           )
         });
       });
@@ -11523,7 +11533,7 @@ var functionFeature = defineFeature({
 });
 
 // src/feature/graphql/index.ts
-import { constantCase as constantCase5, paramCase as paramCase6 } from "change-case";
+import { constantCase as constantCase5, paramCase as paramCase7 } from "change-case";
 import { generate } from "@awsless/graphql";
 import { mergeTypeDefs } from "@graphql-tools/merge";
 import { readFile as readFile5 } from "fs/promises";
@@ -11816,7 +11826,7 @@ var graphqlFeature = defineFeature({
         for (const [fieldName, props2] of Object.entries(fields ?? {})) {
           const name = `${typeName}__${fieldName}`;
           const resolverGroup = new Node7(group, "resolver", name);
-          const entryId = paramCase6(`${id}-${shortId(`${typeName}-${fieldName}`)}`);
+          const entryId = paramCase7(`${id}-${shortId(`${typeName}-${fieldName}`)}`);
           const { lambda } = createLambdaFunction(resolverGroup, ctx, `graphql`, entryId, {
             ...props2.consumer,
             description: `${id} ${typeName}.${fieldName}`
@@ -12592,7 +12602,7 @@ var restFeature = defineFeature({
 });
 
 // src/feature/rpc/index.ts
-import { camelCase as camelCase6, constantCase as constantCase10, paramCase as paramCase7 } from "change-case";
+import { camelCase as camelCase6, constantCase as constantCase10, paramCase as paramCase8 } from "change-case";
 import { Asset as Asset5, aws as aws17, Node as Node16 } from "@awsless/formation";
 import { mebibytes as mebibytes2 } from "@awsless/size";
 import { dirname as dirname10, join as join9, relative as relative5 } from "path";
@@ -12894,7 +12904,7 @@ var rpcFeature = defineFeature({
       const group = new Node16(ctx.stack, "rpc", id);
       for (const [name, props] of Object.entries(queries ?? {})) {
         const queryGroup = new Node16(group, "query", name);
-        const entryId = paramCase7(`${id}-${shortId(name)}`);
+        const entryId = paramCase8(`${id}-${shortId(name)}`);
         createLambdaFunction(queryGroup, ctx, `rpc`, entryId, {
           ...props,
           description: `${id} ${name}`
@@ -13213,7 +13223,7 @@ var siteFeature = defineFeature({
 
 // src/feature/store/index.ts
 import { aws as aws20, Node as Node19 } from "@awsless/formation";
-import { paramCase as paramCase8 } from "change-case";
+import { paramCase as paramCase9 } from "change-case";
 var typeGenCode5 = `
 import { Body, PutObjectProps, BodyStream } from '@awsless/s3'
 
@@ -13297,7 +13307,7 @@ var storeFeature = defineFeature({
       };
       for (const [event, funcProps] of Object.entries(props.events ?? {})) {
         const eventGroup = new Node19(group, "event", event);
-        const eventId = paramCase8(`${id}-${shortId(event)}`);
+        const eventId = paramCase9(`${id}-${shortId(event)}`);
         const { lambda } = createAsyncLambdaFunction(eventGroup, ctx, `store`, eventId, {
           ...funcProps,
           description: `${id} event "${event}"`
@@ -13804,6 +13814,10 @@ import { Asset as Asset7, aws as aws26, Node as Node26 } from "@awsless/formatio
 var layerFeature = defineFeature({
   name: "layer",
   onBefore(ctx) {
+    const layers = Object.entries(ctx.appConfig.defaults.layers ?? {});
+    if (layers.length === 0) {
+      return;
+    }
     const group = new Node26(ctx.base, "layer", "asset");
     const bucket = new aws26.s3.Bucket(group, "bucket", {
       name: formatGlobalResourceName({
@@ -13822,8 +13836,9 @@ var layerFeature = defineFeature({
     if (layers.length === 0) {
       return;
     }
-    for (const [id, props] of layers) {
-      const group = new Node26(ctx.base, "lambda-layer", id);
+    for (const [id, _props] of layers) {
+      const props = _props;
+      const group = new Node26(ctx.base, "layer", id);
       const item = new aws26.s3.BucketObject(group, "code", {
         bucket: ctx.shared.get("layer-bucket-name"),
         key: `/layer/${id}.zip`,
@@ -13837,7 +13852,7 @@ var layerFeature = defineFeature({
           resourceName: id
         }),
         description: props.description,
-        architectures: props.architectures,
+        architectures: props.architecture ? [props.architecture] : void 0,
         runtimes: props.runtimes,
         code: {
           bucket: item.bucket,
@@ -13845,13 +13860,8 @@ var layerFeature = defineFeature({
         }
       }).dependsOn(item);
       ctx.shared.set(`layer-${id}-arn`, layer.arn);
+      ctx.shared.set(`layer-${id}-packages`, props.packages ?? [id]);
     }
-    ctx.onGlobalPolicy((policy) => {
-      policy.addStatement({
-        actions: ["lambda:InvokeFunction", "lambda:InvokeAsync"],
-        resources: [`arn:aws:lambda:*:*:function:${ctx.appConfig.name}--*`]
-      });
-    });
   }
 });
 

package/dist/build-json-schema.js

@@ -1143,6 +1143,7 @@ var DomainsDefaultSchema = z32.record(
 ).optional().describe("Define the domains for your application.");
 
 // src/feature/layer/schema.ts
+import { paramCase as paramCase4 } from "change-case";
 import { z as z34 } from "zod";
 
 // src/config/schema/lambda.ts
@@ -1151,18 +1152,24 @@ var ArchitectureSchema2 = z33.enum(["x86_64", "arm64"]).describe("The instructio
 var NodeRuntimeSchema2 = z33.enum(["nodejs18.x", "nodejs20.x", "nodejs22.x"]).describe("The identifier of the function's runtime.");
 
 // src/feature/layer/schema.ts
+var Schema = z34.object({
+  file: LocalFileSchema,
+  description: z34.string().optional().describe("A description of the lambda layer."),
+  runtimes: NodeRuntimeSchema2.array().optional(),
+  architecture: ArchitectureSchema2.optional(),
+  packages: z34.string().array().optional().describe(
+    "Define the package names that are available bundled in the layer. Those packages are not bundled while bundling the lambda."
+  )
+});
+var LayerIdSchema = z34.string().min(2).max(214).regex(/^[a-z0-9\-@.]+$/i, "Invalid layer ID").transform((value) => paramCase4(value));
 var LayerSchema = z34.record(
-  ResourceIdSchema,
+  LayerIdSchema,
   z34.union([
     LocalFileSchema.transform((file) => ({
-      file
+      file,
+      description: void 0
     })),
-    z34.object({
-      file: LocalFileSchema,
-      description: z34.string().optional().describe("A description of the lambda layer."),
-      runtimes: NodeRuntimeSchema2.array().optional(),
-      architectures: ArchitectureSchema2.array().optional()
-    })
+    Schema
   ])
 ).optional().describe("Define the lambda layers in your stack.");
 

package/package.json

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