@webiny/api-headless-cms 5.25.0-beta.2 → 5.25.0-beta.3

package/content/plugins/schema/resolvers/manage/resolveGet.js

@@ -1,17 +1,79 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.resolveGet = void 0;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _error = _interopRequireDefault(require("@webiny/error"));
+
 var _responses = require("@webiny/handler-graphql/responses");
 
+var _utils = require("@webiny/utils");
+
+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 = 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 possibleTypes = ["published", "latest"];
+
+const getValuesFromArgs = args => {
+  const {
+    status,
+    revision,
+    entryId
+  } = args || {};
+
+  if (!revision && !entryId) {
+    throw new _error.default("You must pass a 'revision' or an 'entryId' argument.", "GRAPHQL_ARGS_ERROR", _objectSpread({}, args || {}));
+  } else if (revision && entryId) {
+    throw new _error.default("Cannot have both of GraphQL query arguments: revision and entryId. Must have only one.", "GRAPHQL_ARGS_ERROR", _objectSpread({}, args));
+  }
+
+  if (status && possibleTypes.includes(status) === false) {
+    throw new _error.default(`Status can only be one of the following values: ${possibleTypes.join(" | ")}.`, "GRAPHQL_ARGS_ERROR", _objectSpread({}, args));
+  }
+  /**
+   * In case we are searching for latest or published but we do not have entryId, we need to set it.
+   * OR if version was not passed we will find latest or published, depending on status sent.
+   */
+
+
+  if (status || !revision) {
+    const {
+      id
+    } = (0, _utils.parseIdentifier)(entryId || revision);
+    return {
+      published: status === "published",
+      entryId: id
+    };
+  }
+
+  return {
+    revision
+  };
+};
+
 const resolveGet = ({
   model
 }) => async (_, args, context) => {
   try {
-    const entry = await context.cms.getEntryById(model, args.revision);
+    const {
+      entryId,
+      published,
+      revision
+    } = getValuesFromArgs(args);
+
+    if (entryId) {
+      const result = published ? await context.cms.getPublishedEntriesByIds(model, [entryId]) : await context.cms.getLatestEntriesByIds(model, [entryId]);
+      return new _responses.Response(result.shift() || null);
+    }
+
+    const entry = await context.cms.getEntryById(model, revision);
     return new _responses.Response(entry);
   } catch (e) {
     return new _responses.ErrorResponse(e);

package/content/plugins/schema/resolvers/manage/resolveGet.js.map

@@ -1 +1 @@
-{"version":3,"sources":["resolveGet.ts"],"names":["resolveGet","model","_","args","context","entry","cms","getEntryById","revision","Response","e","ErrorResponse"],"mappings":";;;;;;;AAAA;;AASO,MAAMA,UAAsB,GAC/B,CAAC;AAAEC,EAAAA;AAAF,CAAD,KACA,OAAOC,CAAP,EAAUC,IAAV,EAAqBC,OAArB,KAAiC;AAC7B,MAAI;AACA,UAAMC,KAAK,GAAG,MAAMD,OAAO,CAACE,GAAR,CAAYC,YAAZ,CAAyBN,KAAzB,EAAgCE,IAAI,CAACK,QAArC,CAApB;AACA,WAAO,IAAIC,mBAAJ,CAAaJ,KAAb,CAAP;AACH,GAHD,CAGE,OAAOK,CAAP,EAAU;AACR,WAAO,IAAIC,wBAAJ,CAAkBD,CAAlB,CAAP;AACH;AACJ,CATE","sourcesContent":["import { ErrorResponse, Response } from \"@webiny/handler-graphql/responses\";\nimport { CmsEntryResolverFactory as ResolverFactory } from \"~/types\";\n\ninterface ResolveGetArgs {\n    revision: string;\n}\n\ntype ResolveGet = ResolverFactory<any, ResolveGetArgs>;\n\nexport const resolveGet: ResolveGet =\n    ({ model }) =>\n    async (_, args: any, context) => {\n        try {\n            const entry = await context.cms.getEntryById(model, args.revision);\n            return new Response(entry);\n        } catch (e) {\n            return new ErrorResponse(e);\n        }\n    };\n"]}
+{"version":3,"sources":["resolveGet.ts"],"names":["possibleTypes","getValuesFromArgs","args","status","revision","entryId","WebinyError","includes","join","id","published","resolveGet","model","_","context","result","cms","getPublishedEntriesByIds","getLatestEntriesByIds","Response","shift","entry","getEntryById","e","ErrorResponse"],"mappings":";;;;;;;;;;;AAAA;;AACA;;AAEA;;;;;;AAmBA,MAAMA,aAAa,GAAG,CAAC,WAAD,EAAc,QAAd,CAAtB;;AAEA,MAAMC,iBAAiB,GAAIC,IAAD,IAA6C;AACnE,QAAM;AAAEC,IAAAA,MAAF;AAAUC,IAAAA,QAAV;AAAoBC,IAAAA;AAApB,MAAgCH,IAAI,IAAI,EAA9C;;AACA,MAAI,CAACE,QAAD,IAAa,CAACC,OAAlB,EAA2B;AACvB,UAAM,IAAIC,cAAJ,CACF,sDADE,EAEF,oBAFE,oBAIMJ,IAAI,IAAI,EAJd,EAAN;AAOH,GARD,MAQO,IAAIE,QAAQ,IAAIC,OAAhB,EAAyB;AAC5B,UAAM,IAAIC,cAAJ,CACF,wFADE,EAEF,oBAFE,oBAIKJ,IAJL,EAAN;AAOH;;AACD,MAAIC,MAAM,IAAIH,aAAa,CAACO,QAAd,CAAuBJ,MAAvB,MAAmC,KAAjD,EAAwD;AACpD,UAAM,IAAIG,cAAJ,CACD,mDAAkDN,aAAa,CAACQ,IAAd,CAAmB,KAAnB,CAA0B,GAD3E,EAEF,oBAFE,oBAIKN,IAJL,EAAN;AAOH;AACD;AACJ;AACA;AACA;;;AACI,MAAIC,MAAM,IAAI,CAACC,QAAf,EAAyB;AACrB,UAAM;AAAEK,MAAAA;AAAF,QAAS,4BAAgBJ,OAAO,IAAID,QAA3B,CAAf;AACA,WAAO;AACHM,MAAAA,SAAS,EAAEP,MAAM,KAAK,WADnB;AAEHE,MAAAA,OAAO,EAAEI;AAFN,KAAP;AAIH;;AACD,SAAO;AACHL,IAAAA;AADG,GAAP;AAGH,CA1CD;;AA4CO,MAAMO,UAAsB,GAC/B,CAAC;AAAEC,EAAAA;AAAF,CAAD,KACA,OAAOC,CAAP,EAAUX,IAAV,EAAqBY,OAArB,KAAiC;AAC7B,MAAI;AACA,UAAM;AAAET,MAAAA,OAAF;AAAWK,MAAAA,SAAX;AAAsBN,MAAAA;AAAtB,QAAmCH,iBAAiB,CAACC,IAAD,CAA1D;;AAEA,QAAIG,OAAJ,EAAa;AACT,YAAMU,MAAM,GAAGL,SAAS,GAClB,MAAMI,OAAO,CAACE,GAAR,CAAYC,wBAAZ,CAAqCL,KAArC,EAA4C,CAACP,OAAD,CAA5C,CADY,GAElB,MAAMS,OAAO,CAACE,GAAR,CAAYE,qBAAZ,CAAkCN,KAAlC,EAAyC,CAACP,OAAD,CAAzC,CAFZ;AAGA,aAAO,IAAIc,mBAAJ,CAAaJ,MAAM,CAACK,KAAP,MAAkB,IAA/B,CAAP;AACH;;AAED,UAAMC,KAAK,GAAG,MAAMP,OAAO,CAACE,GAAR,CAAYM,YAAZ,CAAyBV,KAAzB,EAAgCR,QAAhC,CAApB;AAEA,WAAO,IAAIe,mBAAJ,CAAaE,KAAb,CAAP;AACH,GAbD,CAaE,OAAOE,CAAP,EAAU;AACR,WAAO,IAAIC,wBAAJ,CAAkBD,CAAlB,CAAP;AACH;AACJ,CAnBE","sourcesContent":["import WebinyError from \"@webiny/error\";\nimport { ErrorResponse, Response } from \"@webiny/handler-graphql/responses\";\nimport { CmsEntryResolverFactory as ResolverFactory } from \"~/types\";\nimport { parseIdentifier } from \"@webiny/utils\";\n\ninterface ResolveGetArgs {\n    revision: string;\n}\n\ntype ResolveGet = ResolverFactory<any, ResolveGetArgs>;\n\ninterface ValuesFromArgsParams {\n    status?: \"published\" | \"latest\";\n    entryId?: string;\n    revision: string;\n}\ninterface ArgsValues {\n    published?: boolean;\n    entryId?: string;\n    revision?: string;\n}\n\nconst possibleTypes = [\"published\", \"latest\"];\n\nconst getValuesFromArgs = (args?: ValuesFromArgsParams): ArgsValues => {\n    const { status, revision, entryId } = args || {};\n    if (!revision && !entryId) {\n        throw new WebinyError(\n            \"You must pass a 'revision' or an 'entryId' argument.\",\n            \"GRAPHQL_ARGS_ERROR\",\n            {\n                ...(args || {})\n            }\n        );\n    } else if (revision && entryId) {\n        throw new WebinyError(\n            \"Cannot have both of GraphQL query arguments: revision and entryId. Must have only one.\",\n            \"GRAPHQL_ARGS_ERROR\",\n            {\n                ...args\n            }\n        );\n    }\n    if (status && possibleTypes.includes(status) === false) {\n        throw new WebinyError(\n            `Status can only be one of the following values: ${possibleTypes.join(\" | \")}.`,\n            \"GRAPHQL_ARGS_ERROR\",\n            {\n                ...args\n            }\n        );\n    }\n    /**\n     * In case we are searching for latest or published but we do not have entryId, we need to set it.\n     * OR if version was not passed we will find latest or published, depending on status sent.\n     */\n    if (status || !revision) {\n        const { id } = parseIdentifier(entryId || revision);\n        return {\n            published: status === \"published\",\n            entryId: id\n        };\n    }\n    return {\n        revision\n    };\n};\n\nexport const resolveGet: ResolveGet =\n    ({ model }) =>\n    async (_, args: any, context) => {\n        try {\n            const { entryId, published, revision } = getValuesFromArgs(args);\n\n            if (entryId) {\n                const result = published\n                    ? await context.cms.getPublishedEntriesByIds(model, [entryId])\n                    : await context.cms.getLatestEntriesByIds(model, [entryId]);\n                return new Response(result.shift() || null);\n            }\n\n            const entry = await context.cms.getEntryById(model, revision as string);\n\n            return new Response(entry);\n        } catch (e) {\n            return new ErrorResponse(e);\n        }\n    };\n"]}

package/index.d.ts

@@ -6,12 +6,14 @@ import { CreateParametersPluginsParams } from "./content/parameterPlugins";
 import { CmsParametersPlugin } from "./content/plugins/CmsParametersPlugin";
 import { CmsGroupPlugin } from "./content/plugins/CmsGroupPlugin";
 import { CmsModelPlugin } from "./content/plugins/CmsModelPlugin";
+import { ContextPlugin } from "@webiny/handler";
+import { CmsContext } from "./types";
 export declare type AdminContextParams = CreateAdminCrudsParams;
-export declare const createAdminHeadlessCmsContext: (params: AdminContextParams) => (import("@webiny/handler").ContextPlugin<import("./types").CmsContext> | import("@webiny/api-upgrade").UpgradePlugin<import("./types").CmsContext>[])[];
+export declare const createAdminHeadlessCmsContext: (params: AdminContextParams) => (ContextPlugin<CmsContext> | import("@webiny/api-upgrade").UpgradePlugin<CmsContext>[])[];
 export declare const createAdminHeadlessCmsGraphQL: () => import("@webiny/handler-graphql/types").GraphQLSchemaPlugin<import("@webiny/handler/types").Context>;
 export interface ContentContextParams extends CreateContentCrudsParams, CreateParametersPluginsParams {
 }
-export declare const createContentHeadlessCmsContext: (params: ContentContextParams) => (import("./types").ModelManagerPlugin | import("./types").CmsModelFieldToGraphQLPlugin[] | StorageTransformPlugin<any, any> | import("@webiny/handler").ContextPlugin<import("./types").CmsContext> | CmsParametersPlugin[] | (import("./types").CmsModelFieldValidatorPlugin | import("./types").CmsModelFieldPatternValidatorPlugin[])[])[];
+export declare const createContentHeadlessCmsContext: (params: ContentContextParams) => (import("./types").ModelManagerPlugin | import("./types").CmsModelFieldToGraphQLPlugin[] | StorageTransformPlugin<any, any> | ContextPlugin<CmsContext> | CmsParametersPlugin[] | (import("./types").CmsModelFieldValidatorPlugin | import("./types").CmsModelFieldPatternValidatorPlugin[])[])[];
 export declare type ContentGraphQLParams = CreateGraphQLHandlerOptions;
 export declare const createContentHeadlessCmsGraphQL: (params?: CreateGraphQLHandlerOptions | undefined) => import("@webiny/plugins/types").PluginCollection;
 export { StorageTransformPlugin, CmsParametersPlugin, CmsGroupPlugin, CmsModelPlugin };

package/index.js

@@ -31,6 +31,8 @@ Object.defineProperty(exports, "StorageTransformPlugin", {
 });
 exports.createContentHeadlessCmsGraphQL = exports.createContentHeadlessCmsContext = exports.createAdminHeadlessCmsGraphQL = exports.createAdminHeadlessCmsContext = void 0;
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _graphql = require("./plugins/graphql");
 
 var _crud = require("./plugins/crud");
@@ -65,8 +67,50 @@ var _CmsGroupPlugin = require("./content/plugins/CmsGroupPlugin");
 
 var _CmsModelPlugin = require("./content/plugins/CmsModelPlugin");
 
+var _handler = require("@webiny/handler");
+
+var _utils = require("@webiny/utils");
+
+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 = 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 breakOptionsRequestContextPlugin = () => {
+  const plugin = new _handler.ContextPlugin(async context => {
+    var _context$http, _context$http$request;
+
+    const method = (((_context$http = context.http) === null || _context$http === void 0 ? void 0 : (_context$http$request = _context$http.request) === null || _context$http$request === void 0 ? void 0 : _context$http$request.method) || "").toLowerCase();
+
+    if (method !== "options") {
+      return;
+    }
+
+    context.setResult({
+      statusCode: 204,
+      body: "",
+      headers: _objectSpread(_objectSpread({}, DEFAULT_HEADERS), OPTIONS_HEADERS)
+    });
+  });
+  plugin.name = "break-options-request";
+  return plugin;
+};
+
 const createAdminHeadlessCmsContext = params => {
-  return [(0, _context.default)(), (0, _crud.createAdminCruds)(params), (0, _upgrades.default)()];
+  return [breakOptionsRequestContextPlugin(), (0, _context.default)(), (0, _crud.createAdminCruds)(params), (0, _upgrades.default)()];
 };
 
 exports.createAdminHeadlessCmsContext = createAdminHeadlessCmsContext;
@@ -78,7 +122,7 @@ const createAdminHeadlessCmsGraphQL = () => {
 exports.createAdminHeadlessCmsGraphQL = createAdminHeadlessCmsGraphQL;
 
 const createContentHeadlessCmsContext = params => {
-  return [(0, _parameterPlugins.createParametersPlugins)(params), (0, _contextSetup.default)(), (0, _modelManager.default)(), (0, _crud2.createContentCruds)(params), (0, _graphqlFields.default)(), (0, _validators.default)(), (0, _default.default)(), (0, _object.default)() // new InternalAuthenticationPlugin("read-api-key"),
+  return [breakOptionsRequestContextPlugin(), (0, _parameterPlugins.createParametersPlugins)(params), (0, _contextSetup.default)(), (0, _modelManager.default)(), (0, _crud2.createContentCruds)(params), (0, _graphqlFields.default)(), (0, _validators.default)(), (0, _default.default)(), (0, _object.default)() // new InternalAuthenticationPlugin("read-api-key"),
   // new InternalAuthorizationPlugin("read-api-key")
   ];
 };

package/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["index.ts"],"names":["createAdminHeadlessCmsContext","params","createAdminHeadlessCmsGraphQL","createContentHeadlessCmsContext","createContentHeadlessCmsGraphQL"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAIA;;AACA;;AACA;;AACA;;AACA;;AAIO,MAAMA,6BAA6B,GAAIC,MAAD,IAAgC;AACzE,SAAO,CAAC,uBAAD,EAAY,4BAAiBA,MAAjB,CAAZ,EAAsC,wBAAtC,CAAP;AACH,CAFM;;;;AAIA,MAAMC,6BAA6B,GAAG,MAAM;AAC/C,SAAO,mCAAP;AACH,CAFM;;;;AAOA,MAAMC,+BAA+B,GAAIF,MAAD,IAAkC;AAC7E,SAAO,CACH,+CAAwBA,MAAxB,CADG,EAEH,4BAFG,EAGH,4BAHG,EAIH,+BAAmBA,MAAnB,CAJG,EAKH,6BALG,EAMH,0BANG,EAOH,uBAPG,EAQH,sBARG,CASH;AACA;AAVG,GAAP;AAYH,CAbM;;;;AAeA,MAAMG,+BAA+B,GAAIH,MAAD,IAAmC;AAC9E,SAAO,kDAAsBA,MAAtB,CAAP;AACH,CAFM","sourcesContent":["import { createGraphQLPlugin } from \"~/plugins/graphql\";\nimport { createAdminCruds, CreateAdminCrudsParams } from \"~/plugins/crud\";\nimport context from \"~/plugins/context\";\nimport upgrades from \"~/plugins/upgrades\";\nimport contextSetup from \"~/content/contextSetup\";\nimport modelManager from \"~/content/plugins/modelManager\";\nimport { createContentCruds, CreateContentCrudsParams } from \"~/content/plugins/crud\";\nimport fieldTypePlugins from \"~/content/plugins/graphqlFields\";\nimport validatorsPlugins from \"~/content/plugins/validators\";\nimport defaultStoragePlugin from \"~/content/plugins/storage/default\";\nimport objectStoragePlugin from \"~/content/plugins/storage/object\";\nimport {\n    CreateGraphQLHandlerOptions,\n    graphQLHandlerFactory\n} from \"~/content/graphQLHandlerFactory\";\nimport { StorageTransformPlugin } from \"~/content/plugins/storage/StorageTransformPlugin\";\nimport { createParametersPlugins, CreateParametersPluginsParams } from \"~/content/parameterPlugins\";\nimport { CmsParametersPlugin } from \"~/content/plugins/CmsParametersPlugin\";\nimport { CmsGroupPlugin } from \"~/content/plugins/CmsGroupPlugin\";\nimport { CmsModelPlugin } from \"~/content/plugins/CmsModelPlugin\";\n\nexport type AdminContextParams = CreateAdminCrudsParams;\n\nexport const createAdminHeadlessCmsContext = (params: AdminContextParams) => {\n    return [context(), createAdminCruds(params), upgrades()];\n};\n\nexport const createAdminHeadlessCmsGraphQL = () => {\n    return createGraphQLPlugin();\n};\n\nexport interface ContentContextParams\n    extends CreateContentCrudsParams,\n        CreateParametersPluginsParams {}\nexport const createContentHeadlessCmsContext = (params: ContentContextParams) => {\n    return [\n        createParametersPlugins(params),\n        contextSetup(),\n        modelManager(),\n        createContentCruds(params),\n        fieldTypePlugins(),\n        validatorsPlugins(),\n        defaultStoragePlugin(),\n        objectStoragePlugin()\n        // new InternalAuthenticationPlugin(\"read-api-key\"),\n        // new InternalAuthorizationPlugin(\"read-api-key\")\n    ];\n};\nexport type ContentGraphQLParams = CreateGraphQLHandlerOptions;\nexport const createContentHeadlessCmsGraphQL = (params?: ContentGraphQLParams) => {\n    return graphQLHandlerFactory(params);\n};\n\nexport { StorageTransformPlugin, CmsParametersPlugin, CmsGroupPlugin, CmsModelPlugin };\n"]}
+{"version":3,"sources":["index.ts"],"names":["DEFAULT_HEADERS","DEFAULT_CACHE_MAX_AGE","OPTIONS_HEADERS","breakOptionsRequestContextPlugin","plugin","ContextPlugin","context","method","http","request","toLowerCase","setResult","statusCode","body","headers","name","createAdminHeadlessCmsContext","params","createAdminHeadlessCmsGraphQL","createContentHeadlessCmsContext","createContentHeadlessCmsGraphQL"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAIA;;AACA;;AACA;;AACA;;AACA;;AACA;;AAEA;;;;;;AAIA,MAAMA,eAAuC;AACzC,iCAA+B,GADU;AAEzC,kCAAgC,GAFS;AAGzC,kCAAgC,cAHS;AAIzC,kBAAgB;AAJyB,GAKtC,qCALsC,CAA7C;;AAQA,MAAMC,qBAAqB,GAAG,QAA9B,C,CAAwC;;AAExC,MAAMC,eAAuC,GAAG;AAC5C,4BAA2B,GAAED,qBAAsB,EADP;AAE5C,mBAAkB,mBAAkBA,qBAAsB;AAFd,CAAhD;;AAKA,MAAME,gCAAgC,GAAG,MAAiC;AACtE,QAAMC,MAAM,GAAG,IAAIC,sBAAJ,CAA8B,MAAMC,OAAN,IAAiB;AAAA;;AAC1D,UAAMC,MAAM,GAAG,CAAC,kBAAAD,OAAO,CAACE,IAAR,yFAAcC,OAAd,gFAAuBF,MAAvB,KAAiC,EAAlC,EAAsCG,WAAtC,EAAf;;AACA,QAAIH,MAAM,KAAK,SAAf,EAA0B;AACtB;AACH;;AACDD,IAAAA,OAAO,CAACK,SAAR,CAAkB;AACdC,MAAAA,UAAU,EAAE,GADE;AAEdC,MAAAA,IAAI,EAAE,EAFQ;AAGdC,MAAAA,OAAO,kCACAd,eADA,GAEAE,eAFA;AAHO,KAAlB;AAQH,GAbc,CAAf;AAcAE,EAAAA,MAAM,CAACW,IAAP,GAAc,uBAAd;AAEA,SAAOX,MAAP;AACH,CAlBD;;AAoBO,MAAMY,6BAA6B,GAAIC,MAAD,IAAgC;AACzE,SAAO,CAACd,gCAAgC,EAAjC,EAAqC,uBAArC,EAAgD,4BAAiBc,MAAjB,CAAhD,EAA0E,wBAA1E,CAAP;AACH,CAFM;;;;AAIA,MAAMC,6BAA6B,GAAG,MAAM;AAC/C,SAAO,mCAAP;AACH,CAFM;;;;AAOA,MAAMC,+BAA+B,GAAIF,MAAD,IAAkC;AAC7E,SAAO,CACHd,gCAAgC,EAD7B,EAEH,+CAAwBc,MAAxB,CAFG,EAGH,4BAHG,EAIH,4BAJG,EAKH,+BAAmBA,MAAnB,CALG,EAMH,6BANG,EAOH,0BAPG,EAQH,uBARG,EASH,sBATG,CAUH;AACA;AAXG,GAAP;AAaH,CAdM;;;;AAgBA,MAAMG,+BAA+B,GAAIH,MAAD,IAAmC;AAC9E,SAAO,kDAAsBA,MAAtB,CAAP;AACH,CAFM","sourcesContent":["import { createGraphQLPlugin } from \"~/plugins/graphql\";\nimport { createAdminCruds, CreateAdminCrudsParams } from \"~/plugins/crud\";\nimport context from \"~/plugins/context\";\nimport upgrades from \"~/plugins/upgrades\";\nimport contextSetup from \"~/content/contextSetup\";\nimport modelManager from \"~/content/plugins/modelManager\";\nimport { createContentCruds, CreateContentCrudsParams } from \"~/content/plugins/crud\";\nimport fieldTypePlugins from \"~/content/plugins/graphqlFields\";\nimport validatorsPlugins from \"~/content/plugins/validators\";\nimport defaultStoragePlugin from \"~/content/plugins/storage/default\";\nimport objectStoragePlugin from \"~/content/plugins/storage/object\";\nimport {\n    CreateGraphQLHandlerOptions,\n    graphQLHandlerFactory\n} from \"~/content/graphQLHandlerFactory\";\nimport { StorageTransformPlugin } from \"~/content/plugins/storage/StorageTransformPlugin\";\nimport { createParametersPlugins, CreateParametersPluginsParams } from \"~/content/parameterPlugins\";\nimport { CmsParametersPlugin } from \"~/content/plugins/CmsParametersPlugin\";\nimport { CmsGroupPlugin } from \"~/content/plugins/CmsGroupPlugin\";\nimport { CmsModelPlugin } from \"~/content/plugins/CmsModelPlugin\";\nimport { ContextPlugin } from \"@webiny/handler\";\nimport { CmsContext } from \"~/types\";\nimport { getWebinyVersionHeaders } from \"@webiny/utils\";\n\nexport type AdminContextParams = CreateAdminCrudsParams;\n\nconst DEFAULT_HEADERS: Record<string, string> = {\n    \"Access-Control-Allow-Origin\": \"*\",\n    \"Access-Control-Allow-Headers\": \"*\",\n    \"Access-Control-Allow-Methods\": \"OPTIONS,POST\",\n    \"Content-Type\": \"application/json\",\n    ...getWebinyVersionHeaders()\n};\n\nconst DEFAULT_CACHE_MAX_AGE = 30758400; // 1 year\n\nconst OPTIONS_HEADERS: Record<string, string> = {\n    \"Access-Control-Max-Age\": `${DEFAULT_CACHE_MAX_AGE}`,\n    \"Cache-Control\": `public, max-age=${DEFAULT_CACHE_MAX_AGE}`\n};\n\nconst breakOptionsRequestContextPlugin = (): ContextPlugin<CmsContext> => {\n    const plugin = new ContextPlugin<CmsContext>(async context => {\n        const method = (context.http?.request?.method || \"\").toLowerCase();\n        if (method !== \"options\") {\n            return;\n        }\n        context.setResult({\n            statusCode: 204,\n            body: \"\",\n            headers: {\n                ...DEFAULT_HEADERS,\n                ...OPTIONS_HEADERS\n            }\n        });\n    });\n    plugin.name = \"break-options-request\";\n\n    return plugin;\n};\n\nexport const createAdminHeadlessCmsContext = (params: AdminContextParams) => {\n    return [breakOptionsRequestContextPlugin(), context(), createAdminCruds(params), upgrades()];\n};\n\nexport const createAdminHeadlessCmsGraphQL = () => {\n    return createGraphQLPlugin();\n};\n\nexport interface ContentContextParams\n    extends CreateContentCrudsParams,\n        CreateParametersPluginsParams {}\nexport const createContentHeadlessCmsContext = (params: ContentContextParams) => {\n    return [\n        breakOptionsRequestContextPlugin(),\n        createParametersPlugins(params),\n        contextSetup(),\n        modelManager(),\n        createContentCruds(params),\n        fieldTypePlugins(),\n        validatorsPlugins(),\n        defaultStoragePlugin(),\n        objectStoragePlugin()\n        // new InternalAuthenticationPlugin(\"read-api-key\"),\n        // new InternalAuthorizationPlugin(\"read-api-key\")\n    ];\n};\nexport type ContentGraphQLParams = CreateGraphQLHandlerOptions;\nexport const createContentHeadlessCmsGraphQL = (params?: ContentGraphQLParams) => {\n    return graphQLHandlerFactory(params);\n};\n\nexport { StorageTransformPlugin, CmsParametersPlugin, CmsGroupPlugin, CmsModelPlugin };\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/api-headless-cms",
-	"version": "5.25.0-beta.2",
+	"version": "5.25.0-beta.3",
 	"main": "index.js",
 	"keywords": [
 		"cms:base"
@@ -21,23 +21,23 @@
 		"@babel/runtime": "7.17.7",
 		"@commodo/fields": "1.1.2-beta.20",
 		"@graphql-tools/schema": "7.1.5",
-		"@webiny/api-file-manager": "5.25.0-beta.2",
-		"@webiny/api-i18n": "5.25.0-beta.2",
-		"@webiny/api-i18n-content": "5.25.0-beta.2",
-		"@webiny/api-i18n-ddb": "5.25.0-beta.2",
-		"@webiny/api-security": "5.25.0-beta.2",
-		"@webiny/api-tenancy": "5.25.0-beta.2",
-		"@webiny/api-upgrade": "5.25.0-beta.2",
-		"@webiny/error": "5.25.0-beta.2",
-		"@webiny/handler": "5.25.0-beta.2",
-		"@webiny/handler-aws": "5.25.0-beta.2",
-		"@webiny/handler-db": "5.25.0-beta.2",
-		"@webiny/handler-graphql": "5.25.0-beta.2",
-		"@webiny/handler-http": "5.25.0-beta.2",
-		"@webiny/plugins": "5.25.0-beta.2",
-		"@webiny/pubsub": "5.25.0-beta.2",
-		"@webiny/utils": "5.25.0-beta.2",
-		"@webiny/validation": "5.25.0-beta.2",
+		"@webiny/api-file-manager": "5.25.0-beta.3",
+		"@webiny/api-i18n": "5.25.0-beta.3",
+		"@webiny/api-i18n-content": "5.25.0-beta.3",
+		"@webiny/api-i18n-ddb": "5.25.0-beta.3",
+		"@webiny/api-security": "5.25.0-beta.3",
+		"@webiny/api-tenancy": "5.25.0-beta.3",
+		"@webiny/api-upgrade": "5.25.0-beta.3",
+		"@webiny/error": "5.25.0-beta.3",
+		"@webiny/handler": "5.25.0-beta.3",
+		"@webiny/handler-aws": "5.25.0-beta.3",
+		"@webiny/handler-db": "5.25.0-beta.3",
+		"@webiny/handler-graphql": "5.25.0-beta.3",
+		"@webiny/handler-http": "5.25.0-beta.3",
+		"@webiny/plugins": "5.25.0-beta.3",
+		"@webiny/pubsub": "5.25.0-beta.3",
+		"@webiny/utils": "5.25.0-beta.3",
+		"@webiny/validation": "5.25.0-beta.3",
 		"boolean": "3.2.0",
 		"commodo-fields-object": "1.0.6",
 		"dataloader": "2.0.0",
@@ -55,10 +55,10 @@
 		"@babel/core": "^7.16.0",
 		"@babel/preset-env": "^7.16.4",
 		"@babel/preset-flow": "^7.16.0",
-		"@webiny/api-security-so-ddb": "^5.25.0-beta.2",
-		"@webiny/api-tenancy-so-ddb": "^5.25.0-beta.2",
-		"@webiny/cli": "^5.25.0-beta.2",
-		"@webiny/project-utils": "^5.25.0-beta.2",
+		"@webiny/api-security-so-ddb": "^5.25.0-beta.3",
+		"@webiny/api-tenancy-so-ddb": "^5.25.0-beta.3",
+		"@webiny/cli": "^5.25.0-beta.3",
+		"@webiny/project-utils": "^5.25.0-beta.3",
 		"apollo-graphql": "^0.9.5",
 		"get-yarn-workspaces": "^1.0.2",
 		"graphql": "^15.7.2",
@@ -78,5 +78,5 @@
 		"build": "yarn webiny run build",
 		"watch": "yarn webiny run watch"
 	},
-	"gitHead": "ed2f22976af47aea0b6b5d638f8afdc39951b014"
+	"gitHead": "3364dbf65ade9f33f4decff7e45da1efd02b2af0"
 }

package/types.d.ts

@@ -92,7 +92,12 @@ interface CmsModelFieldRenderer {
  */
 export interface CmsModelField {
     /**
-     * A generated ID for the model field
+     * A generated unique ID for the model field.
+     * MUST be absolute unique throughout the models.
+     * Must be in form of a-zA-Z0-9.
+     *
+     * We generate a unique id value when you're building a model via UI,
+     * but when user is creating a model via a plugin it is up to them to be careful about this.
      */
     id: string;
     /**
@@ -100,7 +105,11 @@ export interface CmsModelField {
      */
     type: string;
     /**
-     * A unique field ID for mapping values
+     * A unique field ID for mapping values.
+     * Must in form of a-zA-Z0-9.
+     *
+     * We generate a unique fieldId value when you're building a model via UI,
+     * but when user is creating a model via a plugin it is up to them to be careful about this.
      */
     fieldId: string;
     /**
@@ -335,11 +344,11 @@ export interface CmsModel {
     /**
      * Date created
      */
-    createdOn?: Date;
+    createdOn?: string;
     /**
      * Date saved. Changes on both save and create.
      */
-    savedOn?: Date;
+    savedOn?: string;
     /**
      * CreatedBy object wrapper. Contains id, name and type of the user.
      */