@aws-amplify/datastore 4.7.6-api-v6-models.b3abc9b.0 → 5.0.0

package/lib/index.d.ts

@@ -9,7 +9,7 @@ export declare const utils: {
         item: T;
         instance: T;
     }[];
-    validatePredicate: <T_2 extends Readonly<Record<string, any>>>(model: T_2, groupType: "and" | "or" | "not", predicatesOrGroups: (import("./types").PredicateObject<T_2> | import("./types").PredicatesGroup<T_2>)[]) => any;
+    validatePredicate: <T_2 extends Readonly<Record<string, any>>>(model: T_2, groupType: keyof import("./types").PredicateGroups<T_2>, predicatesOrGroups: (import("./types").PredicateObject<T_2> | import("./types").PredicatesGroup<T_2>)[]) => any;
     isNonModelConstructor: (obj: any) => obj is import("./types").NonModelTypeConstructor<any>;
     isModelConstructor: <T_3 extends Readonly<Record<string, any>>>(obj: any) => obj is import("./types").PersistentModelConstructor<T_3>;
 };

package/lib/index.js

@@ -1,21 +1,35 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+exports.utils = exports.NAMESPACES = exports.ModelSortPredicateCreator = exports.ModelPredicateCreator = exports.Predicates = exports.AsyncItem = exports.AsyncCollection = exports.initSchema = exports.DataStoreClass = exports.DataStore = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 var datastore_1 = require("./datastore/datastore");
-exports.DataStore = datastore_1.DataStore;
-exports.DataStoreClass = datastore_1.DataStoreClass;
-exports.initSchema = datastore_1.initSchema;
-exports.AsyncCollection = datastore_1.AsyncCollection;
-exports.AsyncItem = datastore_1.AsyncItem;
+Object.defineProperty(exports, "DataStore", { enumerable: true, get: function () { return datastore_1.DataStore; } });
+Object.defineProperty(exports, "DataStoreClass", { enumerable: true, get: function () { return datastore_1.DataStoreClass; } });
+Object.defineProperty(exports, "initSchema", { enumerable: true, get: function () { return datastore_1.initSchema; } });
+Object.defineProperty(exports, "AsyncCollection", { enumerable: true, get: function () { return datastore_1.AsyncCollection; } });
+Object.defineProperty(exports, "AsyncItem", { enumerable: true, get: function () { return datastore_1.AsyncItem; } });
 var predicates_1 = require("./predicates");
-exports.Predicates = predicates_1.Predicates;
-exports.ModelPredicateCreator = predicates_1.ModelPredicateCreator;
-exports.ModelSortPredicateCreator = predicates_1.ModelSortPredicateCreator;
-var util_1 = require("./util");
+Object.defineProperty(exports, "Predicates", { enumerable: true, get: function () { return predicates_1.Predicates; } });
+Object.defineProperty(exports, "ModelPredicateCreator", { enumerable: true, get: function () { return predicates_1.ModelPredicateCreator; } });
+Object.defineProperty(exports, "ModelSortPredicateCreator", { enumerable: true, get: function () { return predicates_1.ModelSortPredicateCreator; } });
+const util_1 = require("./util");
 var util_2 = require("./util");
