@aws-amplify/adapter-nextjs 0.0.2-server-generate-client.1e317a1.0 → 1.0.1-ssr-api.df60e41.0

package/internals/package.json

@@ -0,0 +1,7 @@
+{
+	"name": "@aws-amplify/adapter-nextjs/internals",
+	"main": "../lib/internals/index.js",
+	"browser": "../lib-esm/internals/index.js",
+	"module": "../lib-esm/internals/index.js",
+	"typings": "../lib-esm/internals/index.d.ts"
+}

package/lib/generateServerClient.d.ts

@@ -1,7 +1,15 @@
-import { V6Client } from '@aws-amplify/api-graphql';
+import { V6Client, V6ClientSSR } from '@aws-amplify/api-graphql';
 import { NextServer } from './types';
-export type { GraphQLResult, GraphQLReturnType, } from '@aws-amplify/api-graphql';
 /**
- * Generates an API client that can work with models or raw GraphQL
+ * Generates an API client that can be used inside a Next.js Server Component
+ *
+ * @example
+ * ```ts
+ * import { cookies } from "next/headers";
+ *
+ * const client = generateServerClientUsingCookies({ cookies })
+ * client.graphql()
+ * ```
  */
-export declare function generateServerClient<T extends Record<any, any> = never>(nextServerContext: NextServer.Context): V6Client<T>;
+export declare function generateServerClientUsingCookies<T extends Record<any, any> = never>(nextServerContext: NextServer.ServerComponentContext): V6Client<T>;
+export declare function generateServerClient<T extends Record<any, any> = never>(): V6ClientSSR<T>;

package/lib/generateServerClient.js

@@ -2,30 +2,64 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateServerClient = void 0;
-var internals_1 = require("@aws-amplify/api-graphql/internals");
-var adapter_core_1 = require("@aws-amplify/core/internals/adapter-core");
-var runWithAmplifyServerContext_1 = require("./runWithAmplifyServerContext");
-var getAmplifyConfig_1 = require("./utils/getAmplifyConfig");
+exports.generateServerClient = exports.generateServerClientUsingCookies = void 0;
+const server_1 = require("@aws-amplify/api/server");
+const adapter_core_1 = require("@aws-amplify/core/internals/adapter-core");
+const api_graphql_1 = require("@aws-amplify/api-graphql");
+const runWithAmplifyServerContext_1 = require("./runWithAmplifyServerContext");
+const getAmplifyConfig_1 = require("./utils/getAmplifyConfig");
 /**
- * Generates an API client that can work with models or raw GraphQL
+ * Generates an API client that can be used inside a Next.js Server Component
+ *
+ * @example
+ * ```ts
+ * import { cookies } from "next/headers";
+ *
+ * const client = generateServerClientUsingCookies({ cookies })
+ * client.graphql()
+ * ```
  */
