@aws-amplify/datastore 5.0.1-console-preview.5f040a2.0 → 5.0.1-console-preview.23dc225.0

package/lib/datastore/datastore.js

@@ -122,7 +122,7 @@ exports.DataStore = exports.initSchema = exports.DataStoreClass = exports.AsyncC
 var internals_1 = require("@aws-amplify/api/internals");
 var core_1 = require("@aws-amplify/core");
 var immer_1 = require("immer");
-var uuid_1 = require("uuid");
+var utils_1 = require("@aws-amplify/core/internals/utils");
 var rxjs_1 = require("rxjs");
 var authModeStrategies_1 = require("../authModeStrategies");
 var predicates_1 = require("../predicates");
@@ -132,11 +132,11 @@ var sync_1 = require("../sync");
 var types_1 = require("../types");
 var util_1 = require("../util");
 var next_1 = require("../predicates/next");
-var utils_1 = require("../sync/utils");
-var utils_2 = require("@aws-amplify/core/internals/utils");
+var utils_2 = require("../sync/utils");
+var utils_3 = require("@aws-amplify/core/internals/utils");
 (0, immer_1.setAutoFreeze)(true);
 (0, immer_1.enablePatches)();
-var logger = new utils_2.Logger('DataStore');
+var logger = new utils_3.Logger('DataStore');
 var ulid = (0, util_1.monotonicUlidFactory)(Date.now());
 var SETTING_SCHEMA_VERSION = 'schemaVersion';
 var schema;
@@ -714,13 +714,14 @@ var createModelClass = function (modelDefinition) {
                     var id = isInternalModel
                         ? _id
                         : modelDefinition.syncable
-                            ? (0, uuid_1.v4)()
+                            ? (0, utils_1.amplifyUuid)()
                             : ulid();
                     draft.id = id;
                 }
                 else if ((0, util_1.isIdOptionallyManaged)(modelDefinition)) {
                     // only auto-populate if the id was not provided
-                    draft.id = draft.id || (0, uuid_1.v4)();
+                    draft.id =
+                        draft.id || (0, utils_1.amplifyUuid)();
                 }
                 if (!isInternallyInitialized) {
                     checkReadOnlyPropertyOnCreate(draft, modelDefinition);
@@ -1299,7 +1300,7 @@ var DataStore = /** @class */ (function () {
          *
          * (Reasonable = *seconds*, not minutes.)
          */
-        this.runningProcesses = new utils_2.BackgroundProcessManager();
+        this.runningProcesses = new utils_3.BackgroundProcessManager();
         /**
          * Indicates what state DataStore is in.
          *
@@ -1884,7 +1885,7 @@ var DataStore = /** @class */ (function () {
                                 // first, query and return any locally-available records
                                 (_a.sent()).forEach(function (item) {
                                     var itemModelDefinition = getModelDefinition(model);
-                                    var idOrPk = (0, utils_1.getIdentifierValue)(itemModelDefinition, item);
+                                    var idOrPk = (0, utils_2.getIdentifierValue)(itemModelDefinition, item);
                                     items.set(idOrPk, item);
                                 });
                                 // Observe the model and send a stream of updates (debounced).
@@ -1901,7 +1902,7 @@ var DataStore = /** @class */ (function () {
                                                 switch (_d.label) {
                                                     case 0:
                                                         itemModelDefinition = getModelDefinition(model);
-                                                        idOrPk = (0, utils_1.getIdentifierValue)(itemModelDefinition, element);
+                                                        idOrPk = (0, utils_2.getIdentifierValue)(itemModelDefinition, element);
                                                         _a = executivePredicate;
                                                         if (!_a) return [3 /*break*/, 2];
                                                         return [4 /*yield*/, executivePredicate.matches(element)];
@@ -1974,7 +1975,7 @@ var DataStore = /** @class */ (function () {
                     items.clear();
                     itemsArray.forEach(function (item) {
                         var itemModelDefinition = getModelDefinition(model);
-                        var idOrPk = (0, utils_1.getIdentifierValue)(itemModelDefinition, item);
+                        var idOrPk = (0, utils_2.getIdentifierValue)(itemModelDefinition, item);
                         items.set(idOrPk, item);
                     });
                     // remove deleted items from the final result set

package/lib/sync/processors/subscription.js

@@ -303,8 +303,7 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                                             logger.debug("Attempting ".concat(operation, " subscription with authMode: ").concat(readAuthModes[operationAuthModeAttempts[operation]]));
                                                                             queryObservable = this.amplifyContext.InternalAPI.graphql(__assign(__assign({ query: query, variables: variables }, { authMode: authMode }), { authToken: authToken }), undefined, customUserAgentDetails);
                                                                             // TODO: consider onTerminate.then(() => API.cancel(...))
-                                                                            subscriptions[modelDefinition.name][transformerMutationType].push(queryObservable
-                                                                                .subscribe({
+                                                                            subscriptions[modelDefinition.name][transformerMutationType].push(queryObservable.subscribe({
                                                                                 next: function (result) {
                                                                                     var data = result.data, errors = result.errors;
                                                                                     if (Array.isArray(errors) && errors.length > 0) {

package/lib/sync/utils.d.ts

@@ -1,5 +1,5 @@
 import { GraphQLAuthError } from '@aws-amplify/api';
-import { APIAuthMode } from '@aws-amplify/core/internals/utils';
+import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
 import { ModelInstanceCreator } from '../datastore/datastore';
 import { AuthorizationRule, GraphQLCondition, GraphQLFilter, ModelInstanceMetadata, OpType, PersistentModel, PersistentModelConstructor, PredicatesGroup, RelationshipType, SchemaModel, SchemaNamespace, SchemaNonModel, ModelOperation, InternalSchema, AuthModeStrategy } from '../types';
 import { MutationEvent } from './';
@@ -93,14 +93,14 @@ export declare function getUserGroupsFromToken(token: {
 }, rule: AuthorizationRule): string[];
 export declare function getModelAuthModes({ authModeStrategy, defaultAuthMode, modelName, schema, }: {
     authModeStrategy: AuthModeStrategy;
-    defaultAuthMode: APIAuthMode;
+    defaultAuthMode: GraphQLAuthMode;
     modelName: string;
     schema: InternalSchema;
 }): Promise<{
-    [key in ModelOperation]: APIAuthMode[];
+    [key in ModelOperation]: GraphQLAuthMode[];
 }>;
 export declare function getForbiddenError(error: any): any;
 export declare function getClientSideAuthError(error: any): GraphQLAuthError;
-export declare function getTokenForCustomAuth(authMode: APIAuthMode, amplifyConfig?: Record<string, any>): Promise<string | undefined>;
+export declare function getTokenForCustomAuth(authMode: GraphQLAuthMode, amplifyConfig?: Record<string, any>): Promise<string | undefined>;
 export declare function getIdentifierValue(modelDefinition: SchemaModel, model: ModelInstanceMetadata | PersistentModel): string;
 export {};