Skip to content

Commit 9b1fced

Browse files
backspacebackspace
committed
Update @orbit/* dependencies to 0.17-0.beta.25
This is a followup to this PR: tchak/orbit-sql#8 I needed to use the code from that branch (and with the not-building test removed). This seems pretty straightforward; `UnknownSerializer` is no longer needed because `Serializer` can be used directly: orbitjs/orbit#837 I chose to rename the two deserialising functions to remove the QB that was also removed from the imported class names.
1 parent 0f6a9a3 commit 9b1fced

File tree

5 files changed

+102
-95
lines changed

5 files changed

+102
-95
lines changed

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
"main": "dist/src/index.js",
77
"types": "dist/src/index.d.ts",
88
"dependencies": {
9-
"@orbit/jsonapi": "^0.17.0-beta.14",
10-
"@orbit/records": "^0.17.0-beta.14",
9+
"@orbit/jsonapi": "0.17.0-beta.25",
10+
"@orbit/records": "0.17.0-beta.25",
1111
"koa-bodyparser": "^4.3.0",
1212
"koa-router": "^10.0.0",
1313
"qs": "^6.9.6"
1414
},
1515
"devDependencies": {
16-
"@orbit/memory": "^0.17.0-beta.14",
16+
"@orbit/memory": "0.17.0-beta.25",
1717
"@types/koa": "^2.11.3",
1818
"@types/koa-bodyparser": "^4.3.0",
1919
"@types/koa-router": "^7.4.0",
@@ -28,7 +28,7 @@
2828
"eslint-plugin-prettier": "^3.1.3",
2929
"koa": "^2.11.0",
3030
"node-fetch": "^2.6.1",
31-
"orbit-sql": "^0.4.2",
31+
"orbit-sql": "https://github.com/backspace/orbit-sql.git#orbit-0.17.0-beta.25-no-legacy-test",
3232
"prettier": "^2.0.5",
3333
"qunit": "^2.10.0",
3434
"release-it": "^14.4.1",

‎src/deserialize-params.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { SortQBParam, FilterQBParam, RecordSchema } from '@orbit/records';
1+
import { SortParam, FilterParam, RecordSchema } from '@orbit/records';
22
import { JSONAPIResourceFieldSerializer } from '@orbit/jsonapi';
33

4-
export function deserializeFilterQBParams(
4+
export function deserializeFilterParams(
55
schema: RecordSchema,
66
serializer: JSONAPIResourceFieldSerializer,
77
type: string,
88
filter: Record<string, string>
9-
): FilterQBParam[] {
10-
const params: FilterQBParam[] = [];
9+
): FilterParam[] {
10+
const params: FilterParam[] = [];
1111
for (const property in filter) {
1212
const attribute = serializer.deserialize(property, { type }) as string;
1313
if (schema.hasAttribute(type, attribute)) {
@@ -21,13 +21,13 @@ export function deserializeFilterQBParams(
2121
return params;
2222
}
2323

24-
export function deserializeSortQBParams(
24+
export function deserializeSortParams(
2525
schema: RecordSchema,
2626
serializer: JSONAPIResourceFieldSerializer,
2727
type: string,
2828
sort: string
29-
): SortQBParam[] {
30-
const params: SortQBParam[] = [];
29+
): SortParam[] {
30+
const params: SortParam[] = [];
3131
for (const property of sort.split(',')) {
3232
const desc = property.startsWith('-');
3333
const attribute = serializer.deserialize(

‎src/index.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import bodyParser from 'koa-bodyparser';
1717
import qs from 'qs';
1818

1919
import {
20-
deserializeFilterQBParams,
21-
deserializeSortQBParams,
20+
deserializeFilterParams,
21+
deserializeSortParams,
2222
} from './deserialize-params';
2323
import { serializeError } from './serialize-error';
2424
import { Serializer } from './serializer';
@@ -94,7 +94,7 @@ export default function createJSONAPIRouter(settings: ServerSettings): Router {
9494
const term = source.queryBuilder.findRecords(type);
9595
if (filter) {
9696
term.filter(
97-
...deserializeFilterQBParams(
97+
...deserializeFilterParams(
9898
source.schema,
9999
serializer.resourceFieldParamSerializer(),
100100
type,
@@ -104,7 +104,7 @@ export default function createJSONAPIRouter(settings: ServerSettings): Router {
104104
}
105105
if (sort) {
106106
term.sort(
107-
...deserializeSortQBParams(
107+
...deserializeSortParams(
108108
schema,
109109
serializer.resourceFieldParamSerializer(),
110110
type,
@@ -254,7 +254,7 @@ export default function createJSONAPIRouter(settings: ServerSettings): Router {
254254
);
255255
if (filter) {
256256
term.filter(
257-
...deserializeFilterQBParams(
257+
...deserializeFilterParams(
258258
source.schema,
259259
serializer.resourceFieldParamSerializer(),
260260
relationshipType as string,
@@ -264,7 +264,7 @@ export default function createJSONAPIRouter(settings: ServerSettings): Router {
264264
}
265265
if (sort) {
266266
term.sort(
267-
...deserializeSortQBParams(
267+
...deserializeSortParams(
268268
schema,
269269
serializer.resourceFieldParamSerializer(),
270270
relationshipType as string,

‎src/serializer.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ import {
1212
ResourceDocument,
1313
} from '@orbit/jsonapi';
1414
import {
15+
Serializer as OrbitSerializer,
1516
SerializerForFn,
1617
SerializerClassForFn,
1718
SerializerSettingsForFn,
18-
UnknownSerializer,
1919
} from '@orbit/serializers';
2020

2121
export interface SerializerSettings {
@@ -70,7 +70,7 @@ export class Serializer {
7070
serializeResourceTypePath(type: string): string {
7171
const serializer = this.#serializerFor(
7272
JSONAPISerializers.ResourceTypePath
73-
) as UnknownSerializer;
73+
) as OrbitSerializer;
7474
return serializer.serialize(type) as string;
7575
}
7676

‎yarn.lock‎

Lines changed: 83 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -173,78 +173,86 @@
173173
dependencies:
174174
"@octokit/openapi-types" "^5.1.0"
175175

176-
"@orbit/core@^0.17.0-beta.14":
177-
version "0.17.0-beta.14"
178-
resolved "https://registry.yarnpkg.com/@orbit/core/-/core-0.17.0-beta.14.tgz#268308db98f39e3a4d29ba3948eb003cc25ef405"
179-
integrity sha512-W8fvwPqjxJhSXMy2iJkjBaDGEyAO5aPoWTcSAx/WxhHEYFu45BcGpBij0j8OCryKJgSbSpBn5dfP087DZQu9QQ==
180-
dependencies:
181-
"@orbit/utils" "^0.17.0-beta.14"
182-
183-
"@orbit/data@^0.17.0-beta.14":
184-
version "0.17.0-beta.14"
185-
resolved "https://registry.yarnpkg.com/@orbit/data/-/data-0.17.0-beta.14.tgz#910de6aac532f7c50352627f4bddd9837e1a718f"
186-
integrity sha512-sTz45N7fjayrjoE4IBhEubCWhQlW/X6av0+NaYQu9JJgWLeFGb5RO1COV3wgkglIxxQZY5aZEnS75UxCDe9PaA==
187-
dependencies:
188-
"@orbit/core" "^0.17.0-beta.14"
189-
"@orbit/utils" "^0.17.0-beta.14"
190-
191-
"@orbit/immutable@^0.17.0-beta.14":
192-
version "0.17.0-beta.14"
193-
resolved "https://registry.yarnpkg.com/@orbit/immutable/-/immutable-0.17.0-beta.14.tgz#092f85409b82bafda84eaa2280478805ba904ab6"
194-
integrity sha512-8RAXijo9emE4+3S6n8BT8lsQFnTE8O+NlpnBp9TbMjKeEkZCv3lQNgN+M7iJrYfTMRnhqKPevl2EFyAdqPbsOg==
195-
196-
"@orbit/jsonapi@^0.17.0-beta.14":
197-
version "0.17.0-beta.14"
198-
resolved "https://registry.yarnpkg.com/@orbit/jsonapi/-/jsonapi-0.17.0-beta.14.tgz#60a4db4b8281a8c842fb5c8f2f1831c1bc4cf284"
199-
integrity sha512-+M4nROrbUL+UVtRLTIbkVhOXVWVgG/opM1TQ0l6F0+q7F4okiZb1EpEjuixT+pHi+jUZ7Q3OOzcNaG6URcIzRQ==
200-
dependencies:
201-
"@orbit/core" "^0.17.0-beta.14"
202-
"@orbit/data" "^0.17.0-beta.14"
203-
"@orbit/records" "^0.17.0-beta.14"
204-
"@orbit/serializers" "^0.17.0-beta.14"
205-
"@orbit/utils" "^0.17.0-beta.14"
206-
207-
"@orbit/memory@^0.17.0-beta.14":
208-
version "0.17.0-beta.14"
209-
resolved "https://registry.yarnpkg.com/@orbit/memory/-/memory-0.17.0-beta.14.tgz#c35bcfbeac3e4cf44d612d58cae2c5c786e6f079"
210-
integrity sha512-VtpTrB48X/iqgF//pZeKvCxQ5tT98KR3yP3K+jzwEr7yN1fJjyKwgjviFQ93ZR1M1nT629Ga50982S/IKaEZJQ==
211-
dependencies:
212-
"@orbit/core" "^0.17.0-beta.14"
213-
"@orbit/data" "^0.17.0-beta.14"
214-
"@orbit/immutable" "^0.17.0-beta.14"
215-
"@orbit/record-cache" "^0.17.0-beta.14"
216-
"@orbit/records" "^0.17.0-beta.14"
217-
"@orbit/utils" "^0.17.0-beta.14"
218-
219-
"@orbit/record-cache@^0.17.0-beta.14":
220-
version "0.17.0-beta.14"
221-
resolved "https://registry.yarnpkg.com/@orbit/record-cache/-/record-cache-0.17.0-beta.14.tgz#91884ae49f3d11b54db8a4dc4e5a853313fb05f9"
222-
integrity sha512-ygBtm25+ayrsN0sUjwUUhevHaW30g6H9JBrU8lo4Tu0v1Id5NVxsikPTtFCXiZBDQM1QxH1XpV6DLDLPIjH6bQ==
223-
dependencies:
224-
"@orbit/core" "^0.17.0-beta.14"
225-
"@orbit/data" "^0.17.0-beta.14"
226-
"@orbit/records" "^0.17.0-beta.14"
227-
"@orbit/utils" "^0.17.0-beta.14"
228-
229-
"@orbit/records@^0.17.0-beta.14":
230-
version "0.17.0-beta.14"
231-
resolved "https://registry.yarnpkg.com/@orbit/records/-/records-0.17.0-beta.14.tgz#c38b915fbf1dc5b1f7f968452a7898a4e7f7e240"
232-
integrity sha512-Em40SoLdIxwM3wlwz3pif7zfBzFS+HSe1iRqGoQw0kAq3Qlp53bRU4svUT0pIyd/psQnr1FcQJ2ONjYjyll8SQ==
233-
dependencies:
234-
"@orbit/data" "^0.17.0-beta.14"
235-
"@orbit/utils" "^0.17.0-beta.14"
236-
237-
"@orbit/serializers@^0.17.0-beta.14":
238-
version "0.17.0-beta.14"
239-
resolved "https://registry.yarnpkg.com/@orbit/serializers/-/serializers-0.17.0-beta.14.tgz#07a99cdffd1c73762d03de8304539414ecfcb075"
240-
integrity sha512-xOo3vG8oSNZKasK+qvZhX1EHoaVF8EmUEbVx/rE+TnzLSjBPbqtk4+MoUDEMhLHRreCWX2CPsm3Maz0PLTM7QQ==
241-
dependencies:
242-
"@orbit/utils" "^0.17.0-beta.14"
243-
244-
"@orbit/utils@^0.17.0-beta.14":
245-
version "0.17.0-beta.14"
246-
resolved "https://registry.yarnpkg.com/@orbit/utils/-/utils-0.17.0-beta.14.tgz#b9b8dec255cee355e82b21e754e8e2c3bb1e2287"
247-
integrity sha512-1eGvrGKJjXtgBWJ2nQe83nkIk6Kv4QvataoPoc+waRjLdoBIAgIpX7XnVTJ3XMCQO0yDxHQ7wOTpfvtnYwma0A==
176+
"@orbit/core@^0.17.0-beta.25":
177+
version "0.17.0-beta.25"
178+
resolved "https://registry.yarnpkg.com/@orbit/core/-/core-0.17.0-beta.25.tgz#a166531146ba275c32109022cf6903e3f2dc06bf"
179+
integrity sha512-7g26BNqbFipTUjDCIXGkBAVMI3nYihADezS0FA0vsNMMpAPsX8mgEYJYpPaXq6c9C8VUKaz0H700IRqAvP1ZmQ==
180+
dependencies:
181+
"@orbit/utils" "^0.17.0-beta.25"
182+
183+
"@orbit/data@^0.17.0-beta.25":
184+
version "0.17.0-beta.25"
185+
resolved "https://registry.yarnpkg.com/@orbit/data/-/data-0.17.0-beta.25.tgz#8513b48fa587a4d9a7751685deb348f87bab107b"
186+
integrity sha512-eDzZGSn2ocUIuR8N2LTzEgBnVQ1MlHiB8/ZpFoCyL8Acy8ALSAaOx5J5gylDooiSA/+100XtOHhquDgINKFv2g==
187+
dependencies:
188+
"@orbit/core" "^0.17.0-beta.25"
189+
"@orbit/utils" "^0.17.0-beta.25"
190+
191+
"@orbit/immutable@^0.17.0-beta.25":
192+
version "0.17.0-beta.25"
193+
resolved "https://registry.yarnpkg.com/@orbit/immutable/-/immutable-0.17.0-beta.25.tgz#f909eaf797b8888ff712ec744e3d4cd147eb65b2"
194+
integrity sha512-GSUakoJQXtgz+P1QYgJXZ0yUSMwUr8da14nBJNWbNGkuRU1hQ5Me08BLqynKX1C3jxXT0l+V2/auP0B8YLs62A==
195+
196+
"@orbit/jsonapi@0.17.0-beta.25":
197+
version "0.17.0-beta.25"
198+
resolved "https://registry.yarnpkg.com/@orbit/jsonapi/-/jsonapi-0.17.0-beta.25.tgz#1d59b000a677e5e0078941f59799cdd1db489547"
199+
integrity sha512-Z+EInf+D+Es1Wu+tdRJVCbN/48Zkl8tzKnvQ59c6mKSbdLkULG8rE63wDULGCHq63RIBUugZ03OoPFf2Iagujw==
200+
dependencies:
201+
"@orbit/core" "^0.17.0-beta.25"
202+
"@orbit/data" "^0.17.0-beta.25"
203+
"@orbit/records" "^0.17.0-beta.25"
204+
"@orbit/serializers" "^0.17.0-beta.25"
205+
"@orbit/utils" "^0.17.0-beta.25"
206+
207+
"@orbit/memory@0.17.0-beta.25":
208+
version "0.17.0-beta.25"
209+
resolved "https://registry.yarnpkg.com/@orbit/memory/-/memory-0.17.0-beta.25.tgz#4e74c95ecec120409d6e94bd239b246ba02f3ef2"
210+
integrity sha512-nQOhsaysth/J6iZT9eDMkCz/0Q4xlyiAGEeKoRvhaK2pfhSx+9AtZaHTlVVijMGB7U+osJKnnf/bpzTpI1+Whg==
211+
dependencies:
212+
"@orbit/core" "^0.17.0-beta.25"
213+
"@orbit/data" "^0.17.0-beta.25"
214+
"@orbit/immutable" "^0.17.0-beta.25"
215+
"@orbit/record-cache" "^0.17.0-beta.25"
216+
"@orbit/records" "^0.17.0-beta.25"
217+
"@orbit/utils" "^0.17.0-beta.25"
218+
219+
"@orbit/record-cache@^0.17.0-beta.25":
220+
version "0.17.0-beta.25"
221+
resolved "https://registry.yarnpkg.com/@orbit/record-cache/-/record-cache-0.17.0-beta.25.tgz#cf4211446f588aa55980f441f9a056c1614c5e25"
222+
integrity sha512-qoRdwT+EGjX46fVZZSURRBreLwJq8IkF7tiMC16WiZOGWVR76YjnBn0ugRNzYmUTVMc2648EJzkEqzH1glLocA==
223+
dependencies:
224+
"@orbit/core" "^0.17.0-beta.25"
225+
"@orbit/data" "^0.17.0-beta.25"
226+
"@orbit/records" "^0.17.0-beta.25"
227+
"@orbit/utils" "^0.17.0-beta.25"
228+
229+
"@orbit/records@0.17.0-beta.25", "@orbit/records@^0.17.0-beta.25":
230+
version "0.17.0-beta.25"
231+
resolved "https://registry.yarnpkg.com/@orbit/records/-/records-0.17.0-beta.25.tgz#46d41b688499d959422926ee0c66ec7e515e0938"
232+
integrity sha512-Eg9YzvOuWnbNeK69WvSw3huoTFt+7DkDuwsTBeTi4bLjyo+NHbOHmZPHwS7U+VsXjAUtMWA0LCGRKdU836UjDg==
233+
dependencies:
234+
"@orbit/data" "^0.17.0-beta.25"
235+
"@orbit/utils" "^0.17.0-beta.25"
236+
"@orbit/validators" "^0.17.0-beta.25"
237+
238+
"@orbit/serializers@^0.17.0-beta.25":
239+
version "0.17.0-beta.25"
240+
resolved "https://registry.yarnpkg.com/@orbit/serializers/-/serializers-0.17.0-beta.25.tgz#ca26c8b4e18c244db780477e0c21164afe12a211"
241+
integrity sha512-JfrTFqWoaivyRIj9bcq7lHbEnhF3t4PoouplFDbvmvE9AEclnbiQ7J+/Tsr4Xzyk8LCBTNBr50HVvZFgpJRH5g==
242+
dependencies:
243+
"@orbit/utils" "^0.17.0-beta.25"
244+
245+
"@orbit/utils@^0.17.0-beta.25":
246+
version "0.17.0-beta.25"
247+
resolved "https://registry.yarnpkg.com/@orbit/utils/-/utils-0.17.0-beta.25.tgz#95c34c58f732a42addbcb7271213896cb3b29a25"
248+
integrity sha512-7YdfdHlQr+838ikOlu053/dG+8wrn5Ddw/E/7+YCT3UuNtonWy69e3omZkuFsHEf+6zNDV8FouxfOS9txCXFcg==
249+
250+
"@orbit/validators@^0.17.0-beta.25":
251+
version "0.17.0-beta.25"
252+
resolved "https://registry.yarnpkg.com/@orbit/validators/-/validators-0.17.0-beta.25.tgz#54a7d8a591e6128ba3a13e7cf44f5907ea6986b4"
253+
integrity sha512-eB0OIC8gIoeoBDgjKRqW9nji+SNgGA0sD0fr0lQuGmmWmTax4+GQuciXhibiWuh4sBxzQzxfNMrCfOos4h2MSw==
254+
dependencies:
255+
"@orbit/utils" "^0.17.0-beta.25"
248256

249257
"@sindresorhus/is@^0.14.0":
250258
version "0.14.0"
@@ -3316,12 +3324,11 @@ ora@5.3.0:
33163324
strip-ansi "^6.0.0"
33173325
wcwidth "^1.0.1"
33183326

3319-
orbit-sql@^0.4.2:
3327+
"orbit-sql@https://github.com/backspace/orbit-sql.git#orbit-0.17.0-beta.25-no-legacy-test":
33203328
version "0.4.2"
3321-
resolved "https://registry.yarnpkg.com/orbit-sql/-/orbit-sql-0.4.2.tgz#4aca0cb7ca75c1f6e6148743af8651b19bbccac4"
3322-
integrity sha512-SnoojwkoKjRYCP8Dlqt/Y3ZObDvFVOG6meDTBECYBbBJQjeeYfVKt+9nCkqIyGS+jCs3nyeoHo4XDqgigTN4/A==
3329+
resolved "https://github.com/backspace/orbit-sql.git#e0f7e1216adf4b34a9278931f605406fc8e1dbbf"
33233330
dependencies:
3324-
"@orbit/records" "^0.17.0-beta.14"
3331+
"@orbit/records" "0.17.0-beta.25"
33253332
inflected "^2.1.0"
33263333
knex "^0.21.18"
33273334
objection "^2.2.14"

0 commit comments

Comments
 (0)