-function generateServerClient(nextServerContext) {
-    // This function reference gets passed down to InternalGraphQLAPI.graphql
+function generateServerClientUsingCookies(nextServerContext) {
+    if (!nextServerContext.cookies ||
+        nextServerContext.request !== undefined) {
+        throw new adapter_core_1.AmplifyServerContextError({
+            message: 'generateServerClientUsingCookies is only compatible with the `cookies` Dynamic Function available in Server Components',
+            // TODO: link to docs
+            recoverySuggestion: 'use generateServerClient inside of runWithAmplifyServerContext with the `request` object',
+        });
+    }
+    // This function reference gets passed down to InternalGraphQLAPI.ts.graphql
     // where this._graphql is passed through as the `fn` argument
     // causing it to always get invoked inside `runWithAmplifyServerContext`
-    var getAmplify = function (fn) {
-        return (0, runWithAmplifyServerContext_1.runWithAmplifyServerContext)({
-            nextServerContext: nextServerContext,
-            operation: function (contextSpec) {
-                return fn((0, adapter_core_1.getAmplifyServerContext)(contextSpec).amplify);
-            },
-        });
+    const getAmplify = (fn) => (0, runWithAmplifyServerContext_1.runWithAmplifyServerContext)({
+        nextServerContext,
+        operation: contextSpec => fn((0, adapter_core_1.getAmplifyServerContext)(contextSpec).amplify),
+    });
+    // retrieve general SSR config. This is used only to retrieve the
+    // modelIntroSchema for future model-based use cases
+    const config = (0, getAmplifyConfig_1.getAmplifyConfig)();
+    return (0, server_1.generateClient)({
+        amplify: getAmplify,
+        config,
+    });
+}
+exports.generateServerClientUsingCookies = generateServerClientUsingCookies;
+function generateServerClient() {
+    const config = (0, getAmplifyConfig_1.getAmplifyConfig)();
+    // passing `null` instance because each (future model) method must retrieve a valid instance
+    // from server context
+    const client = (0, server_1.generateClient)({
+        amplify: null,
+        config,
+    });
+    // TODO: improve this and the next type
+    const prevGraphql = client.graphql;
+    const wrappedGraphql = (contextSpec, options, additionalHeaders) => {
+        const amplifyInstance = (0, adapter_core_1.getAmplifyServerContext)(contextSpec).amplify;
+        return prevGraphql.call({ [api_graphql_1.__amplify]: amplifyInstance }, options, additionalHeaders);
     };
-    // retrieve general SSR config. This is used only for get the
-    // modelIntroSchema in generateModelsProperty
-    var config = (0, getAmplifyConfig_1.getAmplifyConfig)();
-    return (0, internals_1.generateClient)({ amplify: getAmplify, config: config });
+    client.graphql = wrappedGraphql;
+    return client;
 }
 exports.generateServerClient = generateServerClient;
 //# sourceMappingURL=generateServerClient.js.map

package/lib/generateServerClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateServerClient.js","sourceRoot":"","sources":["../src/generateServerClient.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;AAEtC,gEAA8F;AAC9F,yEAAmF;AAInF,6EAA4E;AAC5E,6DAA4D;AAQ5D;;GAEG;AACH,SAAgB,oBAAoB,CACnC,iBAAqC;IAErC,yEAAyE;IACzE,6DAA6D;IAC7D,wEAAwE;IACxE,IAAM,UAAU,GAAG,UAAC,EAAkC;QACrD,OAAA,IAAA,yDAA2B,EAAC;YAC3B,iBAAiB,mBAAA;YACjB,SAAS,EAAE,UAAA,WAAW;gBACrB,OAAA,EAAE,CAAC,IAAA,sCAAuB,EAAC,WAAW,CAAC,CAAC,OAAO,CAAC;YAAhD,CAAgD;SACjD,CAAC;IAJF,CAIE,CAAC;IAEJ,6DAA6D;IAC7D,6CAA6C;IAC7C,IAAM,MAAM,GAAG,IAAA,mCAAgB,GAAE,CAAC;IAElC,OAAO,IAAA,0BAAsB,EAAC,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,QAAA,EAAE,CAAC,CAAC;AAChE,CAAC;AAlBD,oDAkBC"}
+{"version":3,"file":"generateServerClient.js","sourceRoot":"","sources":["../src/generateServerClient.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;AAEtC,oDAAmF;AACnF,2EAGkD;AAClD,0DAMkC;AAElC,+EAA4E;AAC5E,+DAA4D;AAG5D;;;;;;;;;;GAUG;AACH,SAAgB,gCAAgC,CAE9C,iBAAoD;IACrD,IACC,CAAC,iBAAiB,CAAC,OAAO;QACzB,iBAAyB,CAAC,OAAO,KAAK,SAAS,EAC/C;QACD,MAAM,IAAI,wCAAyB,CAAC;YACnC,OAAO,EACN,wHAAwH;YACzH,qBAAqB;YACrB,kBAAkB,EACjB,0FAA0F;SAC3F,CAAC,CAAC;KACH;IAED,4EAA4E;IAC5E,6DAA6D;IAC7D,wEAAwE;IACxE,MAAM,UAAU,GAAG,CAAC,EAAkC,EAAE,EAAE,CACzD,IAAA,yDAA2B,EAAC;QAC3B,iBAAiB;QACjB,SAAS,EAAE,WAAW,CAAC,EAAE,CACxB,EAAE,CAAC,IAAA,sCAAuB,EAAC,WAAW,CAAC,CAAC,OAAO,CAAC;KACjD,CAAC,CAAC;IAEJ,iEAAiE;IACjE,oDAAoD;IACpD,MAAM,MAAM,GAAG,IAAA,mCAAgB,GAAE,CAAC;IAElC,OAAO,IAAA,uBAAsB,EAAiB;QAC7C,OAAO,EAAE,UAAU;QACnB,MAAM;KACN,CAAC,CAAC;AACJ,CAAC;AAlCD,4EAkCC;AAED,SAAgB,oBAAoB;IAGnC,MAAM,MAAM,GAAG,IAAA,mCAAgB,GAAE,CAAC;IAElC,4FAA4F;IAC5F,sBAAsB;IACtB,MAAM,MAAM,GAAG,IAAA,uBAAsB,EAAoB;QACxD,OAAO,EAAE,IAAI;QACb,MAAM;KACN,CAAC,CAAC;IAEH,uCAAuC;IACvC,MAAM,WAAW,GAAG,MAAM,CAAC,OAAmC,CAAC;IAE/D,MAAM,cAAc,GAAG,CAAC,WAAW,EAAE,OAAO,EAAE,iBAAkB,EAAE,EAAE;QACnE,MAAM,eAAe,GAAG,IAAA,sCAAuB,EAAC,WAAW,CAAC,CAAC,OAAO,CAAC;QACrE,OAAO,WAAW,CAAC,IAAI,CACtB,EAAE,CAAC,uBAAS,CAAC,EAAE,eAAe,EAAE,EAChC,OAAO,EACP,iBAAwB,CACxB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,GAAG,cAA6C,CAAC;IAC/D,OAAO,MAAM,CAAC;AACf,CAAC;AA1BD,oDA0BC"}

package/lib/index.d.ts

@@ -1,2 +1 @@
 export { runWithAmplifyServerContext } from './runWithAmplifyServerContext';
-export { generateServerClient } from './generateServerClient';

package/lib/index.js

@@ -2,9 +2,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateServerClient = exports.runWithAmplifyServerContext = void 0;
+exports.runWithAmplifyServerContext = void 0;
 var runWithAmplifyServerContext_1 = require("./runWithAmplifyServerContext");
 Object.defineProperty(exports, "runWithAmplifyServerContext", { enumerable: true, get: function () { return runWithAmplifyServerContext_1.runWithAmplifyServerContext; } });
-var generateServerClient_1 = require("./generateServerClient");
-Object.defineProperty(exports, "generateServerClient", { enumerable: true, get: function () { return generateServerClient_1.generateServerClient; } });
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;AAEtC,6EAA4E;AAAnE,0IAAA,2BAA2B,OAAA;AACpC,+DAA8D;AAArD,4HAAA,oBAAoB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;AAEtC,6EAA4E;AAAnE,0IAAA,2BAA2B,OAAA"}

package/lib/internals/index.d.ts

@@ -0,0 +1,2 @@
+export { getAmplifyConfig } from '../utils';
+export { NextServer } from '../types';

package/lib/internals/index.js

@@ -0,0 +1,8 @@
+"use strict";
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAmplifyConfig = void 0;
+var utils_1 = require("../utils");
+Object.defineProperty(exports, "getAmplifyConfig", { enumerable: true, get: function () { return utils_1.getAmplifyConfig; } });
+//# sourceMappingURL=index.js.map

package/lib/internals/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/internals/index.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;AAEtC,kCAA4C;AAAnC,yGAAA,gBAAgB,OAAA"}

package/lib/runWithAmplifyServerContext.js

@@ -1,47 +1,11 @@
 "use strict";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runWithAmplifyServerContext = void 0;
-var utils_1 = require("./utils");
-var core_1 = require("@aws-amplify/core");
-var adapter_core_1 = require("aws-amplify/internals/adapter-core");
+const utils_1 = require("./utils");
+const core_1 = require("@aws-amplify/core");
+const adapter_core_1 = require("aws-amplify/adapter-core");
 /**
  * Runs the {@link operation} with the the context created from the {@link nextServerContext}.
  *
@@ -85,34 +49,33 @@ var adapter_core_1 = require("aws-amplify/internals/adapter-core");
  *   return NextResponse.redirect(new URL('/sign-in', request.url));
  * }
  */
-var runWithAmplifyServerContext = function (_a) {
-    var nextServerContext = _a.nextServerContext, operation = _a.operation;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var amplifyConfig, keyValueStorage, credentialsProvider, tokenProvider;
-        return __generator(this, function (_b) {
-            amplifyConfig = (0, utils_1.getAmplifyConfig)();
-            // When the Auth config is presented, attempt to create a Amplify server
-            // context with token and credentials provider.
-            if (amplifyConfig.Auth) {
-                keyValueStorage = 
-                // When `null` is passed as the value of `nextServerContext`, opt-in
-                // unauthenticated role (primarily for static rendering). It's
-                // safe to use the singleton `MemoryKeyValueStorage` here, as the
-                // static rendering uses the same unauthenticated role cross-sever.
-                nextServerContext === null
-                    ? core_1.sharedInMemoryStorage
-                    : (0, adapter_core_1.createKeyValueStorageFromCookieStorageAdapter)((0, utils_1.createCookieStorageAdapterFromNextServerContext)(nextServerContext));
-                credentialsProvider = (0, adapter_core_1.createAWSCredentialsAndIdentityIdProvider)(amplifyConfig.Auth, keyValueStorage);
-                tokenProvider = (0, adapter_core_1.createUserPoolsTokenProvider)(amplifyConfig.Auth, keyValueStorage);
-                return [2 /*return*/, (0, adapter_core_1.runWithAmplifyServerContext)(amplifyConfig, {
-                        Auth: { credentialsProvider: credentialsProvider, tokenProvider: tokenProvider },
-                    }, operation)];
-            }
-            // Otherwise it may be the case that auth is not used, e.g. API key.
-            // Omitting the `Auth` in the second parameter.
-            return [2 /*return*/, (0, adapter_core_1.runWithAmplifyServerContext)(amplifyConfig, {}, operation)];
-        });
-    });
+const runWithAmplifyServerContext = async ({ nextServerContext, operation }) => {
+    // 1. get amplify config from env vars
+    // 2. create key-value storage from nextServerContext
+    // 3. create credentials provider
+    // 4. create token provider
+    // 5. call low level runWithAmplifyServerContext
+    const amplifyConfig = (0, utils_1.getAmplifyConfig)();
+    // When the Auth config is presented, attempt to create a Amplify server
+    // context with token and credentials provider.
+    if (amplifyConfig.Auth) {
+        const keyValueStorage = 
+        // When `null` is passed as the value of `nextServerContext`, opt-in
+        // unauthenticated role (primarily for static rendering). It's
+        // safe to use the singleton `MemoryKeyValueStorage` here, as the
+        // static rendering uses the same unauthenticated role cross-sever.
+        nextServerContext === null
+            ? core_1.sharedInMemoryStorage
+            : (0, adapter_core_1.createKeyValueStorageFromCookieStorageAdapter)((0, utils_1.createCookieStorageAdapterFromNextServerContext)(nextServerContext));
+        const credentialsProvider = (0, adapter_core_1.createAWSCredentialsAndIdentityIdProvider)(amplifyConfig.Auth, keyValueStorage);
+        const tokenProvider = (0, adapter_core_1.createUserPoolsTokenProvider)(amplifyConfig.Auth, keyValueStorage);
+        return (0, adapter_core_1.runWithAmplifyServerContext)(amplifyConfig, {
+            Auth: { credentialsProvider, tokenProvider },
+        }, operation);
+    }
+    // Otherwise it may be the case that auth is not used, e.g. API key.
+    // Omitting the `Auth` in the second parameter.
+    return (0, adapter_core_1.runWithAmplifyServerContext)(amplifyConfig, {}, operation);
 };
 exports.runWithAmplifyServerContext = runWithAmplifyServerContext;
 //# sourceMappingURL=runWithAmplifyServerContext.js.map

package/lib/runWithAmplifyServerContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"runWithAmplifyServerContext.js","sourceRoot":"","sources":["../src/runWithAmplifyServerContext.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGtC,iCAGiB;AACjB,0CAA0D;AAC1D,mEAK4C;AAE5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACI,IAAM,2BAA2B,GACvC,UAAO,EAAgC;QAA9B,iBAAiB,uBAAA,EAAE,SAAS,eAAA;;;;YAM9B,aAAa,GAAG,IAAA,wBAAgB,GAAE,CAAC;YAEzC,wEAAwE;YACxE,+CAA+C;YAC/C,IAAI,aAAa,CAAC,IAAI,EAAE;gBACjB,eAAe;gBACpB,oEAAoE;gBACpE,8DAA8D;gBAC9D,iEAAiE;gBACjE,mEAAmE;gBACnE,iBAAiB,KAAK,IAAI;oBACzB,CAAC,CAAC,4BAAqB;oBACvB,CAAC,CAAC,IAAA,4DAA6C,EAC7C,IAAA,uDAA+C,EAAC,iBAAiB,CAAC,CACjE,CAAC;gBACA,mBAAmB,GAAG,IAAA,wDAAyC,EACpE,aAAa,CAAC,IAAI,EAClB,eAAe,CACf,CAAC;gBACI,aAAa,GAAG,IAAA,2CAA4B,EACjD,aAAa,CAAC,IAAI,EAClB,eAAe,CACf,CAAC;gBAEF,sBAAO,IAAA,0CAA+B,EACrC,aAAa,EACb;wBACC,IAAI,EAAE,EAAE,mBAAmB,qBAAA,EAAE,aAAa,eAAA,EAAE;qBAC5C,EACD,SAAS,CACT,EAAC;aACF;YAED,oEAAoE;YACpE,+CAA+C;YAC/C,sBAAO,IAAA,0CAA+B,EAAC,aAAa,EAAE,EAAE,EAAE,SAAS,CAAC,EAAC;;;CACrE,CAAC;AA3CU,QAAA,2BAA2B,+BA2CrC"}
+{"version":3,"file":"runWithAmplifyServerContext.js","sourceRoot":"","sources":["../src/runWithAmplifyServerContext.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;AAGtC,mCAGiB;AACjB,4CAA0D;AAC1D,2DAKkC;AAElC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACI,MAAM,2BAA2B,GACvC,KAAK,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAE,EAAE,EAAE;IAC1C,sCAAsC;IACtC,qDAAqD;IACrD,iCAAiC;IACjC,2BAA2B;IAC3B,gDAAgD;IAChD,MAAM,aAAa,GAAG,IAAA,wBAAgB,GAAE,CAAC;IAEzC,wEAAwE;IACxE,+CAA+C;IAC/C,IAAI,aAAa,CAAC,IAAI,EAAE;QACvB,MAAM,eAAe;QACpB,oEAAoE;QACpE,8DAA8D;QAC9D,iEAAiE;QACjE,mEAAmE;QACnE,iBAAiB,KAAK,IAAI;YACzB,CAAC,CAAC,4BAAqB;YACvB,CAAC,CAAC,IAAA,4DAA6C,EAC7C,IAAA,uDAA+C,EAAC,iBAAiB,CAAC,CACjE,CAAC;QACN,MAAM,mBAAmB,GAAG,IAAA,wDAAyC,EACpE,aAAa,CAAC,IAAI,EAClB,eAAe,CACf,CAAC;QACF,MAAM,aAAa,GAAG,IAAA,2CAA4B,EACjD,aAAa,CAAC,IAAI,EAClB,eAAe,CACf,CAAC;QAEF,OAAO,IAAA,0CAA+B,EACrC,aAAa,EACb;YACC,IAAI,EAAE,EAAE,mBAAmB,EAAE,aAAa,EAAE;SAC5C,EACD,SAAS,CACT,CAAC;KACF;IAED,oEAAoE;IACpE,+CAA+C;IAC/C,OAAO,IAAA,0CAA+B,EAAC,aAAa,EAAE,EAAE,EAAE,SAAS,CAAC,CAAC;AACtE,CAAC,CAAC;AA3CU,QAAA,2BAA2B,+BA2CrC"}

package/lib/utils/createCookieStorageAdapterFromNextServerContext.js

@@ -1,24 +1,13 @@
 "use strict";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCookieStorageAdapterFromNextServerContext = exports.DATE_IN_THE_PAST = void 0;
-var server_1 = require("next/server");
-var adapter_core_1 = require("@aws-amplify/core/internals/adapter-core");
+const server_1 = require("next/server");
+const adapter_core_1 = require("@aws-amplify/core/internals/adapter-core");
 exports.DATE_IN_THE_PAST = new Date(0);
-var createCookieStorageAdapterFromNextServerContext = function (context) {
-    var _a = context, req = _a.request, res = _a.response;
+const createCookieStorageAdapterFromNextServerContext = (context) => {
+    const { request: req, response: res } = context;
     // When the server context is from `getServerSideProps`, the `req` is an instance
     // of IncomingMessage, and the `res` is an instance of ServerResponse.
     // We cannot import these two classes here from `http` as it breaks in Next
@@ -30,7 +19,7 @@ var createCookieStorageAdapterFromNextServerContext = function (context) {
         typeof res.setHeader === 'function') {
         return createCookieStorageAdapterFromGetServerSidePropsContext(req, res);
     }
-    var _b = context, request = _b.request, response = _b.response;
+    const { request, response } = context;
     // When the server context is from `middleware`, the `request` is an instance
     // of `NextRequest`.
     // When the server context is from a route handler, the `request` is an `Proxy`
@@ -45,7 +34,7 @@ var createCookieStorageAdapterFromNextServerContext = function (context) {
             return createCookieStorageAdapterFromNextRequestAndHttpResponse(request, response);
         }
     }
-    var cookies = context.cookies;
+    const { cookies } = context;
     if (typeof cookies === 'function') {
         return createCookieStorageAdapterFromNextCookies(cookies);
     }
@@ -55,54 +44,58 @@ var createCookieStorageAdapterFromNextServerContext = function (context) {
     });
 };
 exports.createCookieStorageAdapterFromNextServerContext = createCookieStorageAdapterFromNextServerContext;
-var createCookieStorageAdapterFromNextRequestAndNextResponse = function (request, response) {
-    var readonlyCookieStore = request.cookies;
-    var mutableCookieStore = response.cookies;
+const createCookieStorageAdapterFromNextRequestAndNextResponse = (request, response) => {
+    const readonlyCookieStore = request.cookies;
+    const mutableCookieStore = response.cookies;
     return {
-        get: function (name) {
+        get(name) {
             return readonlyCookieStore.get(ensureEncodedForJSCookie(name));
         },
         getAll: readonlyCookieStore.getAll.bind(readonlyCookieStore),
-        set: function (name, value, options) {
+        set(name, value, options) {
             mutableCookieStore.set(ensureEncodedForJSCookie(name), value, options);
         },
-        delete: function (name) {
+        delete(name) {
             mutableCookieStore.delete(ensureEncodedForJSCookie(name));
         },
     };
 };
-var createCookieStorageAdapterFromNextRequestAndHttpResponse = function (request, response) {
-    var readonlyCookieStore = request.cookies;
-    var mutableCookieStore = createMutableCookieStoreFromHeaders(response.headers);
-    return __assign({ get: function (name) {
+const createCookieStorageAdapterFromNextRequestAndHttpResponse = (request, response) => {
+    const readonlyCookieStore = request.cookies;
+    const mutableCookieStore = createMutableCookieStoreFromHeaders(response.headers);
+    return {
+        get(name) {
             return readonlyCookieStore.get(ensureEncodedForJSCookie(name));
-        }, getAll: readonlyCookieStore.getAll.bind(readonlyCookieStore) }, mutableCookieStore);
+        },
+        getAll: readonlyCookieStore.getAll.bind(readonlyCookieStore),
+        ...mutableCookieStore,
+    };
 };
-var createCookieStorageAdapterFromNextCookies = function (cookies) {
-    var cookieStore = cookies();
+const createCookieStorageAdapterFromNextCookies = (cookies) => {
+    const cookieStore = cookies();
     // When Next cookies() is called in a server component, it returns a readonly
     // cookie store. Hence calling set and delete throws an error. However,
     // cookies() returns a mutable cookie store when called in a server action.
     // We have no way to detect which one is returned, so we try to call set and delete
     // and safely ignore the error if it is thrown.
-    var setFunc = function (name, value, options) {
+    const setFunc = (name, value, options) => {
         try {
             cookieStore.set(ensureEncodedForJSCookie(name), value, options);
         }
-        catch (_a) {
+        catch {
             // no-op
         }
     };
-    var deleteFunc = function (name) {
+    const deleteFunc = name => {
         try {
             cookieStore.delete(ensureEncodedForJSCookie(name));
         }
-        catch (_a) {
+        catch {
             // no-op
         }
     };
     return {
-        get: function (name) {
+        get(name) {
             return cookieStore.get(ensureEncodedForJSCookie(name));
         },
         getAll: cookieStore.getAll.bind(cookieStore),
@@ -110,65 +103,62 @@ var createCookieStorageAdapterFromNextCookies = function (cookies) {
         delete: deleteFunc,
     };
 };
-var createCookieStorageAdapterFromGetServerSidePropsContext = function (request, response) {
-    var cookiesMap = __assign({}, request.cookies);
-    var allCookies = Object.entries(cookiesMap).map(function (_a) {
-        var name = _a[0], value = _a[1];
-        return ({
-            name: name,
-            value: value,
-        });
-    });
+const createCookieStorageAdapterFromGetServerSidePropsContext = (request, response) => {
+    const cookiesMap = { ...request.cookies };
+    const allCookies = Object.entries(cookiesMap).map(([name, value]) => ({
+        name,
+        value,
+    }));
     return {
-        get: function (name) {
-            var value = cookiesMap[ensureEncodedForJSCookie(name)];
+        get(name) {
+            const value = cookiesMap[ensureEncodedForJSCookie(name)];
             return value
                 ? {
-                    name: name,
-                    value: value,
+                    name,
+                    value,
                 }
                 : undefined;
         },
-        getAll: function () {
+        getAll() {
             return allCookies;
         },
-        set: function (name, value, options) {
-            response.setHeader('Set-Cookie', "".concat(ensureEncodedForJSCookie(name), "=").concat(value, ";").concat(options ? serializeSetCookieOptions(options) : ''));
+        set(name, value, options) {
+            response.setHeader('Set-Cookie', `${ensureEncodedForJSCookie(name)}=${value};${options ? serializeSetCookieOptions(options) : ''}`);
         },
-        delete: function (name) {
-            response.setHeader('Set-Cookie', "".concat(ensureEncodedForJSCookie(name), "=;Expires=").concat(exports.DATE_IN_THE_PAST.toUTCString()));
+        delete(name) {
+            response.setHeader('Set-Cookie', `${ensureEncodedForJSCookie(name)}=;Expires=${exports.DATE_IN_THE_PAST.toUTCString()}`);
         },
     };
 };
-var createMutableCookieStoreFromHeaders = function (headers) {
-    var setFunc = function (name, value, options) {
-        headers.append('Set-Cookie', "".concat(ensureEncodedForJSCookie(name), "=").concat(value, ";").concat(options ? serializeSetCookieOptions(options) : ''));
+const createMutableCookieStoreFromHeaders = (headers) => {
+    const setFunc = (name, value, options) => {
+        headers.append('Set-Cookie', `${ensureEncodedForJSCookie(name)}=${value};${options ? serializeSetCookieOptions(options) : ''}`);
     };
-    var deleteFunc = function (name) {
-        headers.append('Set-Cookie', "".concat(ensureEncodedForJSCookie(name), "=;Expires=").concat(exports.DATE_IN_THE_PAST.toUTCString()));
+    const deleteFunc = name => {
+        headers.append('Set-Cookie', `${ensureEncodedForJSCookie(name)}=;Expires=${exports.DATE_IN_THE_PAST.toUTCString()}`);
     };
     return {
         set: setFunc,
         delete: deleteFunc,
     };
 };
-var serializeSetCookieOptions = function (options) {
-    var expires = options.expires, domain = options.domain, httpOnly = options.httpOnly, sameSite = options.sameSite, secure = options.secure;
-    var serializedOptions = [];
+const serializeSetCookieOptions = (options) => {
+    const { expires, domain, httpOnly, sameSite, secure } = options;
+    const serializedOptions = [];
     if (domain) {
-        serializedOptions.push("Domain=".concat(domain));
+        serializedOptions.push(`Domain=${domain}`);
     }
     if (expires) {
-        serializedOptions.push("Expires=".concat(expires.toUTCString()));
+        serializedOptions.push(`Expires=${expires.toUTCString()}`);
     }
     if (httpOnly) {
-        serializedOptions.push("HttpOnly");
+        serializedOptions.push(`HttpOnly`);
     }
     if (sameSite) {
-        serializedOptions.push("SameSite=".concat(sameSite));
+        serializedOptions.push(`SameSite=${sameSite}`);
     }
     if (secure) {
-        serializedOptions.push("Secure");
+        serializedOptions.push(`Secure`);
     }
     return serializedOptions.join(';');
 };
@@ -178,7 +168,5 @@ var serializeSetCookieOptions = function (options) {
 // https://github.com/js-cookie/js-cookie#encoding
 // The implementation is borrowed from js-cookie without escaping `[()]` as
 // we are not using those chars in the auth keys.
-var ensureEncodedForJSCookie = function (name) {
-    return encodeURIComponent(name).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent);
-};
+const ensureEncodedForJSCookie = (name) => encodeURIComponent(name).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent);
 //# sourceMappingURL=createCookieStorageAdapterFromNextServerContext.js.map

package/lib/utils/createCookieStorageAdapterFromNextServerContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"createCookieStorageAdapterFromNextServerContext.js","sourceRoot":"","sources":["../../src/utils/createCookieStorageAdapterFromNextServerContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"createCookieStorageAdapterFromNextServerContext.js","sourceRoot":"","sources":["../../src/utils/createCookieStorageAdapterFromNextServerContext.ts"],"names":[],"mappings":"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"}

package/lib/utils/getAmplifyConfig.js

@@ -6,18 +6,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAmplifyConfig = void 0;
-var utils_1 = require("@aws-amplify/core/internals/utils");
-var adapter_core_1 = require("@aws-amplify/core/internals/adapter-core");
-var config_1 = __importDefault(require("next/config"));
-var getAmplifyConfig = function () {
-    var configStr = process.env.amplifyConfig;
+const utils_1 = require("@aws-amplify/core/internals/utils");
+const adapter_core_1 = require("@aws-amplify/core/internals/adapter-core");
+const config_1 = __importDefault(require("next/config"));
+const getAmplifyConfig = () => {
+    let configStr = process.env.amplifyConfig;
     // With a Next.js app that uses the Pages Router, the key-value pairs
     // listed under the `env` field in the `next.config.js` is not accessible
     // via process.env.<key> at some occasion. Using the following as a fallback
     // See: https://github.com/vercel/next.js/issues/39299
     if (!configStr) {
-        var serverRuntimeConfig = (0, config_1.default)().serverRuntimeConfig;
-        configStr = serverRuntimeConfig === null || serverRuntimeConfig === void 0 ? void 0 : serverRuntimeConfig.amplifyConfig;
+        const { serverRuntimeConfig } = (0, config_1.default)();
+        configStr = serverRuntimeConfig?.amplifyConfig;
     }
     if (!configStr) {
         throw new adapter_core_1.AmplifyServerContextError({
@@ -25,9 +25,9 @@ var getAmplifyConfig = function () {
             recoverySuggestion: 'Ensure to use `withAmplify` function in your `next.config.js`.',
         });
     }
-    var configObject = JSON.parse(configStr);
+    const configObject = JSON.parse(configStr);
     // TODO(HuiSF): adds ResourcesConfig validation when it has one.
-    return Object.keys(configObject).some(function (key) { return key.startsWith('aws_'); })
+    return Object.keys(configObject).some(key => key.startsWith('aws_'))
         ? (0, utils_1.parseAWSExports)(configObject)
         : configObject;
 };

package/lib/utils/getAmplifyConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAmplifyConfig.js","sourceRoot":"","sources":["../../src/utils/getAmplifyConfig.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;;;;AAGtC,2DAAoE;AACpE,yEAAqF;AACrF,uDAAoC;AAE7B,IAAM,gBAAgB,GAAG;IAC/B,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IAE1C,qEAAqE;IACrE,yEAAyE;IACzE,4EAA4E;IAC5E,sDAAsD;IACtD,IAAI,CAAC,SAAS,EAAE;QACP,IAAA,mBAAmB,GAAK,IAAA,gBAAS,GAAE,oBAAhB,CAAiB;QAC5C,SAAS,GAAG,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,aAAa,CAAC;KAC/C;IAED,IAAI,CAAC,SAAS,EAAE;QACf,MAAM,IAAI,wCAAyB,CAAC;YACnC,OAAO,EAAE,sDAAsD;YAC/D,kBAAkB,EACjB,gEAAgE;SACjE,CAAC,CAAC;KACH;IAED,IAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAE3C,gEAAgE;IAChE,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAtB,CAAsB,CAAC;QACnE,CAAC,CAAC,IAAA,uBAAe,EAAC,YAAY,CAAC;QAC/B,CAAC,CAAC,YAAY,CAAC;AACjB,CAAC,CAAC;AA1BW,QAAA,gBAAgB,oBA0B3B"}
+{"version":3,"file":"getAmplifyConfig.js","sourceRoot":"","sources":["../../src/utils/getAmplifyConfig.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;;;;AAGtC,6DAAoE;AACpE,2EAAqF;AACrF,yDAAoC;AAE7B,MAAM,gBAAgB,GAAG,GAAoB,EAAE;IACrD,IAAI,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;IAE1C,qEAAqE;IACrE,yEAAyE;IACzE,4EAA4E;IAC5E,sDAAsD;IACtD,IAAI,CAAC,SAAS,EAAE;QACf,MAAM,EAAE,mBAAmB,EAAE,GAAG,IAAA,gBAAS,GAAE,CAAC;QAC5C,SAAS,GAAG,mBAAmB,EAAE,aAAa,CAAC;KAC/C;IAED,IAAI,CAAC,SAAS,EAAE;QACf,MAAM,IAAI,wCAAyB,CAAC;YACnC,OAAO,EAAE,sDAAsD;YAC/D,kBAAkB,EACjB,gEAAgE;SACjE,CAAC,CAAC;KACH;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAE3C,gEAAgE;IAChE,OAAO,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACnE,CAAC,CAAC,IAAA,uBAAe,EAAC,YAAY,CAAC;QAC/B,CAAC,CAAC,YAAY,CAAC;AACjB,CAAC,CAAC;AA1BW,QAAA,gBAAgB,oBA0B3B"}

package/lib/withAmplify.d.ts

@@ -1,5 +1,5 @@
 import { ResourcesConfig } from 'aws-amplify';
-import { LegacyConfig } from 'aws-amplify/internals/adapter-core';
+import { LegacyConfig } from 'aws-amplify/adapter-core';
 import { NextConfig } from 'next';
 /**
  * Merges the `amplifyConfig` into the `nextConfig.env`.