@awsless/awsless 0.0.79 → 0.0.81

package/dist/bin.js

@@ -2139,10 +2139,7 @@ var tablePlugin = definePlugin({
            *   }
            * }
            */
-          fields: z9.record(
-            z9.string(),
-            z9.enum(["string", "number", "binary"])
-          ).optional(),
+          fields: z9.record(z9.string(), z9.enum(["string", "number", "binary"])).optional(),
           /** The table class of the table.
            * @default 'standard'
            */
@@ -2179,18 +2176,21 @@ var tablePlugin = definePlugin({
            *   }
            * }
            */
-          indexes: z9.record(z9.string(), z9.object({
-            /** Specifies the name of the partition / hash key that makes up the primary key for the global secondary index. */
-            hash: KeySchema,
-            /** Specifies the name of the range / sort key that makes up the primary key for the global secondary index. */
-            sort: KeySchema.optional(),
-            /** The set of attributes that are projected into the index:
-             * - all - All of the table attributes are projected into the index.
-             * - keys-only - Only the index and primary keys are projected into the index.
-             * @default 'all'
-             */
-            projection: z9.enum(["all", "keys-only"]).default("all")
-          })).optional()
+          indexes: z9.record(
+            z9.string(),
+            z9.object({
+              /** Specifies the name of the partition / hash key that makes up the primary key for the global secondary index. */
+              hash: KeySchema,
+              /** Specifies the name of the range / sort key that makes up the primary key for the global secondary index. */
+              sort: KeySchema.optional(),
+              /** The set of attributes that are projected into the index:
+               * - all - All of the table attributes are projected into the index.
+               * - keys-only - Only the index and primary keys are projected into the index.
+               * @default 'all'
+               */
+              projection: z9.enum(["all", "keys-only"]).default("all")
+            })
+          ).optional()
         })
       ).optional()
     }).array()
