Skip to content

Commit 44f0d0a

Browse files
committed
Update @orbit/records dependency to latest beta
0.17.0-beta.19 introduced breaking changes: https://github.com/orbitjs/orbit/releases/tag/v0.17.0-beta.19 This has build failure in `sql-source-legacy-test` that I commented out; I’m not sure how important it is given the file name.
1 parent d02e884 commit 44f0d0a

File tree

4 files changed

+41
-29
lines changed

4 files changed

+41
-29
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"repository": "https://github.com/tchak/orbit-sql",
1616
"license": "MIT",
1717
"dependencies": {
18-
"@orbit/records": "^0.17.0-beta.14",
18+
"@orbit/records": "0.17.0-beta.25",
1919
"inflected": "^2.1.0",
2020
"knex": "^0.21.18",
2121
"objection": "^2.2.14"

src/processor.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,11 @@ export class Processor {
8282
async query(query: RecordQuery) {
8383
return transaction(this._db as Knex, async (trx) => {
8484
const data: (OrbitRecord | OrbitRecord[] | null)[] = [];
85-
for (const expression of query.expressions) {
85+
const expressions = Array.isArray(query.expressions)
86+
? query.expressions
87+
: [query.expressions];
88+
89+
for (const expression of expressions) {
8690
data.push(await this.processQueryExpression(expression, trx));
8791
}
8892
return data;

src/sql-source.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { queryable, updatable, RequestOptions } from '@orbit/data';
33
import {
44
RecordSourceQueryOptions,
55
RecordSchema,
6-
RecordOperation,
76
RecordSourceSettings,
87
RecordQueryable,
98
RecordUpdatable,
@@ -90,13 +89,14 @@ export class SQLSource extends RecordSource<
9089

9190
async _update(transform: RecordTransform): Promise<any> {
9291
if (!this.transformLog.contains(transform.id)) {
93-
const data = await this._processor.patch(
94-
transform.operations as RecordOperation[]
95-
);
92+
const operations = Array.isArray(transform.operations)
93+
? transform.operations
94+
: [transform.operations];
95+
const data = await this._processor.patch(operations);
9696
await this.transformed([transform]);
9797
return {
9898
transform: [transform],
99-
data: transform.operations.length === 1 ? data[0] : data,
99+
data: Array.isArray(transform.operations) ? data : data[0],
100100
};
101101
}
102102
}
@@ -109,7 +109,7 @@ export class SQLSource extends RecordSource<
109109
const data = await this._processor.query(query);
110110
return {
111111
transform: [],
112-
data: query.expressions.length === 1 ? data[0] : data,
112+
data: Array.isArray(data) ? data[0] : data,
113113
};
114114
}
115115
}

yarn.lock

+29-21
Original file line numberDiff line numberDiff line change
@@ -203,33 +203,41 @@
203203
dependencies:
204204
"@octokit/openapi-types" "^5.1.0"
205205

206-
"@orbit/core@^0.17.0-beta.14":
207-
version "0.17.0-beta.14"
208-
resolved "https://registry.yarnpkg.com/@orbit/core/-/core-0.17.0-beta.14.tgz#268308db98f39e3a4d29ba3948eb003cc25ef405"
209-
integrity sha512-W8fvwPqjxJhSXMy2iJkjBaDGEyAO5aPoWTcSAx/WxhHEYFu45BcGpBij0j8OCryKJgSbSpBn5dfP087DZQu9QQ==
206+
"@orbit/core@^0.17.0-beta.25":
207+
version "0.17.0-beta.25"
208+
resolved "https://registry.yarnpkg.com/@orbit/core/-/core-0.17.0-beta.25.tgz#a166531146ba275c32109022cf6903e3f2dc06bf"
209+
integrity sha512-7g26BNqbFipTUjDCIXGkBAVMI3nYihADezS0FA0vsNMMpAPsX8mgEYJYpPaXq6c9C8VUKaz0H700IRqAvP1ZmQ==
210210
dependencies:
211-
"@orbit/utils" "^0.17.0-beta.14"
211+
"@orbit/utils" "^0.17.0-beta.25"
212212

213-
"@orbit/data@^0.17.0-beta.14":
214-
version "0.17.0-beta.14"
215-
resolved "https://registry.yarnpkg.com/@orbit/data/-/data-0.17.0-beta.14.tgz#910de6aac532f7c50352627f4bddd9837e1a718f"
216-
integrity sha512-sTz45N7fjayrjoE4IBhEubCWhQlW/X6av0+NaYQu9JJgWLeFGb5RO1COV3wgkglIxxQZY5aZEnS75UxCDe9PaA==
213+
"@orbit/data@^0.17.0-beta.25":
214+
version "0.17.0-beta.25"
215+
resolved "https://registry.yarnpkg.com/@orbit/data/-/data-0.17.0-beta.25.tgz#8513b48fa587a4d9a7751685deb348f87bab107b"
216+
integrity sha512-eDzZGSn2ocUIuR8N2LTzEgBnVQ1MlHiB8/ZpFoCyL8Acy8ALSAaOx5J5gylDooiSA/+100XtOHhquDgINKFv2g==
217217
dependencies:
218-
"@orbit/core" "^0.17.0-beta.14"
219-
"@orbit/utils" "^0.17.0-beta.14"
218+
"@orbit/core" "^0.17.0-beta.25"
219+
"@orbit/utils" "^0.17.0-beta.25"
220220

221-
"@orbit/records@^0.17.0-beta.14":
222-
version "0.17.0-beta.14"
223-
resolved "https://registry.yarnpkg.com/@orbit/records/-/records-0.17.0-beta.14.tgz#c38b915fbf1dc5b1f7f968452a7898a4e7f7e240"
224-
integrity sha512-Em40SoLdIxwM3wlwz3pif7zfBzFS+HSe1iRqGoQw0kAq3Qlp53bRU4svUT0pIyd/psQnr1FcQJ2ONjYjyll8SQ==
221+
"@orbit/[email protected].25":
222+
version "0.17.0-beta.25"
223+
resolved "https://registry.yarnpkg.com/@orbit/records/-/records-0.17.0-beta.25.tgz#46d41b688499d959422926ee0c66ec7e515e0938"
224+
integrity sha512-Eg9YzvOuWnbNeK69WvSw3huoTFt+7DkDuwsTBeTi4bLjyo+NHbOHmZPHwS7U+VsXjAUtMWA0LCGRKdU836UjDg==
225225
dependencies:
226-
"@orbit/data" "^0.17.0-beta.14"
227-
"@orbit/utils" "^0.17.0-beta.14"
226+
"@orbit/data" "^0.17.0-beta.25"
227+
"@orbit/utils" "^0.17.0-beta.25"
228+
"@orbit/validators" "^0.17.0-beta.25"
228229

229-
"@orbit/utils@^0.17.0-beta.14":
230-
version "0.17.0-beta.14"
231-
resolved "https://registry.yarnpkg.com/@orbit/utils/-/utils-0.17.0-beta.14.tgz#b9b8dec255cee355e82b21e754e8e2c3bb1e2287"
232-
integrity sha512-1eGvrGKJjXtgBWJ2nQe83nkIk6Kv4QvataoPoc+waRjLdoBIAgIpX7XnVTJ3XMCQO0yDxHQ7wOTpfvtnYwma0A==
230+
"@orbit/utils@^0.17.0-beta.25":
231+
version "0.17.0-beta.25"
232+
resolved "https://registry.yarnpkg.com/@orbit/utils/-/utils-0.17.0-beta.25.tgz#95c34c58f732a42addbcb7271213896cb3b29a25"
233+
integrity sha512-7YdfdHlQr+838ikOlu053/dG+8wrn5Ddw/E/7+YCT3UuNtonWy69e3omZkuFsHEf+6zNDV8FouxfOS9txCXFcg==
234+
235+
"@orbit/validators@^0.17.0-beta.25":
236+
version "0.17.0-beta.25"
237+
resolved "https://registry.yarnpkg.com/@orbit/validators/-/validators-0.17.0-beta.25.tgz#54a7d8a591e6128ba3a13e7cf44f5907ea6986b4"
238+
integrity sha512-eB0OIC8gIoeoBDgjKRqW9nji+SNgGA0sD0fr0lQuGmmWmTax4+GQuciXhibiWuh4sBxzQzxfNMrCfOos4h2MSw==
239+
dependencies:
240+
"@orbit/utils" "^0.17.0-beta.25"
233241

234242
"@sindresorhus/is@^0.14.0":
235243
version "0.14.0"

0 commit comments

Comments
 (0)