@aws-amplify/api-graphql 4.0.16 → 4.0.17-unstable.5c56101.0

package/dist/cjs/internals/generateClient.js

@@ -4,10 +4,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateClient = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+const core_1 = require("@aws-amplify/core");
 const v6_1 = require("./v6");
-const generateModelsProperty_1 = require("./generateModelsProperty");
+const generateEnumsProperty_1 = require("./utils/generateEnumsProperty");
+const generateModelsProperty_1 = require("./utils/generateModelsProperty");
+const isApiGraphQLProviderConfig_1 = require("./utils/isApiGraphQLProviderConfig");
 const types_1 = require("../types");
-const core_1 = require("@aws-amplify/core");
+const isConfigureEventWithResourceConfig_1 = require("./utils/isConfigureEventWithResourceConfig");
 /**
  * @private
  *
@@ -26,10 +29,15 @@ function generateClient(params) {
         graphql: v6_1.graphql,
         cancel: v6_1.cancel,
         isCancelError: v6_1.isCancelError,
-        models: {},
+        models: emptyProperty,
+        enums: emptyProperty,
     };
-    const config = params.amplify.getConfig();
-    if (!config.API?.GraphQL) {
+    const apiGraphqlConfig = params.amplify.getConfig().API?.GraphQL;
+    if ((0, isApiGraphQLProviderConfig_1.isApiGraphQLConfig)(apiGraphqlConfig)) {
+        client.models = (0, generateModelsProperty_1.generateModelsProperty)(client, apiGraphqlConfig);
+        client.enums = (0, generateEnumsProperty_1.generateEnumsProperty)(apiGraphqlConfig);
+    }
+    else {
         // This happens when the `Amplify.configure()` call gets evaluated after the `generateClient()` call.
         //
         // Cause: when the `generateClient()` and the `Amplify.configure()` calls are located in
@@ -42,32 +50,26 @@ function generateClient(params) {
         //
         // TODO: revisit, and reverify this approach when enabling multiple clients for multi-endpoints
         // configuration.
-        client.models = emptyModels;
         generateModelsPropertyOnAmplifyConfigure(client);
     }
-    else {
-        client.models = (0, generateModelsProperty_1.generateModelsProperty)(client, config.API?.GraphQL);
-    }
     return client;
 }
 exports.generateClient = generateClient;
 const generateModelsPropertyOnAmplifyConfigure = (clientRef) => {
     core_1.Hub.listen('core', coreEvent => {
-        if (!isConfigureEvent(coreEvent.payload)) {
+        if (!(0, isConfigureEventWithResourceConfig_1.isConfigureEventWithResourceConfig)(coreEvent.payload)) {
             return;
         }
-        const { data: resourceConfig } = coreEvent.payload;
-        if (resourceConfig.API?.GraphQL) {
-            clientRef.models = (0, generateModelsProperty_1.generateModelsProperty)(clientRef, resourceConfig.API?.GraphQL);
+        const apiGraphQLConfig = coreEvent.payload.data.API?.GraphQL;
+        if ((0, isApiGraphQLProviderConfig_1.isApiGraphQLConfig)(apiGraphQLConfig)) {
+            clientRef.models = (0, generateModelsProperty_1.generateModelsProperty)(clientRef, apiGraphQLConfig);
+            clientRef.enums = (0, generateEnumsProperty_1.generateEnumsProperty)(apiGraphQLConfig);
         }
     });
 };
-function isConfigureEvent(payload) {
-    return payload.event === 'configure';
-}
-const emptyModels = new Proxy({}, {
+const emptyProperty = new Proxy({}, {
     get() {
-        throw new Error('Could not generate client. This is likely due to Amplify.configure() not being called prior to generateClient().');
+        throw new Error('Client could not be generated. This is likely due to `Amplify.configure()` not being called prior to `generateClient()` or because the configuration passed to `Amplify.configure()` is missing GraphQL provider configuration.');
     },
 });
 //# sourceMappingURL=generateClient.js.map

package/dist/cjs/internals/generateClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateClient.js","sources":["../../../src/internals/generateClient.ts"],"sourcesContent":["\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.generateClient = void 0;\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nconst v6_1 = require(\"./v6\");\nconst generateModelsProperty_1 = require(\"./generateModelsProperty\");\nconst types_1 = require(\"../types\");\nconst core_1 = require(\"@aws-amplify/core\");\n/**\n * @private\n *\n * Creates a client that can be used to make GraphQL requests, using a provided `AmplifyClassV6`\n * compatible context object for config and auth fetching.\n *\n * @param params\n * @returns\n */\nfunction generateClient(params) {\n    const client = {\n        [types_1.__amplify]: params.amplify,\n        [types_1.__authMode]: params.authMode,\n        [types_1.__authToken]: params.authToken,\n        [types_1.__headers]: params.headers,\n        graphql: v6_1.graphql,\n        cancel: v6_1.cancel,\n        isCancelError: v6_1.isCancelError,\n        models: {},\n    };\n    const config = params.amplify.getConfig();\n    if (!config.API?.GraphQL) {\n        // This happens when the `Amplify.configure()` call gets evaluated after the `generateClient()` call.\n        //\n        // Cause: when the `generateClient()` and the `Amplify.configure()` calls are located in\n        // different source files, script bundlers may randomly arrange their orders in the production\n        // bundle.\n        //\n        // With the current implementation, the `client.models` instance created by `generateClient()`\n        // will be rebuilt on every `Amplify.configure()` call that's provided with a valid GraphQL\n        // provider configuration.\n        //\n        // TODO: revisit, and reverify this approach when enabling multiple clients for multi-endpoints\n        // configuration.\n        client.models = emptyModels;\n        generateModelsPropertyOnAmplifyConfigure(client);\n    }\n    else {\n        client.models = (0, generateModelsProperty_1.generateModelsProperty)(client, config.API?.GraphQL);\n    }\n    return client;\n}\nexports.generateClient = generateClient;\nconst generateModelsPropertyOnAmplifyConfigure = (clientRef) => {\n    core_1.Hub.listen('core', coreEvent => {\n        if (!isConfigureEvent(coreEvent.payload)) {\n            return;\n        }\n        const { data: resourceConfig } = coreEvent.payload;\n        if (resourceConfig.API?.GraphQL) {\n            clientRef.models = (0, generateModelsProperty_1.generateModelsProperty)(clientRef, resourceConfig.API?.GraphQL);\n        }\n    });\n};\nfunction isConfigureEvent(payload) {\n    return payload.event === 'configure';\n}\nconst emptyModels = new Proxy({}, {\n    get() {\n        throw new Error('Could not generate client. This is likely due to Amplify.configure() not being called prior to generateClient().');\n    },\n});\n"],"names":[],"mappings":";;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,cAAc,GAAG,KAAK,CAAC,CAAC;AAChC;AACA;AACA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,wBAAwB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AACrE,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACpC,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAC5C;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS,cAAc,CAAC,MAAM,EAAE;AAChC,IAAI,MAAM,MAAM,GAAG;AACnB,QAAQ,CAAC,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO;AAC3C,QAAQ,CAAC,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,QAAQ;AAC7C,QAAQ,CAAC,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS;AAC/C,QAAQ,CAAC,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO;AAC3C,QAAQ,OAAO,EAAE,IAAI,CAAC,OAAO;AAC7B,QAAQ,MAAM,EAAE,IAAI,CAAC,MAAM;AAC3B,QAAQ,aAAa,EAAE,IAAI,CAAC,aAAa;AACzC,QAAQ,MAAM,EAAE,EAAE;AAClB,KAAK,CAAC;AACN,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;AAC9C,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE;AAC9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,QAAQ,MAAM,CAAC,MAAM,GAAG,WAAW,CAAC;AACpC,QAAQ,wCAAwC,CAAC,MAAM,CAAC,CAAC;AACzD,KAAK;AACL,SAAS;AACT,QAAQ,MAAM,CAAC,MAAM,GAAG,IAAI,wBAAwB,CAAC,sBAAsB,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC1G,KAAK;AACL,IAAI,OAAO,MAAM,CAAC;AAClB,CAAC;AACD,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;AACxC,MAAM,wCAAwC,GAAG,CAAC,SAAS,KAAK;AAChE,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,IAAI;AAC3C,QAAQ,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;AAClD,YAAY,OAAO;AACnB,SAAS;AACT,QAAQ,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC;AAC3D,QAAQ,IAAI,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE;AACzC,YAAY,SAAS,CAAC,MAAM,GAAG,IAAI,wBAAwB,CAAC,sBAAsB,EAAE,SAAS,EAAE,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC5H,SAAS;AACT,KAAK,CAAC,CAAC;AACP,CAAC,CAAC;AACF,SAAS,gBAAgB,CAAC,OAAO,EAAE;AACnC,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,WAAW,CAAC;AACzC,CAAC;AACD,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,EAAE,EAAE;AAClC,IAAI,GAAG,GAAG;AACV,QAAQ,MAAM,IAAI,KAAK,CAAC,kHAAkH,CAAC,CAAC;AAC5I,KAAK;AACL,CAAC,CAAC;;"}
+{"version":3,"file":"generateClient.js","sources":["../../../src/internals/generateClient.ts"],"sourcesContent":["\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.generateClient = void 0;\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nconst core_1 = require(\"@aws-amplify/core\");\nconst v6_1 = require(\"./v6\");\nconst generateEnumsProperty_1 = require(\"./utils/generateEnumsProperty\");\nconst generateModelsProperty_1 = require(\"./utils/generateModelsProperty\");\nconst isApiGraphQLProviderConfig_1 = require(\"./utils/isApiGraphQLProviderConfig\");\nconst types_1 = require(\"../types\");\nconst isConfigureEventWithResourceConfig_1 = require(\"./utils/isConfigureEventWithResourceConfig\");\n/**\n * @private\n *\n * Creates a client that can be used to make GraphQL requests, using a provided `AmplifyClassV6`\n * compatible context object for config and auth fetching.\n *\n * @param params\n * @returns\n */\nfunction generateClient(params) {\n    const client = {\n        [types_1.__amplify]: params.amplify,\n        [types_1.__authMode]: params.authMode,\n        [types_1.__authToken]: params.authToken,\n        [types_1.__headers]: params.headers,\n        graphql: v6_1.graphql,\n        cancel: v6_1.cancel,\n        isCancelError: v6_1.isCancelError,\n        models: emptyProperty,\n        enums: emptyProperty,\n    };\n    const apiGraphqlConfig = params.amplify.getConfig().API?.GraphQL;\n    if ((0, isApiGraphQLProviderConfig_1.isApiGraphQLConfig)(apiGraphqlConfig)) {\n        client.models = (0, generateModelsProperty_1.generateModelsProperty)(client, apiGraphqlConfig);\n        client.enums = (0, generateEnumsProperty_1.generateEnumsProperty)(apiGraphqlConfig);\n    }\n    else {\n        // This happens when the `Amplify.configure()` call gets evaluated after the `generateClient()` call.\n        //\n        // Cause: when the `generateClient()` and the `Amplify.configure()` calls are located in\n        // different source files, script bundlers may randomly arrange their orders in the production\n        // bundle.\n        //\n        // With the current implementation, the `client.models` instance created by `generateClient()`\n        // will be rebuilt on every `Amplify.configure()` call that's provided with a valid GraphQL\n        // provider configuration.\n        //\n        // TODO: revisit, and reverify this approach when enabling multiple clients for multi-endpoints\n        // configuration.\n        generateModelsPropertyOnAmplifyConfigure(client);\n    }\n    return client;\n}\nexports.generateClient = generateClient;\nconst generateModelsPropertyOnAmplifyConfigure = (clientRef) => {\n    core_1.Hub.listen('core', coreEvent => {\n        if (!(0, isConfigureEventWithResourceConfig_1.isConfigureEventWithResourceConfig)(coreEvent.payload)) {\n            return;\n        }\n        const apiGraphQLConfig = coreEvent.payload.data.API?.GraphQL;\n        if ((0, isApiGraphQLProviderConfig_1.isApiGraphQLConfig)(apiGraphQLConfig)) {\n            clientRef.models = (0, generateModelsProperty_1.generateModelsProperty)(clientRef, apiGraphQLConfig);\n            clientRef.enums = (0, generateEnumsProperty_1.generateEnumsProperty)(apiGraphQLConfig);\n        }\n    });\n};\nconst emptyProperty = new Proxy({}, {\n    get() {\n        throw new Error('Client could not be generated. This is likely due to `Amplify.configure()` not being called prior to `generateClient()` or because the configuration passed to `Amplify.configure()` is missing GraphQL provider configuration.');\n    },\n});\n"],"names":[],"mappings":";;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,cAAc,GAAG,KAAK,CAAC,CAAC;AAChC;AACA;AACA,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,uBAAuB,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AACzE,MAAM,wBAAwB,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAC;AAC3E,MAAM,4BAA4B,GAAG,OAAO,CAAC,oCAAoC,CAAC,CAAC;AACnF,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACpC,MAAM,oCAAoC,GAAG,OAAO,CAAC,4CAA4C,CAAC,CAAC;AACnG;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS,cAAc,CAAC,MAAM,EAAE;AAChC,IAAI,MAAM,MAAM,GAAG;AACnB,QAAQ,CAAC,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO;AAC3C,QAAQ,CAAC,OAAO,CAAC,UAAU,GAAG,MAAM,CAAC,QAAQ;AAC7C,QAAQ,CAAC,OAAO,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS;AAC/C,QAAQ,CAAC,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO;AAC3C,QAAQ,OAAO,EAAE,IAAI,CAAC,OAAO;AAC7B,QAAQ,MAAM,EAAE,IAAI,CAAC,MAAM;AAC3B,QAAQ,aAAa,EAAE,IAAI,CAAC,aAAa;AACzC,QAAQ,MAAM,EAAE,aAAa;AAC7B,QAAQ,KAAK,EAAE,aAAa;AAC5B,KAAK,CAAC;AACN,IAAI,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC;AACrE,IAAI,IAAI,IAAI,4BAA4B,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,EAAE;AAChF,QAAQ,MAAM,CAAC,MAAM,GAAG,IAAI,wBAAwB,CAAC,sBAAsB,EAAE,MAAM,EAAE,gBAAgB,CAAC,CAAC;AACvG,QAAQ,MAAM,CAAC,KAAK,GAAG,IAAI,uBAAuB,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;AAC5F,KAAK;AACL,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,QAAQ,wCAAwC,CAAC,MAAM,CAAC,CAAC;AACzD,KAAK;AACL,IAAI,OAAO,MAAM,CAAC;AAClB,CAAC;AACD,OAAO,CAAC,cAAc,GAAG,cAAc,CAAC;AACxC,MAAM,wCAAwC,GAAG,CAAC,SAAS,KAAK;AAChE,IAAI,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,IAAI;AAC3C,QAAQ,IAAI,CAAC,IAAI,oCAAoC,CAAC,kCAAkC,EAAE,SAAS,CAAC,OAAO,CAAC,EAAE;AAC9G,YAAY,OAAO;AACnB,SAAS;AACT,QAAQ,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC;AACrE,QAAQ,IAAI,IAAI,4BAA4B,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,EAAE;AACpF,YAAY,SAAS,CAAC,MAAM,GAAG,IAAI,wBAAwB,CAAC,sBAAsB,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC;AACjH,YAAY,SAAS,CAAC,KAAK,GAAG,IAAI,uBAAuB,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,CAAC;AACnG,SAAS;AACT,KAAK,CAAC,CAAC;AACP,CAAC,CAAC;AACF,MAAM,aAAa,GAAG,IAAI,KAAK,CAAC,EAAE,EAAE;AACpC,IAAI,GAAG,GAAG;AACV,QAAQ,MAAM,IAAI,KAAK,CAAC,iOAAiO,CAAC,CAAC;AAC3P,KAAK;AACL,CAAC,CAAC;;"}

package/dist/cjs/internals/utils/generateEnumsProperty.js

@@ -0,0 +1,21 @@
+'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.generateEnumsProperty = void 0;
+const generateEnumsProperty = (graphqlConfig) => {
+    const modelIntrospection = graphqlConfig.modelIntrospection;
+    if (!modelIntrospection) {
+        return {};
+    }
+    const enums = {};
+    for (const [_, enumData] of Object.entries(modelIntrospection.enums)) {
+        enums[enumData.name] = {
+            values: () => enumData.values,
+        };
+    }
+    return enums;
+};
+exports.generateEnumsProperty = generateEnumsProperty;
+//# sourceMappingURL=generateEnumsProperty.js.map

package/dist/cjs/internals/utils/generateEnumsProperty.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateEnumsProperty.js","sources":["../../../../src/internals/utils/generateEnumsProperty.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.generateEnumsProperty = void 0;\nconst generateEnumsProperty = (graphqlConfig) => {\n    const modelIntrospection = graphqlConfig.modelIntrospection;\n    if (!modelIntrospection) {\n        return {};\n    }\n    const enums = {};\n    for (const [_, enumData] of Object.entries(modelIntrospection.enums)) {\n        enums[enumData.name] = {\n            values: () => enumData.values,\n        };\n    }\n    return enums;\n};\nexports.generateEnumsProperty = generateEnumsProperty;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,qBAAqB,GAAG,KAAK,CAAC,CAAC;AACvC,MAAM,qBAAqB,GAAG,CAAC,aAAa,KAAK;AACjD,IAAI,MAAM,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,CAAC;AAChE,IAAI,IAAI,CAAC,kBAAkB,EAAE;AAC7B,QAAQ,OAAO,EAAE,CAAC;AAClB,KAAK;AACL,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;AACrB,IAAI,KAAK,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE;AAC1E,QAAQ,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG;AAC/B,YAAY,MAAM,EAAE,MAAM,QAAQ,CAAC,MAAM;AACzC,SAAS,CAAC;AACV,KAAK;AACL,IAAI,OAAO,KAAK,CAAC;AACjB,CAAC,CAAC;AACF,OAAO,CAAC,qBAAqB,GAAG,qBAAqB;;"}

package/dist/cjs/internals/{generateModelsProperty.js → utils/generateModelsProperty.js}

@@ -2,16 +2,16 @@
 
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateModelsProperty = void 0;
-const APIClient_1 = require("./APIClient");
-const list_1 = require("./operations/list");
-const indexQuery_1 = require("./operations/indexQuery");
-const get_1 = require("./operations/get");
-const subscription_1 = require("./operations/subscription");
-const observeQuery_1 = require("./operations/observeQuery");
-const clientUtils_1 = require("./clientUtils");
-function generateModelsProperty(client, graphqlConfig) {
+const APIClient_1 = require("../APIClient");
+const list_1 = require("../operations/list");
+const indexQuery_1 = require("../operations/indexQuery");
+const get_1 = require("../operations/get");
+const subscription_1 = require("../operations/subscription");
+const observeQuery_1 = require("../operations/observeQuery");
+const clientUtils_1 = require("../clientUtils");
+function generateModelsProperty(client, apiGraphQLConfig) {
     const models = {};
-    const modelIntrospection = graphqlConfig.modelIntrospection;
+    const modelIntrospection = apiGraphQLConfig.modelIntrospection;
     if (!modelIntrospection) {
         return {};
     }

package/dist/cjs/internals/utils/generateModelsProperty.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateModelsProperty.js","sources":["../../../../src/internals/utils/generateModelsProperty.ts"],"sourcesContent":["\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.generateModelsProperty = void 0;\nconst APIClient_1 = require(\"../APIClient\");\nconst list_1 = require(\"../operations/list\");\nconst indexQuery_1 = require(\"../operations/indexQuery\");\nconst get_1 = require(\"../operations/get\");\nconst subscription_1 = require(\"../operations/subscription\");\nconst observeQuery_1 = require(\"../operations/observeQuery\");\nconst clientUtils_1 = require(\"../clientUtils\");\nfunction generateModelsProperty(client, apiGraphQLConfig) {\n    const models = {};\n    const modelIntrospection = apiGraphQLConfig.modelIntrospection;\n    if (!modelIntrospection) {\n        return {};\n    }\n    const SUBSCRIPTION_OPS = ['ONCREATE', 'ONUPDATE', 'ONDELETE'];\n    for (const model of Object.values(modelIntrospection.models)) {\n        const { name } = model;\n        models[name] = {};\n        Object.entries(APIClient_1.graphQLOperationsInfo).forEach(([key, { operationPrefix }]) => {\n            const operation = key;\n            if (operation === 'LIST') {\n                models[name][operationPrefix] = (0, list_1.listFactory)(client, modelIntrospection, model);\n            }\n            else if (SUBSCRIPTION_OPS.includes(operation)) {\n                models[name][operationPrefix] = (0, subscription_1.subscriptionFactory)(client, modelIntrospection, model, operation);\n            }\n            else if (operation === 'OBSERVE_QUERY') {\n                models[name][operationPrefix] = (0, observeQuery_1.observeQueryFactory)(models, model);\n            }\n            else {\n                models[name][operationPrefix] = (0, get_1.getFactory)(client, modelIntrospection, model, operation);\n            }\n        });\n        const secondaryIdxs = (0, clientUtils_1.getSecondaryIndexesFromSchemaModel)(model);\n        for (const idx of secondaryIdxs) {\n            models[name][idx.queryField] = (0, indexQuery_1.indexQueryFactory)(client, modelIntrospection, model, idx);\n        }\n    }\n    return models;\n}\nexports.generateModelsProperty = generateModelsProperty;\n"],"names":[],"mappings":"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"}

package/dist/cjs/internals/utils/isApiGraphQLProviderConfig.js

@@ -0,0 +1,11 @@
+'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.isApiGraphQLConfig = void 0;
+function isApiGraphQLConfig(apiGraphQLConfig) {
+    return apiGraphQLConfig !== undefined;
+}
+exports.isApiGraphQLConfig = isApiGraphQLConfig;
+//# sourceMappingURL=isApiGraphQLProviderConfig.js.map

package/dist/cjs/internals/utils/isApiGraphQLProviderConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isApiGraphQLProviderConfig.js","sources":["../../../../src/internals/utils/isApiGraphQLProviderConfig.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.isApiGraphQLConfig = void 0;\nfunction isApiGraphQLConfig(apiGraphQLConfig) {\n    return apiGraphQLConfig !== undefined;\n}\nexports.isApiGraphQLConfig = isApiGraphQLConfig;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,kBAAkB,GAAG,KAAK,CAAC,CAAC;AACpC,SAAS,kBAAkB,CAAC,gBAAgB,EAAE;AAC9C,IAAI,OAAO,gBAAgB,KAAK,SAAS,CAAC;AAC1C,CAAC;AACD,OAAO,CAAC,kBAAkB,GAAG,kBAAkB;;"}

package/dist/cjs/internals/utils/isConfigureEventWithResourceConfig.js

@@ -0,0 +1,11 @@
+'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.isConfigureEventWithResourceConfig = void 0;
+function isConfigureEventWithResourceConfig(payload) {
+    return payload.event === 'configure';
+}
+exports.isConfigureEventWithResourceConfig = isConfigureEventWithResourceConfig;
+//# sourceMappingURL=isConfigureEventWithResourceConfig.js.map

package/dist/cjs/internals/utils/isConfigureEventWithResourceConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"isConfigureEventWithResourceConfig.js","sources":["../../../../src/internals/utils/isConfigureEventWithResourceConfig.ts"],"sourcesContent":["\"use strict\";\n// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.isConfigureEventWithResourceConfig = void 0;\nfunction isConfigureEventWithResourceConfig(payload) {\n    return payload.event === 'configure';\n}\nexports.isConfigureEventWithResourceConfig = isConfigureEventWithResourceConfig;\n"],"names":[],"mappings":";;AACA;AACA;AACA,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;AAC9D,OAAO,CAAC,kCAAkC,GAAG,KAAK,CAAC,CAAC;AACpD,SAAS,kCAAkC,CAAC,OAAO,EAAE;AACrD,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,WAAW,CAAC;AACzC,CAAC;AACD,OAAO,CAAC,kCAAkC,GAAG,kCAAkC;;"}

package/dist/esm/internals/generateClient.mjs

@@ -1,7 +1,10 @@
+import { Hub } from '@aws-amplify/core';
 import { graphql, cancel, isCancelError } from './v6.mjs';
-import { generateModelsProperty } from './generateModelsProperty.mjs';
+import { generateEnumsProperty } from './utils/generateEnumsProperty.mjs';
+import { generateModelsProperty } from './utils/generateModelsProperty.mjs';
+import { isApiGraphQLConfig } from './utils/isApiGraphQLProviderConfig.mjs';
 import { __amplify, __authMode, __authToken, __headers } from '../types/index.mjs';
-import { Hub } from '@aws-amplify/core';
+import { isConfigureEventWithResourceConfig } from './utils/isConfigureEventWithResourceConfig.mjs';
 
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
@@ -23,10 +26,15 @@ function generateClient(params) {
         graphql,
         cancel,
         isCancelError,
-        models: {},
+        models: emptyProperty,
+        enums: emptyProperty,
     };
-    const config = params.amplify.getConfig();
-    if (!config.API?.GraphQL) {
+    const apiGraphqlConfig = params.amplify.getConfig().API?.GraphQL;
+    if (isApiGraphQLConfig(apiGraphqlConfig)) {
+        client.models = generateModelsProperty(client, apiGraphqlConfig);
+        client.enums = generateEnumsProperty(apiGraphqlConfig);
+    }
+    else {
         // This happens when the `Amplify.configure()` call gets evaluated after the `generateClient()` call.
         //
         // Cause: when the `generateClient()` and the `Amplify.configure()` calls are located in
@@ -39,31 +47,25 @@ function generateClient(params) {
         //
         // TODO: revisit, and reverify this approach when enabling multiple clients for multi-endpoints
         // configuration.
-        client.models = emptyModels;
         generateModelsPropertyOnAmplifyConfigure(client);
     }
-    else {
-        client.models = generateModelsProperty(client, config.API?.GraphQL);
-    }
     return client;
 }
 const generateModelsPropertyOnAmplifyConfigure = (clientRef) => {
     Hub.listen('core', coreEvent => {
-        if (!isConfigureEvent(coreEvent.payload)) {
+        if (!isConfigureEventWithResourceConfig(coreEvent.payload)) {
             return;
         }
-        const { data: resourceConfig } = coreEvent.payload;
-        if (resourceConfig.API?.GraphQL) {
-            clientRef.models = generateModelsProperty(clientRef, resourceConfig.API?.GraphQL);
+        const apiGraphQLConfig = coreEvent.payload.data.API?.GraphQL;
+        if (isApiGraphQLConfig(apiGraphQLConfig)) {
+            clientRef.models = generateModelsProperty(clientRef, apiGraphQLConfig);
+            clientRef.enums = generateEnumsProperty(apiGraphQLConfig);
         }
     });
 };
-function isConfigureEvent(payload) {
-    return payload.event === 'configure';
-}
-const emptyModels = new Proxy({}, {
+const emptyProperty = new Proxy({}, {
     get() {
-        throw new Error('Could not generate client. This is likely due to Amplify.configure() not being called prior to generateClient().');
+        throw new Error('Client could not be generated. This is likely due to `Amplify.configure()` not being called prior to `generateClient()` or because the configuration passed to `Amplify.configure()` is missing GraphQL provider configuration.');
     },
 });
 

package/dist/esm/internals/generateClient.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"generateClient.mjs","sources":["../../../src/internals/generateClient.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { graphql, cancel, isCancelError } from './v6';\nimport { generateModelsProperty } from './generateModelsProperty';\nimport { __amplify, __authMode, __authToken, __headers, } from '../types';\nimport { Hub } from '@aws-amplify/core';\n/**\n * @private\n *\n * Creates a client that can be used to make GraphQL requests, using a provided `AmplifyClassV6`\n * compatible context object for config and auth fetching.\n *\n * @param params\n * @returns\n */\nexport function generateClient(params) {\n    const client = {\n        [__amplify]: params.amplify,\n        [__authMode]: params.authMode,\n        [__authToken]: params.authToken,\n        [__headers]: params.headers,\n        graphql,\n        cancel,\n        isCancelError,\n        models: {},\n    };\n    const config = params.amplify.getConfig();\n    if (!config.API?.GraphQL) {\n        // This happens when the `Amplify.configure()` call gets evaluated after the `generateClient()` call.\n        //\n        // Cause: when the `generateClient()` and the `Amplify.configure()` calls are located in\n        // different source files, script bundlers may randomly arrange their orders in the production\n        // bundle.\n        //\n        // With the current implementation, the `client.models` instance created by `generateClient()`\n        // will be rebuilt on every `Amplify.configure()` call that's provided with a valid GraphQL\n        // provider configuration.\n        //\n        // TODO: revisit, and reverify this approach when enabling multiple clients for multi-endpoints\n        // configuration.\n        client.models = emptyModels;\n        generateModelsPropertyOnAmplifyConfigure(client);\n    }\n    else {\n        client.models = generateModelsProperty(client, config.API?.GraphQL);\n    }\n    return client;\n}\nconst generateModelsPropertyOnAmplifyConfigure = (clientRef) => {\n    Hub.listen('core', coreEvent => {\n        if (!isConfigureEvent(coreEvent.payload)) {\n            return;\n        }\n        const { data: resourceConfig } = coreEvent.payload;\n        if (resourceConfig.API?.GraphQL) {\n            clientRef.models = generateModelsProperty(clientRef, resourceConfig.API?.GraphQL);\n        }\n    });\n};\nfunction isConfigureEvent(payload) {\n    return payload.event === 'configure';\n}\nconst emptyModels = new Proxy({}, {\n    get() {\n        throw new Error('Could not generate client. This is likely due to Amplify.configure() not being called prior to generateClient().');\n    },\n});\n"],"names":[],"mappings":";;;;;AAAA;AACA;AAKA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,cAAc,CAAC,MAAM,EAAE;AACvC,IAAI,MAAM,MAAM,GAAG;AACnB,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO;AACnC,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,QAAQ;AACrC,QAAQ,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS;AACvC,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO;AACnC,QAAQ,OAAO;AACf,QAAQ,MAAM;AACd,QAAQ,aAAa;AACrB,QAAQ,MAAM,EAAE,EAAE;AAClB,KAAK,CAAC;AACN,IAAI,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;AAC9C,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,EAAE;AAC9B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,QAAQ,MAAM,CAAC,MAAM,GAAG,WAAW,CAAC;AACpC,QAAQ,wCAAwC,CAAC,MAAM,CAAC,CAAC;AACzD,KAAK;AACL,SAAS;AACT,QAAQ,MAAM,CAAC,MAAM,GAAG,sBAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC5E,KAAK;AACL,IAAI,OAAO,MAAM,CAAC;AAClB,CAAC;AACD,MAAM,wCAAwC,GAAG,CAAC,SAAS,KAAK;AAChE,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,IAAI;AACpC,QAAQ,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;AAClD,YAAY,OAAO;AACnB,SAAS;AACT,QAAQ,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC,OAAO,CAAC;AAC3D,QAAQ,IAAI,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE;AACzC,YAAY,SAAS,CAAC,MAAM,GAAG,sBAAsB,CAAC,SAAS,EAAE,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC9F,SAAS;AACT,KAAK,CAAC,CAAC;AACP,CAAC,CAAC;AACF,SAAS,gBAAgB,CAAC,OAAO,EAAE;AACnC,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,WAAW,CAAC;AACzC,CAAC;AACD,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,EAAE,EAAE;AAClC,IAAI,GAAG,GAAG;AACV,QAAQ,MAAM,IAAI,KAAK,CAAC,kHAAkH,CAAC,CAAC;AAC5I,KAAK;AACL,CAAC,CAAC;;;;"}
+{"version":3,"file":"generateClient.mjs","sources":["../../../src/internals/generateClient.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { Hub } from '@aws-amplify/core';\nimport { graphql, cancel, isCancelError } from './v6';\nimport { generateEnumsProperty } from './utils/generateEnumsProperty';\nimport { generateModelsProperty } from './utils/generateModelsProperty';\nimport { isApiGraphQLConfig } from './utils/isApiGraphQLProviderConfig';\nimport { __amplify, __authMode, __authToken, __headers, } from '../types';\nimport { isConfigureEventWithResourceConfig } from './utils/isConfigureEventWithResourceConfig';\n/**\n * @private\n *\n * Creates a client that can be used to make GraphQL requests, using a provided `AmplifyClassV6`\n * compatible context object for config and auth fetching.\n *\n * @param params\n * @returns\n */\nexport function generateClient(params) {\n    const client = {\n        [__amplify]: params.amplify,\n        [__authMode]: params.authMode,\n        [__authToken]: params.authToken,\n        [__headers]: params.headers,\n        graphql,\n        cancel,\n        isCancelError,\n        models: emptyProperty,\n        enums: emptyProperty,\n    };\n    const apiGraphqlConfig = params.amplify.getConfig().API?.GraphQL;\n    if (isApiGraphQLConfig(apiGraphqlConfig)) {\n        client.models = generateModelsProperty(client, apiGraphqlConfig);\n        client.enums = generateEnumsProperty(apiGraphqlConfig);\n    }\n    else {\n        // This happens when the `Amplify.configure()` call gets evaluated after the `generateClient()` call.\n        //\n        // Cause: when the `generateClient()` and the `Amplify.configure()` calls are located in\n        // different source files, script bundlers may randomly arrange their orders in the production\n        // bundle.\n        //\n        // With the current implementation, the `client.models` instance created by `generateClient()`\n        // will be rebuilt on every `Amplify.configure()` call that's provided with a valid GraphQL\n        // provider configuration.\n        //\n        // TODO: revisit, and reverify this approach when enabling multiple clients for multi-endpoints\n        // configuration.\n        generateModelsPropertyOnAmplifyConfigure(client);\n    }\n    return client;\n}\nconst generateModelsPropertyOnAmplifyConfigure = (clientRef) => {\n    Hub.listen('core', coreEvent => {\n        if (!isConfigureEventWithResourceConfig(coreEvent.payload)) {\n            return;\n        }\n        const apiGraphQLConfig = coreEvent.payload.data.API?.GraphQL;\n        if (isApiGraphQLConfig(apiGraphQLConfig)) {\n            clientRef.models = generateModelsProperty(clientRef, apiGraphQLConfig);\n            clientRef.enums = generateEnumsProperty(apiGraphQLConfig);\n        }\n    });\n};\nconst emptyProperty = new Proxy({}, {\n    get() {\n        throw new Error('Client could not be generated. This is likely due to `Amplify.configure()` not being called prior to `generateClient()` or because the configuration passed to `Amplify.configure()` is missing GraphQL provider configuration.');\n    },\n});\n"],"names":[],"mappings":";;;;;;;;AAAA;AACA;AAQA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,cAAc,CAAC,MAAM,EAAE;AACvC,IAAI,MAAM,MAAM,GAAG;AACnB,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO;AACnC,QAAQ,CAAC,UAAU,GAAG,MAAM,CAAC,QAAQ;AACrC,QAAQ,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS;AACvC,QAAQ,CAAC,SAAS,GAAG,MAAM,CAAC,OAAO;AACnC,QAAQ,OAAO;AACf,QAAQ,MAAM;AACd,QAAQ,aAAa;AACrB,QAAQ,MAAM,EAAE,aAAa;AAC7B,QAAQ,KAAK,EAAE,aAAa;AAC5B,KAAK,CAAC;AACN,IAAI,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC;AACrE,IAAI,IAAI,kBAAkB,CAAC,gBAAgB,CAAC,EAAE;AAC9C,QAAQ,MAAM,CAAC,MAAM,GAAG,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;AACzE,QAAQ,MAAM,CAAC,KAAK,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;AAC/D,KAAK;AACL,SAAS;AACT;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,QAAQ,wCAAwC,CAAC,MAAM,CAAC,CAAC;AACzD,KAAK;AACL,IAAI,OAAO,MAAM,CAAC;AAClB,CAAC;AACD,MAAM,wCAAwC,GAAG,CAAC,SAAS,KAAK;AAChE,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,IAAI;AACpC,QAAQ,IAAI,CAAC,kCAAkC,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;AACpE,YAAY,OAAO;AACnB,SAAS;AACT,QAAQ,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC;AACrE,QAAQ,IAAI,kBAAkB,CAAC,gBAAgB,CAAC,EAAE;AAClD,YAAY,SAAS,CAAC,MAAM,GAAG,sBAAsB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;AACnF,YAAY,SAAS,CAAC,KAAK,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;AACtE,SAAS;AACT,KAAK,CAAC,CAAC;AACP,CAAC,CAAC;AACF,MAAM,aAAa,GAAG,IAAI,KAAK,CAAC,EAAE,EAAE;AACpC,IAAI,GAAG,GAAG;AACV,QAAQ,MAAM,IAAI,KAAK,CAAC,iOAAiO,CAAC,CAAC;AAC3P,KAAK;AACL,CAAC,CAAC;;;;"}

package/dist/esm/internals/utils/generateEnumsProperty.d.ts

@@ -0,0 +1,3 @@
+import { GraphQLProviderConfig } from '@aws-amplify/core/internals/utils';
+import { EnumTypes } from '@aws-amplify/data-schema-types';
+export declare const generateEnumsProperty: <T extends Record<any, any> = never>(graphqlConfig: GraphQLProviderConfig['GraphQL']) => EnumTypes<T>;

package/dist/esm/internals/utils/generateEnumsProperty.mjs

@@ -0,0 +1,18 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+const generateEnumsProperty = (graphqlConfig) => {
+    const modelIntrospection = graphqlConfig.modelIntrospection;
+    if (!modelIntrospection) {
+        return {};
+    }
+    const enums = {};
+    for (const [_, enumData] of Object.entries(modelIntrospection.enums)) {
+        enums[enumData.name] = {
+            values: () => enumData.values,
+        };
+    }
+    return enums;
+};
+
+export { generateEnumsProperty };
+//# sourceMappingURL=generateEnumsProperty.mjs.map

package/dist/esm/internals/utils/generateEnumsProperty.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateEnumsProperty.mjs","sources":["../../../../src/internals/utils/generateEnumsProperty.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nexport const generateEnumsProperty = (graphqlConfig) => {\n    const modelIntrospection = graphqlConfig.modelIntrospection;\n    if (!modelIntrospection) {\n        return {};\n    }\n    const enums = {};\n    for (const [_, enumData] of Object.entries(modelIntrospection.enums)) {\n        enums[enumData.name] = {\n            values: () => enumData.values,\n        };\n    }\n    return enums;\n};\n"],"names":[],"mappings":"AAAA;AACA;AACY,MAAC,qBAAqB,GAAG,CAAC,aAAa,KAAK;AACxD,IAAI,MAAM,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,CAAC;AAChE,IAAI,IAAI,CAAC,kBAAkB,EAAE;AAC7B,QAAQ,OAAO,EAAE,CAAC;AAClB,KAAK;AACL,IAAI,MAAM,KAAK,GAAG,EAAE,CAAC;AACrB,IAAI,KAAK,MAAM,CAAC,CAAC,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE;AAC1E,QAAQ,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG;AAC/B,YAAY,MAAM,EAAE,MAAM,QAAQ,CAAC,MAAM;AACzC,SAAS,CAAC;AACV,KAAK;AACL,IAAI,OAAO,KAAK,CAAC;AACjB;;;;"}

package/dist/esm/internals/utils/generateModelsProperty.d.ts

@@ -0,0 +1,4 @@
+import { ModelTypes } from '@aws-amplify/data-schema-types';
+import { V6Client } from '../../types';
+import { GraphQLProviderConfig } from '@aws-amplify/core/internals/utils';
+export declare function generateModelsProperty<T extends Record<any, any> = never>(client: V6Client<Record<string, any>>, apiGraphQLConfig: GraphQLProviderConfig['GraphQL']): ModelTypes<T>;

package/dist/esm/internals/{generateModelsProperty.mjs → utils/generateModelsProperty.mjs}

@@ -1,14 +1,14 @@
-import { graphQLOperationsInfo } from './APIClient.mjs';
-import { listFactory } from './operations/list.mjs';
-import { indexQueryFactory } from './operations/indexQuery.mjs';
-import { getFactory } from './operations/get.mjs';
-import { subscriptionFactory } from './operations/subscription.mjs';
-import { observeQueryFactory } from './operations/observeQuery.mjs';
-import { getSecondaryIndexesFromSchemaModel } from './clientUtils.mjs';
+import { graphQLOperationsInfo } from '../APIClient.mjs';
+import { listFactory } from '../operations/list.mjs';
+import { indexQueryFactory } from '../operations/indexQuery.mjs';
+import { getFactory } from '../operations/get.mjs';
+import { subscriptionFactory } from '../operations/subscription.mjs';
+import { observeQueryFactory } from '../operations/observeQuery.mjs';
+import { getSecondaryIndexesFromSchemaModel } from '../clientUtils.mjs';
 
-function generateModelsProperty(client, graphqlConfig) {
+function generateModelsProperty(client, apiGraphQLConfig) {
     const models = {};
-    const modelIntrospection = graphqlConfig.modelIntrospection;
+    const modelIntrospection = apiGraphQLConfig.modelIntrospection;
     if (!modelIntrospection) {
         return {};
     }

package/dist/esm/internals/utils/generateModelsProperty.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateModelsProperty.mjs","sources":["../../../../src/internals/utils/generateModelsProperty.ts"],"sourcesContent":["import { graphQLOperationsInfo } from '../APIClient';\nimport { listFactory } from '../operations/list';\nimport { indexQueryFactory } from '../operations/indexQuery';\nimport { getFactory } from '../operations/get';\nimport { subscriptionFactory } from '../operations/subscription';\nimport { observeQueryFactory } from '../operations/observeQuery';\nimport { getSecondaryIndexesFromSchemaModel } from '../clientUtils';\nexport function generateModelsProperty(client, apiGraphQLConfig) {\n    const models = {};\n    const modelIntrospection = apiGraphQLConfig.modelIntrospection;\n    if (!modelIntrospection) {\n        return {};\n    }\n    const SUBSCRIPTION_OPS = ['ONCREATE', 'ONUPDATE', 'ONDELETE'];\n    for (const model of Object.values(modelIntrospection.models)) {\n        const { name } = model;\n        models[name] = {};\n        Object.entries(graphQLOperationsInfo).forEach(([key, { operationPrefix }]) => {\n            const operation = key;\n            if (operation === 'LIST') {\n                models[name][operationPrefix] = listFactory(client, modelIntrospection, model);\n            }\n            else if (SUBSCRIPTION_OPS.includes(operation)) {\n                models[name][operationPrefix] = subscriptionFactory(client, modelIntrospection, model, operation);\n            }\n            else if (operation === 'OBSERVE_QUERY') {\n                models[name][operationPrefix] = observeQueryFactory(models, model);\n            }\n            else {\n                models[name][operationPrefix] = getFactory(client, modelIntrospection, model, operation);\n            }\n        });\n        const secondaryIdxs = getSecondaryIndexesFromSchemaModel(model);\n        for (const idx of secondaryIdxs) {\n            models[name][idx.queryField] = indexQueryFactory(client, modelIntrospection, model, idx);\n        }\n    }\n    return models;\n}\n"],"names":[],"mappings":";;;;;;;;AAOO,SAAS,sBAAsB,CAAC,MAAM,EAAE,gBAAgB,EAAE;AACjE,IAAI,MAAM,MAAM,GAAG,EAAE,CAAC;AACtB,IAAI,MAAM,kBAAkB,GAAG,gBAAgB,CAAC,kBAAkB,CAAC;AACnE,IAAI,IAAI,CAAC,kBAAkB,EAAE;AAC7B,QAAQ,OAAO,EAAE,CAAC;AAClB,KAAK;AACL,IAAI,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;AAClE,IAAI,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;AAClE,QAAQ,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;AAC/B,QAAQ,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;AAC1B,QAAQ,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,eAAe,EAAE,CAAC,KAAK;AACtF,YAAY,MAAM,SAAS,GAAG,GAAG,CAAC;AAClC,YAAY,IAAI,SAAS,KAAK,MAAM,EAAE;AACtC,gBAAgB,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC;AAC/F,aAAa;AACb,iBAAiB,IAAI,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;AAC3D,gBAAgB,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;AAClH,aAAa;AACb,iBAAiB,IAAI,SAAS,KAAK,eAAe,EAAE;AACpD,gBAAgB,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACnF,aAAa;AACb,iBAAiB;AACjB,gBAAgB,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;AACzG,aAAa;AACb,SAAS,CAAC,CAAC;AACX,QAAQ,MAAM,aAAa,GAAG,kCAAkC,CAAC,KAAK,CAAC,CAAC;AACxE,QAAQ,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;AACzC,YAAY,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;AACrG,SAAS;AACT,KAAK;AACL,IAAI,OAAO,MAAM,CAAC;AAClB;;;;"}

package/dist/esm/internals/utils/isApiGraphQLProviderConfig.d.ts

@@ -0,0 +1,2 @@
+import { GraphQLProviderConfig } from '@aws-amplify/core/internals/utils';
+export declare function isApiGraphQLConfig(apiGraphQLConfig: GraphQLProviderConfig['GraphQL'] | undefined): apiGraphQLConfig is GraphQLProviderConfig['GraphQL'];

package/dist/esm/internals/utils/isApiGraphQLProviderConfig.mjs

@@ -0,0 +1,8 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+function isApiGraphQLConfig(apiGraphQLConfig) {
+    return apiGraphQLConfig !== undefined;
+}
+
+export { isApiGraphQLConfig };
+//# sourceMappingURL=isApiGraphQLProviderConfig.mjs.map

package/dist/esm/internals/utils/isApiGraphQLProviderConfig.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"isApiGraphQLProviderConfig.mjs","sources":["../../../../src/internals/utils/isApiGraphQLProviderConfig.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nexport function isApiGraphQLConfig(apiGraphQLConfig) {\n    return apiGraphQLConfig !== undefined;\n}\n"],"names":[],"mappings":"AAAA;AACA;AACO,SAAS,kBAAkB,CAAC,gBAAgB,EAAE;AACrD,IAAI,OAAO,gBAAgB,KAAK,SAAS,CAAC;AAC1C;;;;"}

package/dist/esm/internals/utils/isConfigureEventWithResourceConfig.d.ts

@@ -0,0 +1,8 @@
+import { HubCapsule, ResourcesConfig } from '@aws-amplify/core';
+export declare function isConfigureEventWithResourceConfig(payload: HubCapsule<'core', {
+    event: string;
+    data?: unknown;
+}>['payload']): payload is {
+    event: 'configure';
+    data: ResourcesConfig;
+};

package/dist/esm/internals/utils/isConfigureEventWithResourceConfig.mjs

@@ -0,0 +1,8 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+function isConfigureEventWithResourceConfig(payload) {
+    return payload.event === 'configure';
+}
+
+export { isConfigureEventWithResourceConfig };
+//# sourceMappingURL=isConfigureEventWithResourceConfig.mjs.map

package/dist/esm/internals/utils/isConfigureEventWithResourceConfig.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"isConfigureEventWithResourceConfig.mjs","sources":["../../../../src/internals/utils/isConfigureEventWithResourceConfig.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nexport function isConfigureEventWithResourceConfig(payload) {\n    return payload.event === 'configure';\n}\n"],"names":[],"mappings":"AAAA;AACA;AACO,SAAS,kCAAkC,CAAC,OAAO,EAAE;AAC5D,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,WAAW,CAAC;AACzC;;;;"}

package/dist/esm/types/index.d.ts

@@ -1,5 +1,5 @@
 import { AmplifyClassV6, ResourcesConfig } from '@aws-amplify/core';
-import { ModelTypes, CustomHeaders } from '@aws-amplify/data-schema-types';
+import { ModelTypes, CustomHeaders, EnumTypes } from '@aws-amplify/data-schema-types';
 import { Source, DocumentNode, GraphQLError } from 'graphql';
 export { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
@@ -294,6 +294,7 @@ export type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
     cancel: (promise: Promise<any>, message?: string) => boolean;
     isCancelError: (error: any) => boolean;
     models: ModelTypes<T>;
+    enums: EnumTypes<T>;
 }>;
 export type V6ClientSSRRequest<T extends Record<any, any> = never> = ExcludeNeverFields<{
     [__amplify]: AmplifyClassV6;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.16",
+	"version": "4.0.17-unstable.5c56101.0+5c56101",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./dist/cjs/index.js",
 	"module": "./dist/esm/index.mjs",
@@ -84,9 +84,9 @@
 		"server"
 	],
 	"dependencies": {
-		"@aws-amplify/api-rest": "4.0.16",
-		"@aws-amplify/core": "6.0.16",
-		"@aws-amplify/data-schema-types": "^0.7.1",
+		"@aws-amplify/api-rest": "4.0.17-unstable.5c56101.0+5c56101",
+		"@aws-amplify/core": "6.0.17-unstable.5c56101.0+5c56101",
+		"@aws-amplify/data-schema-types": "^0.7.2",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
@@ -101,5 +101,5 @@
 			"limit": "91.7 kB"
 		}
 	],
-	"gitHead": "0e919f6e759cb94d03e119162b530b32d48f1357"
+	"gitHead": "5c561018aedcff314e68b3dd385fe9bd9ff93150"
 }

package/src/internals/generateClient.ts

@@ -1,7 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import { Hub } from '@aws-amplify/core';
+import { EnumTypes, ModelTypes } from '@aws-amplify/data-schema-types';
 import { graphql, cancel, isCancelError } from './v6';
-import { generateModelsProperty } from './generateModelsProperty';
+import { generateEnumsProperty } from './utils/generateEnumsProperty';
+import { generateModelsProperty } from './utils/generateModelsProperty';
+import { isApiGraphQLConfig } from './utils/isApiGraphQLProviderConfig';
 import {
 	V6Client,
 	__amplify,
@@ -10,8 +14,7 @@ import {
 	__headers,
 } from '../types';
 import { ClientGenerationParams } from './types';
-import { ModelTypes } from '@aws-amplify/data-schema-types';
-import { Hub, HubCapsule, ResourcesConfig } from '@aws-amplify/core';
+import { isConfigureEventWithResourceConfig } from './utils/isConfigureEventWithResourceConfig';
 
 /**
  * @private
@@ -23,7 +26,7 @@ import { Hub, HubCapsule, ResourcesConfig } from '@aws-amplify/core';
  * @returns
  */
 export function generateClient<T extends Record<any, any> = never>(
-	params: ClientGenerationParams
+	params: ClientGenerationParams,
 ): V6Client<T> {
 	const client = {
 		[__amplify]: params.amplify,
@@ -33,12 +36,16 @@ export function generateClient<T extends Record<any, any> = never>(
 		graphql,
 		cancel,
 		isCancelError,
-		models: {},
+		models: emptyProperty as ModelTypes<never>,
+		enums: emptyProperty as EnumTypes<never>,
 	} as any;
 
-	const config = params.amplify.getConfig();
+	const apiGraphqlConfig = params.amplify.getConfig().API?.GraphQL;
 
-	if (!config.API?.GraphQL) {
+	if (isApiGraphQLConfig(apiGraphqlConfig)) {
+		client.models = generateModelsProperty<T>(client, apiGraphqlConfig);
+		client.enums = generateEnumsProperty<T>(apiGraphqlConfig);
+	} else {
 		// This happens when the `Amplify.configure()` call gets evaluated after the `generateClient()` call.
 		//
 		// Cause: when the `generateClient()` and the `Amplify.configure()` calls are located in
@@ -51,52 +58,33 @@ export function generateClient<T extends Record<any, any> = never>(
 		//
 		// TODO: revisit, and reverify this approach when enabling multiple clients for multi-endpoints
 		// configuration.
-		client.models = emptyModels as ModelTypes<never>;
-		generateModelsPropertyOnAmplifyConfigure<T>(client);
-	} else {
-		client.models = generateModelsProperty<T>(
-			client,
-			config.API?.GraphQL,
-		);
+		generateModelsPropertyOnAmplifyConfigure(client);
 	}
 
 	return client as V6Client<T>;
 }
 
-const generateModelsPropertyOnAmplifyConfigure = <
-	T extends Record<any, any> = never,
->(clientRef: any) => {
+const generateModelsPropertyOnAmplifyConfigure = (clientRef: any) => {
 	Hub.listen('core', coreEvent => {
-		if (!isConfigureEvent(coreEvent.payload)) {
+		if (!isConfigureEventWithResourceConfig(coreEvent.payload)) {
 			return;
 		}
 
-		const { data: resourceConfig } = coreEvent.payload;
+		const apiGraphQLConfig = coreEvent.payload.data.API?.GraphQL;
 
-		if (resourceConfig.API?.GraphQL) {
-			clientRef.models = generateModelsProperty<T>(
-				clientRef,
-				resourceConfig.API?.GraphQL,
-			);
+		if (isApiGraphQLConfig(apiGraphQLConfig)) {
+			clientRef.models = generateModelsProperty(clientRef, apiGraphQLConfig);
+			clientRef.enums = generateEnumsProperty(apiGraphQLConfig);
 		}
 	});
 };
 
-function isConfigureEvent(
-	payload: HubCapsule<'core', { event: string; data?: unknown }>['payload'],
-): payload is {
-	event: 'configure';
-	data: ResourcesConfig;
-} {
-	return payload.event === 'configure';
-}
-
-const emptyModels = new Proxy(
+const emptyProperty = new Proxy(
 	{},
 	{
 		get() {
 			throw new Error(
-				'Could not generate client. This is likely due to Amplify.configure() not being called prior to generateClient().',
+				'Client could not be generated. This is likely due to `Amplify.configure()` not being called prior to `generateClient()` or because the configuration passed to `Amplify.configure()` is missing GraphQL provider configuration.',
 			);
 		},
 	},

package/src/internals/utils/generateEnumsProperty.ts

@@ -0,0 +1,33 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import {
+	ModelIntrospectionSchema,
+	GraphQLProviderConfig,
+} from '@aws-amplify/core/internals/utils';
+import { EnumTypes } from '@aws-amplify/data-schema-types';
+
+export const generateEnumsProperty = <T extends Record<any, any> = never>(
+	graphqlConfig: GraphQLProviderConfig['GraphQL'],
+): EnumTypes<T> => {
+	const modelIntrospection: ModelIntrospectionSchema | undefined =
+		graphqlConfig.modelIntrospection;
+
+	if (!modelIntrospection) {
+		return {} as EnumTypes<never>;
+	}
+
+	const enums: {
+		[EnumName: string]: {
+			values: () => string[];
+		};
+	} = {};
+
+	for (const [_, enumData] of Object.entries(modelIntrospection.enums)) {
+		enums[enumData.name] = {
+			values: () => enumData.values,
+		};
+	}
+
+	return enums as EnumTypes<T>;
+};

package/src/internals/{generateModelsProperty.ts → utils/generateModelsProperty.ts}

@@ -1,25 +1,27 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { ModelTypes } from '@aws-amplify/data-schema-types';
-import { graphQLOperationsInfo, ModelOperation } from './APIClient';
-import { V6Client, __authMode, __authToken } from '../types';
-import { listFactory } from './operations/list';
-import { indexQueryFactory } from './operations/indexQuery';
-import { getFactory } from './operations/get';
-import { subscriptionFactory } from './operations/subscription';
-import { observeQueryFactory } from './operations/observeQuery';
-import { ModelIntrospectionSchema } from '@aws-amplify/core/internals/utils';
-import { GraphQLProviderConfig } from '@aws-amplify/core';
-import { getSecondaryIndexesFromSchemaModel } from './clientUtils';
+import { graphQLOperationsInfo, ModelOperation } from '../APIClient';
+import { V6Client, __authMode, __authToken } from '../../types';
+import { listFactory } from '../operations/list';
+import { indexQueryFactory } from '../operations/indexQuery';
+import { getFactory } from '../operations/get';
+import { subscriptionFactory } from '../operations/subscription';
+import { observeQueryFactory } from '../operations/observeQuery';
+import {
+	ModelIntrospectionSchema,
+	GraphQLProviderConfig,
+} from '@aws-amplify/core/internals/utils';
+import { getSecondaryIndexesFromSchemaModel } from '../clientUtils';
 
 export function generateModelsProperty<T extends Record<any, any> = never>(
 	client: V6Client<Record<string, any>>,
-	graphqlConfig: GraphQLProviderConfig['GraphQL'],
+	apiGraphQLConfig: GraphQLProviderConfig['GraphQL'],
 ): ModelTypes<T> {
 	const models = {} as any;
 
 	const modelIntrospection: ModelIntrospectionSchema | undefined =
-		graphqlConfig.modelIntrospection;
+		apiGraphQLConfig.modelIntrospection;
 
 	if (!modelIntrospection) {
 		return {} as ModelTypes<never>;

package/src/internals/utils/isApiGraphQLProviderConfig.ts

@@ -0,0 +1,10 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { GraphQLProviderConfig } from '@aws-amplify/core/internals/utils';
+
+export function isApiGraphQLConfig(
+	apiGraphQLConfig: GraphQLProviderConfig['GraphQL'] | undefined,
+): apiGraphQLConfig is GraphQLProviderConfig['GraphQL'] {
+	return apiGraphQLConfig !== undefined;
+}

package/src/internals/utils/isConfigureEventWithResourceConfig.ts

@@ -0,0 +1,13 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+import { HubCapsule, ResourcesConfig } from '@aws-amplify/core';
+
+export function isConfigureEventWithResourceConfig(
+	payload: HubCapsule<'core', { event: string; data?: unknown }>['payload'],
+): payload is {
+	event: 'configure';
+	data: ResourcesConfig;
+} {
+	return payload.event === 'configure';
+}

package/src/types/index.ts

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { AmplifyClassV6, ResourcesConfig } from '@aws-amplify/core';
-import { ModelTypes, CustomHeaders } from '@aws-amplify/data-schema-types';
+import { ModelTypes, CustomHeaders, EnumTypes } from '@aws-amplify/data-schema-types';
 import { Source, DocumentNode, GraphQLError } from 'graphql';
 export { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
@@ -382,6 +382,7 @@ export type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
 	cancel: (promise: Promise<any>, message?: string) => boolean;
 	isCancelError: (error: any) => boolean;
 	models: ModelTypes<T>;
+	enums: EnumTypes<T>;
 }>;
 
 export type V6ClientSSRRequest<T extends Record<any, any> = never> =

package/dist/cjs/internals/generateModelsProperty.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generateModelsProperty.js","sources":["../../../src/internals/generateModelsProperty.ts"],"sourcesContent":["\"use strict\";\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.generateModelsProperty = void 0;\nconst APIClient_1 = require(\"./APIClient\");\nconst list_1 = require(\"./operations/list\");\nconst indexQuery_1 = require(\"./operations/indexQuery\");\nconst get_1 = require(\"./operations/get\");\nconst subscription_1 = require(\"./operations/subscription\");\nconst observeQuery_1 = require(\"./operations/observeQuery\");\nconst clientUtils_1 = require(\"./clientUtils\");\nfunction generateModelsProperty(client, graphqlConfig) {\n    const models = {};\n    const modelIntrospection = graphqlConfig.modelIntrospection;\n    if (!modelIntrospection) {\n        return {};\n    }\n    const SUBSCRIPTION_OPS = ['ONCREATE', 'ONUPDATE', 'ONDELETE'];\n    for (const model of Object.values(modelIntrospection.models)) {\n        const { name } = model;\n        models[name] = {};\n        Object.entries(APIClient_1.graphQLOperationsInfo).forEach(([key, { operationPrefix }]) => {\n            const operation = key;\n            if (operation === 'LIST') {\n                models[name][operationPrefix] = (0, list_1.listFactory)(client, modelIntrospection, model);\n            }\n            else if (SUBSCRIPTION_OPS.includes(operation)) {\n                models[name][operationPrefix] = (0, subscription_1.subscriptionFactory)(client, modelIntrospection, model, operation);\n            }\n            else if (operation === 'OBSERVE_QUERY') {\n                models[name][operationPrefix] = (0, observeQuery_1.observeQueryFactory)(models, model);\n            }\n            else {\n                models[name][operationPrefix] = (0, get_1.getFactory)(client, modelIntrospection, model, operation);\n            }\n        });\n        const secondaryIdxs = (0, clientUtils_1.getSecondaryIndexesFromSchemaModel)(model);\n        for (const idx of secondaryIdxs) {\n            models[name][idx.queryField] = (0, indexQuery_1.indexQueryFactory)(client, modelIntrospection, model, idx);\n        }\n    }\n    return models;\n}\nexports.generateModelsProperty = generateModelsProperty;\n"],"names":[],"mappings":"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"}

package/dist/esm/internals/generateModelsProperty.d.ts

@@ -1,4 +0,0 @@
-import { ModelTypes } from '@aws-amplify/data-schema-types';
-import { V6Client } from '../types';
-import { GraphQLProviderConfig } from '@aws-amplify/core';
-export declare function generateModelsProperty<T extends Record<any, any> = never>(client: V6Client<Record<string, any>>, graphqlConfig: GraphQLProviderConfig['GraphQL']): ModelTypes<T>;

package/dist/esm/internals/generateModelsProperty.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"generateModelsProperty.mjs","sources":["../../../src/internals/generateModelsProperty.ts"],"sourcesContent":["import { graphQLOperationsInfo } from './APIClient';\nimport { listFactory } from './operations/list';\nimport { indexQueryFactory } from './operations/indexQuery';\nimport { getFactory } from './operations/get';\nimport { subscriptionFactory } from './operations/subscription';\nimport { observeQueryFactory } from './operations/observeQuery';\nimport { getSecondaryIndexesFromSchemaModel } from './clientUtils';\nexport function generateModelsProperty(client, graphqlConfig) {\n    const models = {};\n    const modelIntrospection = graphqlConfig.modelIntrospection;\n    if (!modelIntrospection) {\n        return {};\n    }\n    const SUBSCRIPTION_OPS = ['ONCREATE', 'ONUPDATE', 'ONDELETE'];\n    for (const model of Object.values(modelIntrospection.models)) {\n        const { name } = model;\n        models[name] = {};\n        Object.entries(graphQLOperationsInfo).forEach(([key, { operationPrefix }]) => {\n            const operation = key;\n            if (operation === 'LIST') {\n                models[name][operationPrefix] = listFactory(client, modelIntrospection, model);\n            }\n            else if (SUBSCRIPTION_OPS.includes(operation)) {\n                models[name][operationPrefix] = subscriptionFactory(client, modelIntrospection, model, operation);\n            }\n            else if (operation === 'OBSERVE_QUERY') {\n                models[name][operationPrefix] = observeQueryFactory(models, model);\n            }\n            else {\n                models[name][operationPrefix] = getFactory(client, modelIntrospection, model, operation);\n            }\n        });\n        const secondaryIdxs = getSecondaryIndexesFromSchemaModel(model);\n        for (const idx of secondaryIdxs) {\n            models[name][idx.queryField] = indexQueryFactory(client, modelIntrospection, model, idx);\n        }\n    }\n    return models;\n}\n"],"names":[],"mappings":";;;;;;;;AAOO,SAAS,sBAAsB,CAAC,MAAM,EAAE,aAAa,EAAE;AAC9D,IAAI,MAAM,MAAM,GAAG,EAAE,CAAC;AACtB,IAAI,MAAM,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,CAAC;AAChE,IAAI,IAAI,CAAC,kBAAkB,EAAE;AAC7B,QAAQ,OAAO,EAAE,CAAC;AAClB,KAAK;AACL,IAAI,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;AAClE,IAAI,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;AAClE,QAAQ,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;AAC/B,QAAQ,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;AAC1B,QAAQ,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,eAAe,EAAE,CAAC,KAAK;AACtF,YAAY,MAAM,SAAS,GAAG,GAAG,CAAC;AAClC,YAAY,IAAI,SAAS,KAAK,MAAM,EAAE;AACtC,gBAAgB,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,CAAC,CAAC;AAC/F,aAAa;AACb,iBAAiB,IAAI,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;AAC3D,gBAAgB,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;AAClH,aAAa;AACb,iBAAiB,IAAI,SAAS,KAAK,eAAe,EAAE;AACpD,gBAAgB,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,GAAG,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;AACnF,aAAa;AACb,iBAAiB;AACjB,gBAAgB,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;AACzG,aAAa;AACb,SAAS,CAAC,CAAC;AACX,QAAQ,MAAM,aAAa,GAAG,kCAAkC,CAAC,KAAK,CAAC,CAAC;AACxE,QAAQ,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;AACzC,YAAY,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;AACrG,SAAS;AACT,KAAK;AACL,IAAI,OAAO,MAAM,CAAC;AAClB;;;;"}