@awsless/awsless 0.0.191 → 0.0.193

package/dist/bin.js

@@ -2516,7 +2516,7 @@ var functionFeature = defineFeature({
 import { paramCase as paramCase5 } from "change-case";
 import { mergeTypeDefs } from "@graphql-tools/merge";
 import { generate } from "@awsless/graphql";
-import { buildSchema, isObjectType, print } from "graphql";
+import { buildSchema, print } from "graphql";
 import { readFile as readFile5 } from "fs/promises";
 import { Asset as Asset2, Node as Node6, aws as aws6 } from "@awsless/formation";
 
@@ -2751,28 +2751,10 @@ var graphqlFeature = defineFeature({
   onApp(ctx) {
     for (const [id, props] of Object.entries(ctx.appConfig.defaults.graphql ?? {})) {
       const group = new Node6(ctx.base, "graphql", id);
-      const role = new aws6.iam.Role(group, "role", {
-        assumedBy: "appsync.amazonaws.com",
-        policies: [
-          {
-            name: "merge-policy",
-            statements: [
-              {
-                actions: [
-                  //
-                  "appsync:StartSchemaMerge",
-                  "appsync:SourceGraphQL"
-                ],
-                resources: [`arn:aws:appsync:${ctx.appConfig.region}:${ctx.accountId}:apis/*`]
-              }
-            ]
-          }
-        ]
-      });
+      const name = formatGlobalResourceName(ctx.app.name, "graphql", id);
       const api = new aws6.appsync.GraphQLApi(group, "api", {
-        name: formatGlobalResourceName(ctx.app.name, "graphql", id),
-        type: "merged",
-        role: role.arn,
+        name,
+        type: "graphql",
         auth: {
           default: props.auth ? {
             type: "cognito",
@@ -2784,6 +2766,32 @@ var graphqlFeature = defineFeature({
         }
       });
       ctx.shared.set(`graphql-${id}-id`, api.id);
+      ctx.registerBuild("graphql-schema", name, async (build3) => {
+        const sources = [];
+        const fingers = [];
+        for (const stack of ctx.stackConfigs) {
+          const file = stack.graphql?.[id]?.schema;
+          if (file) {
+            const source = await readFile5(file, "utf8");
+            const finger2 = createHash4("sha1").update(source).digest("hex");
+            sources.push(source);
+            fingers.push(finger2);
+          }
+        }
+        const finger = createHash4("sha1").update(sources.sort().join(" ")).digest("hex");
+        return build3(finger, async (write) => {
+          const defs = mergeTypeDefs([scalarSchema, baseSchema, ...sources]);
+          const output = print(defs);
+          await write("schema.gql", output);
+          return {
+            size: formatByteSize(Buffer.from(output).byteLength)
+          };
+        });
+      });
+      new aws6.appsync.GraphQLSchema(group, "schema", {
+        apiId: api.id,
+        definition: Asset2.fromFile(getBuildPath("graphql-schema", name, "schema.gql"))
+      });
       if (props.resolver) {
         ctx.registerBuild("graphql-resolver", id, async (build3) => {
           const resolver = props.resolver;
@@ -2834,57 +2842,11 @@ var graphqlFeature = defineFeature({
         );
       }
       const group = new Node6(ctx.stack, "graphql", id);
-      const name = formatLocalResourceName(ctx.app.name, ctx.stack.name, "graphql", id);
-      const api = new aws6.appsync.GraphQLApi(group, "api", {
-        name,
-        // visibility: false,
-        auth: {
-          default: {
-            type: "iam"
-          }
-        }
-      });
-      ctx.registerBuild("graphql-schema", name, async (build3) => {
-        const source = await readFile5(props.schema, "utf8");
-        const finger = createHash4("sha1").update(source).digest("hex");
-        return build3(finger, async (write) => {
-          const defs = mergeTypeDefs([scalarSchema, baseSchema, source]);
-          const output = print(defs);
-          const schema2 = buildSchema(output);
-          for (const [typeName, fields] of Object.entries(props.resolvers ?? {})) {
-            const type = schema2.getType(typeName);
-            if (!type || !isObjectType(type)) {
-              throw new FileError(props.schema, `GraphQL schema type doesn't exist: ${typeName}`);
-            }
-            const typeFields = type.getFields();
-            for (const fieldName of Object.keys(fields ?? {})) {
-              if (!(fieldName in typeFields)) {
-                throw new FileError(
-                  props.schema,
-                  `GraphQL schema field doesn't exist: ${typeName}.${fieldName}`
-                );
-              }
-            }
-          }
-          await write("schema.gql", output);
-          return {
-            size: formatByteSize(Buffer.from(source).byteLength)
-          };
-        });
-      });
-      const schema = new aws6.appsync.GraphQLSchema(group, "schema", {
-        apiId: api.id,
-        definition: Asset2.fromFile(getBuildPath("graphql-schema", name, "schema.gql"))
-      });
-      const association = new aws6.appsync.SourceApiAssociation(group, "association", {
-        mergedApiId: ctx.shared.get(`graphql-${id}-id`),
-        sourceApiId: api.id
-      });
-      association.dependsOn(schema);
+      const apiId = ctx.shared.get(`graphql-${id}-id`);
       for (const [typeName, fields] of Object.entries(props.resolvers ?? {})) {
         for (const [fieldName, props2] of Object.entries(fields ?? {})) {
-          const name2 = `${typeName}__${fieldName}`;
-          const resolverGroup = new Node6(group, "resolver", name2);
+          const name = `${typeName}__${fieldName}`;
+          const resolverGroup = new Node6(group, "resolver", name);
           const entryId = paramCase5(`${id}-${typeName}-${fieldName}`);
           const { lambda } = createLambdaFunction(resolverGroup, ctx, `graphql`, entryId, {
             ...props2.consumer,
@@ -2905,10 +2867,10 @@ var graphqlFeature = defineFeature({
             ]
           });
           const source = new aws6.appsync.DataSource(resolverGroup, "source", {
-            apiId: api.id,
-            type: "lambda",
-            name: name2,
+            apiId,
+            name,
             role: role.arn,
+            type: "lambda",
             functionArn: lambda.arn
           });
           let code = Asset2.fromString(defaultResolver);
@@ -2918,19 +2880,18 @@ var graphqlFeature = defineFeature({
             code = Asset2.fromFile(getBuildPath("graphql-resolver", id, "resolver.js"));
           }
           const config2 = new aws6.appsync.FunctionConfiguration(resolverGroup, "config", {
-            apiId: api.id,
-            name: name2,
+            apiId,
+            name,
             code,
             dataSourceName: source.name
           });
-          const resolver = new aws6.appsync.Resolver(resolverGroup, "resolver", {
-            apiId: api.id,
+          new aws6.appsync.Resolver(resolverGroup, "resolver", {
+            apiId,
             typeName,
             fieldName,
             functions: [config2.id],
             code
           });
-          resolver.dependsOn(schema);
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awsless/awsless",
-  "version": "0.0.191",
+  "version": "0.0.193",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -29,12 +29,12 @@
   },
   "peerDependencies": {
     "@awsless/lambda": "^0.0.18",
-    "@awsless/s3": "^0.0.10",
     "@awsless/redis": "^0.0.12",
+    "@awsless/s3": "^0.0.10",
     "@awsless/sns": "^0.0.7",
     "@awsless/sqs": "^0.0.7",
-    "@awsless/ssm": "^0.0.7",
     "@awsless/validate": "^0.0.13",
+    "@awsless/ssm": "^0.0.7",
     "@awsless/weak-cache": "^0.0.1"
   },
   "dependencies": {
@@ -97,9 +97,9 @@
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.22.3",
     "@awsless/duration": "^0.0.1",
+    "@awsless/formation": "^0.0.14",
     "@awsless/graphql": "^0.0.9",
     "@awsless/size": "^0.0.1",
-    "@awsless/formation": "^0.0.13",
     "@awsless/validate": "^0.0.13",
     "@awsless/code": "^0.0.10"
   },