-exports.NAMESPACES = util_2.NAMESPACES;
+Object.defineProperty(exports, "NAMESPACES", { enumerable: true, get: function () { return util_2.NAMESPACES; } });
 exports.utils = {
     USER: util_1.USER,
     traverseModel: util_1.traverseModel,
@@ -23,5 +37,4 @@ exports.utils = {
     isNonModelConstructor: util_1.isNonModelConstructor,
     isModelConstructor: util_1.isModelConstructor,
 };
-tslib_1.__exportStar(require("./types"), exports);
-//# sourceMappingURL=index.js.map
+__exportStar(require("./types"), exports);

package/lib/predicates/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var util_1 = require("../util");
+exports.ModelPredicateCreator = exports.Predicates = exports.PredicateAll = exports.comparisonKeys = exports.isPredicatesAll = exports.ModelSortPredicateCreator = void 0;
+const util_1 = require("../util");
 var sort_1 = require("./sort");
-exports.ModelSortPredicateCreator = sort_1.ModelSortPredicateCreator;
-var predicatesAllSet = new WeakSet();
+Object.defineProperty(exports, "ModelSortPredicateCreator", { enumerable: true, get: function () { return sort_1.ModelSortPredicateCreator; } });
+const predicatesAllSet = new WeakSet();
 function isPredicatesAll(predicate) {
     return predicatesAllSet.has(predicate);
 }
@@ -12,7 +12,7 @@ exports.isPredicatesAll = isPredicatesAll;
 /**
  * The valid logical grouping keys for a predicate group.
  */
-var groupKeys = new Set(['and', 'or', 'not']);
+const groupKeys = new Set(['and', 'or', 'not']);
 /**
  * Determines whether an object is a GraphQL style predicate "group", which must be an
  * object containing a single "group key", which then contains the child condition(s).
@@ -26,8 +26,8 @@ var groupKeys = new Set(['and', 'or', 'not']);
  *
  * @param o The object to test.
  */
-var isGroup = function (o) {
-    var keys = tslib_1.__spread(Object.keys(o));
+const isGroup = o => {
+    const keys = [...Object.keys(o)];
     return keys.length === 1 && groupKeys.has(keys[0]);
 };
 /**
@@ -36,7 +36,7 @@ var isGroup = function (o) {
  *
  * @param o The object to test.
  */
-var isEmpty = function (o) {
+const isEmpty = o => {
     return !Array.isArray(o) && Object.keys(o).length === 0;
 };
 /**
@@ -61,8 +61,8 @@ exports.comparisonKeys = new Set([
  *
  * @param o The object to test.
  */
-var isComparison = function (o) {
-    var keys = tslib_1.__spread(Object.keys(o));
+const isComparison = o => {
+    const keys = [...Object.keys(o)];
     return !Array.isArray(o) && keys.length === 1 && exports.comparisonKeys.has(keys[0]);
 };
 /**
@@ -70,9 +70,9 @@ var isComparison = function (o) {
  *
  * @param o The object to test.
  */
-var isValid = function (o) {
+const isValid = o => {
     if (Array.isArray(o)) {
-        return o.every(function (v) { return isValid(v); });
+        return o.every(v => isValid(v));
     }
     else {
         return Object.keys(o).length <= 1;
@@ -80,33 +80,24 @@ var isValid = function (o) {
 };
 // This symbol is not used at runtime, only its type (unique symbol)
 exports.PredicateAll = Symbol('A predicate that matches all records');
-var Predicates = /** @class */ (function () {
-    function Predicates() {
+class Predicates {
+    static get ALL() {
+        const predicate = (c => c);
+        predicatesAllSet.add(predicate);
+        return predicate;
     }
-    Object.defineProperty(Predicates, "ALL", {
-        get: function () {
-            var predicate = (function (c) { return c; });
-            predicatesAllSet.add(predicate);
-            return predicate;
-        },
-        enumerable: true,
-        configurable: true
-    });
-    return Predicates;
-}());
+}
 exports.Predicates = Predicates;
-var ModelPredicateCreator = /** @class */ (function () {
-    function ModelPredicateCreator() {
-    }
+class ModelPredicateCreator {
     /**
      * Determines whether the given storage predicate (lookup key) is a predicate
      * key that DataStore recognizes.
      *
      * @param predicate The storage predicate (lookup key) to test.
      */
-    ModelPredicateCreator.isValidPredicate = function (predicate) {
+    static isValidPredicate(predicate) {
         return ModelPredicateCreator.predicateGroupsMap.has(predicate);
-    };
+    }
     /**
      * Looks for the storage predicate AST that corresponds to a given storage
      * predicate key.
@@ -118,13 +109,12 @@ var ModelPredicateCreator = /** @class */ (function () {
      * @param throwOnInvalid Whether to throw an exception if the predicate
      * isn't a valid DataStore predicate.
      */
-    ModelPredicateCreator.getPredicates = function (predicate, throwOnInvalid) {
-        if (throwOnInvalid === void 0) { throwOnInvalid = true; }
+    static getPredicates(predicate, throwOnInvalid = true) {
         if (throwOnInvalid && !ModelPredicateCreator.isValidPredicate(predicate)) {
             throw new Error('The predicate is not valid');
         }
         return ModelPredicateCreator.predicateGroupsMap.get(predicate);
-    };
+    }
     /**
      * using the PK values from the given `model` (which can be a partial of T
      * Creates a predicate that matches an instance described by `modelDefinition`
@@ -133,18 +123,17 @@ var ModelPredicateCreator = /** @class */ (function () {
      * @param modelDefinition The model definition to create a predicate for.
      * @param model The model instance to extract value equalities from.
      */
-    ModelPredicateCreator.createForPk = function (modelDefinition, model) {
-        var keyFields = util_1.extractPrimaryKeyFieldNames(modelDefinition);
-        var keyValues = util_1.extractPrimaryKeyValues(model, keyFields);
-        var predicate = this.createFromAST(modelDefinition, {
-            and: keyFields.map(function (field, idx) {
-                var _a;
-                var operand = keyValues[idx];
-                return _a = {}, _a[field] = { eq: operand }, _a;
+    static createForPk(modelDefinition, model) {
+        const keyFields = (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition);
+        const keyValues = (0, util_1.extractPrimaryKeyValues)(model, keyFields);
+        const predicate = this.createFromAST(modelDefinition, {
+            and: keyFields.map((field, idx) => {
+                const operand = keyValues[idx];
+                return { [field]: { eq: operand } };
             }),
         });
         return predicate;
-    };
+    }
     /**
      * Searches a `Model` table for records matching the given equalities object.
      *
@@ -154,16 +143,12 @@ var ModelPredicateCreator = /** @class */ (function () {
      * @param modelDefinition The model we need a predicate for.
      * @param flatEqualities An object holding field equalities to search for.
      */
-    ModelPredicateCreator.createFromFlatEqualities = function (modelDefinition, flatEqualities) {
-        var ast = {
-            and: Object.entries(flatEqualities).map(function (_a) {
-                var _b;
-                var _c = tslib_1.__read(_a, 2), k = _c[0], v = _c[1];
-                return (_b = {}, _b[k] = { eq: v }, _b);
-            }),
+    static createFromFlatEqualities(modelDefinition, flatEqualities) {
+        const ast = {
+            and: Object.entries(flatEqualities).map(([k, v]) => ({ [k]: { eq: v } })),
         };
         return this.createFromAST(modelDefinition, ast);
-    };
+    }
     /**
      * Accepts a GraphQL style filter predicate tree and transforms it into an
      * AST that can be used for a storage adapter predicate. Example input:
@@ -185,8 +170,7 @@ var ModelPredicateCreator = /** @class */ (function () {
      *
      * @param gql GraphQL style filter node.
      */
-    ModelPredicateCreator.transformGraphQLFilterNodeToPredicateAST = function (gql) {
-        var _this = this;
+    static transformGraphQLFilterNodeToPredicateAST(gql) {
         if (!isValid(gql)) {
             throw new Error('Invalid GraphQL Condition or subtree: ' + JSON.stringify(gql));
         }
@@ -197,15 +181,15 @@ var ModelPredicateCreator = /** @class */ (function () {
             };
         }
         else if (isGroup(gql)) {
-            var groupkey = Object.keys(gql)[0];
-            var children = this.transformGraphQLFilterNodeToPredicateAST(gql[groupkey]);
+            const groupkey = Object.keys(gql)[0];
+            const children = this.transformGraphQLFilterNodeToPredicateAST(gql[groupkey]);
             return {
                 type: groupkey,
                 predicates: Array.isArray(children) ? children : [children],
             };
         }
         else if (isComparison(gql)) {
-            var operatorKey = Object.keys(gql)[0];
+            const operatorKey = Object.keys(gql)[0];
             return {
                 operator: operatorKey,
                 operand: gql[operatorKey],
@@ -213,14 +197,17 @@ var ModelPredicateCreator = /** @class */ (function () {
         }
         else {
             if (Array.isArray(gql)) {
-                return gql.map(function (o) { return _this.transformGraphQLFilterNodeToPredicateAST(o); });
+                return gql.map(o => this.transformGraphQLFilterNodeToPredicateAST(o));
             }
             else {
-                var fieldKey = Object.keys(gql)[0];
-                return tslib_1.__assign({ field: fieldKey }, this.transformGraphQLFilterNodeToPredicateAST(gql[fieldKey]));
+                const fieldKey = Object.keys(gql)[0];
+                return {
+                    field: fieldKey,
+                    ...this.transformGraphQLFilterNodeToPredicateAST(gql[fieldKey]),
+                };
             }
         }
-    };
+    }
     /**
      * Accepts a GraphQL style filter predicate tree and transforms it into a predicate
      * that storage adapters understand. Example input:
@@ -243,16 +230,14 @@ var ModelPredicateCreator = /** @class */ (function () {
      * @param modelDefinition The model that the AST/predicate must be compatible with.
      * @param ast The graphQL style AST that should specify conditions for `modelDefinition`.
      */
-    ModelPredicateCreator.createFromAST = function (modelDefinition, ast) {
-        var key = {};
+    static createFromAST(modelDefinition, ast) {
+        const key = {};
         ModelPredicateCreator.predicateGroupsMap.set(key, this.transformGraphQLFilterNodeToPredicateAST(ast));
         return key;
-    };
-    /**
-     * Map of storage predicates (key objects) to storage predicate AST's.
-     */
-    ModelPredicateCreator.predicateGroupsMap = new WeakMap();
-    return ModelPredicateCreator;
-}());
+    }
+}
+/**
+ * Map of storage predicates (key objects) to storage predicate AST's.
+ */
+ModelPredicateCreator.predicateGroupsMap = new WeakMap();
 exports.ModelPredicateCreator = ModelPredicateCreator;
-//# sourceMappingURL=index.js.map

package/lib/predicates/next.d.ts

@@ -1,7 +1,7 @@
 import { PersistentModel, ModelMeta, ModelPredicate as StoragePredicate, PredicateInternalsKey, V5ModelPredicate as ModelPredicate, RecursiveModelPredicate } from '../types';
 import { ExclusiveStorage as StorageAdapter } from '../storage/storage';
-declare type GroupOperator = 'and' | 'or' | 'not';
-declare type UntypedCondition = {
+type GroupOperator = 'and' | 'or' | 'not';
+type UntypedCondition = {
     fetch: (storage: StorageAdapter) => Promise<Record<string, any>[]>;
     matches: (item: Record<string, any>) => Promise<boolean>;
     copy(extract?: GroupCondition): [UntypedCondition, GroupCondition | undefined];