@aws-amplify/datastore 4.1.0 → 4.1.1-unstable-v5.3
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.
- package/lib/datastore/datastore.d.ts +0 -1
- package/lib/datastore/datastore.js +21 -28
- package/lib/datastore/datastore.js.map +1 -1
- package/lib/predicates/index.d.ts +31 -6
- package/lib/predicates/index.js +38 -73
- package/lib/predicates/index.js.map +1 -1
- package/lib/predicates/next.d.ts +5 -1
- package/lib/predicates/next.js +7 -1
- package/lib/predicates/next.js.map +1 -1
- package/lib/storage/adapter/AsyncStorageAdapter.js.map +1 -1
- package/lib/storage/storage.js.map +1 -1
- package/lib/sync/index.d.ts +1 -1
- package/lib/sync/index.js +1 -1
- package/lib/sync/index.js.map +1 -1
- package/lib/sync/outbox.js +14 -7
- package/lib/sync/outbox.js.map +1 -1
- package/lib/sync/processors/mutation.js.map +1 -1
- package/lib/sync/processors/subscription.d.ts +1 -1
- package/lib/sync/processors/subscription.js +1 -0
- package/lib/sync/processors/subscription.js.map +1 -1
- package/lib/sync/processors/sync.d.ts +1 -1
- package/lib/sync/processors/sync.js.map +1 -1
- package/lib/sync/utils.d.ts +2 -1
- package/lib/sync/utils.js +4 -0
- package/lib/sync/utils.js.map +1 -1
- package/lib-esm/datastore/datastore.d.ts +0 -1
- package/lib-esm/datastore/datastore.js +21 -28
- package/lib-esm/datastore/datastore.js.map +1 -1
- package/lib-esm/predicates/index.d.ts +31 -6
- package/lib-esm/predicates/index.js +38 -73
- package/lib-esm/predicates/index.js.map +1 -1
- package/lib-esm/predicates/next.d.ts +5 -1
- package/lib-esm/predicates/next.js +7 -1
- package/lib-esm/predicates/next.js.map +1 -1
- package/lib-esm/storage/adapter/AsyncStorageAdapter.js.map +1 -1
- package/lib-esm/storage/storage.js.map +1 -1
- package/lib-esm/sync/index.d.ts +1 -1
- package/lib-esm/sync/index.js +1 -1
- package/lib-esm/sync/index.js.map +1 -1
- package/lib-esm/sync/outbox.js +14 -7
- package/lib-esm/sync/outbox.js.map +1 -1
- package/lib-esm/sync/processors/mutation.js.map +1 -1
- package/lib-esm/sync/processors/subscription.d.ts +1 -1
- package/lib-esm/sync/processors/subscription.js +1 -0
- package/lib-esm/sync/processors/subscription.js.map +1 -1
- package/lib-esm/sync/processors/sync.d.ts +1 -1
- package/lib-esm/sync/processors/sync.js.map +1 -1
- package/lib-esm/sync/utils.d.ts +2 -1
- package/lib-esm/sync/utils.js +4 -0
- package/lib-esm/sync/utils.js.map +1 -1
- package/package.json +8 -8
- package/src/datastore/datastore.ts +17 -34
- package/src/predicates/index.ts +41 -135
- package/src/predicates/next.ts +13 -13
- package/src/storage/adapter/AsyncStorageAdapter.ts +1 -1
- package/src/storage/storage.ts +6 -6
- package/src/sync/index.ts +6 -3
- package/src/sync/outbox.ts +17 -11
- package/src/sync/processors/mutation.ts +1 -1
- package/src/sync/processors/subscription.ts +6 -1
- package/src/sync/processors/sync.ts +4 -1
- package/src/sync/utils.ts +4 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/sync/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/sync/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/datastore",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.1-unstable-v5.3+728a41689",
|
|
4
4
|
"description": "AppSyncLocal support for aws-amplify",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
"clean": "npm run clean:size && rimraf lib-esm lib dist",
|
|
28
28
|
"clean:size": "rimraf dual-publish-tmp tmp*",
|
|
29
29
|
"format": "echo \"Not implemented\" && npm run ts-coverage",
|
|
30
|
-
"lint": "tslint '{__tests__,src}/**/*.ts'",
|
|
30
|
+
"lint": "tslint '{__tests__,src}/**/*.ts' && npm run ts-coverage",
|
|
31
31
|
"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 92.05"
|
|
32
32
|
},
|
|
33
33
|
"repository": {
|
|
@@ -55,11 +55,11 @@
|
|
|
55
55
|
"ssr"
|
|
56
56
|
],
|
|
57
57
|
"dependencies": {
|
|
58
|
-
"@aws-amplify/api": "5.0.
|
|
59
|
-
"@aws-amplify/auth": "5.1.
|
|
60
|
-
"@aws-amplify/core": "5.1.
|
|
61
|
-
"@aws-amplify/pubsub": "5.1.
|
|
62
|
-
"amazon-cognito-identity-js": "6.1.
|
|
58
|
+
"@aws-amplify/api": "5.0.19-unstable-v5.3+728a41689",
|
|
59
|
+
"@aws-amplify/auth": "5.1.13-unstable-v5.3+728a41689",
|
|
60
|
+
"@aws-amplify/core": "5.1.2-unstable-v5.3+728a41689",
|
|
61
|
+
"@aws-amplify/pubsub": "5.1.2-unstable-v5.3+728a41689",
|
|
62
|
+
"amazon-cognito-identity-js": "6.1.3-unstable-v5.33+728a41689",
|
|
63
63
|
"idb": "5.0.6",
|
|
64
64
|
"immer": "9.0.6",
|
|
65
65
|
"ulid": "2.3.0",
|
|
@@ -129,5 +129,5 @@
|
|
|
129
129
|
"lib-esm"
|
|
130
130
|
]
|
|
131
131
|
},
|
|
132
|
-
"gitHead": "
|
|
132
|
+
"gitHead": "728a41689cf69989350a05914e0ca055e8df77d4"
|
|
133
133
|
}
|
|
@@ -985,7 +985,7 @@ const createModelClass = <T extends PersistentModel>(
|
|
|
985
985
|
const field = relationship.field;
|
|
986
986
|
|
|
987
987
|
Object.defineProperty(clazz.prototype, modelDefinition.fields[field].name, {
|
|
988
|
-
set(model:
|
|
988
|
+
set(model: T | undefined | null) {
|
|
989
989
|
if (!(typeof model === 'object' || typeof model === 'undefined'))
|
|
990
990
|
return;
|
|
991
991
|
|
|
@@ -1054,7 +1054,7 @@ const createModelClass = <T extends PersistentModel>(
|
|
|
1054
1054
|
base.and(q => {
|
|
1055
1055
|
return relationship.remoteJoinFields.map((field, index) => {
|
|
1056
1056
|
// TODO: anything we can use instead of `any` here?
|
|
1057
|
-
return (q[field] as
|
|
1057
|
+
return (q[field] as T[typeof field]).eq(
|
|
1058
1058
|
this[relationship.localJoinFields[index]]
|
|
1059
1059
|
);
|
|
1060
1060
|
});
|
|
@@ -1304,9 +1304,9 @@ async function checkSchemaVersion(
|
|
|
1304
1304
|
await storage.runExclusive(async s => {
|
|
1305
1305
|
const [schemaVersionSetting] = await s.query(
|
|
1306
1306
|
Setting,
|
|
1307
|
-
ModelPredicateCreator.
|
|
1308
|
-
|
|
1309
|
-
),
|
|
1307
|
+
ModelPredicateCreator.createFromAST(modelDefinition, {
|
|
1308
|
+
and: { key: { eq: SETTING_SCHEMA_VERSION } },
|
|
1309
|
+
}),
|
|
1310
1310
|
{ page: 0, limit: 1 }
|
|
1311
1311
|
);
|
|
1312
1312
|
|
|
@@ -1407,7 +1407,7 @@ class DataStore {
|
|
|
1407
1407
|
private sync?: SyncEngine;
|
|
1408
1408
|
private syncPageSize!: number;
|
|
1409
1409
|
private syncExpressions!: SyncExpression[];
|
|
1410
|
-
private syncPredicates: WeakMap<SchemaModel, ModelPredicate<any
|
|
1410
|
+
private syncPredicates: WeakMap<SchemaModel, ModelPredicate<any> | null> =
|
|
1411
1411
|
new WeakMap<SchemaModel, ModelPredicate<any>>();
|
|
1412
1412
|
private sessionId?: string;
|
|
1413
1413
|
private storageAdapter!: Adapter;
|
|
@@ -1668,10 +1668,9 @@ class DataStore {
|
|
|
1668
1668
|
throw new Error(msg);
|
|
1669
1669
|
}
|
|
1670
1670
|
|
|
1671
|
-
const predicate = ModelPredicateCreator.
|
|
1671
|
+
const predicate = ModelPredicateCreator.createFromFlatEqualities<T>(
|
|
1672
1672
|
modelDefinition,
|
|
1673
|
-
keyFields[0]
|
|
1674
|
-
identifierOrCriteria
|
|
1673
|
+
{ [keyFields[0]]: identifierOrCriteria }
|
|
1675
1674
|
);
|
|
1676
1675
|
|
|
1677
1676
|
result = await this.storage.query<T>(
|
|
@@ -1924,10 +1923,9 @@ class DataStore {
|
|
|
1924
1923
|
throw new Error(msg);
|
|
1925
1924
|
}
|
|
1926
1925
|
|
|
1927
|
-
condition = ModelPredicateCreator.
|
|
1926
|
+
condition = ModelPredicateCreator.createFromFlatEqualities<T>(
|
|
1928
1927
|
modelDefinition,
|
|
1929
|
-
keyFields[0]
|
|
1930
|
-
identifierOrCriteria
|
|
1928
|
+
{ [keyFields[0]]: identifierOrCriteria }
|
|
1931
1929
|
);
|
|
1932
1930
|
} else {
|
|
1933
1931
|
if (isIdentifierObject(identifierOrCriteria, modelDefinition)) {
|
|
@@ -2006,7 +2004,7 @@ class DataStore {
|
|
|
2006
2004
|
pkField: extractPrimaryKeyFieldNames(modelDefinition),
|
|
2007
2005
|
})
|
|
2008
2006
|
)
|
|
2009
|
-
).toStoragePredicate<T>(
|
|
2007
|
+
).toStoragePredicate<T>();
|
|
2010
2008
|
} else {
|
|
2011
2009
|
condition = pkPredicate;
|
|
2012
2010
|
}
|
|
@@ -2106,7 +2104,7 @@ class DataStore {
|
|
|
2106
2104
|
} else if (modelConstructor && typeof identifierOrCriteria === 'function') {
|
|
2107
2105
|
executivePredicate = internals(
|
|
2108
2106
|
(identifierOrCriteria as RecursiveModelPredicateExtender<T>)(
|
|
2109
|
-
buildSeedPredicate(modelConstructor)
|
|
2107
|
+
buildSeedPredicate(modelConstructor)
|
|
2110
2108
|
)
|
|
2111
2109
|
);
|
|
2112
2110
|
}
|
|
@@ -2635,7 +2633,7 @@ class DataStore {
|
|
|
2635
2633
|
* SchemaModel -> predicate to use during sync.
|
|
2636
2634
|
*/
|
|
2637
2635
|
private async processSyncExpressions(): Promise<
|
|
2638
|
-
WeakMap<SchemaModel, ModelPredicate<any
|
|
2636
|
+
WeakMap<SchemaModel, ModelPredicate<any> | null>
|
|
2639
2637
|
> {
|
|
2640
2638
|
if (!this.syncExpressions || !this.syncExpressions.length) {
|
|
2641
2639
|
return new WeakMap<SchemaModel, ModelPredicate<any>>();
|
|
@@ -2645,7 +2643,7 @@ class DataStore {
|
|
|
2645
2643
|
this.syncExpressions.map(
|
|
2646
2644
|
async (
|
|
2647
2645
|
syncExpression: SyncExpression
|
|
2648
|
-
): Promise<[SchemaModel, ModelPredicate<any>]> => {
|
|
2646
|
+
): Promise<[SchemaModel, ModelPredicate<any> | null]> => {
|
|
2649
2647
|
const { modelConstructor, conditionProducer } = await syncExpression;
|
|
2650
2648
|
const modelDefinition = getModelDefinition(modelConstructor)!;
|
|
2651
2649
|
|
|
@@ -2653,7 +2651,7 @@ class DataStore {
|
|
|
2653
2651
|
// OR a function/promise that returns a predicate
|
|
2654
2652
|
const condition = await this.unwrapPromise(conditionProducer);
|
|
2655
2653
|
if (isPredicatesAll(condition)) {
|
|
2656
|
-
return [modelDefinition
|
|
2654
|
+
return [modelDefinition, null];
|
|
2657
2655
|
}
|
|
2658
2656
|
|
|
2659
2657
|
const predicate = internals(
|
|
@@ -2666,7 +2664,7 @@ class DataStore {
|
|
|
2666
2664
|
)
|
|
2667
2665
|
).toStoragePredicate<any>();
|
|
2668
2666
|
|
|
2669
|
-
return [modelDefinition
|
|
2667
|
+
return [modelDefinition, predicate];
|
|
2670
2668
|
}
|
|
2671
2669
|
)
|
|
2672
2670
|
);
|
|
@@ -2674,21 +2672,6 @@ class DataStore {
|
|
|
2674
2672
|
return this.weakMapFromEntries(syncPredicates);
|
|
2675
2673
|
}
|
|
2676
2674
|
|
|
2677
|
-
private createFromCondition(
|
|
2678
|
-
modelDefinition: SchemaModel,
|
|
2679
|
-
condition: ProducerModelPredicate<PersistentModel>
|
|
2680
|
-
) {
|
|
2681
|
-
try {
|
|
2682
|
-
return ModelPredicateCreator.createFromExisting(
|
|
2683
|
-
modelDefinition,
|
|
2684
|
-
condition
|
|
2685
|
-
);
|
|
2686
|
-
} catch (error) {
|
|
2687
|
-
logger.error('Error creating Sync Predicate');
|
|
2688
|
-
throw error;
|
|
2689
|
-
}
|
|
2690
|
-
}
|
|
2691
|
-
|
|
2692
2675
|
private async unwrapPromise<T extends PersistentModel>(
|
|
2693
2676
|
conditionProducer
|
|
2694
2677
|
): Promise<ModelPredicateExtender<T>> {
|
|
@@ -2704,7 +2687,7 @@ class DataStore {
|
|
|
2704
2687
|
}
|
|
2705
2688
|
|
|
2706
2689
|
private weakMapFromEntries(
|
|
2707
|
-
entries: [SchemaModel, ModelPredicate<any>][]
|
|
2690
|
+
entries: [SchemaModel, ModelPredicate<any> | null][]
|
|
2708
2691
|
): WeakMap<SchemaModel, ModelPredicate<any>> {
|
|
2709
2692
|
return entries.reduce((map, [modelDefinition, predicate]) => {
|
|
2710
2693
|
if (map.has(modelDefinition)) {
|
package/src/predicates/index.ts
CHANGED
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
|
-
AllOperators,
|
|
3
2
|
ModelPredicate,
|
|
4
3
|
PersistentModel,
|
|
5
|
-
PredicateExpression,
|
|
6
|
-
PredicateGroups,
|
|
7
4
|
PredicatesGroup,
|
|
8
5
|
ProducerModelPredicate,
|
|
9
6
|
SchemaModel,
|
|
@@ -71,10 +68,6 @@ const isComparison = o => {
|
|
|
71
68
|
return !Array.isArray(o) && keys.length === 1 && comparisonKeys.has(keys[0]);
|
|
72
69
|
};
|
|
73
70
|
|
|
74
|
-
const isComparisonArray = o => {
|
|
75
|
-
return Array.isArray(o) && isComparison(o[0]);
|
|
76
|
-
};
|
|
77
|
-
|
|
78
71
|
/**
|
|
79
72
|
* A light check to determine whether an object is a valid GraphQL Condition AST.
|
|
80
73
|
*
|
|
@@ -102,106 +95,37 @@ export class Predicates {
|
|
|
102
95
|
}
|
|
103
96
|
|
|
104
97
|
export class ModelPredicateCreator {
|
|
98
|
+
/**
|
|
99
|
+
* Map of storage predicates (key objects) to storage predicate AST's.
|
|
100
|
+
*/
|
|
105
101
|
private static predicateGroupsMap = new WeakMap<
|
|
106
102
|
ModelPredicate<any>,
|
|
107
103
|
PredicatesGroup<any>
|
|
108
104
|
>();
|
|
109
105
|
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
let handler: ProxyHandler<ModelPredicate<T>>;
|
|
117
|
-
|
|
118
|
-
const predicate = new Proxy(
|
|
119
|
-
{} as ModelPredicate<T>,
|
|
120
|
-
(handler = {
|
|
121
|
-
get(
|
|
122
|
-
_,
|
|
123
|
-
propertyKey,
|
|
124
|
-
self: ModelPredicate<T>
|
|
125
|
-
): PredicateExpression<T, any> {
|
|
126
|
-
const groupType = propertyKey as keyof PredicateGroups<T>;
|
|
127
|
-
|
|
128
|
-
switch (groupType) {
|
|
129
|
-
case 'and':
|
|
130
|
-
case 'or':
|
|
131
|
-
case 'not':
|
|
132
|
-
const result: PredicateExpression<T, any> = (
|
|
133
|
-
newPredicate: (criteria: ModelPredicate<T>) => ModelPredicate<T>
|
|
134
|
-
) => {
|
|
135
|
-
const group: PredicatesGroup<T> = {
|
|
136
|
-
type: groupType,
|
|
137
|
-
predicates: [],
|
|
138
|
-
};
|
|
139
|
-
|
|
140
|
-
// Create a new recorder
|
|
141
|
-
const tmpPredicateRecorder = new Proxy(
|
|
142
|
-
{} as ModelPredicate<T>,
|
|
143
|
-
handler
|
|
144
|
-
);
|
|
145
|
-
|
|
146
|
-
// Set the recorder group
|
|
147
|
-
ModelPredicateCreator.predicateGroupsMap.set(
|
|
148
|
-
tmpPredicateRecorder as any,
|
|
149
|
-
group
|
|
150
|
-
);
|
|
151
|
-
|
|
152
|
-
// Apply the predicates to the recorder (this is the step that records the changes)
|
|
153
|
-
newPredicate(tmpPredicateRecorder);
|
|
154
|
-
|
|
155
|
-
// Push the group to the top-level recorder
|
|
156
|
-
ModelPredicateCreator.predicateGroupsMap
|
|
157
|
-
.get(self as any)!
|
|
158
|
-
.predicates.push(group);
|
|
159
|
-
|
|
160
|
-
return self;
|
|
161
|
-
};
|
|
162
|
-
|
|
163
|
-
return result;
|
|
164
|
-
default:
|
|
165
|
-
// intentionally blank.
|
|
166
|
-
}
|
|
167
|
-
|
|
168
|
-
const field = propertyKey as keyof T;
|
|
169
|
-
|
|
170
|
-
if (!fieldNames.has(field)) {
|
|
171
|
-
throw new Error(
|
|
172
|
-
`Invalid field for model. field: ${field}, model: ${modelName}`
|
|
173
|
-
);
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
const result: PredicateExpression<T, any> = (
|
|
177
|
-
operator: keyof AllOperators,
|
|
178
|
-
operand: any
|
|
179
|
-
) => {
|
|
180
|
-
ModelPredicateCreator.predicateGroupsMap
|
|
181
|
-
.get(self as any)!
|
|
182
|
-
.predicates.push({ field, operator, operand });
|
|
183
|
-
return self;
|
|
184
|
-
};
|
|
185
|
-
return result;
|
|
186
|
-
},
|
|
187
|
-
})
|
|
188
|
-
);
|
|
189
|
-
|
|
190
|
-
const group: PredicatesGroup<T> = {
|
|
191
|
-
type: 'and',
|
|
192
|
-
predicates: [],
|
|
193
|
-
};
|
|
194
|
-
ModelPredicateCreator.predicateGroupsMap.set(predicate as any, group);
|
|
195
|
-
|
|
196
|
-
return predicate;
|
|
197
|
-
}
|
|
198
|
-
|
|
106
|
+
/**
|
|
107
|
+
* Determines whether the given storage predicate (lookup key) is a predicate
|
|
108
|
+
* key that DataStore recognizes.
|
|
109
|
+
*
|
|
110
|
+
* @param predicate The storage predicate (lookup key) to test.
|
|
111
|
+
*/
|
|
199
112
|
static isValidPredicate<T extends PersistentModel>(
|
|
200
113
|
predicate: any
|
|
201
114
|
): predicate is ModelPredicate<T> {
|
|
202
115
|
return ModelPredicateCreator.predicateGroupsMap.has(predicate);
|
|
203
116
|
}
|
|
204
117
|
|
|
118
|
+
/**
|
|
119
|
+
* Looks for the storage predicate AST that corresponds to a given storage
|
|
120
|
+
* predicate key.
|
|
121
|
+
*
|
|
122
|
+
* The key must have been created internally by a DataStore utility
|
|
123
|
+
* method, such as `ModelPredicate.createFromAST()`.
|
|
124
|
+
*
|
|
125
|
+
* @param predicate The predicate reference to look up.
|
|
126
|
+
* @param throwOnInvalid Whether to throw an exception if the predicate
|
|
127
|
+
* isn't a valid DataStore predicate.
|
|
128
|
+
*/
|
|
205
129
|
static getPredicates<T extends PersistentModel>(
|
|
206
130
|
predicate: ModelPredicate<T>,
|
|
207
131
|
throwOnInvalid: boolean = true
|
|
@@ -210,33 +134,17 @@ export class ModelPredicateCreator {
|
|
|
210
134
|
throw new Error('The predicate is not valid');
|
|
211
135
|
}
|
|
212
136
|
|
|
213
|
-
return ModelPredicateCreator.predicateGroupsMap.get(predicate
|
|
214
|
-
}
|
|
215
|
-
|
|
216
|
-
// transforms cb-style predicate into Proxy
|
|
217
|
-
static createFromExisting<T extends PersistentModel>(
|
|
218
|
-
modelDefinition?: SchemaModel,
|
|
219
|
-
existing?: ProducerModelPredicate<T>
|
|
220
|
-
) {
|
|
221
|
-
if (!existing || !modelDefinition) {
|
|
222
|
-
return undefined;
|
|
223
|
-
}
|
|
224
|
-
|
|
225
|
-
return existing(
|
|
226
|
-
ModelPredicateCreator.createPredicateBuilder(modelDefinition)
|
|
227
|
-
);
|
|
228
|
-
}
|
|
229
|
-
|
|
230
|
-
static createForSingleField<T extends PersistentModel>(
|
|
231
|
-
modelDefinition: SchemaModel,
|
|
232
|
-
fieldName: string,
|
|
233
|
-
value: string
|
|
234
|
-
) {
|
|
235
|
-
return ModelPredicateCreator.createPredicateBuilder<T>(modelDefinition)[
|
|
236
|
-
fieldName
|
|
237
|
-
](<any>'eq', <any>value);
|
|
137
|
+
return ModelPredicateCreator.predicateGroupsMap.get(predicate);
|
|
238
138
|
}
|
|
239
139
|
|
|
140
|
+
/**
|
|
141
|
+
* using the PK values from the given `model` (which can be a partial of T
|
|
142
|
+
* Creates a predicate that matches an instance described by `modelDefinition`
|
|
143
|
+
* that contains only PK field values.)
|
|
144
|
+
*
|
|
145
|
+
* @param modelDefinition The model definition to create a predicate for.
|
|
146
|
+
* @param model The model instance to extract value equalities from.
|
|
147
|
+
*/
|
|
240
148
|
static createForPk<T extends PersistentModel>(
|
|
241
149
|
modelDefinition: SchemaModel,
|
|
242
150
|
model: T
|
|
@@ -244,15 +152,14 @@ export class ModelPredicateCreator {
|
|
|
244
152
|
const keyFields = extractPrimaryKeyFieldNames(modelDefinition);
|
|
245
153
|
const keyValues = extractPrimaryKeyValues(model, keyFields);
|
|
246
154
|
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
modelPredicate = modelPredicate[field](<any>'eq', <any>operand);
|
|
155
|
+
const predicate = this.createFromAST<T>(modelDefinition, {
|
|
156
|
+
and: keyFields.map((field, idx) => {
|
|
157
|
+
const operand = keyValues[idx];
|
|
158
|
+
return { [field]: { eq: operand } };
|
|
159
|
+
}),
|
|
253
160
|
});
|
|
254
161
|
|
|
255
|
-
return
|
|
162
|
+
return predicate;
|
|
256
163
|
}
|
|
257
164
|
|
|
258
165
|
/**
|
|
@@ -271,7 +178,7 @@ export class ModelPredicateCreator {
|
|
|
271
178
|
const ast = {
|
|
272
179
|
and: Object.entries(flatEqualities).map(([k, v]) => ({ [k]: { eq: v } })),
|
|
273
180
|
};
|
|
274
|
-
return this.createFromAST(modelDefinition, ast);
|
|
181
|
+
return this.createFromAST<T>(modelDefinition, ast);
|
|
275
182
|
}
|
|
276
183
|
|
|
277
184
|
/**
|
|
@@ -350,18 +257,17 @@ export class ModelPredicateCreator {
|
|
|
350
257
|
* @param modelDefinition The model that the AST/predicate must be compatible with.
|
|
351
258
|
* @param ast The graphQL style AST that should specify conditions for `modelDefinition`.
|
|
352
259
|
*/
|
|
353
|
-
static createFromAST(
|
|
260
|
+
static createFromAST<T extends PersistentModel>(
|
|
354
261
|
modelDefinition: SchemaModel,
|
|
355
262
|
ast: any
|
|
356
|
-
): ModelPredicate<
|
|
357
|
-
const
|
|
358
|
-
ModelPredicateCreator.createPredicateBuilder(modelDefinition);
|
|
263
|
+
): ModelPredicate<T> {
|
|
264
|
+
const key = {} as ModelPredicate<T>;
|
|
359
265
|
|
|
360
266
|
ModelPredicateCreator.predicateGroupsMap.set(
|
|
361
|
-
|
|
267
|
+
key,
|
|
362
268
|
this.transformGraphQLFilterNodeToPredicateAST(ast)
|
|
363
269
|
);
|
|
364
270
|
|
|
365
|
-
return
|
|
271
|
+
return key;
|
|
366
272
|
}
|
|
367
273
|
}
|
package/src/predicates/next.ts
CHANGED
|
@@ -584,9 +584,7 @@ export class GroupCondition {
|
|
|
584
584
|
}
|
|
585
585
|
);
|
|
586
586
|
|
|
587
|
-
resultGroups.push(
|
|
588
|
-
await storage.query(this.model.builder, predicate as any)
|
|
589
|
-
);
|
|
587
|
+
resultGroups.push(await storage.query(this.model.builder, predicate));
|
|
590
588
|
} else {
|
|
591
589
|
throw new Error('Missing field metadata.');
|
|
592
590
|
}
|
|
@@ -718,13 +716,15 @@ export class GroupCondition {
|
|
|
718
716
|
};
|
|
719
717
|
}
|
|
720
718
|
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
719
|
+
/**
|
|
720
|
+
* Turn this predicate group into something a storage adapter
|
|
721
|
+
* understands how to use.
|
|
722
|
+
*/
|
|
723
|
+
toStoragePredicate<T>(): StoragePredicate<T> {
|
|
724
|
+
return FlatModelPredicateCreator.createFromAST<T>(
|
|
725
725
|
this.model.schema,
|
|
726
726
|
this.toAST()
|
|
727
|
-
) as
|
|
727
|
+
) as StoragePredicate<T>;
|
|
728
728
|
}
|
|
729
729
|
|
|
730
730
|
/**
|
|
@@ -780,7 +780,7 @@ export function recursivePredicateFor<T extends PersistentModel>(
|
|
|
780
780
|
|
|
781
781
|
// our eventual return object, which can be built upon.
|
|
782
782
|
// next steps will be to add or(), and(), not(), and field.op() methods.
|
|
783
|
-
const link = {} as
|
|
783
|
+
const link = {} as RecursiveModelPredicate<T>;
|
|
784
784
|
|
|
785
785
|
// so it can be looked up later with in the internals when processing conditions.
|
|
786
786
|
registerPredicateInternals(baseCondition, link);
|
|
@@ -799,10 +799,8 @@ export function recursivePredicateFor<T extends PersistentModel>(
|
|
|
799
799
|
|
|
800
800
|
// Adds .or() and .and() methods to the link.
|
|
801
801
|
// TODO: If revisiting this code, consider writing a Proxy instead.
|
|
802
|
-
['and', 'or'].forEach(op => {
|
|
803
|
-
|
|
804
|
-
builder: RecursiveModelPredicateAggregateExtender<T>
|
|
805
|
-
) => {
|
|
802
|
+
(['and', 'or'] as const).forEach(op => {
|
|
803
|
+
link[op] = (builder: RecursiveModelPredicateAggregateExtender<T>) => {
|
|
806
804
|
// or() and and() will return a copy of the original link
|
|
807
805
|
// to head off mutability concerns.
|
|
808
806
|
const { query, newTail } = copyLink();
|
|
@@ -962,5 +960,7 @@ export function recursivePredicateFor<T extends PersistentModel>(
|
|
|
962
960
|
export function predicateFor<T extends PersistentModel>(
|
|
963
961
|
ModelType: ModelMeta<T>
|
|
964
962
|
): ModelPredicate<T> & PredicateInternalsKey {
|
|
963
|
+
// the cast here is just a cheap way to reduce the surface area from
|
|
964
|
+
// the recursive type.
|
|
965
965
|
return recursivePredicateFor(ModelType, false) as any as ModelPredicate<T>;
|
|
966
966
|
}
|
|
@@ -132,7 +132,7 @@ export class AsyncStorageAdapter implements Adapter {
|
|
|
132
132
|
model,
|
|
133
133
|
this.schema.namespaces[namespaceName],
|
|
134
134
|
this.modelInstanceCreator,
|
|
135
|
-
this.getModelConstructorByModelName
|
|
135
|
+
this.getModelConstructorByModelName
|
|
136
136
|
);
|
|
137
137
|
|
|
138
138
|
const set = new Set<string>();
|
package/src/storage/storage.ts
CHANGED
|
@@ -60,7 +60,7 @@ class StorageClass implements StorageFacade {
|
|
|
60
60
|
private readonly sessionId?: string
|
|
61
61
|
) {
|
|
62
62
|
this.adapter = this.adapter || getDefaultAdapter();
|
|
63
|
-
this.pushStream = new PushStream()
|
|
63
|
+
this.pushStream = new PushStream();
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
static getNamespace() {
|
|
@@ -154,7 +154,7 @@ class StorageClass implements StorageFacade {
|
|
|
154
154
|
.constructor as PersistentModelConstructor<T>;
|
|
155
155
|
|
|
156
156
|
this.pushStream.next({
|
|
157
|
-
model: modelConstructor
|
|
157
|
+
model: modelConstructor,
|
|
158
158
|
opType,
|
|
159
159
|
element,
|
|
160
160
|
mutator,
|
|
@@ -234,7 +234,7 @@ class StorageClass implements StorageFacade {
|
|
|
234
234
|
}
|
|
235
235
|
|
|
236
236
|
this.pushStream.next({
|
|
237
|
-
model: modelConstructor
|
|
237
|
+
model: modelConstructor,
|
|
238
238
|
opType: OpType.DELETE,
|
|
239
239
|
element: model,
|
|
240
240
|
mutator,
|
|
@@ -340,7 +340,7 @@ class StorageClass implements StorageFacade {
|
|
|
340
340
|
});
|
|
341
341
|
});
|
|
342
342
|
|
|
343
|
-
return result
|
|
343
|
+
return result;
|
|
344
344
|
}
|
|
345
345
|
|
|
346
346
|
// returns null if no user fields were changed (determined by value comparison)
|
|
@@ -510,11 +510,11 @@ class ExclusiveStorage implements StorageFacade {
|
|
|
510
510
|
if (isModelConstructor(modelOrModelConstructor)) {
|
|
511
511
|
const modelConstructor = modelOrModelConstructor;
|
|
512
512
|
|
|
513
|
-
return storage.delete(modelConstructor
|
|
513
|
+
return storage.delete(modelConstructor, condition, mutator);
|
|
514
514
|
} else {
|
|
515
515
|
const model = modelOrModelConstructor;
|
|
516
516
|
|
|
517
|
-
return storage.delete(model
|
|
517
|
+
return storage.delete(model, condition, mutator);
|
|
518
518
|
}
|
|
519
519
|
});
|
|
520
520
|
}
|
package/src/sync/index.ts
CHANGED
|
@@ -134,7 +134,10 @@ export class SyncEngine {
|
|
|
134
134
|
private readonly modelInstanceCreator: ModelInstanceCreator,
|
|
135
135
|
conflictHandler: ConflictHandler,
|
|
136
136
|
errorHandler: ErrorHandler,
|
|
137
|
-
private readonly syncPredicates: WeakMap<
|
|
137
|
+
private readonly syncPredicates: WeakMap<
|
|
138
|
+
SchemaModel,
|
|
139
|
+
ModelPredicate<any> | null
|
|
140
|
+
>,
|
|
138
141
|
private readonly amplifyConfig: Record<string, any> = {},
|
|
139
142
|
private readonly authModeStrategy: AuthModeStrategy,
|
|
140
143
|
private readonly amplifyContext: AmplifyContext,
|
|
@@ -915,9 +918,9 @@ export class SyncEngine {
|
|
|
915
918
|
const ModelMetadata = this.modelClasses
|
|
916
919
|
.ModelMetadata as PersistentModelConstructor<ModelMetadata>;
|
|
917
920
|
|
|
918
|
-
const predicate = ModelPredicateCreator.
|
|
921
|
+
const predicate = ModelPredicateCreator.createFromAST<ModelMetadata>(
|
|
919
922
|
this.schema.namespaces[SYNC].models[ModelMetadata.name],
|
|
920
|
-
|
|
923
|
+
{ and: [{ namespace: { eq: namespace } }, { model: { eq: model } }] }
|
|
921
924
|
);
|
|
922
925
|
|
|
923
926
|
const [modelMetadata] = await this.storage.query(ModelMetadata, predicate, {
|