npm - @aws-amplify/datastore - Versions diffs - 4.0.0 → 4.0.1-unstable.4 - Mend

@aws-amplify/datastore 4.0.0 → 4.0.1-unstable.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/CHANGELOG.md +41 -146
package/lib/datastore/datastore.d.ts +1 -2
package/lib/datastore/datastore.js.map +1 -1
package/lib/predicates/next.d.ts +1 -83
package/lib/predicates/next.js +2 -12
package/lib/predicates/next.js.map +1 -1
package/lib/types.d.ts +82 -1
package/lib/types.js +12 -0
package/lib/types.js.map +1 -1
package/lib-esm/datastore/datastore.d.ts +1 -2
package/lib-esm/datastore/datastore.js.map +1 -1
package/lib-esm/predicates/next.d.ts +1 -83
package/lib-esm/predicates/next.js +1 -11
package/lib-esm/predicates/next.js.map +1 -1
package/lib-esm/types.d.ts +82 -1
package/lib-esm/types.js +12 -0
package/lib-esm/types.js.map +1 -1
package/package.json +7 -7
package/src/datastore/datastore.ts +2 -2
package/src/predicates/next.ts +6 -132
package/src/types.ts +136 -5

package/lib-esm/predicates/next.d.ts CHANGED Viewed

@@ -1,80 +1,5 @@
-import { Scalar, PersistentModel, ModelMeta, AllOperators, PredicateFieldType, ModelPredicate as StoragePredicate } from '../types';
+import { PersistentModel, ModelMeta, ModelPredicate as StoragePredicate, PredicateInternalsKey, V5ModelPredicate as ModelPredicate, RecursiveModelPredicate } from '../types';
 import { ExclusiveStorage as StorageAdapter } from '../storage/storage';