@@ -2201,7 +2201,7 @@ var tablePlugin = definePlugin({
       const list3 = new TypeObject();
       for (const name of Object.keys(stack.tables || {})) {
         const tableName = formatName(`${config.name}-${stack.name}-${name}`);
-        list3.addType(name, `{ readonly name: '${tableName}' }`);
+        list3.addType(name, tableName);
       }
       types2.addType(stack.name, list3.toString());
     }
@@ -2433,7 +2433,7 @@ import { PublishOptions } from '@awsless/sns'
 
 type Publish<Name extends string> = {
 	readonly name: Name
-	readonly (payload: unknown, options?: Omit<PublishOptions, 'topic' | 'payload'>): Promise<void>
+	(payload: unknown, options?: Omit<PublishOptions, 'topic' | 'payload'>): Promise<void>
 }`;
 var topicPlugin = definePlugin({
   name: "topic",
@@ -5316,11 +5316,13 @@ var sitePlugin = definePlugin({
         }).dependsOn(lambda);
         const url = lambda.addUrl();
         stack.add(url, lambda, permissions);
-        origins.push(new Origin({
-          id: "lambda",
-          domainName: select(2, split("/", url.url)),
-          protocol: "https-only"
-        }));
+        origins.push(
+          new Origin({
+            id: "lambda",
+            domainName: select(2, split("/", url.url)),
+            protocol: "https-only"
+          })
+        );
         deps.push(lambda, url, permissions);
       }
       if (props.static) {
@@ -5355,20 +5357,24 @@ var sitePlugin = definePlugin({
           }
         }).dependsOn(bucket);
         stack.add(bucket, files, uploadBucketAsset, deleteBucket, accessControl);
-        origins.push(new Origin({
-          id: "bucket",
-          // domainName: select(2, split('/', bucket.url)),
-          domainName: bucket.domainName,
-          originAccessControlId: accessControl.id
-        }));
+        origins.push(
+          new Origin({
+            id: "bucket",
+            // domainName: select(2, split('/', bucket.url)),
+            domainName: bucket.domainName,
+            originAccessControlId: accessControl.id
+          })
+        );
         deps.push(bucket, accessControl);
       }
       if (props.ssr && props.static) {
-        originGroups.push(new OriginGroup({
-          id: "group",
-          members: ["lambda", "bucket"],
-          statusCodes: [403, 404]
-        }));
+        originGroups.push(
+          new OriginGroup({
+            id: "group",
+            members: ["lambda", "bucket"],
+            statusCodes: [403, 404]
+          })
+        );
       }
       const cache = new CachePolicy(id, {
         name: `site-${config.name}-${stack.name}-${id}`,
@@ -5455,14 +5461,7 @@ var sitePlugin = definePlugin({
           hostedZoneId: "Z2FDTNDATAQYW2"
         }
       }).dependsOn(distribution);
-      stack.add(
-        distribution,
-        invalidateCache,
-        responseHeaders,
-        originRequest,
-        cache,
-        record
-      );
+      stack.add(distribution, invalidateCache, responseHeaders, originRequest, cache, record);
     }
   }
 });
@@ -5710,22 +5709,42 @@ var UserPool = class extends Resource {
         }
       },
       LambdaConfig: {
-        ...this.attr("PreAuthentication", this.props.events?.preLogin),
-        ...this.attr("PostAuthentication", this.props.events?.postLogin),
-        ...this.attr("PostConfirmation", this.props.events?.postRegister),
-        ...this.attr("PreSignUp", this.props.events?.preRegister),
-        ...this.attr("PreTokenGeneration", this.props.events?.preToken),
-        ...this.attr("CustomMessage", this.props.events?.customMessage),
-        ...this.attr("UserMigration", this.props.events?.userMigration),
-        ...this.attr("DefineAuthChallenge", this.props.events?.defineChallange),
-        ...this.attr("CreateAuthChallenge", this.props.events?.createChallange),
-        ...this.attr("VerifyAuthChallengeResponse", this.props.events?.verifyChallange)
+        ...this.attr("PreAuthentication", this.props.triggers?.beforeLogin),
+        ...this.attr("PostAuthentication", this.props.triggers?.afterLogin),
+        ...this.attr("PostConfirmation", this.props.triggers?.afterRegister),
+        ...this.attr("PreSignUp", this.props.triggers?.beforeRegister),
+        ...this.attr("PreTokenGeneration", this.props.triggers?.beforeToken),
+        ...this.attr("CustomMessage", this.props.triggers?.customMessage),
+        ...this.attr("UserMigration", this.props.triggers?.userMigration),
+        ...this.attr("DefineAuthChallenge", this.props.triggers?.defineChallange),
+        ...this.attr("CreateAuthChallenge", this.props.triggers?.createChallange),
+        ...this.attr("VerifyAuthChallengeResponse", this.props.triggers?.verifyChallange)
       }
     };
   }
 };
 
 // src/plugins/auth.ts
+var TriggersSchema = z25.object({
+  /** A pre jwt token generation AWS Lambda trigger. */
+  beforeToken: FunctionSchema.optional(),
+  /** A pre user login AWS Lambda trigger. */
+  beforeLogin: FunctionSchema.optional(),
+  /** A post user login AWS Lambda trigger. */
+  afterLogin: FunctionSchema.optional(),
+  /** A pre user register AWS Lambda trigger. */
+  beforeRegister: FunctionSchema.optional(),
+  /** A post user register AWS Lambda trigger. */
+  afterRegister: FunctionSchema.optional(),
+  /** A custom message AWS Lambda trigger. */
+  customMessage: FunctionSchema.optional(),
+  /** Defines the authentication challenge. */
+  defineChallenge: FunctionSchema.optional(),
+  /** Creates an authentication challenge. */
+  createChallenge: FunctionSchema.optional(),
+  /** Verifies the authentication challenge response. */
+  verifyChallenge: FunctionSchema.optional()
+});
 var authPlugin = definePlugin({
   name: "auth",
   schema: z25.object({
@@ -5812,29 +5831,31 @@ var authPlugin = definePlugin({
             refreshToken: DurationSchema.default("365 days")
           }).default({}),
           /** Specifies the configuration for AWS Lambda triggers. */
-          events: z25.object({
-            /** A pre jwt token generation AWS Lambda trigger. */
-            preToken: FunctionSchema.optional(),
-            /** A pre user login AWS Lambda trigger. */
-            preLogin: FunctionSchema.optional(),
-            /** A post user login AWS Lambda trigger. */
-            postLogin: FunctionSchema.optional(),
-            /** A pre user register AWS Lambda trigger. */
-            preRegister: FunctionSchema.optional(),
-            /** A post user register AWS Lambda trigger. */
-            postRegister: FunctionSchema.optional(),
-            /** A custom message AWS Lambda trigger. */
-            customMessage: FunctionSchema.optional(),
-            /** Defines the authentication challenge. */
-            defineChallenge: FunctionSchema.optional(),
-            /** Creates an authentication challenge. */
-            createChallenge: FunctionSchema.optional(),
-            /** Verifies the authentication challenge response. */
-            verifyChallenge: FunctionSchema.optional()
-          }).optional()
+          triggers: TriggersSchema.optional()
         })
       ).default({})
-    }).default({})
+    }).default({}),
+    stacks: z25.object({
+      /** Define the auth triggers in your stack.
+       * @example
+       * {
+       *   auth: {
+       *     AUTH_NAME: {
+       *       triggers: {
+       *         beforeLogin: 'function.ts',
+       *       }
+       *     }
+       *   }
+       * }
+       */
+      auth: z25.record(
+        ResourceIdSchema,
+        z25.object({
+          /** Specifies the configuration for AWS Lambda triggers. */
+          triggers: TriggersSchema.optional()
+        })
+      ).optional()
+    }).array()
   }),
   onTypeGen({ config }) {
     const gen = new TypeGen("@awsless/awsless", "AuthResources");
@@ -5847,18 +5868,30 @@ var authPlugin = definePlugin({
     const { config, bootstrap: bootstrap2, bind } = ctx;
     for (const [id, props] of Object.entries(config.defaults.auth)) {
       const functions = /* @__PURE__ */ new Map();
-      const events = {};
-      for (const [event, fnProps] of Object.entries(props.events ?? {})) {
-        const lambda = toLambdaFunction(ctx, `auth-${id}-${event}`, fnProps);
-        functions.set(event, lambda);
-        events[event] = lambda.arn;
+      const triggers = {};
+      for (const [trigger, fnProps] of Object.entries(props.triggers ?? {})) {
+        const lambda = toLambdaFunction(ctx, `auth-${id}-${trigger}`, fnProps);
+        functions.set(trigger, lambda);
+        triggers[trigger] = lambda.arn;
+      }
+      for (const stack of config.stacks) {
+        for (const [trigger, fnProps] of Object.entries(stack.auth?.[id]?.triggers ?? {})) {
+          const lambda = toLambdaFunction(ctx, `auth-${id}-${trigger}`, fnProps);
+          if (functions.has(trigger)) {
+            throw new TypeError(
+              `Only one "${trigger}" trigger can be defined for each auth instance: ${id}`
+            );
+          }
+          functions.set(trigger, lambda);
+          triggers[trigger] = lambda.arn;
+        }
       }
       const userPool = new UserPool(id, {
         name: `${config.name}-${id}`,
         allowUserRegistration: props.allowUserRegistration,
         username: props.username,
         password: props.password,
-        events
+        triggers
       });
       const client = userPool.addClient({
         name: `${config.name}-${id}`,
@@ -5880,10 +5913,7 @@ var authPlugin = definePlugin({
           functionArn: lambda.arn,
           sourceArn: userPool.arn
         }).dependsOn(lambda);
-        bootstrap2.add(
-          lambda,
-          permission
-        );
+        bootstrap2.add(lambda, permission);
       }
     }
     bind((lambda) => {