feedback

packages/api-graphql/package.json

@@ -87,7 +87,7 @@
 	"dependencies": {
 		"@aws-amplify/api-rest": "4.0.21",
 		"@aws-amplify/core": "6.0.21",
-		"@aws-amplify/data-schema-types": "^0.7.10",
+		"@aws-amplify/data-schema-types": "^0.7.11",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",

packages/api-graphql/src/internals/generateCustomOperationsProperty.ts

@@ -23,7 +23,9 @@ type CustomOpsProperty<
 	? CustomQueries<T>
 	: OpType extends 'mutations'
 		? CustomMutations<T>
-		: CustomSubscriptions<T>;
+		: OpType extends 'subscriptions'
+			? CustomSubscriptions<T>
+			: never;
 
 const operationTypeMap = {
 	queries: 'query',

packages/api-graphql/src/internals/operations/custom.ts

@@ -40,6 +40,15 @@ type OpArgs =
 	// Client or SSR Cookies Client without Args defined
 	| [CustomOperationOptions];
 
+/**
+ * Type guard for checking whether a Custom Operation argument is a contextSpec object
+ */
+const argIsContextSpec = (
+	arg: OpArgs[number],
+): arg is AmplifyServer.ContextSpec => {
+	return typeof (arg as AmplifyServer.ContextSpec)?.token?.value === 'symbol';
+};
+
 /**
  * Builds an operation function, embedded with all client and context data, that
  * can be attached to a client as a custom query or mutation.
@@ -115,8 +124,9 @@ export function customOpFactory(
 		let arg: QueryArgs | undefined;
 
 		if (useContext) {
-			contextSpec = args[0] as AmplifyServer.ContextSpec;
-			if (contextSpec?.token === undefined) {
+			if (argIsContextSpec(args[0])) {
+				contextSpec = args[0];
+			} else {
 				throw new Error(
 					`Invalid first argument passed to ${operation.name}. Expected contextSpec`,
 				);