-declare type MatchableTypes = string | string[] | number | number[] | boolean | boolean[];
-declare type AllFieldOperators = keyof AllOperators;
-declare type NonNeverKeys<T> = {
-    [K in keyof T]: T[K] extends never ? never : K;
-}[keyof T];
-declare type WithoutNevers<T> = Pick<T, NonNeverKeys<T>>;
-/**
- * A function that accepts a RecursiveModelPrecicate<T>, which it must use to
- * return a final condition.
- *
- * This is used in `DataStore.query()`, `DataStore.observe()`, and
- * `DataStore.observeQuery()` as the second argument. E.g.,
- *
- * ```
- * DataStore.query(MyModel, model => model.field.eq('some value'))
- * ```
- *
- * More complex queries should also be supported. E.g.,
- *
- * ```
- * DataStore.query(MyModel, model => model.and(m => [
- *   m.relatedEntity.or(relative => [
- *     relative.relativeField.eq('whatever'),
- *     relative.relativeField.eq('whatever else')
- *   ]),
- *   m.myModelField.ne('something')
- * ]))
- * ```
- */
-export declare type RecursiveModelPredicateExtender<RT extends PersistentModel> = (lambda: RecursiveModelPredicate<RT>) => PredicateInternalsKey;
-export declare type RecursiveModelPredicateAggregateExtender<RT extends PersistentModel> = (lambda: RecursiveModelPredicate<RT>) => PredicateInternalsKey[];
-declare type RecursiveModelPredicateOperator<RT extends PersistentModel> = (predicates: RecursiveModelPredicateAggregateExtender<RT>) => PredicateInternalsKey;
-declare type RecursiveModelPredicateNegation<RT extends PersistentModel> = (predicate: RecursiveModelPredicateExtender<RT>) => PredicateInternalsKey;
-export declare type RecursiveModelPredicate<RT extends PersistentModel> = {
-    [K in keyof RT]-?: PredicateFieldType<RT[K]> extends PersistentModel ? RecursiveModelPredicate<PredicateFieldType<RT[K]>> : ValuePredicate<RT, RT[K]>;
-} & {
-    or: RecursiveModelPredicateOperator<RT>;
-    and: RecursiveModelPredicateOperator<RT>;
-    not: RecursiveModelPredicateNegation<RT>;
-} & PredicateInternalsKey;
-/**
- * A function that accepts a ModelPrecicate<T>, which it must use to return a
- * final condition.
- *
- * This is used as predicates in `DataStore.save()`, `DataStore.delete()`, and
- * DataStore sync expressions.
- *
- * ```
- * DataStore.save(record, model => model.field.eq('some value'))
- * ```
- *
- * Logical operators are supported. But, condtiions are related records are
- * NOT supported. E.g.,
- *
- * ```
- * DataStore.delete(record, model => model.or(m => [
- * 	m.field.eq('whatever'),
- * 	m.field.eq('whatever else')
- * ]))
- * ```
- */
-export declare type ModelPredicateExtender<RT extends PersistentModel> = (lambda: ModelPredicate<RT>) => PredicateInternalsKey;
-export declare type ModelPredicateAggregateExtender<RT extends PersistentModel> = (lambda: ModelPredicate<RT>) => PredicateInternalsKey[];
-declare type ValuePredicate<RT extends PersistentModel, MT extends MatchableTypes> = {
-    [K in AllFieldOperators]: K extends 'between' ? (inclusiveLowerBound: Scalar<MT>, inclusiveUpperBound: Scalar<MT>) => PredicateInternalsKey : (operand: Scalar<MT>) => PredicateInternalsKey;
-};
-export declare type ModelPredicate<RT extends PersistentModel> = WithoutNevers<{
-    [K in keyof RT]-?: PredicateFieldType<RT[K]> extends PersistentModel ? never : ValuePredicate<RT, RT[K]>;
-}> & {
-    or: ModelPredicateOperator<RT>;
-    and: ModelPredicateOperator<RT>;
-    not: ModelPredicateNegation<RT>;
-} & PredicateInternalsKey;
-declare type ModelPredicateOperator<RT extends PersistentModel> = (predicates: ModelPredicateAggregateExtender<RT>) => PredicateInternalsKey;
-declare type ModelPredicateNegation<RT extends PersistentModel> = (predicate: ModelPredicateExtender<RT>) => PredicateInternalsKey;
 declare type GroupOperator = 'and' | 'or' | 'not';
 declare type UntypedCondition = {
     fetch: (storage: StorageAdapter) => Promise<Record<string, any>[]>;
@@ -82,13 +7,6 @@ declare type UntypedCondition = {
     copy(extract: GroupCondition): [UntypedCondition, GroupCondition | undefined];
     toAST(): any;
 };
-/**
- * A pointer used by DataStore internally to lookup predicate details
- * that should not be exposed on public customer interfaces.
- */
-export declare class PredicateInternalsKey {
-    private __isPredicateInternalsKeySentinel;
-}
 /**
  * Takes a key object from `registerPredicateInternals()` to fetch an internal
  * `GroupCondition` object, which can then be used to query storage or

package/lib-esm/predicates/next.js CHANGED Viewed

@@ -1,19 +1,9 @@
 import { __assign, __asyncValues, __awaiter, __generator, __read, __spread, __values } from "tslib";
+import { PredicateInternalsKey, } from '../types';
 import { ModelPredicateCreator as FlatModelPredicateCreator, comparisonKeys, } from './index';
 import { ModelRelationship } from '../storage/relationship';
 import { asyncSome, asyncEvery } from '../util';
 var ops = __spread(comparisonKeys);
-/**
- * A pointer used by DataStore internally to lookup predicate details
- * that should not be exposed on public customer interfaces.
- */
-var PredicateInternalsKey = /** @class */ (function () {
-    function PredicateInternalsKey() {
-        this.__isPredicateInternalsKeySentinel = true;
-    }
-    return PredicateInternalsKey;
-}());
-export { PredicateInternalsKey };
 /**
  * A map from keys (exposed to customers) to the internal predicate data
  * structures invoking code should not muck with.

package/lib-esm/predicates/next.js.map CHANGED Viewed

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

package/lib-esm/types.d.ts CHANGED Viewed

@@ -6,7 +6,6 @@ import { Auth } from '@aws-amplify/auth';
 import { API } from '@aws-amplify/api';
 import { Cache } from '@aws-amplify/cache';
 import { Adapter } from './storage/adapter';
-import { ModelPredicateExtender, PredicateInternalsKey, ModelPredicate as V5ModelPredicate } from './predicates/next';
 export declare type Scalar<T> = T extends Array<infer InnerType> ? InnerType : T;
 export declare type Schema = UserSchema & {
     version: string;
@@ -551,4 +550,86 @@ export declare type AmplifyContext = {
     API: typeof API;
     Cache: typeof Cache;
 };
+export declare type MatchableTypes = string | string[] | number | number[] | boolean | boolean[];
+export declare type AllFieldOperators = keyof AllOperators;
+export declare type NonNeverKeys<T> = {
+    [K in keyof T]: T[K] extends never ? never : K;
+}[keyof T];
+export declare type WithoutNevers<T> = Pick<T, NonNeverKeys<T>>;
+/**
+ * A function that accepts a RecursiveModelPrecicate<T>, which it must use to
+ * return a final condition.
+ *
+ * This is used in `DataStore.query()`, `DataStore.observe()`, and
+ * `DataStore.observeQuery()` as the second argument. E.g.,
+ *
+ * ```
+ * DataStore.query(MyModel, model => model.field.eq('some value'))
+ * ```
+ *
+ * More complex queries should also be supported. E.g.,
+ *
+ * ```
+ * DataStore.query(MyModel, model => model.and(m => [
+ *   m.relatedEntity.or(relative => [
+ *     relative.relativeField.eq('whatever'),
+ *     relative.relativeField.eq('whatever else')
+ *   ]),
+ *   m.myModelField.ne('something')
+ * ]))
+ * ```
+ */
+export declare type RecursiveModelPredicateExtender<RT extends PersistentModel> = (lambda: RecursiveModelPredicate<RT>) => PredicateInternalsKey;
+export declare type RecursiveModelPredicateAggregateExtender<RT extends PersistentModel> = (lambda: RecursiveModelPredicate<RT>) => PredicateInternalsKey[];
+export declare type RecursiveModelPredicateOperator<RT extends PersistentModel> = (predicates: RecursiveModelPredicateAggregateExtender<RT>) => PredicateInternalsKey;
+export declare type RecursiveModelPredicateNegation<RT extends PersistentModel> = (predicate: RecursiveModelPredicateExtender<RT>) => PredicateInternalsKey;
+export declare type RecursiveModelPredicate<RT extends PersistentModel> = {
+    [K in keyof RT]-?: PredicateFieldType<RT[K]> extends PersistentModel ? RecursiveModelPredicate<PredicateFieldType<RT[K]>> : ValuePredicate<RT, RT[K]>;
+} & {
+    or: RecursiveModelPredicateOperator<RT>;
+    and: RecursiveModelPredicateOperator<RT>;
+    not: RecursiveModelPredicateNegation<RT>;
+} & PredicateInternalsKey;
+/**
+ * A function that accepts a ModelPrecicate<T>, which it must use to return a
+ * final condition.
+ *
+ * This is used as predicates in `DataStore.save()`, `DataStore.delete()`, and
+ * DataStore sync expressions.
+ *
+ * ```
+ * DataStore.save(record, model => model.field.eq('some value'))
+ * ```
+ *
+ * Logical operators are supported. But, condtiions are related records are
+ * NOT supported. E.g.,
+ *
+ * ```
+ * DataStore.delete(record, model => model.or(m => [
+ * 	m.field.eq('whatever'),
+ * 	m.field.eq('whatever else')
+ * ]))
+ * ```
+ */
+export declare type ModelPredicateExtender<RT extends PersistentModel> = (lambda: V5ModelPredicate<RT>) => PredicateInternalsKey;
+export declare type ModelPredicateAggregateExtender<RT extends PersistentModel> = (lambda: V5ModelPredicate<RT>) => PredicateInternalsKey[];
+export declare type ValuePredicate<RT extends PersistentModel, MT extends MatchableTypes> = {
+    [K in AllFieldOperators]: K extends 'between' ? (inclusiveLowerBound: Scalar<MT>, inclusiveUpperBound: Scalar<MT>) => PredicateInternalsKey : (operand: Scalar<MT>) => PredicateInternalsKey;
+};
+export declare type V5ModelPredicate<RT extends PersistentModel> = WithoutNevers<{
+    [K in keyof RT]-?: PredicateFieldType<RT[K]> extends PersistentModel ? never : ValuePredicate<RT, RT[K]>;
+}> & {
+    or: ModelPredicateOperator<RT>;
+    and: ModelPredicateOperator<RT>;
+    not: ModelPredicateNegation<RT>;
+} & PredicateInternalsKey;
+export declare type ModelPredicateOperator<RT extends PersistentModel> = (predicates: ModelPredicateAggregateExtender<RT>) => PredicateInternalsKey;
+export declare type ModelPredicateNegation<RT extends PersistentModel> = (predicate: ModelPredicateExtender<RT>) => PredicateInternalsKey;
+/**
+ * A pointer used by DataStore internally to lookup predicate details
+ * that should not be exposed on public customer interfaces.
+ */
+export declare class PredicateInternalsKey {
+    private __isPredicateInternalsKeySentinel;
+}
 export {};

package/lib-esm/types.js CHANGED Viewed

@@ -204,4 +204,16 @@ export var LimitTimerRaceResolvedValues;
     LimitTimerRaceResolvedValues["LIMIT"] = "LIMIT";
     LimitTimerRaceResolvedValues["TIMER"] = "TIMER";
 })(LimitTimerRaceResolvedValues || (LimitTimerRaceResolvedValues = {}));
