@feathersjs/adapter-commons 5.0.0-pre.3 → 5.0.0-pre.31
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 +156 -222
- package/LICENSE +1 -1
- package/README.md +2 -2
- package/lib/declarations.d.ts +146 -0
- package/lib/declarations.js +3 -0
- package/lib/declarations.js.map +1 -0
- package/lib/index.d.ts +5 -3
- package/lib/index.js +18 -17
- package/lib/index.js.map +1 -1
- package/lib/query.d.ts +21 -0
- package/lib/query.js +115 -0
- package/lib/query.js.map +1 -0
- package/lib/service.d.ts +86 -62
- package/lib/service.js +129 -65
- package/lib/service.js.map +1 -1
- package/lib/sort.d.ts +6 -4
- package/lib/sort.js +35 -47
- package/lib/sort.js.map +1 -1
- package/package.json +18 -16
- package/src/declarations.ts +156 -0
- package/src/index.ts +15 -18
- package/src/query.ts +137 -0
- package/src/service.ts +209 -151
- package/src/sort.ts +86 -66
- package/lib/filter-query.d.ts +0 -10
- package/lib/filter-query.js +0 -96
- package/lib/filter-query.js.map +0 -1
- package/src/filter-query.ts +0 -116
package/lib/service.js
CHANGED
|
@@ -1,38 +1,28 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
3
|
+
exports.AdapterBase = void 0;
|
|
13
4
|
const errors_1 = require("@feathersjs/errors");
|
|
14
|
-
const
|
|
15
|
-
const callMethod = (self, name, ...args) => {
|
|
16
|
-
if (typeof self[name] !== 'function') {
|
|
17
|
-
return Promise.reject(new errors_1.NotImplemented(`Method ${name} not available`));
|
|
18
|
-
}
|
|
19
|
-
return self[name](...args);
|
|
20
|
-
};
|
|
5
|
+
const query_1 = require("./query");
|
|
21
6
|
const alwaysMulti = {
|
|
22
7
|
find: true,
|
|
23
8
|
get: false,
|
|
24
9
|
update: false
|
|
25
10
|
};
|
|
26
|
-
|
|
11
|
+
/**
|
|
12
|
+
* An abstract base class that a database adapter can extend from to implement the
|
|
13
|
+
* `__find`, `__get`, `__update`, `__patch` and `__remove` methods.
|
|
14
|
+
*/
|
|
15
|
+
class AdapterBase {
|
|
27
16
|
constructor(options) {
|
|
28
|
-
this.options =
|
|
17
|
+
this.options = {
|
|
29
18
|
id: 'id',
|
|
30
19
|
events: [],
|
|
31
|
-
paginate:
|
|
20
|
+
paginate: false,
|
|
32
21
|
multi: false,
|
|
33
|
-
filters:
|
|
34
|
-
|
|
35
|
-
|
|
22
|
+
filters: {},
|
|
23
|
+
operators: [],
|
|
24
|
+
...options
|
|
25
|
+
};
|
|
36
26
|
}
|
|
37
27
|
get id() {
|
|
38
28
|
return this.options.id;
|
|
@@ -40,64 +30,138 @@ class AdapterService {
|
|
|
40
30
|
get events() {
|
|
41
31
|
return this.options.events;
|
|
42
32
|
}
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
paginate
|
|
51
|
-
}, opts);
|
|
52
|
-
const result = filter_query_1.filterQuery(query, options);
|
|
53
|
-
return Object.assign(result, { paginate });
|
|
54
|
-
}
|
|
55
|
-
allowsMulti(method) {
|
|
33
|
+
/**
|
|
34
|
+
* Check if this adapter allows multiple updates for a method.
|
|
35
|
+
* @param method The method name to check.
|
|
36
|
+
* @param params The service call params.
|
|
37
|
+
* @returns Wether or not multiple updates are allowed.
|
|
38
|
+
*/
|
|
39
|
+
allowsMulti(method, params = {}) {
|
|
56
40
|
const always = alwaysMulti[method];
|
|
57
41
|
if (typeof always !== 'undefined') {
|
|
58
42
|
return always;
|
|
59
43
|
}
|
|
60
|
-
const
|
|
61
|
-
if (
|
|
62
|
-
return
|
|
63
|
-
}
|
|
64
|
-
else {
|
|
65
|
-
return option.includes(method);
|
|
44
|
+
const { multi } = this.getOptions(params);
|
|
45
|
+
if (multi === true || multi === false) {
|
|
46
|
+
return multi;
|
|
66
47
|
}
|
|
48
|
+
return multi.includes(method);
|
|
67
49
|
}
|
|
68
|
-
|
|
69
|
-
|
|
50
|
+
/**
|
|
51
|
+
* Returns the combined options for a service call. Options will be merged
|
|
52
|
+
* with `this.options` and `params.adapter` for dynamic overrides.
|
|
53
|
+
*
|
|
54
|
+
* @param params The parameters for the service method call
|
|
55
|
+
* @returns The actual options for this call
|
|
56
|
+
*/
|
|
57
|
+
getOptions(params) {
|
|
58
|
+
const paginate = params.paginate !== undefined ? params.paginate : this.options.paginate;
|
|
59
|
+
return {
|
|
60
|
+
...this.options,
|
|
61
|
+
paginate,
|
|
62
|
+
...params.adapter
|
|
63
|
+
};
|
|
70
64
|
}
|
|
71
|
-
|
|
72
|
-
|
|
65
|
+
/**
|
|
66
|
+
* Sanitize the incoming data, e.g. removing invalid keywords etc.
|
|
67
|
+
*
|
|
68
|
+
* @param data The data to sanitize
|
|
69
|
+
* @param _params Service call parameters
|
|
70
|
+
* @returns The sanitized data
|
|
71
|
+
*/
|
|
72
|
+
async sanitizeData(data, _params) {
|
|
73
|
+
return data;
|
|
73
74
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
75
|
+
/**
|
|
76
|
+
* Returns a sanitized version of `params.query`, converting filter values
|
|
77
|
+
* (like $limit and $skip) into the expected type. Will throw an error if
|
|
78
|
+
* a `$` prefixed filter or operator value that is not allowed in `filters`
|
|
79
|
+
* or `operators` is encountered.
|
|
80
|
+
*
|
|
81
|
+
* @param params The service call parameter.
|
|
82
|
+
* @returns A new object containing the sanitized query.
|
|
83
|
+
*/
|
|
84
|
+
async sanitizeQuery(params = {}) {
|
|
85
|
+
const options = this.getOptions(params);
|
|
86
|
+
const { query, filters } = (0, query_1.filterQuery)(params.query, options);
|
|
87
|
+
return {
|
|
88
|
+
...filters,
|
|
89
|
+
...query
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
async _find(params) {
|
|
93
|
+
const query = await this.sanitizeQuery(params);
|
|
94
|
+
return this.$find({
|
|
95
|
+
...params,
|
|
96
|
+
query
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
/**
|
|
100
|
+
* Retrieve a single resource matching the given ID, skipping any service-level hooks but sanitize the query
|
|
101
|
+
* with allowed filters and properties by calling `sanitizeQuery`.
|
|
102
|
+
*
|
|
103
|
+
* @param id - ID of the resource to locate
|
|
104
|
+
* @param params - Service call parameters {@link Params}
|
|
105
|
+
* @see {@link HookLessServiceMethods}
|
|
106
|
+
* @see {@link https://docs.feathersjs.com/api/services.html#get-id-params|Feathers API Documentation: .get(id, params)}
|
|
107
|
+
*/
|
|
108
|
+
async _get(id, params) {
|
|
109
|
+
const query = await this.sanitizeQuery(params);
|
|
110
|
+
return this.$get(id, {
|
|
111
|
+
...params,
|
|
112
|
+
query
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
async _create(data, params) {
|
|
116
|
+
if (Array.isArray(data) && !this.allowsMulti('create', params)) {
|
|
117
|
+
throw new errors_1.MethodNotAllowed('Can not create multiple entries');
|
|
77
118
|
}
|
|
78
|
-
|
|
119
|
+
const payload = Array.isArray(data)
|
|
120
|
+
? await Promise.all(data.map((current) => this.sanitizeData(current, params)))
|
|
121
|
+
: await this.sanitizeData(data, params);
|
|
122
|
+
return this.$create(payload, params);
|
|
79
123
|
}
|
|
80
|
-
|
|
124
|
+
/**
|
|
125
|
+
* Replace any resources matching the given ID with the given data, skipping any service-level hooks.
|
|
126
|
+
*
|
|
127
|
+
* @param id - ID of the resource to be updated
|
|
128
|
+
* @param data - Data to be put in place of the current resource.
|
|
129
|
+
* @param params - Service call parameters {@link Params}
|
|
130
|
+
* @see {@link HookLessServiceMethods}
|
|
131
|
+
* @see {@link https://docs.feathersjs.com/api/services.html#update-id-data-params|Feathers API Documentation: .update(id, data, params)}
|
|
132
|
+
*/
|
|
133
|
+
async _update(id, data, params) {
|
|
81
134
|
if (id === null || Array.isArray(data)) {
|
|
82
|
-
|
|
135
|
+
throw new errors_1.BadRequest("You can not replace multiple instances. Did you mean 'patch'?");
|
|
83
136
|
}
|
|
84
|
-
|
|
137
|
+
const payload = await this.sanitizeData(data, params);
|
|
138
|
+
const query = await this.sanitizeQuery(params);
|
|
139
|
+
return this.$update(id, payload, {
|
|
140
|
+
...params,
|
|
141
|
+
query
|
|
142
|
+
});
|
|
85
143
|
}
|
|
86
|
-
|
|
87
|
-
if (id === null && !this.allowsMulti('patch')) {
|
|
88
|
-
|
|
144
|
+
async _patch(id, data, params) {
|
|
145
|
+
if (id === null && !this.allowsMulti('patch', params)) {
|
|
146
|
+
throw new errors_1.MethodNotAllowed('Can not patch multiple entries');
|
|
89
147
|
}
|
|
90
|
-
|
|
148
|
+
const { $limit, ...query } = await this.sanitizeQuery(params);
|
|
149
|
+
const payload = await this.sanitizeData(data, params);
|
|
150
|
+
return this.$patch(id, payload, {
|
|
151
|
+
...params,
|
|
152
|
+
query
|
|
153
|
+
});
|
|
91
154
|
}
|
|
92
|
-
|
|
93
|
-
if (id === null && !this.allowsMulti('remove')) {
|
|
94
|
-
|
|
155
|
+
async _remove(id, params) {
|
|
156
|
+
if (id === null && !this.allowsMulti('remove', params)) {
|
|
157
|
+
throw new errors_1.MethodNotAllowed('Can not remove multiple entries');
|
|
95
158
|
}
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
159
|
+
const { $limit, ...query } = await this.sanitizeQuery(params);
|
|
160
|
+
return this.$remove(id, {
|
|
161
|
+
...params,
|
|
162
|
+
query
|
|
163
|
+
});
|
|
100
164
|
}
|
|
101
165
|
}
|
|
102
|
-
exports.
|
|
166
|
+
exports.AdapterBase = AdapterBase;
|
|
103
167
|
//# sourceMappingURL=service.js.map
|
package/lib/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
|
package/lib/sort.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
export declare function compareNSB(a: any, b: any): 1 |
|
|
2
|
-
export declare function compareArrays(a: any, b: any):
|
|
3
|
-
export declare function compare(a: any, b: any, compareStrings?: any):
|
|
4
|
-
export declare function sorter($sort:
|
|
1
|
+
export declare function compareNSB(a: any, b: any): 1 | -1 | 0;
|
|
2
|
+
export declare function compareArrays(a: any[], b: any[]): 1 | -1 | 0;
|
|
3
|
+
export declare function compare(a: any, b: any, compareStrings?: any): 0 | 1 | -1;
|
|
4
|
+
export declare function sorter($sort: {
|
|
5
|
+
[key: string]: -1 | 1;
|
|
6
|
+
}): (a: any, b: any) => number;
|
package/lib/sort.js
CHANGED
|
@@ -14,77 +14,76 @@ function compareNSB(a, b) {
|
|
|
14
14
|
}
|
|
15
15
|
exports.compareNSB = compareNSB;
|
|
16
16
|
function compareArrays(a, b) {
|
|
17
|
-
let i;
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
if (comp !== 0) {
|
|
22
|
-
return comp;
|
|
17
|
+
for (let i = 0, l = Math.min(a.length, b.length); i < l; i++) {
|
|
18
|
+
const comparison = compare(a[i], b[i]);
|
|
19
|
+
if (comparison !== 0) {
|
|
20
|
+
return comparison;
|
|
23
21
|
}
|
|
24
22
|
}
|
|
25
23
|
// Common section was identical, longest one wins
|
|
26
|
-
return
|
|
24
|
+
return compareNSB(a.length, b.length);
|
|
27
25
|
}
|
|
28
26
|
exports.compareArrays = compareArrays;
|
|
29
|
-
function compare(a, b, compareStrings =
|
|
30
|
-
|
|
27
|
+
function compare(a, b, compareStrings = compareNSB) {
|
|
28
|
+
if (a === b) {
|
|
29
|
+
return 0;
|
|
30
|
+
}
|
|
31
31
|
// undefined
|
|
32
32
|
if (a === undefined) {
|
|
33
|
-
return
|
|
33
|
+
return -1;
|
|
34
34
|
}
|
|
35
35
|
if (b === undefined) {
|
|
36
|
-
return
|
|
36
|
+
return 1;
|
|
37
37
|
}
|
|
38
38
|
// null
|
|
39
39
|
if (a === null) {
|
|
40
|
-
return
|
|
40
|
+
return -1;
|
|
41
41
|
}
|
|
42
42
|
if (b === null) {
|
|
43
|
-
return
|
|
43
|
+
return 1;
|
|
44
44
|
}
|
|
45
45
|
// Numbers
|
|
46
46
|
if (typeof a === 'number') {
|
|
47
47
|
return typeof b === 'number' ? compareNSB(a, b) : -1;
|
|
48
48
|
}
|
|
49
49
|
if (typeof b === 'number') {
|
|
50
|
-
return
|
|
50
|
+
return 1;
|
|
51
51
|
}
|
|
52
52
|
// Strings
|
|
53
53
|
if (typeof a === 'string') {
|
|
54
54
|
return typeof b === 'string' ? compareStrings(a, b) : -1;
|
|
55
55
|
}
|
|
56
56
|
if (typeof b === 'string') {
|
|
57
|
-
return
|
|
57
|
+
return 1;
|
|
58
58
|
}
|
|
59
59
|
// Booleans
|
|
60
60
|
if (typeof a === 'boolean') {
|
|
61
61
|
return typeof b === 'boolean' ? compareNSB(a, b) : -1;
|
|
62
62
|
}
|
|
63
63
|
if (typeof b === 'boolean') {
|
|
64
|
-
return
|
|
64
|
+
return 1;
|
|
65
65
|
}
|
|
66
66
|
// Dates
|
|
67
67
|
if (a instanceof Date) {
|
|
68
68
|
return b instanceof Date ? compareNSB(a.getTime(), b.getTime()) : -1;
|
|
69
69
|
}
|
|
70
70
|
if (b instanceof Date) {
|
|
71
|
-
return
|
|
71
|
+
return 1;
|
|
72
72
|
}
|
|
73
73
|
// Arrays (first element is most significant and so on)
|
|
74
74
|
if (Array.isArray(a)) {
|
|
75
75
|
return Array.isArray(b) ? compareArrays(a, b) : -1;
|
|
76
76
|
}
|
|
77
77
|
if (Array.isArray(b)) {
|
|
78
|
-
return
|
|
78
|
+
return 1;
|
|
79
79
|
}
|
|
80
80
|
// Objects
|
|
81
81
|
const aKeys = Object.keys(a).sort();
|
|
82
82
|
const bKeys = Object.keys(b).sort();
|
|
83
|
-
let
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
return comp;
|
|
83
|
+
for (let i = 0, l = Math.min(aKeys.length, bKeys.length); i < l; i++) {
|
|
84
|
+
const comparison = compare(a[aKeys[i]], b[bKeys[i]]);
|
|
85
|
+
if (comparison !== 0) {
|
|
86
|
+
return comparison;
|
|
88
87
|
}
|
|
89
88
|
}
|
|
90
89
|
return compareNSB(aKeys.length, bKeys.length);
|
|
@@ -93,33 +92,22 @@ exports.compare = compare;
|
|
|
93
92
|
// An in-memory sorting function according to the
|
|
94
93
|
// $sort special query parameter
|
|
95
94
|
function sorter($sort) {
|
|
96
|
-
|
|
97
|
-
const
|
|
98
|
-
let keys = sortKeys.map(key => key);
|
|
99
|
-
let val = a;
|
|
100
|
-
do {
|
|
101
|
-
let key = keys.shift();
|
|
102
|
-
val = val[key];
|
|
103
|
-
} while (keys.length);
|
|
104
|
-
return val;
|
|
105
|
-
};
|
|
106
|
-
const criteria = Object.keys($sort).map(key => {
|
|
95
|
+
const get = (value, path) => path.reduce((value, key) => value[key], value);
|
|
96
|
+
const compares = Object.keys($sort).map((key) => {
|
|
107
97
|
const direction = $sort[key];
|
|
108
|
-
const
|
|
109
|
-
|
|
110
|
-
|
|
98
|
+
const path = key.split('.');
|
|
99
|
+
if (path.length === 1) {
|
|
100
|
+
return (a, b) => direction * compare(a[key], b[key]);
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
return (a, b) => direction * compare(get(a, path), get(b, path));
|
|
104
|
+
}
|
|
111
105
|
});
|
|
112
106
|
return function (a, b) {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
if (
|
|
116
|
-
|
|
117
|
-
}
|
|
118
|
-
else {
|
|
119
|
-
compare = criterion.direction * exports.compare(a[criterion.keys[0]], b[criterion.keys[0]]);
|
|
120
|
-
}
|
|
121
|
-
if (compare !== 0) {
|
|
122
|
-
return compare;
|
|
107
|
+
for (const compare of compares) {
|
|
108
|
+
const comparasion = compare(a, b);
|
|
109
|
+
if (comparasion !== 0) {
|
|
110
|
+
return comparasion;
|
|
123
111
|
}
|
|
124
112
|
}
|
|
125
113
|
return 0;
|
package/lib/sort.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sort.js","sourceRoot":"","sources":["../src/sort.ts"],"names":[],"mappings":";AAAA,4EAA4E;AAC5E,4GAA4G;;;AAE5G,SAAgB,UAAU,
|
|
1
|
+
{"version":3,"file":"sort.js","sourceRoot":"","sources":["../src/sort.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@feathersjs/adapter-commons",
|
|
3
|
-
"version": "5.0.0-pre.
|
|
3
|
+
"version": "5.0.0-pre.31",
|
|
4
4
|
"description": "Shared database adapter utility functions",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"keywords": [
|
|
@@ -13,7 +13,8 @@
|
|
|
13
13
|
},
|
|
14
14
|
"repository": {
|
|
15
15
|
"type": "git",
|
|
16
|
-
"url": "git://github.com/feathersjs/
|
|
16
|
+
"url": "git://github.com/feathersjs/feathers.git",
|
|
17
|
+
"directory": "packages/adapter-commons"
|
|
17
18
|
},
|
|
18
19
|
"author": {
|
|
19
20
|
"name": "Feathers contributor",
|
|
@@ -22,7 +23,7 @@
|
|
|
22
23
|
},
|
|
23
24
|
"contributors": [],
|
|
24
25
|
"bugs": {
|
|
25
|
-
"url": "https://github.com/feathersjs/
|
|
26
|
+
"url": "https://github.com/feathersjs/feathers/issues"
|
|
26
27
|
},
|
|
27
28
|
"engines": {
|
|
28
29
|
"node": ">= 12"
|
|
@@ -31,7 +32,8 @@
|
|
|
31
32
|
"types": "lib/",
|
|
32
33
|
"scripts": {
|
|
33
34
|
"prepublish": "npm run compile",
|
|
34
|
-
"
|
|
35
|
+
"pack": "npm pack --pack-destination ../cli/test/build",
|
|
36
|
+
"compile": "shx rm -rf lib/ && tsc && npm run pack",
|
|
35
37
|
"test": "mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts"
|
|
36
38
|
},
|
|
37
39
|
"directories": {
|
|
@@ -48,19 +50,19 @@
|
|
|
48
50
|
"access": "public"
|
|
49
51
|
},
|
|
50
52
|
"dependencies": {
|
|
51
|
-
"@feathersjs/commons": "^5.0.0-pre.
|
|
52
|
-
"@feathersjs/errors": "^5.0.0-pre.
|
|
53
|
-
"@feathersjs/feathers": "^5.0.0-pre.
|
|
53
|
+
"@feathersjs/commons": "^5.0.0-pre.31",
|
|
54
|
+
"@feathersjs/errors": "^5.0.0-pre.31",
|
|
55
|
+
"@feathersjs/feathers": "^5.0.0-pre.31"
|
|
54
56
|
},
|
|
55
57
|
"devDependencies": {
|
|
56
|
-
"@types/mocha": "^
|
|
57
|
-
"@types/mongodb": "^
|
|
58
|
-
"@types/node": "^
|
|
59
|
-
"mocha": "^
|
|
60
|
-
"mongodb": "^
|
|
61
|
-
"shx": "^0.3.
|
|
62
|
-
"ts-node": "^9.1
|
|
63
|
-
"typescript": "^4.
|
|
58
|
+
"@types/mocha": "^10.0.0",
|
|
59
|
+
"@types/mongodb": "^4.0.6",
|
|
60
|
+
"@types/node": "^18.8.2",
|
|
61
|
+
"mocha": "^10.0.0",
|
|
62
|
+
"mongodb": "^4.10.0",
|
|
63
|
+
"shx": "^0.3.4",
|
|
64
|
+
"ts-node": "^10.9.1",
|
|
65
|
+
"typescript": "^4.8.4"
|
|
64
66
|
},
|
|
65
|
-
"gitHead": "
|
|
67
|
+
"gitHead": "4500dbeb8cea566678cf88b3313a88efd93a2ed9"
|
|
66
68
|
}
|