@awsless/awsless 0.0.163 → 0.0.165

package/dist/bin.js

@@ -1352,6 +1352,9 @@ import { relative as relative2 } from "path";
 var isFunctionProps = (input) => {
   return typeof input === "string" || typeof input.file === "string";
 };
+var toFunctionProps = (fileOrProps) => {
+  return typeof fileOrProps === "string" ? { file: fileOrProps } : fileOrProps;
+};
 var typeGenCode = `
 import { InvokeOptions, InvokeResponse } from '@awsless/lambda'
 import type { PartialDeep } from 'type-fest'
@@ -1427,7 +1430,10 @@ var toLambdaFunction = (ctx, id, fileOrProps) => {
   const config2 = ctx.config;
   const stack = ctx.stack ?? ctx.bootstrap;
   const bootstrap2 = ctx.bootstrap;
-  const props = typeof fileOrProps === "string" ? { ...config2.app.defaults?.function, file: fileOrProps } : { ...config2.app.defaults?.function, ...fileOrProps };
+  const props = {
+    ...config2.app.defaults?.function,
+    ...toFunctionProps(fileOrProps)
+  };
   const lambda = new Function(id, {
     name: `${config2.app.name}-${stack.name}-${id}`,
     code: Code.fromFile(
@@ -1758,47 +1764,50 @@ var authPlugin = definePlugin({
     gen.addInterface("AuthResources", resources);
     await write("auth.d.ts", gen, true);
   },
-  // onStack({ config, bootstrap, stackConfig, bind }) {
-  // 	for (const [id, props] of Object.entries(stackConfig.auth ?? {})) {
-  // 		if (props.access) {
-  // 			const userPoolId = bootstrap.import(`auth-${id}-user-pool-id`)
-  // 			const clientId = bootstrap.import(`auth-${id}-client-id`)
-  // 			const name = constantCase(id)
-  // 			bind(lambda => {
-  // 				lambda.addEnvironment(`AUTH_${name}_USER_POOL_ID`, userPoolId)
-  // 				lambda.addEnvironment(`AUTH_${name}_CLIENT_ID`, clientId)
-  // 				if (config.app.defaults.auth?.[id]?.secret) {
-  // 					const clientSecret = bootstrap.import(`auth-${id}-client-secret`)
-  // 					lambda.addEnvironment(`AUTH_${name}_CLIENT_SECRET`, clientSecret)
-  // 				}
-  // 				lambda.addPermissions({
-  // 					actions: ['cognito:*'],
-  // 					resources: ['*'],
-  // 				})
-  // 			})
-  // 		}
-  // 	}
-  // },
-  onStack({ config: config2, bootstrap: bootstrap2, bind: bind2 }) {
-    for (const [id, props] of Object.entries(config2.app.defaults.auth)) {
-      bind2((lambda) => {
-        const userPoolArn = bootstrap2.import(`auth-${id}-user-pool-arn`);
+  onStack({ config: config2, bootstrap: bootstrap2, stackConfig, bind: bind2 }) {
+    for (const [id, props] of Object.entries(stackConfig.auth ?? {})) {
+      if (props.access) {
         const userPoolId = bootstrap2.import(`auth-${id}-user-pool-id`);
         const clientId = bootstrap2.import(`auth-${id}-client-id`);
         const name = constantCase6(id);
-        lambda.addEnvironment(`AUTH_${name}_USER_POOL_ID`, userPoolId);
-        lambda.addEnvironment(`AUTH_${name}_CLIENT_ID`, clientId);
-        if (props.secret) {
-          const clientSecret = bootstrap2.import(`auth-${id}-client-secret`);
-          lambda.addEnvironment(`AUTH_${name}_CLIENT_SECRET`, clientSecret);
-        }
-        lambda.addPermissions({
-          actions: ["cognito:*"],
-          resources: [userPoolArn]
+        bind2((lambda) => {
+          lambda.addEnvironment(`AUTH_${name}_USER_POOL_ID`, userPoolId);
+          lambda.addEnvironment(`AUTH_${name}_CLIENT_ID`, clientId);
+          if (config2.app.defaults.auth?.[id]?.secret) {
+            const clientSecret = bootstrap2.import(`auth-${id}-client-secret`);
+            lambda.addEnvironment(`AUTH_${name}_CLIENT_SECRET`, clientSecret);
+          }
+          lambda.addPermissions({
+            actions: ["cognito:*"],
+            resources: ["*"]
+          });
         });
-      });
+      }
     }
   },
+  // onStack({ config, bootstrap, bind }) {
+  // 	// Give access to every lambda function in our app to our cognito instance.
+  // 	for (const [id, props] of Object.entries(config.app.defaults.auth)) {
+  // 		bind(lambda => {
+  // 			const userPoolArn = bootstrap.import(`auth-${id}-user-pool-arn`)
+  // 			const userPoolId = bootstrap.import(`auth-${id}-user-pool-id`)
+  // 			const clientId = bootstrap.import(`auth-${id}-client-id`)
+  // 			const name = constantCase(id)
+  // 			lambda.addEnvironment(`AUTH_${name}_USER_POOL_ID`, userPoolId)
+  // 			lambda.addEnvironment(`AUTH_${name}_CLIENT_ID`, clientId)
+  // 			// lambda.addEnvironment(`AWSLESS_PUBLIC_AUTH_${name}_USER_POOL_ID`, userPoolId)
+  // 			// lambda.addEnvironment(`AWSLESS_PUBLIC_AUTH_${name}_CLIENT_ID`, clientId)
+  // 			if (props.secret) {
+  // 				const clientSecret = bootstrap.import(`auth-${id}-client-secret`)
+  // 				lambda.addEnvironment(`AUTH_${name}_CLIENT_SECRET`, clientSecret)
+  // 			}
+  // 			lambda.addPermissions({
+  // 				actions: ['cognito:*'],
+  // 				resources: [userPoolArn],
+  // 			})
+  // 		})
+  // 	}
+  // },
   onApp(ctx) {
     const { config: config2, bootstrap: bootstrap2 } = ctx;
     if (Object.keys(config2.app.defaults.auth).length === 0) {
@@ -3267,8 +3276,12 @@ var graphqlPlugin = definePlugin({
       for (const [typeName, fields] of Object.entries(props.resolvers || {})) {
         for (const [fieldName, resolverProps] of Object.entries(fields || {})) {
           const props2 = isFunctionProps(resolverProps) ? { consumer: resolverProps } : resolverProps;
-          const entryId = paramCase4(`${id}-${shortId(`${typeName}-${fieldName}`)}`);
-          const lambda = toLambdaFunction(ctx, `graphql-${entryId}`, props2.consumer);
+          const entryId = paramCase4(`${id}-${typeName}-${fieldName}`);
+          const funcId = paramCase4(`${id}-${shortId(`${typeName}-${fieldName}`)}`);
+          const lambda = toLambdaFunction(ctx, `graphql-${funcId}`, {
+            description: entryId,
+            ...toFunctionProps(props2.consumer)
+          });
           const resolver = props2.resolver ?? defaultProps?.resolver;
           let code = defaultResolver;
           if (resolver) {
@@ -5830,6 +5843,7 @@ var VPCSchema = z7.boolean().describe("Put the function inside your global VPC."
 var MinifySchema = z7.boolean().describe("Minify the function code.");
 var HandlerSchema = z7.string().describe("The name of the exported method within your code that Lambda calls to run your function.");
 var FileSchema = LocalFileSchema.describe("The file path of the function code.");
+var DescriptionSchema = z7.string().describe("A description of the function.");
 var LogRetentionSchema = DurationSchema.refine(durationMin(Duration.days(1)), "Minimum log retention is 1 day");
 var LogSchema = z7.union([
   z7.boolean(),
@@ -5853,6 +5867,7 @@ var FunctionSchema = z7.union([
   LocalFileSchema,
   z7.object({
     file: FileSchema,
+    description: DescriptionSchema.optional(),
     handler: HandlerSchema.optional(),
     minify: MinifySchema.optional(),
     warm: WarmSchema.optional(),
@@ -5909,10 +5924,7 @@ var TriggersSchema = z8.object({
 var AuthSchema = z8.record(
   ResourceIdSchema,
   z8.object({
-    // access: z
-    // 	.boolean()
-    // 	.default(false)
-    // 	.describe('Give access to every function in this stack to your cognito instance.'),
+    access: z8.boolean().default(false).describe("Give access to every function in this stack to your cognito instance."),
     triggers: TriggersSchema.optional()
   })
 ).optional().describe("Define the auth triggers in your stack.");
@@ -8669,13 +8681,7 @@ var del2 = (program2) => {
               label: stack.name,
               task: async (update) => {
                 update("deleting...");
-                try {
-                  await client.delete(stack.name, stack.region);
-                } catch (error) {
-                  debugError(error);
-                  update("failed");
-                  throw error;
-                }
+                await client.delete(stack.name, stack.region);
                 update("deleted");
                 return "done";
               }