+/**
+ * A pointer used by DataStore internally to lookup predicate details
+ * that should not be exposed on public customer interfaces.
+ */
+var PredicateInternalsKey = /** @class */ (function () {
+    function PredicateInternalsKey() {
+        this.__isPredicateInternalsKeySentinel = true;
+    }
+    return PredicateInternalsKey;
+}());
+export { PredicateInternalsKey };
+// #endregion
 //# sourceMappingURL=types.js.map

package/lib-esm/types.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";AACA,OAAO,EACN,SAAS,EACT,SAAS,EACT,aAAa,EACb,cAAc,EACd,UAAU,EACV,SAAS,EACT,QAAQ,EACR,UAAU,EACV,cAAc,EAEd,2BAA2B,GAC3B,MAAM,QAAQ,CAAC;~~AA8ChB~~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"}
1	+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/datastore",
-	"version": "4.0.0",
+	"version": "4.0.1-unstable.4+623374ded",
 	"description": "AppSyncLocal support for aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -53,11 +53,11 @@
 		"ssr"
 	],
 	"dependencies": {
-		"@aws-amplify/api": "5.0.0",
-		"@aws-amplify/auth": "5.0.0",
-		"@aws-amplify/core": "5.0.0",
-		"@aws-amplify/pubsub": "5.0.0",
-		"amazon-cognito-identity-js": "6.0.0",
+		"@aws-amplify/api": "5.0.1-unstable.4+623374ded",
+		"@aws-amplify/auth": "5.0.1-unstable.4+623374ded",
+		"@aws-amplify/core": "5.0.1-unstable.4+623374ded",
+		"@aws-amplify/pubsub": "5.0.1-unstable.4+623374ded",
+		"amazon-cognito-identity-js": "6.0.1-unstable.4+623374ded",
 		"idb": "5.0.6",
 		"immer": "9.0.6",
 		"ulid": "2.3.0",
@@ -119,5 +119,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "ee238ee6baccbeab8adbe26b9e6af07ab1f90264"
+	"gitHead": "623374dedb951061e49529c11434d31d36c31bf8"
 }

