@unchainedshop/api 1.2.17 → 1.2.20
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/acl.d.ts +2 -2
- package/lib/acl.js.map +1 -1
- package/lib/createBulkImportServer.js +2 -2
- package/lib/createBulkImportServer.js.map +1 -1
- package/lib/resolvers/queries/filters/searchProducts.d.ts +1 -0
- package/lib/resolvers/queries/filters/searchProducts.js +3 -3
- package/lib/resolvers/queries/filters/searchProducts.js.map +1 -1
- package/lib/resolvers/type/assortment/assortment-types.d.ts +1 -0
- package/lib/resolvers/type/assortment/assortment-types.js.map +1 -1
- package/package.json +2 -2
- package/src/acl.ts +3 -3
- package/src/createBulkImportServer.ts +2 -2
- package/src/resolvers/queries/filters/searchProducts.ts +4 -3
- package/src/resolvers/type/assortment/assortment-types.ts +1 -0
package/lib/acl.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { CheckPermissionArgs } from '@unchainedshop/types/roles';
|
|
2
2
|
declare const checkAction: (context: any, action: any, args?: CheckPermissionArgs, options?: any) => Promise<void>;
|
|
3
|
-
declare const checkResolver: (action: any, userOptions
|
|
3
|
+
declare const checkResolver: (action: any, userOptions?: any) => (fn: any, name?: string) => (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
|
|
4
4
|
declare const checkTypeResolver: (action: any, key: any) => (obj: any, params: any, context: any) => Promise<any>;
|
|
5
|
-
declare const resolverDecorator: (action: any, userOptions
|
|
5
|
+
declare const resolverDecorator: (action: any, userOptions?: any) => (target: any, key: any, descriptor: any) => {
|
|
6
6
|
configurable: boolean;
|
|
7
7
|
get(): (root: any, params: any, context: any, ...other: any[]) => Promise<any>;
|
|
8
8
|
};
|
package/lib/acl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"acl.js","sourceRoot":"","sources":["../src/acl.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAEpE,MAAM,cAAc,GAAG;IACrB,OAAO,EAAE,IAAI;IACb,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI;CAC3B,CAAC;AAEF,MAAM,WAAW,GAAG,EAAE,CAAC;AACvB,MAAM,UAAU,GAAwB,EAAE,CAAC;AAE3C,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;IACjD,IAAI,CAAC,MAAM,EAAE;QACX,MAAM,IAAI,qBAAqB,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;KAClD;AACH,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE;IACpD,IAAI,OAAO,EAAE,KAAK,UAAU,EAAE;QAC5B,MAAM,IAAI,qBAAqB,CAAC;YAC9B,MAAM;YACN,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;SAChC,CAAC,CAAC;KACJ;AACH,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,GAAG,UAAU,EAAE,UAAe,WAAW,EAAE,EAAE;IAC3F,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,IAAI,WAAW,CAAC;IAEvC,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAC3E,IAAI,aAAa;QAAE,OAAO;IAE1B,MAAM,OAAO,GAAG,GAAG,IAAI,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAExD,MAAM,IAAI,iBAAiB,CAAC;QAC1B,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM;QACN,GAAG;QACH,OAAO,EAAE,aACP,OAAO,CAAC,MAAM,IAAI,EACpB,8CAA8C,MAAM,IAAI,OAAO,EAAE;KAClE,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"acl.js","sourceRoot":"","sources":["../src/acl.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { checkAction } from './acl';
|
|
|
4
4
|
import { actions } from './roles';
|
|
5
5
|
import { useMiddlewareWithCurrentContext } from './context';
|
|
6
6
|
const logger = createLogger('unchained:api');
|
|
7
|
-
const { BULK_IMPORT_API_PATH = '/bulk-import' } = process.env;
|
|
7
|
+
const { BULK_IMPORT_API_PATH = '/bulk-import', BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY } = process.env;
|
|
8
8
|
const errorHandler = (res) => (e) => {
|
|
9
9
|
logger.error(e.message);
|
|
10
10
|
res.writeHead(503);
|
|
@@ -39,7 +39,7 @@ const bulkImportMiddleware = async (req, res) => {
|
|
|
39
39
|
const input = {
|
|
40
40
|
createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
|
|
41
41
|
skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
|
|
42
|
-
fsPayloadCacheDirectory:
|
|
42
|
+
fsPayloadCacheDirectory: BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY,
|
|
43
43
|
remoteAddress: resolvedContext.remoteAddress,
|
|
44
44
|
};
|
|
45
45
|
const stream = input.fsPayloadCacheDirectory
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createBulkImportServer.js","sourceRoot":"","sources":["../src/createBulkImportServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAE,MAAM,IAAI,CAAC;AAEpB,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,OAAO,EAAE,+BAA+B,EAAE,MAAM,WAAW,CAAC;AAE5D,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;AAE7C,MAAM,EAAE,oBAAoB,GAAG,cAAc,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"createBulkImportServer.js","sourceRoot":"","sources":["../src/createBulkImportServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { QueryStringRequiredError } from '../../../errors';
|
|
|
3
3
|
export default async function searchProducts(root, query, context) {
|
|
4
4
|
const { modules, userId } = context;
|
|
5
5
|
const forceLiveCollection = false;
|
|
6
|
-
const { queryString, includeInactive, filterQuery, assortmentId, ignoreChildAssortments } = query;
|
|
6
|
+
const { queryString, includeInactive, filterQuery, assortmentId, ignoreChildAssortments, ...rest } = query;
|
|
7
7
|
log(`query search ${assortmentId} ${JSON.stringify(query)}`, { userId });
|
|
8
8
|
if (assortmentId) {
|
|
9
9
|
const productIds = await modules.assortments.findProductIds({
|
|
@@ -14,10 +14,10 @@ export default async function searchProducts(root, query, context) {
|
|
|
14
14
|
const filterIds = await modules.assortments.filters.findFilterIds({
|
|
15
15
|
assortmentId,
|
|
16
16
|
});
|
|
17
|
-
return modules.filters.search.searchProducts({ queryString, includeInactive, filterQuery, productIds, filterIds }, { forceLiveCollection }, context);
|
|
17
|
+
return modules.filters.search.searchProducts({ queryString, includeInactive, filterQuery, productIds, filterIds, ...rest }, { forceLiveCollection }, context);
|
|
18
18
|
}
|
|
19
19
|
if (!queryString)
|
|
20
20
|
throw new QueryStringRequiredError({});
|
|
21
|
-
return modules.filters.search.searchProducts({ queryString, includeInactive, filterQuery }, { forceLiveCollection }, context);
|
|
21
|
+
return modules.filters.search.searchProducts({ queryString, includeInactive, filterQuery, ...rest }, { forceLiveCollection }, context);
|
|
22
22
|
}
|
|
23
23
|
//# sourceMappingURL=searchProducts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchProducts.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/filters/searchProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,
|
|
1
|
+
{"version":3,"file":"searchProducts.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/filters/searchProducts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAE3D,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,cAAc,CAC1C,IAAU,EACV,KAOC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,mBAAmB,GAAG,KAAK,CAAC;IAClC,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,YAAY,EAAE,sBAAsB,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IAE3G,GAAG,CAAC,gBAAgB,YAAY,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEzE,IAAI,YAAY,EAAE;QAChB,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC;YAC1D,YAAY;YACZ,mBAAmB;YACnB,sBAAsB;SACvB,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC;YAChE,YAAY;SACb,CAAC,CAAC;QACH,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAC1C,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAC7E,EAAE,mBAAmB,EAAE,EACvB,OAAO,CACR,CAAC;KACH;IAED,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,wBAAwB,CAAC,EAAE,CAAC,CAAC;IAEzD,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAC1C,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,GAAG,IAAI,EAAE,EACtD,EAAE,mBAAmB,EAAE,EACvB,OAAO,CACR,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assortment-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"assortment-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/api",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.20",
|
|
4
4
|
"main": "lib/api-index.js",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./lib/api-index.js",
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
"@types/graphql-upload": "^8.0.11",
|
|
52
52
|
"@types/locale": "^0.1.1",
|
|
53
53
|
"@types/node": "^16.11.49",
|
|
54
|
-
"@unchainedshop/types": "^1.2.
|
|
54
|
+
"@unchainedshop/types": "^1.2.18",
|
|
55
55
|
"apollo-server-express": "2.x",
|
|
56
56
|
"graphql": "^15.8.0",
|
|
57
57
|
"jest": "^28.1.3",
|
package/src/acl.ts
CHANGED
|
@@ -43,7 +43,7 @@ const checkAction = async (context, action, args = emptyArray, options: any = em
|
|
|
43
43
|
});
|
|
44
44
|
};
|
|
45
45
|
|
|
46
|
-
const wrapFunction = (fn, name, action, userOptions) => {
|
|
46
|
+
const wrapFunction = (fn, name, action, userOptions?: any) => {
|
|
47
47
|
const key = name || fn.name;
|
|
48
48
|
const options = { ...defaultOptions, ...userOptions };
|
|
49
49
|
ensureIsFunction(fn, action, options, key);
|
|
@@ -56,7 +56,7 @@ const wrapFunction = (fn, name, action, userOptions) => {
|
|
|
56
56
|
};
|
|
57
57
|
};
|
|
58
58
|
|
|
59
|
-
const checkResolver = (action, userOptions) => {
|
|
59
|
+
const checkResolver = (action, userOptions?: any) => {
|
|
60
60
|
ensureActionExists(action, userOptions);
|
|
61
61
|
return (fn: any, name?: string) => wrapFunction(fn, name, action, userOptions);
|
|
62
62
|
};
|
|
@@ -70,7 +70,7 @@ const checkTypeResolver = (action, key) =>
|
|
|
70
70
|
return obj[key];
|
|
71
71
|
};
|
|
72
72
|
|
|
73
|
-
const resolverDecorator = function resolverDecorator(action, userOptions) {
|
|
73
|
+
const resolverDecorator = function resolverDecorator(action, userOptions?: any) {
|
|
74
74
|
ensureActionExists(action, userOptions);
|
|
75
75
|
return function decorator(target, key, descriptor) {
|
|
76
76
|
const fn = descriptor.value || target[key];
|
|
@@ -9,7 +9,7 @@ import { useMiddlewareWithCurrentContext } from './context';
|
|
|
9
9
|
|
|
10
10
|
const logger = createLogger('unchained:api');
|
|
11
11
|
|
|
12
|
-
const { BULK_IMPORT_API_PATH = '/bulk-import' } = process.env;
|
|
12
|
+
const { BULK_IMPORT_API_PATH = '/bulk-import', BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY } = process.env;
|
|
13
13
|
|
|
14
14
|
const errorHandler = (res) => (e) => {
|
|
15
15
|
logger.error(e.message);
|
|
@@ -51,7 +51,7 @@ const bulkImportMiddleware = async (req, res) => {
|
|
|
51
51
|
const input: any = {
|
|
52
52
|
createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
|
|
53
53
|
skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
|
|
54
|
-
fsPayloadCacheDirectory:
|
|
54
|
+
fsPayloadCacheDirectory: BULK_IMPORT_PAYLOAD_CACHE_DIRECTORY,
|
|
55
55
|
remoteAddress: resolvedContext.remoteAddress,
|
|
56
56
|
};
|
|
57
57
|
|
|
@@ -11,12 +11,13 @@ export default async function searchProducts(
|
|
|
11
11
|
ignoreChildAssortments: boolean;
|
|
12
12
|
includeInactive: boolean;
|
|
13
13
|
queryString?: string;
|
|
14
|
+
orderBy?: string;
|
|
14
15
|
},
|
|
15
16
|
context: Context,
|
|
16
17
|
) {
|
|
17
18
|
const { modules, userId } = context;
|
|
18
19
|
const forceLiveCollection = false;
|
|
19
|
-
const { queryString, includeInactive, filterQuery, assortmentId, ignoreChildAssortments } = query;
|
|
20
|
+
const { queryString, includeInactive, filterQuery, assortmentId, ignoreChildAssortments, ...rest } = query;
|
|
20
21
|
|
|
21
22
|
log(`query search ${assortmentId} ${JSON.stringify(query)}`, { userId });
|
|
22
23
|
|
|
@@ -30,7 +31,7 @@ export default async function searchProducts(
|
|
|
30
31
|
assortmentId,
|
|
31
32
|
});
|
|
32
33
|
return modules.filters.search.searchProducts(
|
|
33
|
-
{ queryString, includeInactive, filterQuery, productIds, filterIds },
|
|
34
|
+
{ queryString, includeInactive, filterQuery, productIds, filterIds, ...rest },
|
|
34
35
|
{ forceLiveCollection },
|
|
35
36
|
context,
|
|
36
37
|
);
|
|
@@ -39,7 +40,7 @@ export default async function searchProducts(
|
|
|
39
40
|
if (!queryString) throw new QueryStringRequiredError({});
|
|
40
41
|
|
|
41
42
|
return modules.filters.search.searchProducts(
|
|
42
|
-
{ queryString, includeInactive, filterQuery },
|
|
43
|
+
{ queryString, includeInactive, filterQuery, ...rest },
|
|
43
44
|
{ forceLiveCollection },
|
|
44
45
|
context,
|
|
45
46
|
);
|