@aws-amplify/geo 2.3.5 → 3.0.1-console-preview.431c340.0

package/lib-esm/Geo.js

@@ -1,15 +1,21 @@
 import { __awaiter, __generator, __read } from "tslib";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Amplify, ConsoleLogger as Logger, parseAWSExports, } from '@aws-amplify/core';
-import { AmazonLocationServiceProvider } from './Providers/AmazonLocationServiceProvider';
+import { Amplify } from '@aws-amplify/core';
+import { ConsoleLogger as Logger } from '@aws-amplify/core/internals/utils';
+import { AmazonLocationServiceProvider } from './providers/location-service/AmazonLocationServiceProvider';
 import { validateCoordinates } from './util';
 var logger = new Logger('Geo');
 var DEFAULT_PROVIDER = 'AmazonLocationService';
-var GeoClass = /** @class */ (function () {
+export var GeoClass = /** @class */ (function () {
     function GeoClass() {
+        var _a;
         this._config = {};
         this._pluggables = [];
+        var amplifyConfig = (_a = Amplify.getConfig()) !== null && _a !== void 0 ? _a : {};
+        this._config = Object.assign({}, this._config, amplifyConfig.Geo);
+        var locationProvider = new AmazonLocationServiceProvider(amplifyConfig.Geo);
+        this._pluggables.push(locationProvider);
         logger.debug('Geo Options', this._config);
     }
     /**
@@ -26,8 +32,6 @@ var GeoClass = /** @class */ (function () {
     GeoClass.prototype.addPluggable = function (pluggable) {
         if (pluggable && pluggable.getCategory() === 'Geo') {
             this._pluggables.push(pluggable);
-            var config = pluggable.configure(this._config[pluggable.getProviderName()]);
-            return config;
         }
     };
     /**
@@ -51,26 +55,6 @@ var GeoClass = /** @class */ (function () {
         this._pluggables = this._pluggables.filter(function (pluggable) { return pluggable.getProviderName() !== providerName; });
         return;
     };
-    /**
-     * Configure Geo
-     * @param {Object} config - Configuration object for Geo
-     * @return {Object} - Current configuration
-     */
-    GeoClass.prototype.configure = function (config) {
-        var _this = this;
-        logger.debug('configure Geo');
-        if (!config)
-            return this._config;
-        var amplifyConfig = parseAWSExports(config);
-        this._config = Object.assign({}, this._config, amplifyConfig.Geo, config);
-        this._pluggables.forEach(function (pluggable) {
-            pluggable.configure(_this._config[pluggable.getProviderName()]);
-        });
-        if (this._pluggables.length === 0) {
-            this.addPluggable(new AmazonLocationServiceProvider());
-        }
-        return this._config;
-    };
     /**
      * Get the map resources that are currently available through the provider
      * @param {string} provider
@@ -99,11 +83,12 @@ var GeoClass = /** @class */ (function () {
      */
     GeoClass.prototype.searchByText = function (text, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, providerName, prov, error_1;
+            var providerName, prov, error_1;
+            var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        providerName = (_a = (options || {}).providerName, _a === void 0 ? DEFAULT_PROVIDER : _a);
                         prov = this.getPluggable(providerName);
                         _b.label = 1;
                     case 1:
@@ -127,11 +112,12 @@ var GeoClass = /** @class */ (function () {
      */
     GeoClass.prototype.searchForSuggestions = function (text, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, providerName, prov, error_2;
+            var providerName, prov, error_2;
+            var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        providerName = (_a = (options || {}).providerName, _a === void 0 ? DEFAULT_PROVIDER : _a);
                         prov = this.getPluggable(providerName);
                         _b.label = 1;
                     case 1:
@@ -183,13 +169,14 @@ var GeoClass = /** @class */ (function () {
      */
     GeoClass.prototype.searchByCoordinates = function (coordinates, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, providerName, prov, _b, lng, lat, error_4;
+            var providerName, prov, lng, lat, error_4;
+            var _a, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
-                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        providerName = (_a = (options || {}).providerName, _a === void 0 ? DEFAULT_PROVIDER : _a);
                         prov = this.getPluggable(providerName);
-                        _b = __read(coordinates, 2), lng = _b[0], lat = _b[1];
+                        lng = (_b = __read(coordinates, 2), _b[0]), lat = _b[1];
                         _c.label = 1;
                     case 1:
                         _c.trys.push([1, 3, , 4]);
@@ -215,11 +202,12 @@ var GeoClass = /** @class */ (function () {
      */
     GeoClass.prototype.saveGeofences = function (geofences, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, providerName, prov, geofenceInputArray, error_5;
+            var providerName, prov, geofenceInputArray, error_5;
+            var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        providerName = (_a = (options || {}).providerName, _a === void 0 ? DEFAULT_PROVIDER : _a);
                         prov = this.getPluggable(providerName);
                         if (!Array.isArray(geofences)) {
                             geofenceInputArray = [geofences];
@@ -249,11 +237,12 @@ var GeoClass = /** @class */ (function () {
      */
     GeoClass.prototype.getGeofence = function (geofenceId, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, providerName, prov, error_6;
+            var providerName, prov, error_6;
+            var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        providerName = (_a = (options || {}).providerName, _a === void 0 ? DEFAULT_PROVIDER : _a);
                         prov = this.getPluggable(providerName);
                         _b.label = 1;
                     case 1:
@@ -278,11 +267,12 @@ var GeoClass = /** @class */ (function () {
      */
     GeoClass.prototype.listGeofences = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, providerName, prov, error_7;
+            var providerName, prov, error_7;
+            var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        providerName = (_a = (options || {}).providerName, _a === void 0 ? DEFAULT_PROVIDER : _a);
                         prov = this.getPluggable(providerName);
                         _b.label = 1;
                     case 1:
@@ -308,11 +298,12 @@ var GeoClass = /** @class */ (function () {
      */
     GeoClass.prototype.deleteGeofences = function (geofenceIds, options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, providerName, prov, geofenceIdsInputArray, error_8;
+            var providerName, prov, geofenceIdsInputArray, error_8;
+            var _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = (options || {}).providerName, providerName = _a === void 0 ? DEFAULT_PROVIDER : _a;
+                        providerName = (_a = (options || {}).providerName, _a === void 0 ? DEFAULT_PROVIDER : _a);
                         prov = this.getPluggable(providerName);
                         if (!Array.isArray(geofenceIds)) {
                             geofenceIdsInputArray = [geofenceIds];
@@ -337,7 +328,4 @@ var GeoClass = /** @class */ (function () {
     GeoClass.MODULE = 'Geo';
     return GeoClass;
 }());
-export { GeoClass };
 export var Geo = new GeoClass();
-Amplify.register(Geo);
-//# sourceMappingURL=Geo.js.map

package/lib-esm/index.js

@@ -1,4 +1,4 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 export { Geo } from './Geo';
-//# sourceMappingURL=index.js.map
+export * from './types';

package/{lib/Providers → lib-esm/providers/location-service}/AmazonLocationServiceProvider.d.ts

@@ -1,4 +1,4 @@
-import { GeoConfig, SearchByTextOptions, SearchByCoordinatesOptions, GeoProvider, Place, AmazonLocationServiceMapStyle, Coordinates, SearchForSuggestionsResults, GeofenceId, GeofenceInput, AmazonLocationServiceGeofenceOptions, AmazonLocationServiceListGeofenceOptions, ListGeofenceResults, SaveGeofencesResults, AmazonLocationServiceGeofence, AmazonLocationServiceDeleteGeofencesResults, searchByPlaceIdOptions } from '../types';
+import { GeoConfig, SearchByTextOptions, SearchByCoordinatesOptions, GeoProvider, Place, AmazonLocationServiceMapStyle, Coordinates, SearchForSuggestionsResults, GeofenceId, GeofenceInput, AmazonLocationServiceGeofenceOptions, AmazonLocationServiceListGeofenceOptions, ListGeofenceResults, SaveGeofencesResults, AmazonLocationServiceGeofence, AmazonLocationServiceDeleteGeofencesResults, searchByPlaceIdOptions } from '../../types';
 export declare class AmazonLocationServiceProvider implements GeoProvider {
     static CATEGORY: string;
     static PROVIDER_NAME: string;
@@ -6,6 +6,7 @@ export declare class AmazonLocationServiceProvider implements GeoProvider {
      * @private
      */
     private _config;
+    private _credentials;
     /**
      * Initialize Geo with AWS configurations
      * @param {Object} config - Configuration object for Geo
@@ -21,12 +22,6 @@ export declare class AmazonLocationServiceProvider implements GeoProvider {
      * @returns {string} name of the provider
      */
     getProviderName(): string;
-    /**
-     * Configure Geo part with aws configuration
-     * @param {Object} config - Configuration of the Geo
-     * @return {Object} - Current configuration
-     */
-    configure(config?: any): object;
     /**
      * Get the map resources that are currently available through the provider
      * @returns {AmazonLocationServiceMapStyle[]}- Array of available map resources
@@ -97,6 +92,7 @@ export declare class AmazonLocationServiceProvider implements GeoProvider {
      * @private
      */
     private _ensureCredentials;
+    private _refreshConfig;
     private _verifyMapResources;
     private _verifySearchIndex;
     private _verifyGeofenceCollections;

package/lib-esm/{Providers → providers/location-service}/AmazonLocationServiceProvider.js

@@ -1,12 +1,13 @@
-import { __assign, __awaiter, __generator, __read, __spread } from "tslib";
+import { __assign, __awaiter, __generator, __read, __spreadArray } from "tslib";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import camelcaseKeys from 'camelcase-keys';
-import { ConsoleLogger as Logger, Credentials, getAmplifyUserAgentObject, } from '@aws-amplify/core';
+import { Amplify, fetchAuthSession } from '@aws-amplify/core';
+import { ConsoleLogger as Logger, getAmplifyUserAgentObject, } from '@aws-amplify/core/internals/utils';
 import { LocationClient, SearchPlaceIndexForTextCommand, SearchPlaceIndexForSuggestionsCommand, SearchPlaceIndexForPositionCommand, BatchPutGeofenceCommand, GetPlaceCommand, GetGeofenceCommand, ListGeofencesCommand, BatchDeleteGeofenceCommand, } from '@aws-sdk/client-location';
-import { mapSearchOptions, validateGeofenceId, validateGeofencesInput, } from '../util';
+import { mapSearchOptions, validateGeofenceId, validateGeofencesInput, } from '../../util';
 var logger = new Logger('AmazonLocationServiceProvider');
-var AmazonLocationServiceProvider = /** @class */ (function () {
+export var AmazonLocationServiceProvider = /** @class */ (function () {
     /**
      * Initialize Geo with AWS configurations
      * @param {Object} config - Configuration object for Geo
@@ -29,18 +30,6 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
     AmazonLocationServiceProvider.prototype.getProviderName = function () {
         return AmazonLocationServiceProvider.PROVIDER_NAME;
     };
-    /**
-     * Configure Geo part with aws configuration
-     * @param {Object} config - Configuration of the Geo
-     * @return {Object} - Current configuration
-     */
-    AmazonLocationServiceProvider.prototype.configure = function (config) {
-        logger.debug('configure Amazon Location Service Provider', config);
-        if (!config)
-            return this._config;
-        this._config = Object.assign({}, this._config, config);
-        return this._config;
-    };
     /**
      * Get the map resources that are currently available through the provider
      * @returns {AmazonLocationServiceMapStyle[]}- Array of available map resources
@@ -96,7 +85,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                             locationServiceInput = __assign(__assign({}, locationServiceInput), mapSearchOptions(options, locationServiceInput));
                         }
                         client = new LocationClient({
-                            credentials: this._config.credentials,
+                            credentials: this._credentials,
                             region: this._config.region,
                             customUserAgent: getAmplifyUserAgentObject(),
                         });
@@ -151,7 +140,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                             locationServiceInput = __assign(__assign({}, locationServiceInput), mapSearchOptions(options, locationServiceInput));
                         }
                         client = new LocationClient({
-                            credentials: this._config.credentials,
+                            credentials: this._credentials,
                             region: this._config.region,
                             customUserAgent: getAmplifyUserAgentObject(),
                         });
@@ -198,7 +187,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                         this._verifySearchIndex(options === null || options === void 0 ? void 0 : options.searchIndexName);
                         this._verifyPlaceId(placeId);
                         client = new LocationClient({
-                            credentials: this._config.credentials,
+                            credentials: this._credentials,
                             region: this._config.region,
                             customUserAgent: getAmplifyUserAgentObject(),
                         });
@@ -257,7 +246,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                             locationServiceInput.MaxResults = options.maxResults;
                         }
                         client = new LocationClient({
-                            credentials: this._config.credentials,
+                            credentials: this._credentials,
                             region: this._config.region,
                             customUserAgent: getAmplifyUserAgentObject(),
                         });
@@ -336,16 +325,17 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                         }
                         return [4 /*yield*/, Promise.all(geofenceBatches.map(function (batch) { return __awaiter(_this, void 0, void 0, function () {
                                 var response, error_5;
-                                return __generator(this, function (_a) {
-                                    switch (_a.label) {
+                                var _a, _b;
+                                return __generator(this, function (_c) {
+                                    switch (_c.label) {
                                         case 0:
-                                            _a.trys.push([0, 2, , 3]);
+                                            _c.trys.push([0, 2, , 3]);
                                             return [4 /*yield*/, this._AmazonLocationServiceBatchPutGeofenceCall(batch, (options === null || options === void 0 ? void 0 : options.collectionName) || this._config.geofenceCollections.default)];
                                         case 1:
-                                            response = _a.sent();
+                                            response = _c.sent();
                                             return [3 /*break*/, 3];
                                         case 2:
-                                            error_5 = _a.sent();
+                                            error_5 = _c.sent();
                                             // If the API call fails, add the geofences to the errors array and move to next batch
                                             batch.forEach(function (geofence) {
                                                 results.errors.push({
@@ -359,7 +349,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                                             return [2 /*return*/];
                                         case 3:
                                             // Push all successes to results
-                                            response.Successes.forEach(function (success) {
+                                            (_a = response.Successes) === null || _a === void 0 ? void 0 : _a.forEach(function (success) {
                                                 var GeofenceId = success.GeofenceId, CreateTime = success.CreateTime, UpdateTime = success.UpdateTime;
                                                 results.successes.push({
                                                     geofenceId: GeofenceId,
@@ -368,8 +358,10 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                                                 });
                                             });
                                             // Push all errors to results
-                                            response.Errors.forEach(function (error) {
-                                                var _a = error.Error, Code = _a.Code, Message = _a.Message, GeofenceId = error.GeofenceId;
+                                            (_b = response.Errors) === null || _b === void 0 ? void 0 : _b.forEach(function (error) {
+                                                var _a;
+                                                var Error = error.Error, GeofenceId = error.GeofenceId;
+                                                var Code = (_a = Error, _a.Code), Message = _a.Message;
                                                 results.errors.push({
                                                     error: {
                                                         code: Code,
@@ -416,7 +408,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                         }
                         validateGeofenceId(geofenceId);
                         client = new LocationClient({
-                            credentials: this._config.credentials,
+                            credentials: this._credentials,
                             region: this._config.region,
                             customUserAgent: getAmplifyUserAgentObject(),
                         });
@@ -479,7 +471,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                             throw error;
                         }
                         client = new LocationClient({
-                            credentials: this._config.credentials,
+                            credentials: this._credentials,
                             region: this._config.region,
                             customUserAgent: getAmplifyUserAgentObject(),
                         });
@@ -503,14 +495,14 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                         NextToken = response.NextToken, Entries = response.Entries;
                         results = {
                             entries: Entries.map(function (_a) {
-                                var GeofenceId = _a.GeofenceId, CreateTime = _a.CreateTime, UpdateTime = _a.UpdateTime, Status = _a.Status, Polygon = _a.Geometry.Polygon;
+                                var GeofenceId = _a.GeofenceId, CreateTime = _a.CreateTime, UpdateTime = _a.UpdateTime, Status = _a.Status, Geometry = _a.Geometry;
                                 return {
                                     geofenceId: GeofenceId,
                                     createTime: CreateTime,
                                     updateTime: UpdateTime,
                                     status: Status,
                                     geometry: {
-                                        polygon: Polygon,
+                                        polygon: Geometry.Polygon,
                                     },
                                 };
                             }),
@@ -555,7 +547,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                             }
                         });
                         if (badGeofenceIds.length > 0) {
-                            throw new Error("Invalid geofence ids: " + badGeofenceIds.join(', '));
+                            throw new Error("Invalid geofence ids: ".concat(badGeofenceIds.join(', ')));
                         }
                         results = {
                             successes: [],
@@ -584,8 +576,10 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                                                 var errorObject = {
                                                     geofenceId: geofenceId,
                                                     error: {
-                                                        code: error_8.message,
-                                                        message: error_8.message,
+                                                        code: error_8
+                                                            .message,
+                                                        message: error_8
+                                                            .message,
                                                     },
                                                 };
                                                 results.errors.push(errorObject);
@@ -596,7 +590,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                                                 var geofenceId = _a.geofenceId;
                                                 return geofenceId;
                                             });
-                                            (_a = results.successes).push.apply(_a, __spread(batch.filter(function (Id) { return !badGeofenceIds.includes(Id); })));
+                                            (_a = results.successes).push.apply(_a, __spreadArray([], __read(batch.filter(function (Id) { return !badGeofenceIds.includes(Id); })), false));
                                             return [2 /*return*/];
                                     }
                                 });
@@ -613,19 +607,18 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
      */
     AmazonLocationServiceProvider.prototype._ensureCredentials = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var credentials, cred, error_9;
+            var credentials, error_9;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, Credentials.get()];
+                        return [4 /*yield*/, fetchAuthSession()];
                     case 1:
-                        credentials = _a.sent();
+                        credentials = (_a.sent()).credentials;
                         if (!credentials)
                             return [2 /*return*/, false];
-                        cred = Credentials.shear(credentials);
-                        logger.debug('Set credentials for storage. Credentials are:', cred);
-                        this._config.credentials = cred;
+                        logger.debug('Set credentials for storage. Credentials are:', credentials);
+                        this._credentials = credentials;
                         return [2 /*return*/, true];
                     case 2:
                         error_9 = _a.sent();
@@ -636,7 +629,17 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
             });
         });
     };
+    AmazonLocationServiceProvider.prototype._refreshConfig = function () {
+        var _a;
+        this._config = (_a = Amplify.getConfig().Geo) === null || _a === void 0 ? void 0 : _a.LocationService;
+        if (!this._config) {
+            var errorString = "No Geo configuration found in amplify config, run 'amplify add geo' to create one and run `amplify push` after";
+            logger.debug(errorString);
+            throw new Error(errorString);
+        }
+    };
     AmazonLocationServiceProvider.prototype._verifyMapResources = function () {
+        this._refreshConfig();
         if (!this._config.maps) {
             var errorString = "No map resources found in amplify config, run 'amplify add geo' to create one and run `amplify push` after";
             logger.debug(errorString);
@@ -649,7 +652,8 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
         }
     };
     AmazonLocationServiceProvider.prototype._verifySearchIndex = function (optionalSearchIndex) {
-        if ((!this._config.search_indices || !this._config.search_indices.default) &&
+        this._refreshConfig();
+        if ((!this._config.searchIndices || !this._config.searchIndices.default) &&
             !optionalSearchIndex) {
             var errorString = 'No Search Index found in amplify config, please run `amplify add geo` to create one and run `amplify push` after.';
             logger.debug(errorString);
@@ -657,6 +661,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
         }
     };
     AmazonLocationServiceProvider.prototype._verifyGeofenceCollections = function (optionalGeofenceCollectionName) {
+        this._refreshConfig();
         if ((!this._config.geofenceCollections ||
             !this._config.geofenceCollections.default) &&
             !optionalGeofenceCollectionName) {
@@ -676,7 +681,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                             CollectionName: collectionName || this._config.geofenceCollections.default,
                         };
                         client = new LocationClient({
-                            credentials: this._config.credentials,
+                            credentials: this._credentials,
                             region: this._config.region,
                             customUserAgent: getAmplifyUserAgentObject(),
                         });
@@ -707,7 +712,7 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
                             CollectionName: collectionName || this._config.geofenceCollections.default,
                         };
                         client = new LocationClient({
-                            credentials: this._config.credentials,
+                            credentials: this._credentials,
                             region: this._config.region,
                             customUserAgent: getAmplifyUserAgentObject(),
                         });
@@ -731,5 +736,3 @@ var AmazonLocationServiceProvider = /** @class */ (function () {
     AmazonLocationServiceProvider.PROVIDER_NAME = 'AmazonLocationService';
     return AmazonLocationServiceProvider;
 }());
-export { AmazonLocationServiceProvider };
-//# sourceMappingURL=AmazonLocationServiceProvider.js.map