package/src/datastore/datastore.ts CHANGED Viewed

@@ -72,6 +72,8 @@ import {
 	isIdentifierObject,
 	AmplifyContext,
 	isFieldAssociation,
+	RecursiveModelPredicateExtender,
+	ModelPredicateExtender,
 } from '../types';
 // tslint:disable:no-duplicate-imports
 import type { __modelMeta__ } from '../types';
@@ -98,8 +100,6 @@ import {
 	mergePatches,
 } from '../util';
 import {
-	RecursiveModelPredicateExtender,
-	ModelPredicateExtender,
 	recursivePredicateFor,
 	predicateFor,
 	GroupCondition,

package/src/predicates/next.ts CHANGED Viewed

@@ -1,11 +1,14 @@
 import {
-	Scalar,
 	PersistentModel,
 	ModelFieldType,
 	ModelMeta,
-	AllOperators,
-	PredicateFieldType,
 	ModelPredicate as StoragePredicate,
+	AllFieldOperators,
+	PredicateInternalsKey,
+	V5ModelPredicate as ModelPredicate,
+	RecursiveModelPredicate,
+	RecursiveModelPredicateExtender,
+	RecursiveModelPredicateAggregateExtender,
 } from '../types';
 import {
@@ -16,129 +19,8 @@ import { ExclusiveStorage as StorageAdapter } from '../storage/storage';
 import { ModelRelationship } from '../storage/relationship';
 import { asyncSome, asyncEvery } from '../util';
-type MatchableTypes =
-	| string
-	| string[]
-	| number
-	| number[]
-	| boolean
-	| boolean[];
-type AllFieldOperators = keyof AllOperators;
 const ops = [...comparisonKeys] as AllFieldOperators[];
-type NonNeverKeys<T> = {
-	[K in keyof T]: T[K] extends never ? never : K;
-}[keyof T];
-type WithoutNevers<T> = Pick<T, NonNeverKeys<T>>;
-/**
- * A function that accepts a RecursiveModelPrecicate<T>, which it must use to
- * return a final condition.
- *
- * This is used in `DataStore.query()`, `DataStore.observe()`, and
- * `DataStore.observeQuery()` as the second argument. E.g.,
- *
- * ```
- * DataStore.query(MyModel, model => model.field.eq('some value'))
- * ```
- *
- * More complex queries should also be supported. E.g.,
- *
- * ```
- * DataStore.query(MyModel, model => model.and(m => [
- *   m.relatedEntity.or(relative => [
- *     relative.relativeField.eq('whatever'),
- *     relative.relativeField.eq('whatever else')
- *   ]),
- *   m.myModelField.ne('something')
- * ]))
- * ```
- */
-export type RecursiveModelPredicateExtender<RT extends PersistentModel> = (
-	lambda: RecursiveModelPredicate<RT>
-) => PredicateInternalsKey;
-export type RecursiveModelPredicateAggregateExtender<
-	RT extends PersistentModel
-> = (lambda: RecursiveModelPredicate<RT>) => PredicateInternalsKey[];
-type RecursiveModelPredicateOperator<RT extends PersistentModel> = (
-	predicates: RecursiveModelPredicateAggregateExtender<RT>
-) => PredicateInternalsKey;
-type RecursiveModelPredicateNegation<RT extends PersistentModel> = (
-	predicate: RecursiveModelPredicateExtender<RT>
-) => PredicateInternalsKey;
-export type RecursiveModelPredicate<RT extends PersistentModel> = {
-	[K in keyof RT]-?: PredicateFieldType<RT[K]> extends PersistentModel
-		? RecursiveModelPredicate<PredicateFieldType<RT[K]>>
-		: ValuePredicate<RT, RT[K]>;
-} & {
-	or: RecursiveModelPredicateOperator<RT>;
-	and: RecursiveModelPredicateOperator<RT>;
-	not: RecursiveModelPredicateNegation<RT>;
-} & PredicateInternalsKey;
-/**
- * A function that accepts a ModelPrecicate<T>, which it must use to return a
- * final condition.
- *
- * This is used as predicates in `DataStore.save()`, `DataStore.delete()`, and
- * DataStore sync expressions.
- *
- * ```
- * DataStore.save(record, model => model.field.eq('some value'))
- * ```
- *
- * Logical operators are supported. But, condtiions are related records are
- * NOT supported. E.g.,
- *
- * ```
- * DataStore.delete(record, model => model.or(m => [
- * 	m.field.eq('whatever'),
- * 	m.field.eq('whatever else')
- * ]))
- * ```
- */
-export type ModelPredicateExtender<RT extends PersistentModel> = (
-	lambda: ModelPredicate<RT>
-) => PredicateInternalsKey;
-export type ModelPredicateAggregateExtender<RT extends PersistentModel> = (
-	lambda: ModelPredicate<RT>
-) => PredicateInternalsKey[];
-type ValuePredicate<RT extends PersistentModel, MT extends MatchableTypes> = {
-	[K in AllFieldOperators]: K extends 'between'
-		? (
-				inclusiveLowerBound: Scalar<MT>,
-				inclusiveUpperBound: Scalar<MT>
-		  ) => PredicateInternalsKey
-		: (operand: Scalar<MT>) => PredicateInternalsKey;
-};
-export type ModelPredicate<RT extends PersistentModel> = WithoutNevers<{
-	[K in keyof RT]-?: PredicateFieldType<RT[K]> extends PersistentModel
-		? never
-		: ValuePredicate<RT, RT[K]>;
-}> & {
-	or: ModelPredicateOperator<RT>;
-	and: ModelPredicateOperator<RT>;
-	not: ModelPredicateNegation<RT>;
-} & PredicateInternalsKey;
-type ModelPredicateOperator<RT extends PersistentModel> = (
-	predicates: ModelPredicateAggregateExtender<RT>
-) => PredicateInternalsKey;
-type ModelPredicateNegation<RT extends PersistentModel> = (
-	predicate: ModelPredicateExtender<RT>
-) => PredicateInternalsKey;
 type GroupOperator = 'and' | 'or' | 'not';
 type UntypedCondition = {
@@ -148,14 +30,6 @@ type UntypedCondition = {
 	toAST(): any;
 };
-/**
- * A pointer used by DataStore internally to lookup predicate details
- * that should not be exposed on public customer interfaces.
- */
-export class PredicateInternalsKey {
-	private __isPredicateInternalsKeySentinel: boolean = true;
-}
 /**
  * A map from keys (exposed to customers) to the internal predicate data
  * structures invoking code should not muck with.