datastore-api 1.2.0 → 1.6.0
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/CHANGELOG.md +28 -0
- package/README.md +6 -2
- package/build/main/lib/dstore-api.d.ts +45 -23
- package/build/main/lib/dstore-api.js +61 -24
- package/build/main/lib/dstore-api.spec.js +51 -129
- package/build/module/lib/dstore-api.d.ts +45 -23
- package/build/module/lib/dstore-api.js +61 -24
- package/build/module/lib/dstore-api.spec.js +48 -128
- package/package.json +7 -7
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,34 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
|
4
4
|
|
|
5
|
+
## [1.6.0](https://github.com/mdornseif/datastore-api/compare/v1.5.0...v1.6.0) (2022-01-10)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
* catch incomplete keys before trying to update the datastore ([1132e3b](https://github.com/mdornseif/datastore-api/commit/1132e3b52913d83b189c7bf94101c6df162f87df))
|
|
11
|
+
|
|
12
|
+
## [1.5.0](https://github.com/mdornseif/datastore-api/compare/v1.4.0...v1.5.0) (2022-01-06)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Features
|
|
16
|
+
|
|
17
|
+
* provide _keyStr also in queries ([fe7e90b](https://github.com/mdornseif/datastore-api/commit/fe7e90b3011e08de552e1b4e35b1ad110efa6b1b))
|
|
18
|
+
|
|
19
|
+
## [1.4.0](https://github.com/mdornseif/datastore-api/compare/v1.3.0...v1.4.0) (2022-01-04)
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
### Features
|
|
23
|
+
|
|
24
|
+
* save() adds _keyStr the same way get() does ([f4f6452](https://github.com/mdornseif/datastore-api/commit/f4f6452c77046c0ee8d0b6ddfe2ec6744a4968bd))
|
|
25
|
+
|
|
26
|
+
## [1.3.0](https://github.com/mdornseif/datastore-api/compare/v1.2.0...v1.3.0) (2022-01-03)
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
### Features
|
|
30
|
+
|
|
31
|
+
* Set excludeLargeProperties by default. ([289cd28](https://github.com/mdornseif/datastore-api/commit/289cd289651b0c34f36098370b3dfbe249790c5a))
|
|
32
|
+
|
|
5
33
|
## [1.2.0](https://github.com/mdornseif/datastore-api/compare/v1.1.3...v1.2.0) (2021-12-30)
|
|
6
34
|
|
|
7
35
|
|
package/README.md
CHANGED
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
[](https://npmjs.org/datastore-api)
|
|
2
|
+
[](https://github.com/mdornseif/datastore-api/blob/master/LICENSE)
|
|
3
|
+
[](https://npmcharts.com/compare/datastore-api)
|
|
4
|
+
|
|
1
5
|
# datastore-api
|
|
2
6
|
|
|
3
7
|
Simplified, more consistent API for Google Cloud Datastore.
|
|
@@ -22,7 +26,7 @@ Main differences:
|
|
|
22
26
|
|
|
23
27
|
Find the full documentation [here](http://mdornseif.io/datastore-api/classes/Dstore.html). In there also some of the idiosyncrasies of using the Datastore are explained.
|
|
24
28
|
|
|
25
|
-
See [the API documentation](http://mdornseif.io/datastore-api/classes/Dstore.html) for Details.
|
|
29
|
+
See [the API documentation](http://mdornseif.io/datastore-api/classes/Dstore.html) for Details, [Github](https://github.com/mdornseif/datastore-api) for source.
|
|
26
30
|
|
|
27
31
|
## See also
|
|
28
32
|
|
|
@@ -33,7 +37,7 @@ See [the API documentation](http://mdornseif.io/datastore-api/classes/Dstore.htm
|
|
|
33
37
|
- Other [Hidden Auto-Generated Datastore API Documentation](https://googleapis.dev/nodejs/datastore/latest/) with better navigation. Seems to contain more on the lower level access.
|
|
34
38
|
- [SDK Source](https://github.com/googleapis/nodejs-datastore)
|
|
35
39
|
- [API reference](https://cloud.google.com/datastore/docs/reference/data/rpc) helps to understand under-documented SDK.
|
|
36
|
-
- [grpc-js environment variables](https://github.com/grpc/grpc-node/blob/master/doc/environment_variables.md) - try[GRPC_VERBOSITY=DEBUG GRPC_TRACE=all yarn test](https://github.com/grpc/grpc-node/blob/master/TROUBLESHOOTING.md)
|
|
40
|
+
- [grpc-js environment variables](https://github.com/grpc/grpc-node/blob/master/doc/environment_variables.md) - try [GRPC_VERBOSITY=DEBUG GRPC_TRACE=all yarn test](https://github.com/grpc/grpc-node/blob/master/TROUBLESHOOTING.md)
|
|
37
41
|
|
|
38
42
|
- API Simplification
|
|
39
43
|
- [google-cloud-datastore-node](https://www.npmjs.com/package/google-cloud-datastore-node)
|
|
@@ -19,8 +19,7 @@ export interface IDstoreEntryWithoutKey {
|
|
|
19
19
|
[key: string]: DstorePropertyValues;
|
|
20
20
|
}
|
|
21
21
|
/** Represents what is actually stored inside the Datastore, called "Entity" by Google
|
|
22
|
-
[@google-cloud/datastore](https://github.com/googleapis/nodejs-datastore#readme) adds `[Datastore.KEY]`. Using ES6 Symbols presents all kinds of hurdles, especially when you try to serialize into a cache. So we add the property _keyStr which contains the encoded
|
|
23
|
-
to reconstruct `[Datastore.KEY]`, if you use [[Dstore.readKey]].
|
|
22
|
+
[@google-cloud/datastore](https://github.com/googleapis/nodejs-datastore#readme) adds `[Datastore.KEY]`. Using ES6 Symbols presents all kinds of hurdles, especially when you try to serialize into a cache. So we add the property _keyStr which contains the encoded key. It is automatically used to reconstruct `[Datastore.KEY]`, if you use [[Dstore.readKey]].
|
|
24
23
|
*/
|
|
25
24
|
export interface IDstoreEntry extends IDstoreEntryWithoutKey {
|
|
26
25
|
readonly [Datastore.KEY]?: Key;
|
|
@@ -32,7 +31,10 @@ export interface IDstoreEntry extends IDstoreEntryWithoutKey {
|
|
|
32
31
|
/** Represents the thing you pass to the save method. Also called "Entity" by Google */
|
|
33
32
|
export declare type DstoreSaveEntity = {
|
|
34
33
|
key: Key;
|
|
35
|
-
data: Omit<IDstoreEntry, '_keyStr' | Datastore['KEY']
|
|
34
|
+
data: Omit<IDstoreEntry, '_keyStr' | Datastore['KEY']> & Partial<{
|
|
35
|
+
_keyStr: string;
|
|
36
|
+
[Datastore.KEY]: Key;
|
|
37
|
+
}>;
|
|
36
38
|
method?: 'insert' | 'update' | 'upsert';
|
|
37
39
|
excludeLargeProperties?: boolean;
|
|
38
40
|
excludeFromIndexes?: readonly string[];
|
|
@@ -65,18 +67,18 @@ declare type IDstore = {
|
|
|
65
67
|
[@google-cloud/datastore](https://github.com/googleapis/nodejs-datastore#readme) is a strange beast: [The documentation is auto generated](https://cloud.google.com/nodejs/docs/reference/datastore/latest) and completely shy of documenting any advanced concepts.
|
|
66
68
|
(Example: If you ask the datastore to auto-generate keys during save: how do you retrieve the generated key?) Generally I suggest to look at the Python 2.x [db](https://cloud.google.com/appengine/docs/standard/python/datastore/api-overview) and [ndb](https://cloud.google.com/appengine/docs/standard/python/ndb) documentation to get a better explanation of the workings of the datastore.
|
|
67
69
|
|
|
68
|
-
Also the typings are strange. The Google provided type `Entities` can be the on disk representation, the same but including a key reference (`Datastore.KEY` - [[
|
|
70
|
+
Also the typings are strange. The Google provided type `Entities` can be the on disk representation, the same but including a key reference (`Datastore.KEY` - [[IDstoreEntry]]), a list of these or a structured object containing the on disk representation under the `data` property and a `key` property and maybe some configuration like `excludeFromIndexes` ([[DstoreSaveEntity]]) or a list of these.
|
|
69
71
|
|
|
70
72
|
KvStore tries to abstract away most surprises the datastore provides to you but als tries to stay as API compatible as possible to [@google-cloud/datastore](https://github.com/googleapis/nodejs-datastore).
|
|
71
73
|
|
|
72
74
|
Main differences:
|
|
73
75
|
|
|
74
76
|
- Everything asynchronous is Promise-based - no callbacks.
|
|
75
|
-
- [[get]] always returns a single [[
|
|
76
|
-
- [[getMulti]] always returns an Array<[[
|
|
77
|
+
- [[get]] always returns a single [[IDstoreEntry]].
|
|
78
|
+
- [[getMulti]] always returns an Array<[[IDstoreEntry]]> of the same length as the input Array. Items not found are represented by null.
|
|
77
79
|
- [[set]] is called with `(key, value)` and always returns the complete [[Key]] of the entity being written. Keys are normalized, numeric IDs are always encoded as strings.
|
|
78
80
|
- [[key]] handles [[Key]] object instantiation for you.
|
|
79
|
-
- [[readKey]] extracts the key from an [[
|
|
81
|
+
- [[readKey]] extracts the key from an [[IDstoreEntry]] you have read without the need of fancy `Symbol`-based access to `entity[Datastore.KEY]`. If needed, it tries to deserialize `_keyStr` to create `entity[Datastore.KEY]`. This ist important when rehydrating an [[IDstoreEntry]] from a serializing cache.
|
|
80
82
|
- [[allocateOneId]] returns a single numeric string encoded unique datastore id without the need of fancy unpacking.
|
|
81
83
|
- [[runInTransaction]] allows you to provide a function to be executed inside an transaction without the need of passing around the transaction object. This is modelled after Python 2.7 [ndb's `@ndb.transactional` feature](https://cloud.google.com/appengine/docs/standard/python/ndb/transactions). This is implemented via node's [AsyncLocalStorage](https://nodejs.org/docs/latest-v14.x/api/async_hooks.html).
|
|
82
84
|
- [[keySerialize]] is synchronous.
|
|
@@ -131,24 +133,24 @@ export declare class Dstore implements IDstore {
|
|
|
131
133
|
* @category Datastore Drop-In
|
|
132
134
|
*/
|
|
133
135
|
keyFromSerialized(text: string): Key;
|
|
134
|
-
/** `readKey()` extracts the [[Key]] from an [[
|
|
136
|
+
/** `readKey()` extracts the [[Key]] from an [[IDstoreEntry]].
|
|
135
137
|
*
|
|
136
138
|
* Is is an alternative to `entity[Datastore.KEY]` which tends to fail in various contexts and also confuses older Typescript compilers.
|
|
137
|
-
* It can extract the [[Key]] form a [[
|
|
139
|
+
* It can extract the [[Key]] form a [[IDstoreEntry]] which has been serialized to JSON by leveraging the property `_keyStr`.
|
|
138
140
|
*
|
|
139
141
|
* @category Additional
|
|
140
142
|
*/
|
|
141
143
|
readKey(ent: IDstoreEntry): Key;
|
|
142
|
-
/** `fixKeys()` is called for all [[
|
|
144
|
+
/** `fixKeys()` is called for all [[IDstoreEntry]]sa returned from [[Dstore]].
|
|
143
145
|
*
|
|
144
146
|
* Is ensures that besides `entity[Datastore.KEY]` there is `_keyStr` to be leveraged by [[readKey]].
|
|
145
147
|
*
|
|
146
148
|
* @internal
|
|
147
149
|
*/
|
|
148
150
|
private fixKeys;
|
|
149
|
-
/** `get()` reads a [[
|
|
151
|
+
/** `get()` reads a [[IDstoreEntry]] from the Datastore.
|
|
150
152
|
*
|
|
151
|
-
* It returns [[
|
|
153
|
+
* It returns [[IDstoreEntry]] or `null` if not found.
|
|
152
154
|
|
|
153
155
|
* The underlying Datastore API Call is [lookup](https://cloud.google.com/datastore/docs/reference/data/rest/v1/projects/lookup).
|
|
154
156
|
*
|
|
@@ -157,14 +159,14 @@ export declare class Dstore implements IDstore {
|
|
|
157
159
|
* Differences between [[Dstore.get]] and [[Datastore.get]]:
|
|
158
160
|
*
|
|
159
161
|
* - [Dstore.get]] takes a single [[Key]] as Parameter, no Array. Check [[getMulti]] if you want Arrays.
|
|
160
|
-
* - [Dstore.get]] returns a single [[
|
|
162
|
+
* - [Dstore.get]] returns a single [[IDstoreEntry]], no Array.
|
|
161
163
|
*
|
|
162
164
|
* @category Datastore Drop-In
|
|
163
165
|
*/
|
|
164
166
|
get(key: Key): Promise<IDstoreEntry | null>;
|
|
165
|
-
/** `getMulti()` reads several [[
|
|
167
|
+
/** `getMulti()` reads several [[IDstoreEntry]]s from the Datastore.
|
|
166
168
|
*
|
|
167
|
-
* It returns a list of [[
|
|
169
|
+
* It returns a list of [[IDstoreEntry]]s or `null` if not found.
|
|
168
170
|
|
|
169
171
|
* The underlying Datastore API Call is [lookup](https://cloud.google.com/datastore/docs/reference/data/rest/v1/projects/lookup).
|
|
170
172
|
*
|
|
@@ -173,7 +175,7 @@ export declare class Dstore implements IDstore {
|
|
|
173
175
|
* Differences between [[Dstore.getMulti]] and [[Datastore.get]]:
|
|
174
176
|
*
|
|
175
177
|
* - [[Dstore.getMulti]] always takes an Array of [[Key]]s as Parameter.
|
|
176
|
-
* - [[Dstore.getMulti]] returns always a Array of [[
|
|
178
|
+
* - [[Dstore.getMulti]] returns always a Array of [[IDstoreEntry]], or null.
|
|
177
179
|
* - [[Datastore.get]] has many edge cases - e.g. when not being able to find any of the provided keys - which return surprising results. [[Dstore.getMulti]] always returns an Array. TODO: return a Array with the same length as the Input.
|
|
178
180
|
*
|
|
179
181
|
* @category Datastore Drop-In
|
|
@@ -211,7 +213,21 @@ export declare class Dstore implements IDstore {
|
|
|
211
213
|
*
|
|
212
214
|
* If the Datastore generates a new ID because of an incomplete [[Key]] *on first save* it will return an large integer as [[Key.id]].
|
|
213
215
|
* On every subsequent `save()` an string encoded number representation is returned.
|
|
214
|
-
* Dstore normalizes that and always
|
|
216
|
+
* @todo Dstore should normalizes that and always return an string encoded number representation.
|
|
217
|
+
*
|
|
218
|
+
* Each [[DstoreSaveEntity]] can have an `excludeFromIndexes` property which is somewhat underdocumented.
|
|
219
|
+
* It can use something like JSON-Path notation
|
|
220
|
+
* ([Source](https://github.com/googleapis/nodejs-datastore/blob/2941f2f0f132b41534e303d441d837051ce88fd7/src/index.ts#L948))
|
|
221
|
+
* [.*](https://github.com/googleapis/nodejs-datastore/blob/406b15d2014087172df617c6e0a397a2c0902c5f/test/index.ts#L1598),
|
|
222
|
+
* [parent[]](https://github.com/googleapis/nodejs-datastore/blob/406b15d2014087172df617c6e0a397a2c0902c5f/test/index.ts#L1672),
|
|
223
|
+
* [parent.*](https://github.com/googleapis/nodejs-datastore/blob/406b15d2014087172df617c6e0a397a2c0902c5f/test/index.ts#L1672),
|
|
224
|
+
* [parent[].*](https://github.com/googleapis/nodejs-datastore/blob/406b15d2014087172df617c6e0a397a2c0902c5f/test/index.ts#L1672)
|
|
225
|
+
* and [more complex patterns](https://github.com/googleapis/nodejs-datastore/blob/406b15d2014087172df617c6e0a397a2c0902c5f/test/index.ts#L1754)
|
|
226
|
+
* seem to be supported patterns.
|
|
227
|
+
*
|
|
228
|
+
* If the caller has not provided an `excludeLargeProperties` in a [[DstoreSaveEntity]] we will default it
|
|
229
|
+
* to `excludeLargeProperties: true`. Without this you can not store strings longer than 1500 bytes easily
|
|
230
|
+
* ([source](https://github.com/googleapis/nodejs-datastore/blob/c7a08a8382c6706ccbfbbf77950babf40bac757c/src/entity.ts#L961)).
|
|
215
231
|
*
|
|
216
232
|
* @category Datastore Drop-In
|
|
217
233
|
*/
|
|
@@ -226,6 +242,8 @@ export declare class Dstore implements IDstore {
|
|
|
226
242
|
*
|
|
227
243
|
* For handling of incomplete [[Key]]s see [[save]].
|
|
228
244
|
*
|
|
245
|
+
* This function can be completely emulated by using [[save]] with `method: 'insert'` inside each [[DstoreSaveEntity]].
|
|
246
|
+
*
|
|
229
247
|
* @throws [[DstoreError]]
|
|
230
248
|
* @category Datastore Drop-In
|
|
231
249
|
*/
|
|
@@ -240,15 +258,17 @@ export declare class Dstore implements IDstore {
|
|
|
240
258
|
* It throws an [[DstoreError]] if there is no Entity with the same [[Key]] in the Datastore. `update()` *overwrites all existing data* for that [[Key]].
|
|
241
259
|
* There was an alpha functionality called `merge()` in the Datastore which read an Entity, merged it with the new data and wrote it back, but this was never documented.
|
|
242
260
|
*
|
|
243
|
-
* `update()` is idempotent.
|
|
261
|
+
* `update()` is idempotent. Updating the same [[Key]] twice is no error.
|
|
262
|
+
*
|
|
263
|
+
* This function can be completely emulated by using [[save]] with `method: 'update'` inside each [[DstoreSaveEntity]].
|
|
244
264
|
*
|
|
245
265
|
* @throws [[DstoreError]]
|
|
246
266
|
* @category Datastore Drop-In
|
|
247
267
|
*/
|
|
248
268
|
update(entities: readonly DstoreSaveEntity[]): Promise<CommitResponse | undefined>;
|
|
249
|
-
/** `delete()` is compatible to [Datastore.
|
|
269
|
+
/** `delete()` is compatible to [Datastore.delete()].
|
|
250
270
|
*
|
|
251
|
-
* Unfortunately currently (late 2021) there is no formal documentation from Google on [Datastore.
|
|
271
|
+
* Unfortunately currently (late 2021) there is no formal documentation from Google on [Datastore.delete()].
|
|
252
272
|
*
|
|
253
273
|
* The single Parameter is a list of [[Key]]s.
|
|
254
274
|
* If called within a transaction it returns `undefined`.
|
|
@@ -285,8 +305,6 @@ export declare class Dstore implements IDstore {
|
|
|
285
305
|
allocateOneId(kindName?: string): Promise<string>;
|
|
286
306
|
/** This tries to give high level access to transactions.
|
|
287
307
|
|
|
288
|
-
Be aware that Transactions differ considerable between Master-Slave Datastore (very old), High Replication Datastore (old, later called [Google Cloud Datastore](https://cloud.google.com/datastore/docs/concepts/cloud-datastore-transactions)) and [Firestore in Datastore Mode](https://cloud.google.com/datastore/docs/firestore-or-datastore#in_datastore_mode) (current).
|
|
289
|
-
|
|
290
308
|
So called "Gross Group Transactions" are always enabled. Transactions are never Cross Project. `runInTransaction()` works only if you use the same [[KvStore] instance for all access within the Transaction.
|
|
291
309
|
|
|
292
310
|
[[runInTransaction]] is modelled after Python 2.7 [ndb's `@ndb.transactional` feature](https://cloud.google.com/appengine/docs/standard/python/ndb/transactions). This is based on node's [AsyncLocalStorage](https://nodejs.org/docs/latest-v14.x/api/async_hooks.html).
|
|
@@ -294,7 +312,11 @@ export declare class Dstore implements IDstore {
|
|
|
294
312
|
Transactions frequently fail if you try to access the same data via in a transaction. See the [Documentation on Locking](https://cloud.google.com/datastore/docs/concepts/transactions#transaction_locks) for further reference. You are advised to use [p-limit](https://github.com/sindresorhus/p-limit)(1) to serialize transactions touching the same resource. This should work nicely with node's single process model. It is a much bigger problem on shared-nothing approaches, like Python on App Engine.
|
|
295
313
|
|
|
296
314
|
Transactions might be wrapped in [p-retry](https://github.com/sindresorhus/p-retry) to implement automatically retrying them with exponential back-off should they fail due to contention.
|
|
297
|
-
|
|
315
|
+
|
|
316
|
+
Be aware that Transactions differ considerable between Master-Slave Datastore (very old), High Replication Datastore (old, later called [Google Cloud Datastore](https://cloud.google.com/datastore/docs/concepts/cloud-datastore-transactions)) and [Firestore in Datastore Mode](https://cloud.google.com/datastore/docs/firestore-or-datastore#in_datastore_mode) (current).
|
|
317
|
+
|
|
318
|
+
Most Applications today are running on "Firestore in Datastore Mode". Beware that the Datastore-Emulator fails with `error: 3 INVALID_ARGUMENT: Only ancestor queries are allowed inside transactions.` during [[runQuery]] while the Datastore on Google Infrastructure does not have such an restriction anymore as of 2022.
|
|
319
|
+
*/
|
|
298
320
|
runInTransaction<T>(func: () => Promise<T>): Promise<T>;
|
|
299
321
|
}
|
|
300
322
|
export declare class DstoreError extends Error {
|
|
@@ -39,18 +39,18 @@ exports.KEYSYM = datastore_1.Datastore.KEY;
|
|
|
39
39
|
[@google-cloud/datastore](https://github.com/googleapis/nodejs-datastore#readme) is a strange beast: [The documentation is auto generated](https://cloud.google.com/nodejs/docs/reference/datastore/latest) and completely shy of documenting any advanced concepts.
|
|
40
40
|
(Example: If you ask the datastore to auto-generate keys during save: how do you retrieve the generated key?) Generally I suggest to look at the Python 2.x [db](https://cloud.google.com/appengine/docs/standard/python/datastore/api-overview) and [ndb](https://cloud.google.com/appengine/docs/standard/python/ndb) documentation to get a better explanation of the workings of the datastore.
|
|
41
41
|
|
|
42
|
-
Also the typings are strange. The Google provided type `Entities` can be the on disk representation, the same but including a key reference (`Datastore.KEY` - [[
|
|
42
|
+
Also the typings are strange. The Google provided type `Entities` can be the on disk representation, the same but including a key reference (`Datastore.KEY` - [[IDstoreEntry]]), a list of these or a structured object containing the on disk representation under the `data` property and a `key` property and maybe some configuration like `excludeFromIndexes` ([[DstoreSaveEntity]]) or a list of these.
|
|
43
43
|
|
|
44
44
|
KvStore tries to abstract away most surprises the datastore provides to you but als tries to stay as API compatible as possible to [@google-cloud/datastore](https://github.com/googleapis/nodejs-datastore).
|
|
45
45
|
|
|
46
46
|
Main differences:
|
|
47
47
|
|
|
48
48
|
- Everything asynchronous is Promise-based - no callbacks.
|
|
49
|
-
- [[get]] always returns a single [[
|
|
50
|
-
- [[getMulti]] always returns an Array<[[
|
|
49
|
+
- [[get]] always returns a single [[IDstoreEntry]].
|
|
50
|
+
- [[getMulti]] always returns an Array<[[IDstoreEntry]]> of the same length as the input Array. Items not found are represented by null.
|
|
51
51
|
- [[set]] is called with `(key, value)` and always returns the complete [[Key]] of the entity being written. Keys are normalized, numeric IDs are always encoded as strings.
|
|
52
52
|
- [[key]] handles [[Key]] object instantiation for you.
|
|
53
|
-
- [[readKey]] extracts the key from an [[
|
|
53
|
+
- [[readKey]] extracts the key from an [[IDstoreEntry]] you have read without the need of fancy `Symbol`-based access to `entity[Datastore.KEY]`. If needed, it tries to deserialize `_keyStr` to create `entity[Datastore.KEY]`. This ist important when rehydrating an [[IDstoreEntry]] from a serializing cache.
|
|
54
54
|
- [[allocateOneId]] returns a single numeric string encoded unique datastore id without the need of fancy unpacking.
|
|
55
55
|
- [[runInTransaction]] allows you to provide a function to be executed inside an transaction without the need of passing around the transaction object. This is modelled after Python 2.7 [ndb's `@ndb.transactional` feature](https://cloud.google.com/appengine/docs/standard/python/ndb/transactions). This is implemented via node's [AsyncLocalStorage](https://nodejs.org/docs/latest-v14.x/api/async_hooks.html).
|
|
56
56
|
- [[keySerialize]] is synchronous.
|
|
@@ -116,10 +116,10 @@ class Dstore {
|
|
|
116
116
|
keyFromSerialized(text) {
|
|
117
117
|
return this.urlSaveKey.legacyDecode(text);
|
|
118
118
|
}
|
|
119
|
-
/** `readKey()` extracts the [[Key]] from an [[
|
|
119
|
+
/** `readKey()` extracts the [[Key]] from an [[IDstoreEntry]].
|
|
120
120
|
*
|
|
121
121
|
* Is is an alternative to `entity[Datastore.KEY]` which tends to fail in various contexts and also confuses older Typescript compilers.
|
|
122
|
-
* It can extract the [[Key]] form a [[
|
|
122
|
+
* It can extract the [[Key]] form a [[IDstoreEntry]] which has been serialized to JSON by leveraging the property `_keyStr`.
|
|
123
123
|
*
|
|
124
124
|
* @category Additional
|
|
125
125
|
*/
|
|
@@ -132,7 +132,7 @@ class Dstore {
|
|
|
132
132
|
(0, assertate_1.assertIsObject)(ret, 'entity[Datastore.KEY]/entity._keyStr', `Entity is missing the datastore Key: ${JSON.stringify(ent)}`);
|
|
133
133
|
return ret;
|
|
134
134
|
}
|
|
135
|
-
/** `fixKeys()` is called for all [[
|
|
135
|
+
/** `fixKeys()` is called for all [[IDstoreEntry]]sa returned from [[Dstore]].
|
|
136
136
|
*
|
|
137
137
|
* Is ensures that besides `entity[Datastore.KEY]` there is `_keyStr` to be leveraged by [[readKey]].
|
|
138
138
|
*
|
|
@@ -149,9 +149,9 @@ class Dstore {
|
|
|
149
149
|
});
|
|
150
150
|
return entities;
|
|
151
151
|
}
|
|
152
|
-
/** `get()` reads a [[
|
|
152
|
+
/** `get()` reads a [[IDstoreEntry]] from the Datastore.
|
|
153
153
|
*
|
|
154
|
-
* It returns [[
|
|
154
|
+
* It returns [[IDstoreEntry]] or `null` if not found.
|
|
155
155
|
|
|
156
156
|
* The underlying Datastore API Call is [lookup](https://cloud.google.com/datastore/docs/reference/data/rest/v1/projects/lookup).
|
|
157
157
|
*
|
|
@@ -160,19 +160,20 @@ class Dstore {
|
|
|
160
160
|
* Differences between [[Dstore.get]] and [[Datastore.get]]:
|
|
161
161
|
*
|
|
162
162
|
* - [Dstore.get]] takes a single [[Key]] as Parameter, no Array. Check [[getMulti]] if you want Arrays.
|
|
163
|
-
* - [Dstore.get]] returns a single [[
|
|
163
|
+
* - [Dstore.get]] returns a single [[IDstoreEntry]], no Array.
|
|
164
164
|
*
|
|
165
165
|
* @category Datastore Drop-In
|
|
166
166
|
*/
|
|
167
167
|
async get(key) {
|
|
168
168
|
(0, assertate_1.assertIsObject)(key);
|
|
169
169
|
(0, assertate_1.assert)(!Array.isArray(key));
|
|
170
|
+
(0, assertate_1.assert)(key.path.length % 2 == 0, `key.path must be complete: ${JSON.stringify(key.path)}`);
|
|
170
171
|
const result = await this.getMulti([key]);
|
|
171
172
|
return (result === null || result === void 0 ? void 0 : result[0]) || null;
|
|
172
173
|
}
|
|
173
|
-
/** `getMulti()` reads several [[
|
|
174
|
+
/** `getMulti()` reads several [[IDstoreEntry]]s from the Datastore.
|
|
174
175
|
*
|
|
175
|
-
* It returns a list of [[
|
|
176
|
+
* It returns a list of [[IDstoreEntry]]s or `null` if not found.
|
|
176
177
|
|
|
177
178
|
* The underlying Datastore API Call is [lookup](https://cloud.google.com/datastore/docs/reference/data/rest/v1/projects/lookup).
|
|
178
179
|
*
|
|
@@ -181,7 +182,7 @@ class Dstore {
|
|
|
181
182
|
* Differences between [[Dstore.getMulti]] and [[Datastore.get]]:
|
|
182
183
|
*
|
|
183
184
|
* - [[Dstore.getMulti]] always takes an Array of [[Key]]s as Parameter.
|
|
184
|
-
* - [[Dstore.getMulti]] returns always a Array of [[
|
|
185
|
+
* - [[Dstore.getMulti]] returns always a Array of [[IDstoreEntry]], or null.
|
|
185
186
|
* - [[Datastore.get]] has many edge cases - e.g. when not being able to find any of the provided keys - which return surprising results. [[Dstore.getMulti]] always returns an Array. TODO: return a Array with the same length as the Input.
|
|
186
187
|
*
|
|
187
188
|
* @category Datastore Drop-In
|
|
@@ -239,21 +240,44 @@ class Dstore {
|
|
|
239
240
|
*
|
|
240
241
|
* If the Datastore generates a new ID because of an incomplete [[Key]] *on first save* it will return an large integer as [[Key.id]].
|
|
241
242
|
* On every subsequent `save()` an string encoded number representation is returned.
|
|
242
|
-
* Dstore normalizes that and always
|
|
243
|
+
* @todo Dstore should normalizes that and always return an string encoded number representation.
|
|
244
|
+
*
|
|
245
|
+
* Each [[DstoreSaveEntity]] can have an `excludeFromIndexes` property which is somewhat underdocumented.
|
|
246
|
+
* It can use something like JSON-Path notation
|
|
247
|
+
* ([Source](https://github.com/googleapis/nodejs-datastore/blob/2941f2f0f132b41534e303d441d837051ce88fd7/src/index.ts#L948))
|
|
248
|
+
* [.*](https://github.com/googleapis/nodejs-datastore/blob/406b15d2014087172df617c6e0a397a2c0902c5f/test/index.ts#L1598),
|
|
249
|
+
* [parent[]](https://github.com/googleapis/nodejs-datastore/blob/406b15d2014087172df617c6e0a397a2c0902c5f/test/index.ts#L1672),
|
|
250
|
+
* [parent.*](https://github.com/googleapis/nodejs-datastore/blob/406b15d2014087172df617c6e0a397a2c0902c5f/test/index.ts#L1672),
|
|
251
|
+
* [parent[].*](https://github.com/googleapis/nodejs-datastore/blob/406b15d2014087172df617c6e0a397a2c0902c5f/test/index.ts#L1672)
|
|
252
|
+
* and [more complex patterns](https://github.com/googleapis/nodejs-datastore/blob/406b15d2014087172df617c6e0a397a2c0902c5f/test/index.ts#L1754)
|
|
253
|
+
* seem to be supported patterns.
|
|
254
|
+
*
|
|
255
|
+
* If the caller has not provided an `excludeLargeProperties` in a [[DstoreSaveEntity]] we will default it
|
|
256
|
+
* to `excludeLargeProperties: true`. Without this you can not store strings longer than 1500 bytes easily
|
|
257
|
+
* ([source](https://github.com/googleapis/nodejs-datastore/blob/c7a08a8382c6706ccbfbbf77950babf40bac757c/src/entity.ts#L961)).
|
|
243
258
|
*
|
|
244
259
|
* @category Datastore Drop-In
|
|
245
260
|
*/
|
|
246
261
|
async save(entities) {
|
|
247
262
|
(0, assertate_1.assertIsArray)(entities);
|
|
248
263
|
try {
|
|
249
|
-
// Within Transaction we
|
|
264
|
+
// Within Transaction we don't get any answer here!
|
|
250
265
|
// [ { mutationResults: [ [Object], [Object] ], indexUpdates: 51 } ]
|
|
251
266
|
for (const e of entities) {
|
|
252
267
|
(0, assertate_1.assertIsObject)(e.key);
|
|
253
268
|
(0, assertate_1.assertIsObject)(e.data);
|
|
254
269
|
this.fixKeys([e.data]);
|
|
270
|
+
e.excludeLargeProperties =
|
|
271
|
+
e.excludeLargeProperties === undefined
|
|
272
|
+
? true
|
|
273
|
+
: e.excludeLargeProperties;
|
|
255
274
|
}
|
|
256
|
-
|
|
275
|
+
const ret = (await this.getDoT().save(entities)) || undefined;
|
|
276
|
+
for (const e of entities) {
|
|
277
|
+
e.data[datastore_1.Datastore.KEY] = e.key;
|
|
278
|
+
this.fixKeys([e.data]);
|
|
279
|
+
}
|
|
280
|
+
return ret;
|
|
257
281
|
}
|
|
258
282
|
catch (error) {
|
|
259
283
|
throw process.env.NODE_ENV === 'test'
|
|
@@ -271,6 +295,8 @@ class Dstore {
|
|
|
271
295
|
*
|
|
272
296
|
* For handling of incomplete [[Key]]s see [[save]].
|
|
273
297
|
*
|
|
298
|
+
* This function can be completely emulated by using [[save]] with `method: 'insert'` inside each [[DstoreSaveEntity]].
|
|
299
|
+
*
|
|
274
300
|
* @throws [[DstoreError]]
|
|
275
301
|
* @category Datastore Drop-In
|
|
276
302
|
*/
|
|
@@ -296,13 +322,20 @@ class Dstore {
|
|
|
296
322
|
* It throws an [[DstoreError]] if there is no Entity with the same [[Key]] in the Datastore. `update()` *overwrites all existing data* for that [[Key]].
|
|
297
323
|
* There was an alpha functionality called `merge()` in the Datastore which read an Entity, merged it with the new data and wrote it back, but this was never documented.
|
|
298
324
|
*
|
|
299
|
-
* `update()` is idempotent.
|
|
325
|
+
* `update()` is idempotent. Updating the same [[Key]] twice is no error.
|
|
326
|
+
*
|
|
327
|
+
* This function can be completely emulated by using [[save]] with `method: 'update'` inside each [[DstoreSaveEntity]].
|
|
300
328
|
*
|
|
301
329
|
* @throws [[DstoreError]]
|
|
302
330
|
* @category Datastore Drop-In
|
|
303
331
|
*/
|
|
304
332
|
async update(entities) {
|
|
305
333
|
(0, assertate_1.assertIsArray)(entities);
|
|
334
|
+
entities.forEach((entity) => (0, assertate_1.assertIsObject)(entity.key));
|
|
335
|
+
entities.forEach((entity) => (0, assertate_1.assert)(entity.key.path.length % 2 == 0, `entity.key.path must be complete: ${JSON.stringify([
|
|
336
|
+
entity.key.path,
|
|
337
|
+
entity,
|
|
338
|
+
])}`));
|
|
306
339
|
try {
|
|
307
340
|
return (await this.getDoT().update(entities)) || undefined;
|
|
308
341
|
}
|
|
@@ -313,9 +346,9 @@ class Dstore {
|
|
|
313
346
|
: new DstoreError('datastore.update error', error);
|
|
314
347
|
}
|
|
315
348
|
}
|
|
316
|
-
/** `delete()` is compatible to [Datastore.
|
|
349
|
+
/** `delete()` is compatible to [Datastore.delete()].
|
|
317
350
|
*
|
|
318
|
-
* Unfortunately currently (late 2021) there is no formal documentation from Google on [Datastore.
|
|
351
|
+
* Unfortunately currently (late 2021) there is no formal documentation from Google on [Datastore.delete()].
|
|
319
352
|
*
|
|
320
353
|
* The single Parameter is a list of [[Key]]s.
|
|
321
354
|
* If called within a transaction it returns `undefined`.
|
|
@@ -329,6 +362,7 @@ class Dstore {
|
|
|
329
362
|
async delete(keys) {
|
|
330
363
|
(0, assertate_1.assertIsArray)(keys);
|
|
331
364
|
keys.forEach((key) => (0, assertate_1.assertIsObject)(key));
|
|
365
|
+
keys.forEach((key) => (0, assertate_1.assert)(key.path.length % 2 == 0, `key.path must be complete: ${JSON.stringify(key.path)}`));
|
|
332
366
|
try {
|
|
333
367
|
return (await this.getDoT().delete(keys)) || undefined;
|
|
334
368
|
}
|
|
@@ -357,7 +391,8 @@ class Dstore {
|
|
|
357
391
|
}
|
|
358
392
|
async runQuery(query) {
|
|
359
393
|
try {
|
|
360
|
-
|
|
394
|
+
const [entities, info] = await this.getDoT().runQuery(query);
|
|
395
|
+
return [this.fixKeys(entities), info];
|
|
361
396
|
}
|
|
362
397
|
catch (error) {
|
|
363
398
|
throw new DstoreError('datastore.runQuery error', error);
|
|
@@ -416,8 +451,6 @@ class Dstore {
|
|
|
416
451
|
}
|
|
417
452
|
/** This tries to give high level access to transactions.
|
|
418
453
|
|
|
419
|
-
Be aware that Transactions differ considerable between Master-Slave Datastore (very old), High Replication Datastore (old, later called [Google Cloud Datastore](https://cloud.google.com/datastore/docs/concepts/cloud-datastore-transactions)) and [Firestore in Datastore Mode](https://cloud.google.com/datastore/docs/firestore-or-datastore#in_datastore_mode) (current).
|
|
420
|
-
|
|
421
454
|
So called "Gross Group Transactions" are always enabled. Transactions are never Cross Project. `runInTransaction()` works only if you use the same [[KvStore] instance for all access within the Transaction.
|
|
422
455
|
|
|
423
456
|
[[runInTransaction]] is modelled after Python 2.7 [ndb's `@ndb.transactional` feature](https://cloud.google.com/appengine/docs/standard/python/ndb/transactions). This is based on node's [AsyncLocalStorage](https://nodejs.org/docs/latest-v14.x/api/async_hooks.html).
|
|
@@ -425,7 +458,11 @@ class Dstore {
|
|
|
425
458
|
Transactions frequently fail if you try to access the same data via in a transaction. See the [Documentation on Locking](https://cloud.google.com/datastore/docs/concepts/transactions#transaction_locks) for further reference. You are advised to use [p-limit](https://github.com/sindresorhus/p-limit)(1) to serialize transactions touching the same resource. This should work nicely with node's single process model. It is a much bigger problem on shared-nothing approaches, like Python on App Engine.
|
|
426
459
|
|
|
427
460
|
Transactions might be wrapped in [p-retry](https://github.com/sindresorhus/p-retry) to implement automatically retrying them with exponential back-off should they fail due to contention.
|
|
428
|
-
|
|
461
|
+
|
|
462
|
+
Be aware that Transactions differ considerable between Master-Slave Datastore (very old), High Replication Datastore (old, later called [Google Cloud Datastore](https://cloud.google.com/datastore/docs/concepts/cloud-datastore-transactions)) and [Firestore in Datastore Mode](https://cloud.google.com/datastore/docs/firestore-or-datastore#in_datastore_mode) (current).
|
|
463
|
+
|
|
464
|
+
Most Applications today are running on "Firestore in Datastore Mode". Beware that the Datastore-Emulator fails with `error: 3 INVALID_ARGUMENT: Only ancestor queries are allowed inside transactions.` during [[runQuery]] while the Datastore on Google Infrastructure does not have such an restriction anymore as of 2022.
|
|
465
|
+
*/
|
|
429
466
|
async runInTransaction(func) {
|
|
430
467
|
let ret;
|
|
431
468
|
const transaction = this.datastore.transaction();
|
|
@@ -474,4 +511,4 @@ class DstoreError extends Error {
|
|
|
474
511
|
}
|
|
475
512
|
}
|
|
476
513
|
exports.DstoreError = DstoreError;
|
|
477
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dstore-api.js","sourceRoot":"","sources":["../../../src/lib/dstore-api.ts"],"names":[],"mappings":"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"}
|
|
514
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dstore-api.js","sourceRoot":"","sources":["../../../src/lib/dstore-api.ts"],"names":[],"mappings":"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"}
|