@webiny/api-headless-cms 5.20.0-beta.2 → 5.22.0-beta.0

package/content/contextSetup.d.ts

@@ -1,4 +1,4 @@
 import { CmsContext } from "../types";
-import { ContextPlugin } from "@webiny/handler/plugins/ContextPlugin";
+import { ContextPlugin } from "@webiny/handler";
 declare const _default: () => ContextPlugin<CmsContext>;
 export default _default;

package/content/contextSetup.js

@@ -9,7 +9,7 @@ exports.default = void 0;
 
 var _error = _interopRequireDefault(require("@webiny/error"));
 
-var _ContextPlugin = require("@webiny/handler/plugins/ContextPlugin");
+var _handler = require("@webiny/handler");
 
 const extractHandlerHttpParameters = context => {
   var _context$http, _context$http$request, _context$http$request2;
@@ -32,7 +32,7 @@ const extractHandlerHttpParameters = context => {
 };
 
 var _default = () => {
-  return new _ContextPlugin.ContextPlugin(async context => {
+  return new _handler.ContextPlugin(async context => {
     var _context$http2, _context$http2$reques;
 
     if (((_context$http2 = context.http) === null || _context$http2 === void 0 ? void 0 : (_context$http2$reques = _context$http2.request) === null || _context$http2$reques === void 0 ? void 0 : _context$http2$reques.method) === "OPTIONS") {

package/content/graphQLHandlerFactory.js

@@ -23,18 +23,26 @@ var _buildSchemaPlugins = _interopRequireDefault(require("./plugins/buildSchemaP
 
 var _plugins = require("@webiny/handler-graphql/plugins");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+var _utils = require("@webiny/utils");
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-const DEFAULT_HEADERS = {
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+const DEFAULT_HEADERS = _objectSpread({
   "Access-Control-Allow-Origin": "*",
   "Access-Control-Allow-Headers": "*",
   "Access-Control-Allow-Methods": "OPTIONS,POST",
   "Content-Type": "application/json"
-};
+}, (0, _utils.getWebinyVersionHeaders)());
+
 const DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year
 
+const OPTIONS_HEADERS = {
+  "Access-Control-Max-Age": `${DEFAULT_CACHE_MAX_AGE}`,
+  "Cache-Control": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`
+};
+
 const respond = (http, result) => {
   return http.response({
     body: JSON.stringify(result),
@@ -141,9 +149,7 @@ const graphQLHandlerFactory = (options = {}) => {
       if (http.request.method === "OPTIONS") {
         return http.response({
           statusCode: 204,
-          headers: _objectSpread(_objectSpread({}, DEFAULT_HEADERS), {}, {
-            "Cache-Control": "public, max-age=" + DEFAULT_CACHE_MAX_AGE
-          })
+          headers: _objectSpread(_objectSpread({}, DEFAULT_HEADERS), OPTIONS_HEADERS)
         });
       }
 

package/content/plugins/crud/contentEntry/afterDelete.d.ts

@@ -2,6 +2,6 @@ import { Topic } from "@webiny/pubsub/types";
 import { AfterEntryDeleteTopicParams, CmsContext } from "../../../../types";
 export interface Params {
     context: CmsContext;
-    onAfterDelete: Topic<AfterEntryDeleteTopicParams>;
+    onAfterEntryDelete: Topic<AfterEntryDeleteTopicParams>;
 }
 export declare const assignAfterEntryDelete: (params: Params) => void;

package/content/plugins/crud/contentEntry/afterDelete.js

@@ -10,9 +10,9 @@ var _markLockedFields = require("./markLockedFields");
 const assignAfterEntryDelete = params => {
   const {
     context,
-    onAfterDelete
+    onAfterEntryDelete
   } = params;
-  onAfterDelete.subscribe(async params => {
+  onAfterEntryDelete.subscribe(async params => {
     const {
       entry,
       model

package/content/plugins/crud/contentEntry/beforeCreate.d.ts

@@ -2,6 +2,6 @@ import { Topic } from "@webiny/pubsub/types";
 import { BeforeEntryCreateTopicParams, CmsContext } from "../../../../types";
 export interface Params {
     context: CmsContext;
-    onBeforeCreate: Topic<BeforeEntryCreateTopicParams>;
+    onBeforeEntryCreate: Topic<BeforeEntryCreateTopicParams>;
 }
 export declare const assignBeforeEntryCreate: (params: Params) => void;

package/content/plugins/crud/contentEntry/beforeCreate.js

@@ -10,9 +10,9 @@ var _markLockedFields = require("./markLockedFields");
 const assignBeforeEntryCreate = params => {
   const {
     context,
-    onBeforeCreate
+    onBeforeEntryCreate
   } = params;
-  onBeforeCreate.subscribe(async params => {
+  onBeforeEntryCreate.subscribe(async params => {
     const {
       entry,
       model

package/content/plugins/crud/contentEntry/beforeUpdate.d.ts

@@ -2,6 +2,6 @@ import { Topic } from "@webiny/pubsub/types";
 import { BeforeEntryUpdateTopicParams, CmsContext } from "../../../../types";
 export interface Params {
     context: CmsContext;
-    onBeforeUpdate: Topic<BeforeEntryUpdateTopicParams>;
+    onBeforeEntryUpdate: Topic<BeforeEntryUpdateTopicParams>;
 }
 export declare const assignBeforeEntryUpdate: (params: Params) => void;

package/content/plugins/crud/contentEntry/beforeUpdate.js

@@ -10,9 +10,9 @@ var _markLockedFields = require("./markLockedFields");
 const assignBeforeEntryUpdate = params => {
   const {
     context,
-    onBeforeUpdate
+    onBeforeEntryUpdate
   } = params;
-  onBeforeUpdate.subscribe(async params => {
+  onBeforeEntryUpdate.subscribe(async params => {
     const {
       entry,
       model

package/content/plugins/crud/contentEntry/entryDataValidation.d.ts

@@ -1,4 +1,10 @@
-import { CmsModel, CmsContext } from "../../../../types";
+import { CmsModel, CmsContext, CmsEntry } from "../../../../types";
 declare type InputData = Record<string, any>;
-export declare const validateModelEntryData: (context: CmsContext, contentModel: CmsModel, data: InputData) => Promise<void>;
+export interface Params {
+    context: CmsContext;
+    model: CmsModel;
+    data: InputData;
+    entry?: CmsEntry;
+}
+export declare const validateModelEntryData: (params: Params) => Promise<void>;
 export {};

package/content/plugins/crud/contentEntry/entryDataValidation.js

@@ -18,7 +18,8 @@ const validateValue = async (args, fieldValidators, value) => {
     validatorList,
     context,
     field,
-    contentModel
+    model,
+    entry
   } = args;
 
   try {
@@ -36,7 +37,8 @@ const validateValue = async (args, fieldValidators, value) => {
           context,
           validator: fieldValidator,
           field,
-          contentModel
+          model,
+          entry
         });
 
         if (!result) {
@@ -139,11 +141,18 @@ const execValidation = async args => {
   return await runFieldValueValidations(args);
 };
 
-const validateModelEntryData = async (context, contentModel, data) => {
+const validateModelEntryData = async params => {
+  const {
+    context,
+    model,
+    entry,
+    data
+  } = params;
   /**
    * To later simplify searching for the validations we map them to a name.
    * @see CmsModelFieldValidatorPlugin.validator.validate
    */
+
   const validatorList = context.plugins.byType("cms-model-field-validator").reduce((acc, plugin) => {
     const name = plugin.validator.name;
 
@@ -161,13 +170,14 @@ const validateModelEntryData = async (context, contentModel, data) => {
 
   const invalidFields = [];
 
-  for (const field of contentModel.fields) {
+  for (const field of model.fields) {
     const error = await execValidation({
-      contentModel,
+      model,
       validatorList,
       field,
       data,
-      context
+      context,
+      entry
     });
 
     if (!error) {

package/content/plugins/crud/contentEntry/markLockedFields.js

@@ -13,9 +13,9 @@ var _error = _interopRequireDefault(require("@webiny/error"));
 
 var _CmsModelPlugin = require("../../CmsModelPlugin");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const markLockedFields = async params => {
   const {

package/content/plugins/crud/contentEntry/referenceFieldsMapping.js

@@ -15,9 +15,9 @@ var _dotProp = _interopRequireDefault(require("dot-prop"));
 
 var _utils = require("@webiny/utils");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const buildReferenceFieldPaths = params => {
   const {