npm - @vendure/core - Versions diffs - 1.4.7 → 1.5.2 - Mend

@vendure/core 1.4.7 → 1.5.2

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.

Files changed (1176) hide show

package/dist/api/config/configure-graphql-module.js CHANGED Viewed

@@ -47,6 +47,7 @@ function configureGraphQLModule(getOptions) {
 }
 exports.configureGraphQLModule = configureGraphQLModule;
 async function createGraphQLOptions(i18nService, configService, idCodecService, typesLoader, customFieldRelationResolverService, options) {
+    var _a;
     const builtSchema = await buildSchemaForApi(options.apiType);
     const resolvers = generate_resolvers_1.generateResolvers(configService, customFieldRelationResolverService, options.apiType, builtSchema);
     return {
@@ -70,6 +71,7 @@ async function createGraphQLOptions(i18nService, configService, idCodecService,
             ...configService.apiOptions.apolloServerPlugins,
         ],
         validationRules: options.validationRules,
+        introspection: (_a = configService.apiOptions.introspection) !== null && _a !== void 0 ? _a : true,
     };
     /**
      * Generates the server's GraphQL schema by combining:

package/dist/api/config/configure-graphql-module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"configure-graphql-module.js","sourceRoot":"","sources":["../../../src/api/config/configure-graphql-module.ts"],"names":[],"mappings":";;;;;;AAEA,6CAAsF;AACtF,mEAAsE;AACtE,qCAAmG;AACnG,gDAAwB;AAExB,8DAA0D;AAC1D,gEAA4D;AAE5D,wDAAoD;AACpD,0DAAsD;AACtD,sFAA4F;AAC5F,kEAAsE;AAEtE,iEAA6D;AAE7D,kEAA0D;AAC1D,6GAAsG;AACtG,iEAA4D;AAC5D,qFAAgF;AAChF,mEAA8D;AAC9D,mFAA8E;AAE9E,+DAAoE;AACpE,yEAAmE;AACnE,mEAA8D;AAC9D,iEAAgE;AAChE,6DAAyD;AACzD,mEASiC;AAajC;;GAEG;AACH,SAAgB,sBAAsB,CAClC,UAA+D;IAE/D,OAAO,uBAAa,CAAC,YAAY,CAAC;QAC9B,UAAU,EAAE,CACR,aAA4B,EAC5B,WAAwB,EACxB,cAA8B,EAC9B,WAA+B,EAC/B,kCAAsE,EACxE,EAAE;YACA,OAAO,oBAAoB,CACvB,WAAW,EACX,aAAa,EACb,cAAc,EACd,WAAW,EACX,kCAAkC,EAClC,UAAU,CAAC,aAAa,CAAC,CAC5B,CAAC;QACN,CAAC;QACD,MAAM,EAAE;YACJ,8BAAa;YACb,0BAAW;YACX,iCAAc;YACd,4BAAkB;YAClB,2EAAkC;SACrC;QACD,OAAO,EAAE,CAAC,4BAAY,EAAE,wBAAU,EAAE,sCAAe,EAAE,8BAAa,CAAC;KACtE,CAAC,CAAC;AACP,CAAC;AA7BD,wDA6BC;AAED,KAAK,UAAU,oBAAoB,CAC/B,WAAwB,EACxB,aAA4B,EAC5B,cAA8B,EAC9B,WAA+B,EAC/B,kCAAsE,EACtE,OAA0B;IAE1B,MAAM,WAAW,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7D,MAAM,SAAS,GAAG,sCAAiB,CAC/B,aAAa,EACb,kCAAkC,EAClC,OAAO,CAAC,OAAO,EACf,WAAW,CACd,CAAC;IACF,OAAO;QACH,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO;QAC3B,QAAQ,EAAE,qBAAW,CAAC,WAAW,CAAC;QAClC,OAAO,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,GAAG,8DAAkC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACzF,sBAAsB,EAAE,CAAC,QAAQ,CAAC;QAClC,SAAS;QACT,mFAAmF;QACnF,6GAA6G;QAC7G,OAAO,EAAE,KAAK;QACd,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,KAAK;QACvC,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,KAAK;QAC7B,OAAO,EAAE,CAAC,GAAQ,EAAE,EAAE,CAAC,GAAG;QAC1B,6CAA6C;QAC7C,IAAI,EAAE,KAAK;QACX,OAAO,EAAE;YACL,IAAI,+BAAa,CAAC,cAAc,CAAC;YACjC,IAAI,+CAAqB,CAAC,WAAW,CAAC;YACtC,IAAI,iDAAsB,CAAC,aAAa,CAAC;YACzC,GAAG,aAAa,CAAC,UAAU,CAAC,mBAAmB;SAClD;QACD,eAAe,EAAE,OAAO,CAAC,eAAe;~~KACvB~~,CAAC;IAEtB;;;;;OAKG;IACH,KAAK,UAAU,iBAAiB,CAAC,OAAyB;QACtD,MAAM,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC;QAChD,4DAA4D;QAC5D,mDAAmD;QACnD,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAChF,MAAM,QAAQ,GAAG,MAAM,WAAW,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;QACtE,MAAM,cAAc,GAChB,OAAO,KAAK,MAAM;YACd,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,0BAA0B;YACtD,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,2BAA2B,CAAC;QAChE,IAAI,MAAM,GAAG,qBAAW,CAAC,QAAQ,CAAC,CAAC;QAEnC,wCAAsB,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC;aACjD,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;aAClE,MAAM,CAAC,iCAAkB,CAAC;aAC1B,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,sBAAY,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC;QAC5E,MAAM,GAAG,2CAAmB,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,GAAG,8CAAsB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,KAAK,MAAM,CAAC,CAAC;QAC1E,MAAM,GAAG,qDAA6B,CAAC,MAAM,EAAE,YAAY,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC;QAC7E,MAAM,GAAG,kDAA0B,CAAC,MAAM,EAAE,YAAY,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACtE,MAAM,GAAG,0DAAkC,CAAC,MAAM,EAAE,YAAY,CAAC,cAAc,IAAI,EAAE,CAAC,CAAC;QACvF,MAAM,GAAG,yDAAiC,CAAC,MAAM,EAAE,YAAY,CAAC,aAAa,IAAI,EAAE,CAAC,CAAC;QACrF,MAAM,GAAG,iDAA2B,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;QAC7D,MAAM,GAAG,gDAAqB,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,OAAO,KAAK,OAAO,EAAE;YACrB,MAAM,GAAG,mDAA2B,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAC3D,MAAM,GAAG,0DAAkC,CAAC,MAAM,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;SACnF;QACD,IAAI,OAAO,KAAK,MAAM,EAAE;YACpB,MAAM,GAAG,4DAAoC,CAAC,MAAM,EAAE,YAAY,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;SACtF;QACD,MAAM,GAAG,6CAAsB,CAAC,MAAM,EAAE,aAAa,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC;QAErF,OAAO,MAAM,CAAC;IAClB,CAAC;AACL,CAAC"}
1	+ {"version":3,"file":"configure-graphql-module.js","sourceRoot":"","sources":["../../../src/api/config/configure-graphql-module.ts"],"names":[],"mappings":"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"}

package/dist/api/config/generate-permissions.js CHANGED Viewed

@@ -4,10 +4,35 @@ exports.generatePermissionEnum = void 0;
 const stitch_1 = require("@graphql-tools/stitch");
 const graphql_1 = require("graphql");
 const constants_1 = require("../../common/constants");
-const PERMISSION_DESCRIPTION = `@description
-Permissions for administrators and customers. Used to control access to
-GraphQL resolvers via the {@link Allow} decorator.
+const PERMISSION_DESCRIPTION = `@description
+Permissions for administrators and customers. Used to control access to
+GraphQL resolvers via the {@link Allow} decorator.
+## Understanding Permission.Owner
+\`Permission.Owner\` is a special permission which is used in some of the Vendure resolvers to indicate that that resolver should only
+be accessible to the "owner" of that resource.
+For example, the Shop API \`activeCustomer\` query resolver should only return the Customer object for the "owner" of that Customer, i.e.
+based on the activeUserId of the current session. As a result, the resolver code looks like this:
+@example
+\`\`\`TypeScript
+\\@Query()
+\\@Allow(Permission.Owner)
+async activeCustomer(\\@Ctx() ctx: RequestContext): Promise<Customer | undefined> {
+  const userId = ctx.activeUserId;
+  if (userId) {
+    return this.customerService.findOneByUserId(ctx, userId);
+  }
+}
+\`\`\`
+Here we can see that the "ownership" must be enforced by custom logic inside the resolver. Since "ownership" cannot be defined generally
+nor statically encoded at build-time, any resolvers using \`Permission.Owner\` **must** include logic to enforce that only the owner
+of the resource has access. If not, then it is the equivalent of using \`Permission.Public\`.
 @docsCategory common`;
 /**
  * Generates the `Permission` GraphQL enum based on the default & custom permission definitions.

package/dist/api/config/generate-permissions.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"generate-permissions.js","sourceRoot":"","sources":["../../../src/api/config/generate-permissions.ts"],"names":[],"mappings":";;;AAAA,kDAAuE;AACvE,qCAAyD;AAGzD,sDAAmE;AAGnE,MAAM,sBAAsB,GAAG~~;;;;qBAIV~~,CAAC;AAEtB;;GAEG;AACH,SAAgB,sBAAsB,CAClC,MAAqB,EACrB,iBAAyC;IAEzC,MAAM,sBAAsB,GAAG,qCAAyB,CAAC,iBAAiB,CAAC,CAAC;IAC5E,MAAM,MAAM,GAA8B,EAAE,CAAC;IAC7C,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,KAAK,IAAI,sBAAsB,EAAE;QACxC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG;YACjB,KAAK,EAAE,CAAC;YACR,WAAW,EAAE,KAAK,CAAC,WAAW;SACjC,CAAC;QACF,CAAC,EAAE,CAAC;KACP;IAED,MAAM,eAAe,GAAG,IAAI,yBAAe,CAAC;QACxC,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,sBAAsB;QACnC,MAAM;KACT,CAAC,CAAC;IAEH,OAAO,sBAAa,CAAC;QACjB,UAAU,EAAE,CAAC,MAAM,CAAC;QACpB,KAAK,EAAE,CAAC,eAAe,CAAC;QACxB,kBAAkB,EAAE,EAAE,kBAAkB,EAAE,EAAE,eAAe,EAAE,wBAAe,CAAC,GAAG,EAAE,EAAE;KACvF,CAAC,CAAC;AACP,CAAC;AA1BD,wDA0BC"}
1	+ {"version":3,"file":"generate-permissions.js","sourceRoot":"","sources":["../../../src/api/config/generate-permissions.ts"],"names":[],"mappings":";;;AAAA,kDAAuE;AACvE,qCAAyD;AAGzD,sDAAmE;AAGnE,MAAM,sBAAsB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBA6BV,CAAC;AAEtB;;GAEG;AACH,SAAgB,sBAAsB,CAClC,MAAqB,EACrB,iBAAyC;IAEzC,MAAM,sBAAsB,GAAG,qCAAyB,CAAC,iBAAiB,CAAC,CAAC;IAC5E,MAAM,MAAM,GAA8B,EAAE,CAAC;IAC7C,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,KAAK,IAAI,sBAAsB,EAAE;QACxC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG;YACjB,KAAK,EAAE,CAAC;YACR,WAAW,EAAE,KAAK,CAAC,WAAW;SACjC,CAAC;QACF,CAAC,EAAE,CAAC;KACP;IAED,MAAM,eAAe,GAAG,IAAI,yBAAe,CAAC;QACxC,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,sBAAsB;QACnC,MAAM;KACT,CAAC,CAAC;IAEH,OAAO,sBAAa,CAAC;QACjB,UAAU,EAAE,CAAC,MAAM,CAAC;QACpB,KAAK,EAAE,CAAC,eAAe,CAAC;QACxB,kBAAkB,EAAE,EAAE,kBAAkB,EAAE,EAAE,eAAe,EAAE,wBAAe,CAAC,GAAG,EAAE,EAAE;KACvF,CAAC,CAAC;AACP,CAAC;AA1BD,wDA0BC"}

package/dist/api/config/graphql-custom-fields.js CHANGED Viewed

@@ -42,7 +42,7 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
             if (customEntityFields.length) {
                 customFieldTypeDefs += `
                     type ${entityName}CustomFields {
-                        ${mapToFields(customEntityFields, getGraphQlType)}
+                        ${mapToFields(customEntityFields, wrapListType(getGraphQlType))}
                     }
                     extend type ${entityName} {
@@ -61,7 +61,7 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
         if (localeStringFields.length && schema.getType(`${entityName}Translation`)) {
             customFieldTypeDefs += `
                     type ${entityName}TranslationCustomFields {
-                         ${mapToFields(localeStringFields, getGraphQlType)}
+                         ${mapToFields(localeStringFields, wrapListType(getGraphQlType))}
                     }
                     extend type ${entityName}Translation {
@@ -73,7 +73,7 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
             if (writeableNonLocaleStringFields.length) {
                 customFieldTypeDefs += `
                     input Create${entityName}CustomFieldsInput {
-                       ${mapToFields(writeableNonLocaleStringFields, getGraphQlInputType, shared_utils_1.getGraphQlInputName)}
+                       ${mapToFields(writeableNonLocaleStringFields, wrapListType(getGraphQlInputType), shared_utils_1.getGraphQlInputName)}
                     }
                     extend input Create${entityName}Input {
@@ -93,7 +93,7 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
             if (writeableNonLocaleStringFields.length) {
                 customFieldTypeDefs += `
                     input Update${entityName}CustomFieldsInput {
-                       ${mapToFields(writeableNonLocaleStringFields, getGraphQlInputType, shared_utils_1.getGraphQlInputName)}
+                       ${mapToFields(writeableNonLocaleStringFields, wrapListType(getGraphQlInputType), shared_utils_1.getGraphQlInputName)}
                     }
                     extend input Update${entityName}Input {
@@ -109,10 +109,13 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
                 `;
             }
         }
-        if (customEntityFields.length && schema.getType(`${entityName}SortParameter`)) {
+        const customEntityNonListFields = customEntityFields.filter(f => f.list !== true);
+        if (customEntityNonListFields.length && schema.getType(`${entityName}SortParameter`)) {
+            // Sorting list fields makes no sense, so we only add "sort" fields
+            // to non-list fields.
             customFieldTypeDefs += `
                     extend input ${entityName}SortParameter {
-                         ${mapToFields(customEntityFields, () => 'SortOrder')}
+                         ${mapToFields(customEntityNonListFields, () => 'SortOrder')}
                     }
                 `;
         }
@@ -134,7 +137,7 @@ function addGraphQLCustomFields(typeDefsOrSchema, customFieldConfig, publicOnly)
                     if (writeableLocaleStringFields.length) {
                         customFieldTypeDefs += `
                             input ${inputName}CustomFields {
-                                ${mapToFields(writeableLocaleStringFields, getGraphQlType)}
+                                ${mapToFields(writeableLocaleStringFields, wrapListType(getGraphQlType))}
                             }
                             extend input ${inputName} {
@@ -226,7 +229,7 @@ function addRegisterCustomerCustomFieldsInput(typeDefsOrSchema, customerCustomFi
     }
     const customFieldTypeDefs = `
         input RegisterCustomerCustomFieldsInput {
-            ${mapToFields(publicWritableCustomFields, getGraphQlInputType, shared_utils_1.getGraphQlInputName)}
+            ${mapToFields(publicWritableCustomFields, wrapListType(getGraphQlInputType), shared_utils_1.getGraphQlInputName)}
         }
         extend input RegisterCustomerInput {
@@ -375,13 +378,12 @@ exports.addPaymentMethodQuoteCustomFields = addPaymentMethodQuoteCustomFields;
 function mapToFields(fieldDefs, typeFn, nameFn) {
     const res = fieldDefs
         .map(field => {
-        const primitiveType = typeFn(field);
-        if (!primitiveType) {
+        const type = typeFn(field);
+        if (!type) {
             return;
         }
-        const finalType = field.list ? `[${primitiveType}!]` : primitiveType;
         const name = nameFn ? nameFn(field) : field.name;
-        return `${name}: ${finalType}`;
+        return `${name}: ${type}`;
     })
         .filter(x => x != null);
     return res.join('\n');
@@ -389,16 +391,16 @@ function mapToFields(fieldDefs, typeFn, nameFn) {
 function getFilterOperator(config) {
     switch (config.type) {
         case 'datetime':
-            return 'DateOperators';
+            return config.list ? 'DateListOperators' : 'DateOperators';
         case 'string':
         case 'localeString':
         case 'text':
-            return 'StringOperators';
+            return config.list ? 'StringListOperators' : 'StringOperators';
         case 'boolean':
-            return 'BooleanOperators';
+            return config.list ? 'BooleanListOperators' : 'BooleanOperators';
         case 'int':
         case 'float':
-            return 'NumberOperators';
+            return config.list ? 'NumberListOperators' : 'NumberOperators';
         case 'relation':
             return undefined;
         default:
@@ -409,6 +411,15 @@ function getFilterOperator(config) {
 function getGraphQlInputType(config) {
     return config.type === 'relation' ? `ID` : getGraphQlType(config);
 }
+function wrapListType(getTypeFn) {
+    return (def) => {
+        const type = getTypeFn(def);
+        if (!type) {
+            return;
+        }
+        return def.list ? `[${type}!]` : type;
+    };
+}
 function getGraphQlType(config) {
     switch (config.type) {
         case 'string':

package/dist/api/config/graphql-custom-fields.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"graphql-custom-fields.js","sourceRoot":"","sources":["../../../src/api/config/graphql-custom-fields.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"graphql-custom-fields.js","sourceRoot":"","sources":["../../../src/api/config/graphql-custom-fields.ts"],"names":[],"mappings":"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"}

package/dist/api/decorators/request-context.decorator.js CHANGED Viewed

@@ -20,13 +20,20 @@ const constants_1 = require("../../common/constants");
  * @docsPage Ctx Decorator
  */
 exports.Ctx = common_1.createParamDecorator((data, ctx) => {
+    const getContext = (req) => {
+        const map = req[constants_1.REQUEST_CONTEXT_MAP_KEY];
+        // If a map contains associated transactional context with this handler
+        // we have to use it. It means that this handler was wrapped with @Transaction decorator.
+        // Otherwise use default context.
+        return (map === null || map === void 0 ? void 0 : map.get(ctx.getHandler())) || req[constants_1.REQUEST_CONTEXT_KEY];
+    };
     if (ctx.getType() === 'graphql') {
         // GraphQL request
-        return ctx.getArgByIndex(2).req[constants_1.REQUEST_CONTEXT_KEY];
+        return getContext(ctx.getArgByIndex(2).req);
     }
     else {
         // REST request
-        return ctx.switchToHttp().getRequest()[constants_1.REQUEST_CONTEXT_KEY];
+        return getContext(ctx.switchToHttp().getRequest());
     }
 });
 //# sourceMappingURL=request-context.decorator.js.map

package/dist/api/decorators/request-context.decorator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"request-context.decorator.js","sourceRoot":"","sources":["../../../src/api/decorators/request-context.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAqF;AAErF,~~sDAA6D~~;~~AAE7D~~;;;;;;;;;;;;;;;GAeG;AACU,QAAA,GAAG,GAAG,6BAAoB,CAAC,CAAC,IAAI,EAAE,GAAqB,EAAE,EAAE;IACpE,IAAI,GAAG,CAAC,OAAO,EAA2B,KAAK,SAAS,EAAE;QACtD,kBAAkB;QAClB,OAAO,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC~~,+BAAmB~~,CAAC~~,CAAC~~;~~KACxD~~;SAAM;QACH,eAAe;QACf,OAAO,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC~~,+BAAmB~~,CAAC~~,CAAC~~;~~KAC/D~~;AACL,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"request-context.decorator.js","sourceRoot":"","sources":["../../../src/api/decorators/request-context.decorator.ts"],"names":[],"mappings":";;;AAAA,2CAAqF;AAErF,sDAAsF;AAEtF;;;;;;;;;;;;;;;GAeG;AACU,QAAA,GAAG,GAAG,6BAAoB,CAAC,CAAC,IAAI,EAAE,GAAqB,EAAE,EAAE;IACpE,MAAM,UAAU,GAAG,CAAC,GAAQ,EAAE,EAAE;QAC5B,MAAM,GAAG,GAAmC,GAAG,CAAC,mCAAuB,CAAC,CAAC;QAEzE,uEAAuE;QACvE,yFAAyF;QACzF,iCAAiC;QACjC,OAAO,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,KAAI,GAAG,CAAC,+BAAmB,CAAC,CAAC;IAClE,CAAC,CAAA;IAED,IAAI,GAAG,CAAC,OAAO,EAA2B,KAAK,SAAS,EAAE;QACtD,kBAAkB;QAClB,OAAO,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;KAC/C;SAAM;QACH,eAAe;QACf,OAAO,UAAU,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC;KACtD;AACL,CAAC,CAAC,CAAC"}

package/dist/api/middleware/auth-guard.d.ts CHANGED Viewed

@@ -1,10 +1,10 @@
 import { CanActivate, ExecutionContext } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { ConfigService } from '../../config/config.service';
+import { RequestContextService } from '../../service/helpers/request-context/request-context.service';
 import { ChannelService } from '../../service/services/channel.service';
 import { CustomerService } from '../../service/services/customer.service';
 import { SessionService } from '../../service/services/session.service';
-import { RequestContextService } from '../common/request-context.service';
 /**
  * @description
  * A guard which:

package/dist/api/middleware/auth-guard.js CHANGED Viewed

@@ -18,12 +18,12 @@ const errors_1 = require("../../common/error/errors");
 const config_service_1 = require("../../config/config.service");
 const vendure_logger_1 = require("../../config/logger/vendure-logger");
 const customer_entity_1 = require("../../entity/customer/customer.entity");
+const request_context_service_1 = require("../../service/helpers/request-context/request-context.service");
 const channel_service_1 = require("../../service/services/channel.service");
 const customer_service_1 = require("../../service/services/customer.service");
 const session_service_1 = require("../../service/services/session.service");
 const extract_session_token_1 = require("../common/extract-session-token");
 const parse_context_1 = require("../common/parse-context");
-const request_context_service_1 = require("../common/request-context.service");
 const set_session_token_1 = require("../common/set-session-token");
 const allow_decorator_1 = require("../decorators/allow.decorator");
 /**

package/dist/api/middleware/auth-guard.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"auth-guard.js","sourceRoot":"","sources":["../../../src/api/middleware/auth-guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA2E;AAC3E,uCAAyC;AACzC,yEAAiE;AAIjE,sDAA6D;AAC7D,sDAA2D;AAC3D,gEAA4D;AAC5D,uEAA8D;AAE9D,2EAAiE;AACjE,4EAAwE;AACxE,8EAA0E;AAC1E,4EAAwE;AACxE,2EAAsE;AACtE,2DAAuD;AAEvD~~,+EAA0E;AAC1E~~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"}
1	+ {"version":3,"file":"auth-guard.js","sourceRoot":"","sources":["../../../src/api/middleware/auth-guard.ts"],"names":[],"mappings":"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"}

package/dist/api/middleware/transaction-interceptor.d.ts CHANGED Viewed

@@ -1,6 +1,7 @@
 import { CallHandler, ExecutionContext, NestInterceptor } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { Observable } from 'rxjs';
+import { RequestContext } from '..';
 import { TransactionWrapper } from '../../connection/transaction-wrapper';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 /**
@@ -14,4 +15,12 @@ export declare class TransactionInterceptor implements NestInterceptor {
     private reflector;
     constructor(connection: TransactionalConnection, transactionWrapper: TransactionWrapper, reflector: Reflector);
     intercept(context: ExecutionContext, next: CallHandler): Observable<any>;
+    /**
+     * Registers transactional request context associated with execution handler function
+     *
+     * @param ctx transactional request context
+     * @param handler handler function from ExecutionContext
+     * @param req Request object
+     */
+    registerTransactionalContext(ctx: RequestContext, handler: Function, req: any): void;
 }

package/dist/api/middleware/transaction-interceptor.js CHANGED Viewed

@@ -34,12 +34,27 @@ let TransactionInterceptor = class TransactionInterceptor {
         const ctx = req[constants_1.REQUEST_CONTEXT_KEY];
         if (ctx) {
             const transactionMode = this.reflector.get(transaction_decorator_1.TRANSACTION_MODE_METADATA_KEY, context.getHandler());
-            return rxjs_1.of(this.transactionWrapper.executeInTransaction(ctx, () => next.handle(), transactionMode, this.connection.rawConnection));
+            return rxjs_1.of(this.transactionWrapper.executeInTransaction(ctx, (ctx) => {
+                this.registerTransactionalContext(ctx, context.getHandler(), req);
+                return next.handle();
+            }, transactionMode, this.connection.rawConnection));
         }
         else {
             return next.handle();
         }
     }
+    /**
+     * Registers transactional request context associated with execution handler function
+     *
+     * @param ctx transactional request context
+     * @param handler handler function from ExecutionContext
+     * @param req Request object
+     */
+    registerTransactionalContext(ctx, handler, req) {
+        const map = req[constants_1.REQUEST_CONTEXT_MAP_KEY] || new Map();
+        map.set(handler, ctx);
+        req[constants_1.REQUEST_CONTEXT_MAP_KEY] = map;
+    }
 };
 TransactionInterceptor = __decorate([
     common_1.Injectable(),

package/dist/api/middleware/transaction-interceptor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"transaction-interceptor.js","sourceRoot":"","sources":["../../../src/api/middleware/transaction-interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4F;AAC5F,uCAAyC;AACzC,+BAAsC;~~AAEtC~~,~~sDAA6D~~;~~AAC7D~~,8EAA0E;AAC1E,wFAAoF;AACpF,2DAAuD;AACvD,+EAAqG;AAErG;;;;GAIG;AAEH,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAC/B,YACY,UAAmC,EACnC,kBAAsC,EACtC,SAAoB;QAFpB,eAAU,GAAV,UAAU,CAAyB;QACnC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,cAAS,GAAT,SAAS,CAAW;IAC7B,CAAC;~~IACJ~~,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAClD,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,4BAAY,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,GAAG,~~GAAI~~,GAAW,CAAC,+BAAmB,CAAC,CAAC;~~QAC9C~~,IAAI,GAAG,EAAE;YACL,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CACtC,qDAA6B,EAC7B,OAAO,CAAC,UAAU,EAAE,CACvB,CAAC;~~YACF~~,OAAO,SAAE,CACL,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CACxC,GAAG,EACH,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,~~EACnB~~,eAAe,EACf,IAAI,CAAC,UAAU,CAAC,aAAa,CAChC,CACJ,CAAC;SACL;aAAM;YACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;SACxB;IACL,CAAC;CACJ,CAAA;~~AA1BY~~,sBAAsB;IADlC,mBAAU,EAAE;qCAGe,kDAAuB;QACf,wCAAkB;QAC3B,gBAAS;GAJvB,sBAAsB,~~CA0BlC~~;~~AA1BY~~,wDAAsB"}
1	+ {"version":3,"file":"transaction-interceptor.js","sourceRoot":"","sources":["../../../src/api/middleware/transaction-interceptor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4F;AAC5F,uCAAyC;AACzC,+BAAsC;AAGtC,sDAAsF;AACtF,8EAA0E;AAC1E,wFAAoF;AACpF,2DAAuD;AACvD,+EAAqG;AAErG;;;;GAIG;AAEH,IAAa,sBAAsB,GAAnC,MAAa,sBAAsB;IAC/B,YACY,UAAmC,EACnC,kBAAsC,EACtC,SAAoB;QAFpB,eAAU,GAAV,UAAU,CAAyB;QACnC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,cAAS,GAAT,SAAS,CAAW;IAC7B,CAAC;IAEJ,SAAS,CAAC,OAAyB,EAAE,IAAiB;QAClD,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,GAAG,4BAAY,CAAC,OAAO,CAAC,CAAC;QACjD,MAAM,GAAG,GAAgC,GAAW,CAAC,+BAAmB,CAAC,CAAC;QAE1E,IAAI,GAAG,EAAE;YACL,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CACtC,qDAA6B,EAC7B,OAAO,CAAC,UAAU,EAAE,CACvB,CAAC;YAEF,OAAO,SAAE,CACL,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CACxC,GAAG,EACH,CAAC,GAAG,EAAE,EAAE;gBACJ,IAAI,CAAC,4BAA4B,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,EAAE,EAAE,GAAG,CAAC,CAAC;gBAElE,OAAO,IAAI,CAAC,MAAM,EAAE,CAAA;YACxB,CAAC,EACD,eAAe,EACf,IAAI,CAAC,UAAU,CAAC,aAAa,CAChC,CACJ,CAAC;SACL;aAAM;YACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;SACxB;IACL,CAAC;IAED;;;;;;OAMG;IACH,4BAA4B,CAAC,GAAmB,EAAE,OAAiB,EAAE,GAAQ;QACzE,MAAM,GAAG,GAAkC,GAAG,CAAC,mCAAuB,CAAC,IAAI,IAAI,GAAG,EAAE,CAAC;QACrF,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAEtB,GAAG,CAAC,mCAAuB,CAAC,GAAG,GAAG,CAAC;IACvC,CAAC;CACJ,CAAA;AA/CY,sBAAsB;IADlC,mBAAU,EAAE;qCAGe,kDAAuB;QACf,wCAAkB;QAC3B,gBAAS;GAJvB,sBAAsB,CA+ClC;AA/CY,wDAAsB"}

package/dist/api/resolvers/admin/global-settings.resolver.js CHANGED Viewed

@@ -82,7 +82,7 @@ let GlobalSettingsResolver = class GlobalSettingsResolver {
     }
     getScalarFieldsOfType(info, typeName) {
         const type = info.schema.getType(typeName);
-        if (type && graphql_2.isObjectType(type)) {
+        if (type && (graphql_2.isObjectType(type) || graphql_2.isInterfaceType(type))) {
             return Object.values(type.getFields())
                 .filter(field => {
                 const namedType = this.getNamedType(field.type);

package/dist/api/resolvers/admin/global-settings.resolver.js.map CHANGED Viewed

	@@ -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,yEAO6C;AAC7C,~~qCAUiB~~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~~YAC5B~~,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;iBACjC,MAAM,CAAC,KAAK,CAAC,EAAE;gBACZ,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAChD,OAAO,sBAAY,CAAC,SAAS,CAAC,IAAI,oBAAU,CAAC,SAAS,CAAC,CAAC;YAC5D,CAAC,CAAC;iBACD,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACjC;aAAM;YACH,OAAO,EAAE,CAAC;SACb;IACL,CAAC;IAEO,YAAY,CAAC,IAAuB;QACxC,IAAI,uBAAa,CAAC,IAAI,CAAC,IAAI,oBAAU,CAAC,IAAI,CAAC,EAAE;YACzC,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACzC;aAAM;YACH,OAAO,IAAI,CAAC;SACf;IACL,CAAC;CACJ,CAAA;AAxFG;IAFC,eAAK,EAAE;IACP,uBAAK,CAAC,4BAAU,CAAC,aAAa,CAAC;IACV,WAAA,+BAAG,EAAE,CAAA;;qCAAM,gCAAc;;4DAE9C;AAMD;IADC,sBAAY,EAAE;IACD,WAAA,cAAI,EAAE,CAAA;;;;0DAUnB;AAKD;IAHC,mCAAW,EAAE;IACb,kBAAQ,EAAE;IACV,uBAAK,CAAC,4BAAU,CAAC,cAAc,EAAE,4BAAU,CAAC,oBAAoB,CAAC;IAE7D,WAAA,+BAAG,EAAE,CAAA;IACL,WAAA,cAAI,EAAE,CAAA;;qCADK,gCAAc;;kEAmB7B;AArDQ,sBAAsB;IADlC,kBAAQ,CAAC,gBAAgB,CAAC;qCAGI,8BAAa;QACL,+CAAqB;QAC5B,gCAAc;QAChB,4BAAY;GAL7B,sBAAsB,CAkGlC;AAlGY,wDAAsB"}
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/api/resolvers/entity/order-line-entity.resolver.d.ts CHANGED Viewed

@@ -1,10 +1,12 @@
-import { Asset, OrderLine, ProductVariant } from '../../../entity';
-import { AssetService, ProductVariantService } from '../../../service';
+import { Asset, Order, OrderLine, ProductVariant } from '../../../entity';
+import { AssetService, OrderService, ProductVariantService } from '../../../service';
 import { RequestContext } from '../../common/request-context';
 export declare class OrderLineEntityResolver {
     private productVariantService;
     private assetService;
-    constructor(productVariantService: ProductVariantService, assetService: AssetService);
+    private orderService;
+    constructor(productVariantService: ProductVariantService, assetService: AssetService, orderService: OrderService);
     productVariant(ctx: RequestContext, orderLine: OrderLine): Promise<ProductVariant>;
     featuredAsset(ctx: RequestContext, orderLine: OrderLine): Promise<Asset | undefined>;
+    order(ctx: RequestContext, orderLine: OrderLine): Promise<Order | undefined>;
 }

package/dist/api/resolvers/entity/order-line-entity.resolver.js CHANGED Viewed

@@ -19,9 +19,10 @@ const service_1 = require("../../../service");
 const request_context_1 = require("../../common/request-context");
 const request_context_decorator_1 = require("../../decorators/request-context.decorator");
 let OrderLineEntityResolver = class OrderLineEntityResolver {
-    constructor(productVariantService, assetService) {
+    constructor(productVariantService, assetService, orderService) {
         this.productVariantService = productVariantService;
         this.assetService = assetService;
+        this.orderService = orderService;
     }
     async productVariant(ctx, orderLine) {
         if (orderLine.productVariant) {
@@ -37,6 +38,9 @@ let OrderLineEntityResolver = class OrderLineEntityResolver {
             return this.assetService.getFeaturedAsset(ctx, orderLine);
         }
     }
+    async order(ctx, orderLine) {
+        return this.orderService.findOneByOrderLineId(ctx, orderLine.id);
+    }
 };
 __decorate([
     graphql_1.ResolveField(),
@@ -56,9 +60,19 @@ __decorate([
         entity_1.OrderLine]),
     __metadata("design:returntype", Promise)
 ], OrderLineEntityResolver.prototype, "featuredAsset", null);
+__decorate([
+    graphql_1.ResolveField(),
+    __param(0, request_context_decorator_1.Ctx()),
+    __param(1, graphql_1.Parent()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [request_context_1.RequestContext, entity_1.OrderLine]),
+    __metadata("design:returntype", Promise)
+], OrderLineEntityResolver.prototype, "order", null);
 OrderLineEntityResolver = __decorate([
     graphql_1.Resolver('OrderLine'),
-    __metadata("design:paramtypes", [service_1.ProductVariantService, service_1.AssetService])
+    __metadata("design:paramtypes", [service_1.ProductVariantService,
+        service_1.AssetService,
+        service_1.OrderService])
 ], OrderLineEntityResolver);
 exports.OrderLineEntityResolver = OrderLineEntityResolver;
 //# sourceMappingURL=order-line-entity.resolver.js.map

package/dist/api/resolvers/entity/order-line-entity.resolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"order-line-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/order-line-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAiE;AAEjE,~~4CAAmE~~;~~AACnE~~,~~8CAAuE~~;~~AACvE~~,kEAA8D;AAC9D,0FAAiE;AAGjE,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAChC,~~YAAoB~~,qBAA4C,~~EAAU~~,YAA0B;~~QAAhF~~,0BAAqB,GAArB,qBAAqB,CAAuB;~~QAAU~~,iBAAY,GAAZ,YAAY,CAAc;~~IAAG~~,CAAC;~~IAGxG~~,KAAK,CAAC,cAAc,CACT,GAAmB,EAChB,SAAoB;QAE9B,IAAI,SAAS,CAAC,cAAc,EAAE;YAC1B,OAAO,SAAS,CAAC,cAAc,CAAC;SACnC;QACD,OAAO,IAAI,CAAC,qBAAqB,CAAC,uBAAuB,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IAGD,KAAK,CAAC,aAAa,CACR,GAAmB,EAChB,SAAoB;QAE9B,IAAI,SAAS,CAAC,aAAa,EAAE;YACzB,OAAO,SAAS,CAAC,aAAa,CAAC;SAClC;aAAM;YACH,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;SAC7D;IACL,CAAC;CACJ,CAAA;~~AArBG~~;IADC,sBAAY,EAAE;IAEV,WAAA,+BAAG,EAAE,CAAA;IACL,WAAA,gBAAM,EAAE,CAAA;;qCADG,gCAAc;QACL,kBAAS;;6DAMjC;AAGD;IADC,sBAAY,EAAE;IAEV,WAAA,+BAAG,EAAE,CAAA;IACL,WAAA,gBAAM,EAAE,CAAA;;qCADG,gCAAc;QACL,kBAAS;;4DAOjC;~~AAxBQ~~,uBAAuB;IADnC,kBAAQ,CAAC,WAAW,CAAC;~~qCAEyB~~,+BAAqB,~~EAAwB~~,sBAAY;~~GAD3F~~,uBAAuB,~~CAyBnC~~;~~AAzBY~~,0DAAuB"}
1	+ {"version":3,"file":"order-line-entity.resolver.js","sourceRoot":"","sources":["../../../../src/api/resolvers/entity/order-line-entity.resolver.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAAiE;AAEjE,4CAA0E;AAC1E,8CAAqF;AACrF,kEAA8D;AAC9D,0FAAiE;AAGjE,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAChC,YACY,qBAA4C,EAC5C,YAA0B,EAC1B,YAA0B;QAF1B,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iBAAY,GAAZ,YAAY,CAAc;IACnC,CAAC;IAGJ,KAAK,CAAC,cAAc,CACT,GAAmB,EAChB,SAAoB;QAE9B,IAAI,SAAS,CAAC,cAAc,EAAE;YAC1B,OAAO,SAAS,CAAC,cAAc,CAAC;SACnC;QACD,OAAO,IAAI,CAAC,qBAAqB,CAAC,uBAAuB,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IAGD,KAAK,CAAC,aAAa,CACR,GAAmB,EAChB,SAAoB;QAE9B,IAAI,SAAS,CAAC,aAAa,EAAE;YACzB,OAAO,SAAS,CAAC,aAAa,CAAC;SAClC;aAAM;YACH,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;SAC7D;IACL,CAAC;IAGD,KAAK,CAAC,KAAK,CAAQ,GAAmB,EAAY,SAAoB;QAClE,OAAO,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC;IACrE,CAAC;CACJ,CAAA;AA1BG;IADC,sBAAY,EAAE;IAEV,WAAA,+BAAG,EAAE,CAAA;IACL,WAAA,gBAAM,EAAE,CAAA;;qCADG,gCAAc;QACL,kBAAS;;6DAMjC;AAGD;IADC,sBAAY,EAAE;IAEV,WAAA,+BAAG,EAAE,CAAA;IACL,WAAA,gBAAM,EAAE,CAAA;;qCADG,gCAAc;QACL,kBAAS;;4DAOjC;AAGD;IADC,sBAAY,EAAE;IACF,WAAA,+BAAG,EAAE,CAAA;IAAuB,WAAA,gBAAM,EAAE,CAAA;;qCAAzB,gCAAc,EAAuB,kBAAS;;oDAErE;AAjCQ,uBAAuB;IADnC,kBAAQ,CAAC,WAAW,CAAC;qCAGiB,+BAAqB;QAC9B,sBAAY;QACZ,sBAAY;GAJ7B,uBAAuB,CAkCnC;AAlCY,0DAAuB"}

package/dist/api/schema/admin-api/customer.api.graphql CHANGED Viewed

@@ -36,6 +36,10 @@ input UpdateCustomerInput {
     emailAddress: String
 }
+input CustomerFilterParameter {
+    postalCode: StringOperators
+}
 # generated by generateListOptions function
 input CustomerListOptions

package/dist/api/schema/admin-api/order.api.graphql CHANGED Viewed

@@ -63,6 +63,8 @@ input CancelOrderInput {
     orderId: ID!
     "Optionally specify which OrderLines to cancel. If not provided, all OrderLines will be cancelled"
     lines: [OrderLineInput!]
+    "Specify whether the shipping charges should also be cancelled. Defaults to false"
+    cancelShipping: Boolean
     reason: String
 }
@@ -134,6 +136,7 @@ input ModifyOrderInput {
     note: String
     refund: AdministratorRefundInput
     options: ModifyOrderOptions
+    couponCodes: [String!]
 }
 input AddItemInput {
@@ -365,4 +368,7 @@ union ModifyOrderResult =
     | OrderLimitError
     | NegativeQuantityError
     | InsufficientStockError
+    | CouponCodeExpiredError
+    | CouponCodeInvalidError
+    | CouponCodeLimitError
 union AddManualPaymentToOrderResult = Order | ManualPaymentStateError

package/dist/api/schema/common/common-enums.graphql CHANGED Viewed

@@ -7,6 +7,7 @@ enum GlobalFlag {
 enum AdjustmentType {
     PROMOTION
     DISTRIBUTED_ORDER_PROMOTION
+    OTHER
 }
 enum DeletionResult {

package/dist/api/schema/common/common-error-results.graphql CHANGED Viewed

@@ -46,3 +46,25 @@ type InsufficientStockError implements ErrorResult {
     quantityAvailable: Int!
     order: Order!
 }
+"Returned if the provided coupon code is invalid"
+type CouponCodeInvalidError implements ErrorResult {
+    errorCode: ErrorCode!
+    message: String!
+    couponCode: String!
+}
+"Returned if the provided coupon code is invalid"
+type CouponCodeExpiredError implements ErrorResult {
+    errorCode: ErrorCode!
+    message: String!
+    couponCode: String!
+}
+"Returned if the provided coupon code is invalid"
+type CouponCodeLimitError implements ErrorResult {
+    errorCode: ErrorCode!
+    message: String!
+    couponCode: String!
+    limit: Int!
+}

package/dist/api/schema/common/common-types.graphql CHANGED Viewed

@@ -125,6 +125,31 @@ input DateOperators {
     between: DateRange
 }
+"Operators for filtering on a list of String fields"
+input StringListOperators {
+    inList: String!
+}
+"Operators for filtering on a list of Number fields"
+input NumberListOperators {
+    inList: Float!
+}
+"Operators for filtering on a list of Boolean fields"
+input BooleanListOperators {
+    inList: Boolean!
+}
+"Operators for filtering on a list of ID fields"
+input IDListOperators {
+    inList: ID!
+}
+"Operators for filtering on a list of Date fields"
+input DateListOperators {
+    inList: DateTime!
+}
 """
 Used to construct boolean expressions for filtering search results
 by FacetValue ID. Examples: