@vendure/core 2.1.6 → 2.2.0-next.1
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/dist/api/common/graphql-value-transformer.js +4 -0
- package/dist/api/common/graphql-value-transformer.js.map +1 -1
- package/dist/api/config/generate-list-options.js +19 -15
- package/dist/api/config/generate-list-options.js.map +1 -1
- package/dist/api/resolvers/admin/global-settings.resolver.js +2 -0
- package/dist/api/resolvers/admin/global-settings.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/global-settings.type.graphql +1 -0
- package/dist/api/schema/admin-api/product-admin.type.graphql +0 -1
- package/dist/api/schema/admin-api/product.api.graphql +1 -0
- package/dist/api/schema/common/product.type.graphql +1 -0
- package/dist/bootstrap.d.ts +66 -3
- package/dist/bootstrap.js +49 -13
- package/dist/bootstrap.js.map +1 -1
- package/dist/common/types/common-types.d.ts +3 -0
- package/dist/config/entity/bigint-money-strategy.d.ts +1 -0
- package/dist/config/entity/bigint-money-strategy.js +1 -0
- package/dist/config/entity/bigint-money-strategy.js.map +1 -1
- package/dist/config/entity/default-money-strategy.d.ts +1 -0
- package/dist/config/entity/default-money-strategy.js +1 -0
- package/dist/config/entity/default-money-strategy.js.map +1 -1
- package/dist/config/entity/money-strategy.d.ts +35 -4
- package/dist/config/vendure-config.d.ts +21 -2
- package/dist/data-import/providers/populator/populator.js +2 -1
- package/dist/data-import/providers/populator/populator.js.map +1 -1
- package/dist/data-import/types.d.ts +1 -0
- package/dist/job-queue/in-memory-job-queue-strategy.js +3 -0
- package/dist/job-queue/in-memory-job-queue-strategy.js.map +1 -1
- package/dist/service/helpers/list-query-builder/list-query-builder.d.ts +14 -1
- package/dist/service/helpers/list-query-builder/list-query-builder.js +73 -31
- package/dist/service/helpers/list-query-builder/list-query-builder.js.map +1 -1
- package/dist/service/helpers/list-query-builder/parse-filter-params.d.ts +12 -3
- package/dist/service/helpers/list-query-builder/parse-filter-params.js +44 -28
- package/dist/service/helpers/list-query-builder/parse-filter-params.js.map +1 -1
- package/dist/service/services/customer.service.js +1 -2
- package/dist/service/services/customer.service.js.map +1 -1
- package/dist/service/services/product-variant.service.js +1 -2
- package/dist/service/services/product-variant.service.js.map +1 -1
- package/dist/service/services/product.service.js +6 -2
- package/dist/service/services/product.service.js.map +1 -1
- package/package.json +3 -3
|
@@ -152,6 +152,10 @@ class GraphqlValueTransformer {
|
|
|
152
152
|
getChildrenTreeNodes(inputType, parent) {
|
|
153
153
|
return Object.entries(inputType.getFields()).reduce((result, [key, field]) => {
|
|
154
154
|
const namedType = (0, graphql_1.getNamedType)(field.type);
|
|
155
|
+
if (namedType === parent.type) {
|
|
156
|
+
// prevent recursion-induced stack overflow
|
|
157
|
+
return result;
|
|
158
|
+
}
|
|
155
159
|
const child = {
|
|
156
160
|
type: namedType,
|
|
157
161
|
isList: this.isList(field.type),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphql-value-transformer.js","sourceRoot":"","sources":["../../../src/api/common/graphql-value-transformer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"graphql-value-transformer.js","sourceRoot":"","sources":["../../../src/api/common/graphql-value-transformer.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,7 +39,7 @@ function generateListOptions(typeDefsOrSchema) {
|
|
|
39
39
|
? {
|
|
40
40
|
filterOperator: {
|
|
41
41
|
type: logicalOperatorEnum,
|
|
42
|
-
description: 'Specifies whether multiple "filter"
|
|
42
|
+
description: 'Specifies whether multiple top-level "filter" fields should be combined ' +
|
|
43
43
|
'with a logical AND or OR operation. Defaults to AND.',
|
|
44
44
|
},
|
|
45
45
|
}
|
|
@@ -118,20 +118,6 @@ function createFilterParameter(schema, targetType) {
|
|
|
118
118
|
if ((0, index_js_1.isInputObjectType)(existingInput)) {
|
|
119
119
|
fields.push(...Object.values(existingInput.getFields()));
|
|
120
120
|
}
|
|
121
|
-
return new index_js_1.GraphQLInputObjectType({
|
|
122
|
-
name: inputName,
|
|
123
|
-
fields: fields.reduce((result, field) => {
|
|
124
|
-
const fieldType = field.type;
|
|
125
|
-
const filterType = (0, index_js_1.isInputObjectType)(fieldType) ? fieldType : getFilterType(field);
|
|
126
|
-
if (!filterType) {
|
|
127
|
-
return result;
|
|
128
|
-
}
|
|
129
|
-
const fieldConfig = {
|
|
130
|
-
type: filterType,
|
|
131
|
-
};
|
|
132
|
-
return Object.assign(Object.assign({}, result), { [field.name]: fieldConfig });
|
|
133
|
-
}, {}),
|
|
134
|
-
});
|
|
135
121
|
function getFilterType(field) {
|
|
136
122
|
const innerType = unwrapNonNullType(field.type);
|
|
137
123
|
if ((0, index_js_1.isListType)(innerType)) {
|
|
@@ -157,6 +143,24 @@ function createFilterParameter(schema, targetType) {
|
|
|
157
143
|
return;
|
|
158
144
|
}
|
|
159
145
|
}
|
|
146
|
+
const FilterInputType = new index_js_1.GraphQLInputObjectType({
|
|
147
|
+
name: inputName,
|
|
148
|
+
fields: () => {
|
|
149
|
+
const namedFields = fields.reduce((result, field) => {
|
|
150
|
+
const fieldType = field.type;
|
|
151
|
+
const filterType = (0, index_js_1.isInputObjectType)(fieldType) ? fieldType : getFilterType(field);
|
|
152
|
+
if (!filterType) {
|
|
153
|
+
return result;
|
|
154
|
+
}
|
|
155
|
+
const fieldConfig = {
|
|
156
|
+
type: filterType,
|
|
157
|
+
};
|
|
158
|
+
return Object.assign(Object.assign({}, result), { [field.name]: fieldConfig });
|
|
159
|
+
}, {});
|
|
160
|
+
return Object.assign(Object.assign({}, namedFields), { _and: { type: new index_js_1.GraphQLList(new index_js_1.GraphQLNonNull(FilterInputType)) }, _or: { type: new index_js_1.GraphQLList(new index_js_1.GraphQLNonNull(FilterInputType)) } });
|
|
161
|
+
},
|
|
162
|
+
});
|
|
163
|
+
return FilterInputType;
|
|
160
164
|
}
|
|
161
165
|
function getCommonTypes(schema) {
|
|
162
166
|
const SortOrder = schema.getType('SortOrder');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-list-options.js","sourceRoot":"","sources":["../../../src/api/config/generate-list-options.ts"],"names":[],"mappings":";;;AAAA,kDAAuE;AACvE,mEAAsE;AACtE,+
|
|
1
|
+
{"version":3,"file":"generate-list-options.js","sourceRoot":"","sources":["../../../src/api/config/generate-list-options.ts"],"names":[],"mappings":";;;AAAA,kDAAuE;AACvE,mEAAsE;AACtE,+CAwB0B;AAE1B;;GAEG;AACH,SAAgB,mBAAmB,CAAC,gBAAwC;IACxE,MAAM,MAAM,GAAG,OAAO,gBAAgB,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,sBAAW,EAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC;IACvG,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;IACxC,IAAI,CAAC,SAAS,EAAE;QACZ,OAAO,MAAM,CAAC;KACjB;IACD,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAC9D,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,uBAAY,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;QAClD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACxF,OAAO,CAAC,GAAG,MAAM,EAAE,GAAG,UAAU,CAAC,CAAC;IACtC,CAAC,EAAE,EAAmC,CAAC,CAAC;IACxC,MAAM,cAAc,GAAuB,EAAE,CAAC;IAE9C,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE;QAC3B,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACrF,MAAM,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAClD,IAAI,UAAU,IAAI,IAAA,uBAAY,EAAC,UAAU,CAAC,EAAE;YACxC,MAAM,aAAa,GAAG,mBAAmB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;YAC9D,MAAM,eAAe,GAAG,qBAAqB,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;YAClE,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CACtC,GAAG,cAAc,aAAa,CACA,CAAC;YACnC,MAAM,oBAAoB,GAAG,IAAI,iCAAsB,CAAC;gBACpD,IAAI,EAAE,GAAG,cAAc,aAAa;gBACpC,MAAM,gCACF,IAAI,EAAE;wBACF,IAAI,EAAE,qBAAU;wBAChB,WAAW,EAAE,kDAAkD;qBAClE,EACD,IAAI,EAAE,EAAE,IAAI,EAAE,qBAAU,EAAE,WAAW,EAAE,wCAAwC,EAAE,EACjF,IAAI,EAAE;wBACF,IAAI,EAAE,aAAa;wBACnB,WAAW,EAAE,mDAAmD;qBACnE,EACD,MAAM,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,mCAAmC,EAAE,IAChF,CAAC,mBAAmB;oBACnB,CAAC,CAAC;wBACI,cAAc,EAAE;4BACZ,IAAI,EAAE,mBAAsC;4BAC5C,WAAW,EACP,0EAA0E;gCAC1E,sDAAsD;yBAC7D;qBACJ;oBACH,CAAC,CAAC,EAAE,CAAC,GACN,CAAC,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAClE;aACJ,CAAC,CAAC;YAEH,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,GAAG,cAAc,aAAa,CAAC,EAAE;gBAC7E,KAAK,CAAC,IAAI,GAAG;oBACT,GAAG,KAAK,CAAC,IAAI;oBACb;wBACI,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,oBAAoB;wBAC1B,WAAW,EAAE,IAAI;wBACjB,YAAY,EAAE,IAAI;wBAClB,UAAU,EAAE,EAAE;wBACd,OAAO,EAAE,IAAI;wBACb,iBAAiB,EAAE,IAAI;qBAC1B;iBACJ,CAAC;aACL;YAED,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACrC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YACnC,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;SAC7C;KACJ;IACD,OAAO,IAAA,sBAAa,EAAC;QACjB,UAAU,EAAE,CAAC,MAAM,CAAC;QACpB,KAAK,EAAE,cAAc;QACrB,kBAAkB,EAAE,EAAE,kBAAkB,EAAE,EAAE,eAAe,EAAE,wBAAe,CAAC,GAAG,EAAE,EAAE;KACvF,CAAC,CAAC;AACP,CAAC;AA3ED,kDA2EC;AAED,SAAS,eAAe,CAAC,IAAuB;IAC5C,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC1C,OAAO,IAAA,uBAAY,EAAC,SAAS,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC;AACxG,CAAC;AAED,SAAS,mBAAmB,CAAC,MAAqB,EAAE,UAA6B;IAC7E,MAAM,MAAM,GAAsD,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;IACxG,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;IACvC,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAoB,CAAC;IAEjE,MAAM,SAAS,GAAG,GAAG,cAAc,eAAe,CAAC;IACnD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAChD,IAAI,IAAA,4BAAiB,EAAC,aAAa,CAAC,EAAE;QAClC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;KAC5D;IAED,MAAM,aAAa,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5E,OAAO,IAAI,iCAAsB,CAAC;QAC9B,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,MAAM;aACT,GAAG,CAAC,KAAK,CAAC,EAAE;YACT,IAAI,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE;gBAC7C,OAAO,KAAK,CAAC;aAChB;iBAAM;gBACH,MAAM,SAAS,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAChD,IAAI,IAAA,qBAAU,EAAC,SAAS,CAAC,EAAE;oBACvB,OAAO;iBACV;gBACD,OAAO,aAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;aACrE;QACL,CAAC,CAAC;aACD,MAAM,CAAC,iCAAkB,CAAC;aAC1B,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;YACtB,MAAM,WAAW,GAA4B;gBACzC,IAAI,EAAE,SAAS;aAClB,CAAC;YACF,uCACO,MAAM,KACT,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,WAAW,IAC3B;QACN,CAAC,EAAE,EAAgC,CAAC;KAC3C,CAAC,CAAC;AACP,CAAC;AAED,SAAS,qBAAqB,CAAC,MAAqB,EAAE,UAA6B;IAC/E,MAAM,MAAM,GAAsD,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC;IACxG,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC;IACvC,MAAM,EAAE,eAAe,EAAE,gBAAgB,EAAE,eAAe,EAAE,aAAa,EAAE,WAAW,EAAE,GACpF,cAAc,CAAC,MAAM,CAAC,CAAC;IAE3B,MAAM,SAAS,GAAG,GAAG,cAAc,iBAAiB,CAAC;IACrD,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAChD,IAAI,IAAA,4BAAiB,EAAC,aAAa,CAAC,EAAE;QAClC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;KAC5D;IAED,SAAS,aAAa,CAAC,KAAiD;QACpE,MAAM,SAAS,GAAG,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,IAAA,qBAAU,EAAC,SAAS,CAAC,EAAE;YACvB,OAAO;SACV;QACD,IAAI,IAAA,qBAAU,EAAC,SAAS,CAAC,EAAE;YACvB,OAAO,eAAe,CAAC;SAC1B;QACD,QAAQ,SAAS,CAAC,IAAI,EAAE;YACpB,KAAK,QAAQ;gBACT,OAAO,eAAe,CAAC;YAC3B,KAAK,SAAS;gBACV,OAAO,gBAAgB,CAAC;YAC5B,KAAK,KAAK,CAAC;YACX,KAAK,OAAO,CAAC;YACb,KAAK,OAAO;gBACR,OAAO,eAAe,CAAC;YAC3B,KAAK,UAAU;gBACX,OAAO,aAAa,CAAC;YACzB,KAAK,IAAI;gBACL,OAAO,WAAW,CAAC;YACvB;gBACI,OAAO;SACd;IACL,CAAC;IAED,MAAM,eAAe,GAA2B,IAAI,iCAAsB,CAAC;QACvE,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,GAAG,EAAE;YACT,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;gBAChD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;gBAC7B,MAAM,UAAU,GAAG,IAAA,4BAAiB,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBACnF,IAAI,CAAC,UAAU,EAAE;oBACb,OAAO,MAAM,CAAC;iBACjB;gBACD,MAAM,WAAW,GAA4B;oBACzC,IAAI,EAAE,UAAU;iBACnB,CAAC;gBACF,uCACO,MAAM,KACT,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,WAAW,IAC3B;YACN,CAAC,EAAE,EAAgC,CAAC,CAAC;YACrC,uCACO,WAAW,KACd,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,sBAAW,CAAC,IAAI,yBAAc,CAAC,eAAe,CAAC,CAAC,EAAE,EACpE,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,sBAAW,CAAC,IAAI,yBAAc,CAAC,eAAe,CAAC,CAAC,EAAE,IACrE;QACN,CAAC;KACJ,CAAC,CAAC;IAEH,OAAO,eAAe,CAAC;AAC3B,CAAC;AAED,SAAS,cAAc,CAAC,MAAqB;IACzC,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAA2B,CAAC;IACxE,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAA4B,CAAC;IACrF,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAA4B,CAAC;IACvF,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAA4B,CAAC;IAC7E,MAAM,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAA4B,CAAC;IACrF,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAA4B,CAAC;IACzE,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,CAA4B,CAAC;IACjF,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAA4B,CAAC;IAC7E,IACI,CAAC,SAAS;QACV,CAAC,eAAe;QAChB,CAAC,gBAAgB;QACjB,CAAC,WAAW;QACZ,CAAC,eAAe;QAChB,CAAC,SAAS;QACV,CAAC,aAAa;QACd,CAAC,WAAW,EACd;QACE,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;KACpD;IACD,OAAO;QACH,SAAS;QACT,eAAe;QACf,gBAAgB;QAChB,eAAe;QACf,aAAa;QACb,WAAW;KACd,CAAC;AACN,CAAC;AAED;;GAEG;AACH,SAAS,iBAAiB,CACtB,IAA0C;IAE1C,IAAI,IAAA,wBAAa,EAAC,IAAI,CAAC,EAAE;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC;KACtB;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}
|
|
@@ -40,12 +40,14 @@ let GlobalSettingsResolver = class GlobalSettingsResolver {
|
|
|
40
40
|
* Exposes a subset of the VendureConfig which may be of use to clients.
|
|
41
41
|
*/
|
|
42
42
|
serverConfig(info) {
|
|
43
|
+
var _a;
|
|
43
44
|
const permissions = (0, constants_1.getAllPermissionsMetadata)(this.configService.authOptions.customPermissions).filter(p => !p.internal);
|
|
44
45
|
return {
|
|
45
46
|
customFieldConfig: this.generateCustomFieldConfig(info),
|
|
46
47
|
orderProcess: this.orderService.getOrderProcessStates(),
|
|
47
48
|
permittedAssetTypes: this.configService.assetOptions.permittedFileTypes,
|
|
48
49
|
permissions,
|
|
50
|
+
moneyStrategyPrecision: (_a = this.configService.entityOptions.moneyStrategy.precision) !== null && _a !== void 0 ? _a : 2,
|
|
49
51
|
};
|
|
50
52
|
}
|
|
51
53
|
async updateGlobalSettings(ctx, args) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-settings.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/global-settings.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAsF;AACtF,
|
|
1
|
+
{"version":3,"file":"global-settings.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/admin/global-settings.resolver.ts"],"names":[],"mappings":"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"}
|
package/dist/bootstrap.d.ts
CHANGED
|
@@ -1,8 +1,42 @@
|
|
|
1
1
|
import { INestApplication } from '@nestjs/common';
|
|
2
|
+
import { NestApplicationContextOptions } from '@nestjs/common/interfaces/nest-application-context-options.interface';
|
|
3
|
+
import { NestApplicationOptions } from '@nestjs/common/interfaces/nest-application-options.interface';
|
|
2
4
|
import { Type } from '@vendure/common/lib/shared-types';
|
|
3
5
|
import { RuntimeVendureConfig, VendureConfig } from './config/vendure-config';
|
|
4
6
|
import { VendureWorker } from './worker/vendure-worker';
|
|
5
7
|
export type VendureBootstrapFunction = (config: VendureConfig) => Promise<INestApplication>;
|
|
8
|
+
/**
|
|
9
|
+
* @description
|
|
10
|
+
* Additional options that can be used to configure the bootstrap process of the
|
|
11
|
+
* Vendure server.
|
|
12
|
+
*
|
|
13
|
+
* @since 2.2.0
|
|
14
|
+
* @docsCategory common
|
|
15
|
+
* @docsPage bootstrap
|
|
16
|
+
*/
|
|
17
|
+
export interface BootstrapOptions {
|
|
18
|
+
/**
|
|
19
|
+
* @description
|
|
20
|
+
* These options get passed directly to the `NestFactory.create()` method.
|
|
21
|
+
*/
|
|
22
|
+
nestApplicationOptions: NestApplicationOptions;
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* @description
|
|
26
|
+
* Additional options that can be used to configure the bootstrap process of the
|
|
27
|
+
* Vendure worker.
|
|
28
|
+
*
|
|
29
|
+
* @since 2.2.0
|
|
30
|
+
* @docsCategory worker
|
|
31
|
+
* @docsPage bootstrapWorker
|
|
32
|
+
*/
|
|
33
|
+
export interface BootstrapWorkerOptions {
|
|
34
|
+
/**
|
|
35
|
+
* @description
|
|
36
|
+
* These options get passed directly to the `NestFactory.createApplicationContext` method.
|
|
37
|
+
*/
|
|
38
|
+
nestApplicationContextOptions: NestApplicationContextOptions;
|
|
39
|
+
}
|
|
6
40
|
/**
|
|
7
41
|
* @description
|
|
8
42
|
* Bootstraps the Vendure server. This is the entry point to the application.
|
|
@@ -13,12 +47,37 @@ export type VendureBootstrapFunction = (config: VendureConfig) => Promise<INestA
|
|
|
13
47
|
* import { config } from './vendure-config';
|
|
14
48
|
*
|
|
15
49
|
* bootstrap(config).catch(err => {
|
|
16
|
-
*
|
|
50
|
+
* console.log(err);
|
|
51
|
+
* process.exit(1);
|
|
52
|
+
* });
|
|
53
|
+
* ```
|
|
54
|
+
*
|
|
55
|
+
* ### Passing additional options
|
|
56
|
+
*
|
|
57
|
+
* Since v2.2.0, you can pass additional options to the NestJs application via the `options` parameter.
|
|
58
|
+
* For example, to integrate with the [Nest Devtools](https://docs.nestjs.com/devtools/overview), you need to
|
|
59
|
+
* pass the `snapshot` option:
|
|
60
|
+
*
|
|
61
|
+
* ```ts
|
|
62
|
+
* import { bootstrap } from '\@vendure/core';
|
|
63
|
+
* import { config } from './vendure-config';
|
|
64
|
+
*
|
|
65
|
+
* bootstrap(config, {
|
|
66
|
+
* // highlight-start
|
|
67
|
+
* nestApplicationOptions: {
|
|
68
|
+
* snapshot: true,
|
|
69
|
+
* }
|
|
70
|
+
* // highlight-end
|
|
71
|
+
* }).catch(err => {
|
|
72
|
+
* console.log(err);
|
|
73
|
+
* process.exit(1);
|
|
17
74
|
* });
|
|
18
75
|
* ```
|
|
19
76
|
* @docsCategory common
|
|
77
|
+
* @docsPage bootstrap
|
|
78
|
+
* @docsWeight 0
|
|
20
79
|
* */
|
|
21
|
-
export declare function bootstrap(userConfig: Partial<VendureConfig
|
|
80
|
+
export declare function bootstrap(userConfig: Partial<VendureConfig>, options?: BootstrapOptions): Promise<INestApplication>;
|
|
22
81
|
/**
|
|
23
82
|
* @description
|
|
24
83
|
* Bootstraps a Vendure worker. Resolves to a {@link VendureWorker} object containing a reference to the underlying
|
|
@@ -37,11 +96,14 @@ export declare function bootstrap(userConfig: Partial<VendureConfig>): Promise<I
|
|
|
37
96
|
* .then(worker => worker.startHealthCheckServer({ port: 3020 }))
|
|
38
97
|
* .catch(err => {
|
|
39
98
|
* console.log(err);
|
|
99
|
+
* process.exit(1);
|
|
40
100
|
* });
|
|
41
101
|
* ```
|
|
42
102
|
* @docsCategory worker
|
|
103
|
+
* @docsPage bootstrapWorker
|
|
104
|
+
* @docsWeight 0
|
|
43
105
|
* */
|
|
44
|
-
export declare function bootstrapWorker(userConfig: Partial<VendureConfig
|
|
106
|
+
export declare function bootstrapWorker(userConfig: Partial<VendureConfig>, options?: BootstrapWorkerOptions): Promise<VendureWorker>;
|
|
45
107
|
/**
|
|
46
108
|
* Setting the global config must be done prior to loading the AppModule.
|
|
47
109
|
*/
|
|
@@ -50,3 +112,4 @@ export declare function preBootstrapConfig(userConfig: Partial<VendureConfig>):
|
|
|
50
112
|
* Returns an array of core entities and any additional entities defined in plugins.
|
|
51
113
|
*/
|
|
52
114
|
export declare function getAllEntities(userConfig: Partial<VendureConfig>): Promise<Array<Type<any>>>;
|
|
115
|
+
export declare function configureSessionCookies(app: INestApplication, userConfig: Readonly<RuntimeVendureConfig>): void;
|
package/dist/bootstrap.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getAllEntities = exports.preBootstrapConfig = exports.bootstrapWorker = exports.bootstrap = void 0;
|
|
3
|
+
exports.configureSessionCookies = exports.getAllEntities = exports.preBootstrapConfig = exports.bootstrapWorker = exports.bootstrap = void 0;
|
|
4
4
|
const core_1 = require("@nestjs/core");
|
|
5
5
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
6
|
+
const shared_constants_1 = require("@vendure/common/lib/shared-constants");
|
|
6
7
|
const cookieSession = require("cookie-session");
|
|
7
8
|
const semver_1 = require("semver");
|
|
8
9
|
const errors_1 = require("./common/error/errors");
|
|
@@ -31,12 +32,37 @@ const vendure_worker_1 = require("./worker/vendure-worker");
|
|
|
31
32
|
* import { config } from './vendure-config';
|
|
32
33
|
*
|
|
33
34
|
* bootstrap(config).catch(err => {
|
|
34
|
-
*
|
|
35
|
+
* console.log(err);
|
|
36
|
+
* process.exit(1);
|
|
37
|
+
* });
|
|
38
|
+
* ```
|
|
39
|
+
*
|
|
40
|
+
* ### Passing additional options
|
|
41
|
+
*
|
|
42
|
+
* Since v2.2.0, you can pass additional options to the NestJs application via the `options` parameter.
|
|
43
|
+
* For example, to integrate with the [Nest Devtools](https://docs.nestjs.com/devtools/overview), you need to
|
|
44
|
+
* pass the `snapshot` option:
|
|
45
|
+
*
|
|
46
|
+
* ```ts
|
|
47
|
+
* import { bootstrap } from '\@vendure/core';
|
|
48
|
+
* import { config } from './vendure-config';
|
|
49
|
+
*
|
|
50
|
+
* bootstrap(config, {
|
|
51
|
+
* // highlight-start
|
|
52
|
+
* nestApplicationOptions: {
|
|
53
|
+
* snapshot: true,
|
|
54
|
+
* }
|
|
55
|
+
* // highlight-end
|
|
56
|
+
* }).catch(err => {
|
|
57
|
+
* console.log(err);
|
|
58
|
+
* process.exit(1);
|
|
35
59
|
* });
|
|
36
60
|
* ```
|
|
37
61
|
* @docsCategory common
|
|
62
|
+
* @docsPage bootstrap
|
|
63
|
+
* @docsWeight 0
|
|
38
64
|
* */
|
|
39
|
-
async function bootstrap(userConfig) {
|
|
65
|
+
async function bootstrap(userConfig, options) {
|
|
40
66
|
const config = await preBootstrapConfig(userConfig);
|
|
41
67
|
vendure_logger_1.Logger.useLogger(config.logger);
|
|
42
68
|
vendure_logger_1.Logger.info(`Bootstrapping Vendure Server (pid: ${process.pid})...`);
|
|
@@ -48,17 +74,13 @@ async function bootstrap(userConfig) {
|
|
|
48
74
|
(0, process_context_1.setProcessContext)('server');
|
|
49
75
|
const { hostname, port, cors, middleware } = config.apiOptions;
|
|
50
76
|
default_logger_1.DefaultLogger.hideNestBoostrapLogs();
|
|
51
|
-
const app = await core_1.NestFactory.create(appModule.AppModule, {
|
|
52
|
-
cors,
|
|
53
|
-
logger: new vendure_logger_1.Logger(),
|
|
54
|
-
});
|
|
77
|
+
const app = await core_1.NestFactory.create(appModule.AppModule, Object.assign({ cors, logger: new vendure_logger_1.Logger() }, options === null || options === void 0 ? void 0 : options.nestApplicationOptions));
|
|
55
78
|
default_logger_1.DefaultLogger.restoreOriginalLogLevel();
|
|
56
79
|
app.useLogger(new vendure_logger_1.Logger());
|
|
57
80
|
const { tokenMethod } = config.authOptions;
|
|
58
81
|
const usingCookie = tokenMethod === 'cookie' || (Array.isArray(tokenMethod) && tokenMethod.includes('cookie'));
|
|
59
82
|
if (usingCookie) {
|
|
60
|
-
|
|
61
|
-
app.use(cookieSession(cookieOptions));
|
|
83
|
+
configureSessionCookies(app, config);
|
|
62
84
|
}
|
|
63
85
|
const earlyMiddlewares = middleware.filter(mid => mid.beforeListen);
|
|
64
86
|
earlyMiddlewares.forEach(mid => {
|
|
@@ -88,11 +110,14 @@ exports.bootstrap = bootstrap;
|
|
|
88
110
|
* .then(worker => worker.startHealthCheckServer({ port: 3020 }))
|
|
89
111
|
* .catch(err => {
|
|
90
112
|
* console.log(err);
|
|
113
|
+
* process.exit(1);
|
|
91
114
|
* });
|
|
92
115
|
* ```
|
|
93
116
|
* @docsCategory worker
|
|
117
|
+
* @docsPage bootstrapWorker
|
|
118
|
+
* @docsWeight 0
|
|
94
119
|
* */
|
|
95
|
-
async function bootstrapWorker(userConfig) {
|
|
120
|
+
async function bootstrapWorker(userConfig, options) {
|
|
96
121
|
var _a, _b;
|
|
97
122
|
const vendureConfig = await preBootstrapConfig(userConfig);
|
|
98
123
|
const config = disableSynchronize(vendureConfig);
|
|
@@ -103,9 +128,7 @@ async function bootstrapWorker(userConfig) {
|
|
|
103
128
|
(0, process_context_1.setProcessContext)('worker');
|
|
104
129
|
default_logger_1.DefaultLogger.hideNestBoostrapLogs();
|
|
105
130
|
const WorkerModule = await import('./worker/worker.module.js').then(m => m.WorkerModule);
|
|
106
|
-
const workerApp = await core_1.NestFactory.createApplicationContext(WorkerModule, {
|
|
107
|
-
logger: new vendure_logger_1.Logger(),
|
|
108
|
-
});
|
|
131
|
+
const workerApp = await core_1.NestFactory.createApplicationContext(WorkerModule, Object.assign({ logger: new vendure_logger_1.Logger() }, options === null || options === void 0 ? void 0 : options.nestApplicationContextOptions));
|
|
109
132
|
default_logger_1.DefaultLogger.restoreOriginalLogLevel();
|
|
110
133
|
workerApp.useLogger(new vendure_logger_1.Logger());
|
|
111
134
|
workerApp.enableShutdownHooks();
|
|
@@ -298,4 +321,17 @@ async function validateDbTablesForWorker(worker) {
|
|
|
298
321
|
reject('Could not validate DB table structure. Aborting bootstrap.');
|
|
299
322
|
});
|
|
300
323
|
}
|
|
324
|
+
function configureSessionCookies(app, userConfig) {
|
|
325
|
+
const { cookieOptions } = userConfig.authOptions;
|
|
326
|
+
app.use(cookieSession(Object.assign(Object.assign({}, cookieOptions), { name: typeof (cookieOptions === null || cookieOptions === void 0 ? void 0 : cookieOptions.name) === 'string' ? cookieOptions.name : shared_constants_1.DEFAULT_COOKIE_NAME })));
|
|
327
|
+
// If the Admin API and Shop API should have specific cookies names
|
|
328
|
+
if (typeof (cookieOptions === null || cookieOptions === void 0 ? void 0 : cookieOptions.name) === 'object') {
|
|
329
|
+
const shopApiCookieName = cookieOptions.name.shop;
|
|
330
|
+
const adminApiCookieName = cookieOptions.name.admin;
|
|
331
|
+
const { shopApiPath, adminApiPath } = userConfig.apiOptions;
|
|
332
|
+
app.use(`/${shopApiPath}`, cookieSession(Object.assign(Object.assign({}, cookieOptions), { name: shopApiCookieName })));
|
|
333
|
+
app.use(`/${adminApiPath}`, cookieSession(Object.assign(Object.assign({}, cookieOptions), { name: adminApiCookieName })));
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
exports.configureSessionCookies = configureSessionCookies;
|
|
301
337
|
//# sourceMappingURL=bootstrap.js.map
|
package/dist/bootstrap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":";;;AAGA,uCAA2C;AAC3C,6CAAqD;AACrD,2EAA2E;AAE3E,gDAAiD;AACjD,mCAAmC;AAGnC,kDAA4D;AAC5D,4DAA+D;AAC/D,mEAA+D;AAC/D,mEAAwD;AAExD,sFAA4E;AAC5E,gDAAoD;AACpD,0FAAoF;AACpF,0FAAoF;AACpF,4EAAsE;AACtE,oEAA+D;AAC/D,0FAAoF;AACpF,8DAA8G;AAC9G,wDAAiE;AACjE,uEAAsE;AACtE,uCAA4C;AAC5C,4DAAwD;AAsCxD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAuCK;AACE,KAAK,UAAU,SAAS,CAC3B,UAAkC,EAClC,OAA0B;IAE1B,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACpD,uBAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,uBAAM,CAAC,IAAI,CAAC,sCAAsC,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC;IACrE,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAEjC,8EAA8E;IAC9E,gFAAgF;IAChF,2BAA2B;IAC3B,MAAM,SAAS,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAClD,IAAA,mCAAiB,EAAC,QAAQ,CAAC,CAAC;IAC5B,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;IAC/D,8BAAa,CAAC,oBAAoB,EAAE,CAAC;IACrC,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAC,SAAS,CAAC,SAAS,kBACpD,IAAI,EACJ,MAAM,EAAE,IAAI,uBAAM,EAAE,IACjB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,sBAAsB,EACpC,CAAC;IACH,8BAAa,CAAC,uBAAuB,EAAE,CAAC;IACxC,GAAG,CAAC,SAAS,CAAC,IAAI,uBAAM,EAAE,CAAC,CAAC;IAC5B,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC;IAC3C,MAAM,WAAW,GACb,WAAW,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/F,IAAI,WAAW,EAAE;QACb,uBAAuB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;KACxC;IACD,MAAM,gBAAgB,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACpE,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAC3B,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IACH,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,IAAI,EAAE,CAAC,CAAC;IACvC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC1B,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,GAAG,CAAC;AACf,CAAC;AArCD,8BAqCC;AAED;;;;;;;;;;;;;;;;;;;;;;;;KAwBK;AACE,KAAK,UAAU,eAAe,CACjC,UAAkC,EAClC,OAAgC;;IAEhC,MAAM,aAAa,GAAG,MAAM,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,kBAAkB,CAAC,aAAa,CAAC,CAAC;IACjD,MAAA,MAAA,MAAM,CAAC,MAAM,EAAC,iBAAiB,mDAAG,gBAAgB,CAAC,CAAC;IACpD,uBAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,uBAAM,CAAC,IAAI,CAAC,sCAAsC,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC;IACrE,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAEjC,IAAA,mCAAiB,EAAC,QAAQ,CAAC,CAAC;IAC5B,8BAAa,CAAC,oBAAoB,EAAE,CAAC;IAErC,MAAM,YAAY,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IACzF,MAAM,SAAS,GAAG,MAAM,kBAAW,CAAC,wBAAwB,CAAC,YAAY,kBACrE,MAAM,EAAE,IAAI,uBAAM,EAAE,IACjB,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,6BAA6B,EAC3C,CAAC;IACH,8BAAa,CAAC,uBAAuB,EAAE,CAAC;IACxC,SAAS,CAAC,SAAS,CAAC,IAAI,uBAAM,EAAE,CAAC,CAAC;IAClC,SAAS,CAAC,mBAAmB,EAAE,CAAC;IAChC,MAAM,yBAAyB,CAAC,SAAS,CAAC,CAAC;IAC3C,uBAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IACvC,OAAO,IAAI,8BAAa,CAAC,SAAS,CAAC,CAAC;AACxC,CAAC;AAzBD,0CAyBC;AAED;;GAEG;AACI,KAAK,UAAU,kBAAkB,CACpC,UAAkC;;IAElC,IAAI,UAAU,EAAE;QACZ,MAAM,IAAA,0BAAS,EAAC,UAAU,CAAC,CAAC;KAC/B;IAED,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,UAAU,CAAC,CAAC;IAClD,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;IACvE,MAAM,IAAA,0BAAS,EAAC;QACZ,mBAAmB,EAAE;YACjB,QAAQ;YACR,WAAW,EAAE;gBACT,GAAI,CAAC,MAAA,MAAA,UAAU,CAAC,mBAAmB,0CAAE,WAAW,mCAAI,EAAE,CAEpD;gBACF,GAAI,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAA4C;aACnF;SACJ;KACJ,CAAC,CAAC;IAEH,IAAI,MAAM,GAAG,IAAA,0BAAS,GAAE,CAAC;IACzB,oFAAoF;IACpF,sEAAsE;IACtE,uBAAM,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,GAAG,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,gBAAgB,GAAG,MAAA,MAAM,CAAC,aAAa,CAAC,gBAAgB,mCAAI,MAAM,CAAC,gBAAgB,CAAC;IAC1F,IAAA,4CAAmB,EAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;IAChD,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC;IACzD,IAAA,qCAAgB,EAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IAC1C,MAAM,2BAA2B,GAAG,IAAA,0DAA0B,EAAC,MAAM,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAC9F,IAAI,CAAC,2BAA2B,CAAC,KAAK,EAAE;QACpC,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,2BAA2B,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;KACvG;IACD,IAAA,0DAA0B,EAAC,MAAM,CAAC,CAAC;IACnC,MAAM,IAAA,0DAA0B,EAAC,MAAM,CAAC,CAAC;IACzC,iBAAiB,CAAC,MAAM,CAAC,CAAC;IAC1B,OAAO,MAAM,CAAC;AAClB,CAAC;AAvCD,gDAuCC;AAED,SAAS,wBAAwB,CAAC,MAA4B;IAC1D,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;QACjC,MAAM,aAAa,GAAG,IAAA,kCAAgB,EAAC,MAAM,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAI,MAAc,CAAC,IAAc,CAAC;QAClD,IAAI,CAAC,aAAa,EAAE;YAChB,uBAAM,CAAC,IAAI,CACP,eAAe,UAAU,kHAAkH,CAC9I,CAAC;SACL;aAAM;YACH,IAAI,CAAC,IAAA,kBAAS,EAAC,yBAAe,EAAE,aAAa,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,EAAE;gBACtF,uBAAM,CAAC,KAAK,CACR,WAAW,UAAU,oDAAoD;oBACrE,mCAAmC,aAAa,iCAAiC,yBAAe,IAAI,CAC3G,CAAC;gBACF,MAAM,IAAI,4BAAmB,CACzB,WAAW,UAAU,mDAAmD,CAC3E,CAAC;aACL;SACJ;KACJ;AACL,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,uBAAuB,CAAC,MAA4B;IAC/D,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE;QACjC,MAAM,QAAQ,GAAG,IAAA,0CAAwB,EAAC,MAAM,CAAC,CAAC;QAClD,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE;YAChC,MAAM,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,CAAC;SACnC;KACJ;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;GAEG;AACI,KAAK,UAAU,cAAc,CAAC,UAAkC;IACnE,MAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,0BAAe,CAAqB,CAAC;IACxE,MAAM,cAAc,GAAG,IAAA,wCAAsB,EAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAElE,MAAM,WAAW,GAAqB,YAAY,CAAC;IAEnD,mEAAmE;IACnE,yCAAyC;IACzC,KAAK,MAAM,YAAY,IAAI,cAAc,EAAE;QACvC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,IAAI,CAAC,EAAE;YACrD,MAAM,IAAI,4BAAmB,CAAC,4BAA4B,EAAE,EAAE,UAAU,EAAE,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;SAClG;aAAM;YACH,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SAClC;KACJ;IACD,OAAO,WAAW,CAAC;AACvB,CAAC;AAhBD,wCAgBC;AAED;;;GAGG;AACH,SAAS,iBAAiB,CAAC,MAAsC;IAC7D,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC;IAC3C,MAAM,kBAAkB,GACpB,WAAW,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC/F,IAAI,kBAAkB,EAAE;QACpB,MAAM,kBAAkB,GAAG,MAAM,CAAC,WAAW,CAAC,kBAAkB,CAAC;QACjE,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;QAC3C,IAAI,OAAO,WAAW,KAAK,SAAS,EAAE;YAClC,MAAM,EAAE,cAAc,EAAE,GAAG,WAAW,CAAC;YACvC,IAAI,yBAAmC,CAAC;YACxC,IAAI,CAAC,cAAc,EAAE;gBACjB,yBAAyB,GAAG,CAAC,kBAAkB,CAAC,CAAC;aACpD;iBAAM,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;gBAC3C,yBAAyB,GAAG,cAAc;qBACrC,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;qBAClB,MAAM,CAAC,kBAAkB,CAAC,CAAC;aACnC;iBAAM;gBACH,yBAAyB,GAAG,cAAc,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;aACzE;YACD,WAAW,CAAC,cAAc,GAAG,yBAAyB,CAAC;SAC1D;KACJ;AACL,CAAC;AAED,SAAS,iBAAiB,CAAC,MAA4B;IACnD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,MAAM,CAAC,UAAU,CAAC;IACxE,MAAM,eAAe,GAAqC,EAAE,CAAC;IAC7D,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,UAAU,QAAQ,IAAI,WAAW,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;IACxF,eAAe,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC3D,eAAe,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC7D,eAAe,CAAC,IAAI,CAChB,GAAG,IAAA,uCAAwB,GAAE,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,CAAU,CAAC,CAC5F,CAAC;IACF,MAAM,iBAAiB,GAAG,4BAA4B,CAAC,eAAe,CAAC,CAAC;IACxE,MAAM,KAAK,GAAG,oBAAoB,yBAAe,yBAAyB,IAAI,EAAE,CAAC;IACjF,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACtF,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,aAAa,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACzG,uBAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;IACvC,uBAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC;IAC3D,uBAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC;IAChE,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,uBAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACrD,uBAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,4BAA4B,CAAC,KAAuC;IACzE,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;IACjE,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AACxE,CAAC;AAED;;;GAGG;AACH,SAAS,kBAAkB,CAAC,UAA0C;IAClE,MAAM,MAAM,mCACL,UAAU,KACb,mBAAmB,EAAE,gCACd,UAAU,CAAC,mBAAmB,KACjC,WAAW,EAAE,KAAK,GACA,GACzB,CAAC;IACF,OAAO,MAAM,CAAC;AAClB,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,yBAAyB,CAAC,MAA+B;IACpE,MAAM,UAAU,GAAe,MAAM,CAAC,GAAG,CAAC,IAAA,4BAAkB,GAAE,CAAC,CAAC;IAChE,MAAM,IAAI,OAAO,CAAO,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9C,MAAM,cAAc,GAAG,KAAK,IAAsB,EAAE;YAChD,IAAI;gBACA,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,oCAAa,CAAC,CAAC,KAAK,EAAE,CAAC;gBACzE,OAAO,CAAC,GAAG,UAAU,CAAC;aACzB;YAAC,OAAO,CAAM,EAAE;gBACb,OAAO,KAAK,CAAC;aAChB;QACL,CAAC,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,CAAC;QAC5B,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,MAAM,WAAW,GAAG,EAAE,CAAC;QACvB,IAAI,mBAAmB,GAAG,KAAK,CAAC;QAChC,uBAAM,CAAC,OAAO,CAAC,6CAA6C,CAAC,CAAC;QAC9D,OAAO,CAAC,mBAAmB,IAAI,QAAQ,GAAG,WAAW,EAAE;YACnD,QAAQ,EAAE,CAAC;YACX,mBAAmB,GAAG,MAAM,cAAc,EAAE,CAAC;YAC7C,IAAI,mBAAmB,EAAE;gBACrB,uBAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,CAAC;gBAC3C,OAAO,EAAE,CAAC;gBACV,OAAO;aACV;YACD,uBAAM,CAAC,OAAO,CACV,6DAA6D,cAAc,eAAe,QAAQ,OAAO,WAAW,GAAG,CAC1H,CAAC;YACF,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;SACvE;QACD,MAAM,CAAC,4DAA4D,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAgB,uBAAuB,CACnC,GAAqB,EACrB,UAA0C;IAE1C,MAAM,EAAE,aAAa,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC;IACjD,GAAG,CAAC,GAAG,CACH,aAAa,iCACN,aAAa,KAChB,IAAI,EAAE,OAAO,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAA,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,sCAAmB,IAC1F,CACL,CAAC;IAEF,mEAAmE;IACnE,IAAI,OAAO,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,IAAI,CAAA,KAAK,QAAQ,EAAE;QACzC,MAAM,iBAAiB,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;QAClD,MAAM,kBAAkB,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;QACpD,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,UAAU,CAAC;QAC5D,GAAG,CAAC,GAAG,CAAC,IAAI,WAAW,EAAE,EAAE,aAAa,iCAAM,aAAa,KAAE,IAAI,EAAE,iBAAiB,IAAG,CAAC,CAAC;QACzF,GAAG,CAAC,GAAG,CAAC,IAAI,YAAY,EAAE,EAAE,aAAa,iCAAM,aAAa,KAAE,IAAI,EAAE,kBAAkB,IAAG,CAAC,CAAC;KAC9F;AACL,CAAC;AApBD,0DAoBC"}
|
|
@@ -85,6 +85,9 @@ export type CustomFieldSortParameter = {
|
|
|
85
85
|
};
|
|
86
86
|
export type FilterParameter<T extends VendureEntity> = {
|
|
87
87
|
[K in PrimitiveFields<T>]?: T[K] extends string | LocaleString ? StringOperators : T[K] extends number ? NumberOperators : T[K] extends boolean ? BooleanOperators : T[K] extends Date ? DateOperators : StringOperators;
|
|
88
|
+
} & {
|
|
89
|
+
_and?: Array<FilterParameter<T>>;
|
|
90
|
+
_or?: Array<FilterParameter<T>>;
|
|
88
91
|
};
|
|
89
92
|
export interface StringOperators {
|
|
90
93
|
eq?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bigint-money-strategy.js","sourceRoot":"","sources":["../../../src/config/entity/bigint-money-strategy.ts"],"names":[],"mappings":";;;AAEA,6DAAkD;AAIlD;;;;;;;;;;GAUG;AACH,MAAa,mBAAmB;IAAhC;QACa,uBAAkB,GAAkB;YACzC,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE;gBACT,EAAE,EAAE,CAAC,WAAmB,EAAE,EAAE;oBACxB,OAAO,WAAW,CAAC;gBACvB,CAAC;gBACD,IAAI,EAAE,CAAC,aAAqB,EAAU,EAAE;oBACpC,IAAI,aAAa,IAAI,IAAI,EAAE;wBACvB,OAAO,aAAa,CAAC;qBACxB;oBACD,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;oBAClD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;wBAC/B,uBAAM,CAAC,IAAI,CAAC,kBAAkB,aAAa,yBAAyB,CAAC,CAAC;qBACzE;oBACD,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;wBACtB,uBAAM,CAAC,IAAI,CAAC,kBAAkB,aAAa,mBAAmB,CAAC,CAAC;qBACnE;oBACD,OAAO,MAAM,CAAC;gBAClB,CAAC;aACJ;SACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"bigint-money-strategy.js","sourceRoot":"","sources":["../../../src/config/entity/bigint-money-strategy.ts"],"names":[],"mappings":";;;AAEA,6DAAkD;AAIlD;;;;;;;;;;GAUG;AACH,MAAa,mBAAmB;IAAhC;QACa,uBAAkB,GAAkB;YACzC,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE;gBACT,EAAE,EAAE,CAAC,WAAmB,EAAE,EAAE;oBACxB,OAAO,WAAW,CAAC;gBACvB,CAAC;gBACD,IAAI,EAAE,CAAC,aAAqB,EAAU,EAAE;oBACpC,IAAI,aAAa,IAAI,IAAI,EAAE;wBACvB,OAAO,aAAa,CAAC;qBACxB;oBACD,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;oBAClD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;wBAC/B,uBAAM,CAAC,IAAI,CAAC,kBAAkB,aAAa,yBAAyB,CAAC,CAAC;qBACzE;oBACD,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE;wBACtB,uBAAM,CAAC,IAAI,CAAC,kBAAkB,aAAa,mBAAmB,CAAC,CAAC;qBACnE;oBACD,OAAO,MAAM,CAAC;gBAClB,CAAC;aACJ;SACJ,CAAC;QACF,cAAS,GAAG,CAAC,CAAC;IAKlB,CAAC;IAHG,KAAK,CAAC,KAAa,EAAE,QAAQ,GAAG,CAAC;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,QAAQ,CAAC,CAAC;IACxC,CAAC;CACJ;AA3BD,kDA2BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"default-money-strategy.js","sourceRoot":"","sources":["../../../src/config/entity/default-money-strategy.ts"],"names":[],"mappings":";;;AAMA;;;;;;;GAOG;AACH,MAAa,oBAAoB;IAAjC;QACa,uBAAkB,GAAkB;YACzC,IAAI,EAAE,KAAK;SACd,CAAC;
|
|
1
|
+
{"version":3,"file":"default-money-strategy.js","sourceRoot":"","sources":["../../../src/config/entity/default-money-strategy.ts"],"names":[],"mappings":";;;AAMA;;;;;;;GAOG;AACH,MAAa,oBAAoB;IAAjC;QACa,uBAAkB,GAAkB;YACzC,IAAI,EAAE,KAAK;SACd,CAAC;QACO,cAAS,GAAW,CAAC,CAAC;IAKnC,CAAC;IAHG,KAAK,CAAC,KAAa,EAAE,QAAQ,GAAG,CAAC;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;IACxC,CAAC;CACJ;AATD,oDASC"}
|
|
@@ -23,14 +23,30 @@ import { InjectableStrategy } from '../../common/types/injectable-strategy';
|
|
|
23
23
|
* {@link BigIntMoneyStrategy} which will use the `bigint` type to store monetary values,
|
|
24
24
|
* giving an effective upper limit of over 9 quadrillion.
|
|
25
25
|
*
|
|
26
|
-
* ## Precision
|
|
26
|
+
* ## Precision
|
|
27
27
|
*
|
|
28
28
|
* Both the `DefaultMoneyStrategy` and `BigIntMoneyStrategy` store monetary values as integers, representing
|
|
29
29
|
* the price in the minor units of the currency (i.e. _cents_ in USD or _pennies_ in GBP).
|
|
30
30
|
*
|
|
31
|
-
*
|
|
32
|
-
* the
|
|
33
|
-
*
|
|
31
|
+
* Since v2.2.0, you can configure the precision of the stored values via the `precision` property of the
|
|
32
|
+
* strategy. Changing the precision has **no effect** on the stored value. It is merely a hint to the
|
|
33
|
+
* UI as to how many decimal places to display.
|
|
34
|
+
*
|
|
35
|
+
* @example
|
|
36
|
+
* ```ts
|
|
37
|
+
* import { DefaultMoneyStrategy, VendureConfig } from '\@vendure/core';
|
|
38
|
+
*
|
|
39
|
+
* export class ThreeDecimalPlacesMoneyStrategy extends DefaultMoneyStrategy {
|
|
40
|
+
* readonly precision = 3;
|
|
41
|
+
* }
|
|
42
|
+
*
|
|
43
|
+
* export const config: VendureConfig = {
|
|
44
|
+
* // ...
|
|
45
|
+
* entityOptions: {
|
|
46
|
+
* moneyStrategy: new ThreeDecimalPlacesMoneyStrategy(),
|
|
47
|
+
* }
|
|
48
|
+
* };
|
|
49
|
+
* ```
|
|
34
50
|
*
|
|
35
51
|
* :::info
|
|
36
52
|
*
|
|
@@ -48,6 +64,21 @@ export interface MoneyStrategy extends InjectableStrategy {
|
|
|
48
64
|
* Defines the TypeORM column used to store monetary values.
|
|
49
65
|
*/
|
|
50
66
|
readonly moneyColumnOptions: ColumnOptions;
|
|
67
|
+
/**
|
|
68
|
+
* @description
|
|
69
|
+
* Defines the precision (i.e. number of decimal places) represented by the monetary values.
|
|
70
|
+
* For example, consider a product variant with a price value of `12345`.
|
|
71
|
+
*
|
|
72
|
+
* - If the precision is `2`, then the price is `123.45`.
|
|
73
|
+
* - If the precision is `3`, then the price is `12.345`.
|
|
74
|
+
*
|
|
75
|
+
* Changing the precision has **no effect** on the stored value. It is merely a hint to the
|
|
76
|
+
* UI as to how many decimal places to display.
|
|
77
|
+
*
|
|
78
|
+
* @default 2
|
|
79
|
+
* @since 2.2.0
|
|
80
|
+
*/
|
|
81
|
+
readonly precision?: number;
|
|
51
82
|
/**
|
|
52
83
|
* @description
|
|
53
84
|
* Defines the logic used to round monetary values. For instance, the default behavior
|
|
@@ -217,11 +217,16 @@ export interface ApiOptions {
|
|
|
217
217
|
export interface CookieOptions {
|
|
218
218
|
/**
|
|
219
219
|
* @description
|
|
220
|
-
* The name of the
|
|
220
|
+
* The name of the cookies to set.
|
|
221
|
+
* If set to a string, both cookies for the Admin API and Shop API will have the same name.
|
|
222
|
+
* If set as an object, it makes it possible to give different names to the Admin API and the Shop API cookies
|
|
221
223
|
*
|
|
222
224
|
* @default 'session'
|
|
223
225
|
*/
|
|
224
|
-
name?: string
|
|
226
|
+
name?: string | {
|
|
227
|
+
shop: string;
|
|
228
|
+
admin: string;
|
|
229
|
+
};
|
|
225
230
|
/**
|
|
226
231
|
* @description
|
|
227
232
|
* The secret used for signing the session cookies for authenticated users. Only applies
|
|
@@ -284,6 +289,20 @@ export interface CookieOptions {
|
|
|
284
289
|
* the same request with the same name (regardless of path or domain) are filtered out of the Set-Cookie header when setting this cookie.
|
|
285
290
|
*/
|
|
286
291
|
overwrite?: boolean;
|
|
292
|
+
/**
|
|
293
|
+
* @description
|
|
294
|
+
* A number representing the milliseconds from Date.now() for expiry
|
|
295
|
+
*
|
|
296
|
+
* @since 2.2.0
|
|
297
|
+
*/
|
|
298
|
+
maxAge?: number;
|
|
299
|
+
/**
|
|
300
|
+
* @description
|
|
301
|
+
* a Date object indicating the cookie's expiration date (expires at the end of session by default).
|
|
302
|
+
*
|
|
303
|
+
* @since 2.2.0
|
|
304
|
+
*/
|
|
305
|
+
expires?: Date;
|
|
287
306
|
}
|
|
288
307
|
/**
|
|
289
308
|
* @description
|