@webiny/api-headless-cms 5.29.0 → 5.30.0

package/{content → graphql}/graphQLHandlerFactory.js

@@ -9,8 +9,6 @@ exports.graphQLHandlerFactory = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _boolean = require("boolean");
-
 var _schema = require("@graphql-tools/schema");
 
 var _apiSecurity = require("@webiny/api-security");
@@ -19,7 +17,7 @@ var _debugPlugins = _interopRequireDefault(require("@webiny/handler-graphql/debu
 
 var _processRequestBody = _interopRequireDefault(require("@webiny/handler-graphql/processRequestBody"));
 
-var _buildSchemaPlugins = _interopRequireDefault(require("./plugins/buildSchemaPlugins"));
+var _buildSchemaPlugins = require("./buildSchemaPlugins");
 
 var _plugins = require("@webiny/handler-graphql/plugins");
 
@@ -67,7 +65,7 @@ const generateSchema = async args => {
   const {
     context
   } = args;
-  context.plugins.register(await (0, _buildSchemaPlugins.default)(context));
+  context.plugins.register(await (0, _buildSchemaPlugins.buildSchemaPlugins)(context));
   /**
    * Really hard to type this to satisfy the makeExecutableSchema
    */
@@ -87,22 +85,25 @@ const generateSchema = async args => {
     typeDefs,
     resolvers
   });
-}; // gets an existing schema or rewrites existing one or creates a completely new one
-// depending on the schemaId created from type and locale parameters
+};
+/**
+ * Gets an existing schema or rewrites existing one or creates a completely new one
+ * depending on the schemaId created from type and locale parameters
+ */
 
 
-const getSchema = async args => {
+const getSchema = async params => {
   const {
     context,
     type,
     locale
-  } = args;
+  } = params;
   const tenantId = context.tenancy.getCurrentTenant().id;
   const id = `${tenantId}#${type}#${locale.code}`;
-  const cacheKey = await generateCacheKey(args);
+  const cacheKey = await generateCacheKey(params);
 
   if (!schemaList.has(id)) {
-    const schema = await generateSchema(args);
+    const schema = await generateSchema(params);
     schemaList.set(id, {
       key: cacheKey,
       schema
@@ -120,7 +121,7 @@ const getSchema = async args => {
     return cache.schema;
   }
 
-  const schema = await generateSchema(args);
+  const schema = await generateSchema(params);
   schemaList.set(id, {
     key: cacheKey,
     schema
@@ -140,18 +141,25 @@ const checkEndpointAccess = async context => {
   }
 };
 
-const graphQLHandlerFactory = (options = {}) => {
-  const debug = (0, _boolean.boolean)(options.debug);
+const graphQLHandlerFactory = ({
+  debug
+}) => {
   const handler = {
     type: "handler",
-    name: "handler-graphql-content-model",
+    name: "handler.cms.graphql",
 
     async handle(context, next) {
       const {
-        http
+        http,
+        cms
       } = context;
+      /**
+       * Possibly not a CMS request?
+       */
+
+      const type = cms === null || cms === void 0 ? void 0 : cms.type;
 
-      if (!http || !http.request) {
+      if (!type || !(http !== null && http !== void 0 && http.request)) {
         return next();
       }
 
@@ -183,8 +191,8 @@ const graphQLHandlerFactory = (options = {}) => {
 
       const schema = await getSchema({
         context,
-        locale: context.cms.getLocale(),
-        type: context.cms.type
+        locale: cms.getLocale(),
+        type
       });
       const body = JSON.parse(http.request.body);
       const result = await (0, _processRequestBody.default)(body, schema, context);

package/graphql/graphQLHandlerFactory.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["DEFAULT_HEADERS","getWebinyVersionHeaders","DEFAULT_CACHE_MAX_AGE","OPTIONS_HEADERS","respond","http","result","response","body","JSON","stringify","statusCode","headers","schemaList","Map","generateCacheKey","args","context","locale","type","lastModelChange","cms","getModelLastChange","code","toISOString","join","generateSchema","plugins","register","buildSchemaPlugins","typeDefs","resolvers","schemaPlugins","byType","GraphQLSchemaPlugin","pl","push","schema","makeExecutableSchema","getSchema","params","tenantId","tenancy","getCurrentTenant","id","cacheKey","has","set","key","cache","get","checkEndpointAccess","permission","security","getPermission","NotAuthorizedError","data","reason","graphQLHandlerFactory","debug","handler","name","handle","next","request","method","toLowerCase","ex","NotAuthorizedResponse","getLocale","parse","processRequestBody","debugPlugins"],"sources":["graphQLHandlerFactory.ts"],"sourcesContent":["import { GraphQLSchema } from \"graphql\";\nimport { makeExecutableSchema } from \"@graphql-tools/schema\";\nimport { ApiEndpoint, CmsContext } from \"~/types\";\nimport { I18NLocale } from \"@webiny/api-i18n/types\";\nimport { NotAuthorizedError, NotAuthorizedResponse } from \"@webiny/api-security\";\nimport { PluginCollection } from \"@webiny/plugins/types\";\nimport debugPlugins from \"@webiny/handler-graphql/debugPlugins\";\nimport processRequestBody from \"@webiny/handler-graphql/processRequestBody\";\nimport { buildSchemaPlugins } from \"./buildSchemaPlugins\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins\";\nimport { getWebinyVersionHeaders } from \"@webiny/utils\";\nimport { HttpObject } from \"@webiny/handler-http/types\";\nimport { HandlerPlugin } from \"@webiny/handler/types\";\nimport { GraphQLRequestBody } from \"@webiny/handler-graphql/types\";\n\ninterface SchemaCache {\n    key: string;\n    schema: GraphQLSchema;\n}\ninterface GetSchemaParams {\n    context: CmsContext;\n    type: ApiEndpoint;\n    locale: I18NLocale;\n}\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 respond = (http: HttpObject, result: unknown) => {\n    return http.response({\n        body: JSON.stringify(result),\n        statusCode: 200,\n        headers: DEFAULT_HEADERS\n    });\n};\nconst schemaList = new Map<string, SchemaCache>();\n\nconst generateCacheKey = async (args: GetSchemaParams): Promise<string> => {\n    const { context, locale, type } = args;\n    const lastModelChange = await context.cms.getModelLastChange();\n    return [locale.code, type, lastModelChange.toISOString()].join(\"#\");\n};\n\nconst generateSchema = async (args: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context } = args;\n\n    context.plugins.register(await buildSchemaPlugins(context));\n    /**\n     * Really hard to type this to satisfy the makeExecutableSchema\n     */\n    // TODO @ts-refactor\n    const typeDefs: any = [];\n    const resolvers: any = [];\n\n    // Get schema definitions from plugins\n    const schemaPlugins = context.plugins.byType<GraphQLSchemaPlugin>(GraphQLSchemaPlugin.type);\n    for (const pl of schemaPlugins) {\n        typeDefs.push(pl.schema.typeDefs);\n        resolvers.push(pl.schema.resolvers);\n    }\n\n    return makeExecutableSchema({\n        typeDefs,\n        resolvers\n    });\n};\n\n/**\n * Gets an existing schema or rewrites existing one or creates a completely new one\n * depending on the schemaId created from type and locale parameters\n */\nconst getSchema = async (params: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context, type, locale } = params;\n    const tenantId = context.tenancy.getCurrentTenant().id;\n    const id = `${tenantId}#${type}#${locale.code}`;\n\n    const cacheKey = await generateCacheKey(params);\n    if (!schemaList.has(id)) {\n        const schema = await generateSchema(params);\n\n        schemaList.set(id, {\n            key: cacheKey,\n            schema\n        });\n        return schema;\n    }\n    /**\n     * Safe to cast because check was done few lines up.\n     */\n    const cache = schemaList.get(id) as SchemaCache;\n    if (cache.key === cacheKey) {\n        return cache.schema;\n    }\n    const schema = await generateSchema(params);\n    schemaList.set(id, {\n        key: cacheKey,\n        schema\n    });\n    return schema;\n};\n\nconst checkEndpointAccess = async (context: CmsContext): Promise<void> => {\n    const permission = await context.security.getPermission(`cms.endpoint.${context.cms.type}`);\n    if (!permission) {\n        throw new NotAuthorizedError({\n            data: {\n                reason: `Not allowed to access \"${context.cms.type}\" endpoint.`\n            }\n        });\n    }\n};\n\nexport interface GraphQLHandlerFactoryParams {\n    debug?: boolean;\n}\n\nexport const graphQLHandlerFactory = ({ debug }: GraphQLHandlerFactoryParams): PluginCollection => {\n    const handler: HandlerPlugin = {\n        type: \"handler\",\n        name: \"handler.cms.graphql\",\n        async handle(context: CmsContext, next) {\n            const { http, cms } = context;\n            /**\n             * Possibly not a CMS request?\n             */\n            const type = cms?.type;\n            if (!type || !http?.request) {\n                return next();\n            }\n\n            const method = (http.request.method || \"\").toLowerCase();\n            /**\n             * In case of OPTIONS method we just return the headers since there is no need to go further.\n             */\n            if (method.toLowerCase() === \"options\") {\n                return http.response({\n                    statusCode: 204,\n                    headers: {\n                        ...DEFAULT_HEADERS,\n                        ...OPTIONS_HEADERS\n                    }\n                });\n            }\n            /**\n             * We expect, and allow, only POST method to access our GraphQL\n             */\n            if (method !== \"post\") {\n                return next();\n            }\n\n            try {\n                await checkEndpointAccess(context);\n            } catch (ex) {\n                return respond(http, new NotAuthorizedResponse(ex));\n            }\n\n            const schema = await getSchema({\n                context,\n                locale: cms.getLocale(),\n                type\n            });\n\n            const body: GraphQLRequestBody | GraphQLRequestBody[] = JSON.parse(http.request.body);\n\n            const result = await processRequestBody(body, schema, context);\n            return respond(http, result);\n        }\n    };\n\n    return [\n        ...(debug ? debugPlugins() : []),\n        handler,\n        {\n            type: \"wcp-telemetry-tracker\"\n        }\n    ];\n};\n"],"mappings":"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"}

package/graphql/index.d.ts

@@ -0,0 +1,5 @@
+import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/types";
+import { GraphQLHandlerFactoryParams } from "./graphQLHandlerFactory";
+import { CmsContext } from "../types";
+export declare type CreateGraphQLParams = GraphQLHandlerFactoryParams;
+export declare const createGraphQL: (params: CreateGraphQLParams) => (import("@webiny/plugins/types").PluginCollection | import("@webiny/handler").ContextPlugin<CmsContext> | GraphQLSchemaPlugin<CmsContext>)[];

package/graphql/index.js

@@ -0,0 +1,57 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createGraphQL = void 0;
+
+var _system = require("./system");
+
+var _graphQLHandlerFactory = require("./graphQLHandlerFactory");
+
+const createBaseSchema = () => {
+  return {
+    name: "cms.graphql.schema.base",
+    type: "graphql-schema",
+    schema: {
+      typeDefs:
+      /* GraphQL */
+      `
+                type CmsError {
+                    code: String
+                    message: String
+                    data: JSON
+                    stack: String
+                }
+
+                type CmsCursors {
+                    next: String
+                    previous: String
+                }
+
+                type CmsListMeta {
+                    cursor: String
+                    hasMoreItems: Boolean
+                    totalCount: Int
+                }
+
+                type CmsDeleteResponse {
+                    data: Boolean
+                    error: CmsError
+                }
+
+                type CmsBooleanResponse {
+                    data: Boolean
+                    error: CmsError
+                }
+            `,
+      resolvers: {}
+    }
+  };
+};
+
+const createGraphQL = params => {
+  return [createBaseSchema(), (0, _system.createSystemSchemaPlugin)(), (0, _graphQLHandlerFactory.graphQLHandlerFactory)(params)];
+};
+
+exports.createGraphQL = createGraphQL;

package/graphql/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createBaseSchema","name","type","schema","typeDefs","resolvers","createGraphQL","params","createSystemSchemaPlugin","graphQLHandlerFactory"],"sources":["index.ts"],"sourcesContent":["import { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/types\";\nimport { createSystemSchemaPlugin } from \"./system\";\nimport { graphQLHandlerFactory, GraphQLHandlerFactoryParams } from \"./graphQLHandlerFactory\";\nimport { CmsContext } from \"~/types\";\n\nconst createBaseSchema = (): GraphQLSchemaPlugin<CmsContext> => {\n    return {\n        name: \"cms.graphql.schema.base\",\n        type: \"graphql-schema\",\n        schema: {\n            typeDefs: /* GraphQL */ `\n                type CmsError {\n                    code: String\n                    message: String\n                    data: JSON\n                    stack: String\n                }\n\n                type CmsCursors {\n                    next: String\n                    previous: String\n                }\n\n                type CmsListMeta {\n                    cursor: String\n                    hasMoreItems: Boolean\n                    totalCount: Int\n                }\n\n                type CmsDeleteResponse {\n                    data: Boolean\n                    error: CmsError\n                }\n\n                type CmsBooleanResponse {\n                    data: Boolean\n                    error: CmsError\n                }\n            `,\n            resolvers: {}\n        }\n    };\n};\n\nexport type CreateGraphQLParams = GraphQLHandlerFactoryParams;\nexport const createGraphQL = (params: CreateGraphQLParams) => {\n    return [createBaseSchema(), createSystemSchemaPlugin(), graphQLHandlerFactory(params)];\n};\n"],"mappings":";;;;;;;AACA;;AACA;;AAGA,MAAMA,gBAAgB,GAAG,MAAuC;EAC5D,OAAO;IACHC,IAAI,EAAE,yBADH;IAEHC,IAAI,EAAE,gBAFH;IAGHC,MAAM,EAAE;MACJC,QAAQ;MAAE;MAAe;AACrC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,aA7BgB;MA8BJC,SAAS,EAAE;IA9BP;EAHL,CAAP;AAoCH,CArCD;;AAwCO,MAAMC,aAAa,GAAIC,MAAD,IAAiC;EAC1D,OAAO,CAACP,gBAAgB,EAAjB,EAAqB,IAAAQ,gCAAA,GAArB,EAAiD,IAAAC,4CAAA,EAAsBF,MAAtB,CAAjD,CAAP;AACH,CAFM"}

package/graphql/schema/baseContentSchema.d.ts

@@ -0,0 +1,3 @@
+import { CmsContext } from "../../types";
+import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins/GraphQLSchemaPlugin";
+export declare const createBaseContentSchema: (context: CmsContext) => GraphQLSchemaPlugin;

package/{content/plugins/schema/baseSchema.js → graphql/schema/baseContentSchema.js}

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createBaseContentSchema = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -17,7 +17,7 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 
 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 baseSchema = context => {
+const createBaseContentSchema = context => {
   const scalars = context.plugins.byType("graphql-scalar").map(item => item.scalar);
   return new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
     typeDefs:
@@ -40,29 +40,6 @@ const baseSchema = context => {
                 _empty: String
             }
 
-            type CmsError {
-                code: String
-                message: String
-                data: JSON
-                stack: String
-            }
-
-            type CmsListMeta {
-                cursor: String
-                hasMoreItems: Boolean
-                totalCount: Int
-            }
-
-            type CmsDeleteResponse {
-                data: Boolean
-                error: CmsError
-            }
-
-            type CmsBooleanResponse {
-                data: Boolean
-                error: CmsError
-            }
-
             type CmsCreatedBy {
                 id: String
                 displayName: String
@@ -100,5 +77,4 @@ const baseSchema = context => {
   });
 };
 
-var _default = baseSchema;
-exports.default = _default;
+exports.createBaseContentSchema = createBaseContentSchema;

package/graphql/schema/baseContentSchema.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createBaseContentSchema","context","scalars","plugins","byType","map","item","scalar","GraphQLSchemaPlugin","typeDefs","name","join","resolvers","reduce","acc","s","JSON","JsonScalar","Long","LongScalar","RefInput","Number","NumberScalar","Any","AnyScalar","DateTime","DateTimeScalar","DateTimeZ","DateTimeZScalar","Date","DateScalar","Time","TimeScalar","Mutation","_empty"],"sources":["baseContentSchema.ts"],"sourcesContent":["import { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types\";\nimport { CmsContext } from \"~/types\";\nimport {\n    RefInput,\n    Number as NumberScalar,\n    Any as AnyScalar,\n    DateTimeScalar,\n    DateScalar,\n    TimeScalar,\n    LongScalar,\n    JsonScalar,\n    DateTimeZScalar\n} from \"@webiny/handler-graphql/builtInTypes\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins/GraphQLSchemaPlugin\";\nimport { GraphQLScalarType } from \"graphql\";\n\nexport const createBaseContentSchema = (context: CmsContext): GraphQLSchemaPlugin => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    return new GraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            ${scalars.map(scalar => `scalar ${scalar.name}`).join(\" \")}\n            scalar JSON\n            scalar Long\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar DateTimeZ\n            scalar Time\n\n            type Query\n\n            type Mutation {\n                _empty: String\n            }\n\n            type CmsCreatedBy {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            type CmsOwnedBy {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            enum CmsEntryStatusType {\n                latest\n                published\n            }\n        `,\n        resolvers: {\n            ...scalars.reduce((acc, s) => {\n                acc[s.name] = s;\n                return acc;\n            }, {} as Record<string, GraphQLScalarType>),\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            DateTimeZ: DateTimeZScalar,\n            Date: DateScalar,\n            Time: TimeScalar,\n            Mutation: {\n                _empty: () => \"_empty\"\n            }\n        }\n    });\n};\n"],"mappings":";;;;;;;;;;;AAEA;;AAWA;;;;;;AAGO,MAAMA,uBAAuB,GAAIC,OAAD,IAA8C;EACjF,MAAMC,OAAO,GAAGD,OAAO,CAACE,OAAR,CACXC,MADW,CACiB,gBADjB,EAEXC,GAFW,CAEPC,IAAI,IAAIA,IAAI,CAACC,MAFN,CAAhB;EAIA,OAAO,IAAIC,wCAAJ,CAAwB;IAC3BC,QAAQ;IAAE;IAAe;AACjC,cAAcP,OAAO,CAACG,GAAR,CAAYE,MAAM,IAAK,UAASA,MAAM,CAACG,IAAK,EAA5C,EAA+CC,IAA/C,CAAoD,GAApD,CAAyD;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAnCmC;IAoC3BC,SAAS,kCACFV,OAAO,CAACW,MAAR,CAAe,CAACC,GAAD,EAAMC,CAAN,KAAY;MAC1BD,GAAG,CAACC,CAAC,CAACL,IAAH,CAAH,GAAcK,CAAd;MACA,OAAOD,GAAP;IACH,CAHE,EAGA,EAHA,CADE;MAKLE,IAAI,EAAEC,wBALD;MAMLC,IAAI,EAAEC,wBAND;MAOLC,QAAQ,EAARA,sBAPK;MAQLC,MAAM,EAAEC,oBARH;MASLC,GAAG,EAAEC,iBATA;MAULC,QAAQ,EAAEC,4BAVL;MAWLC,SAAS,EAAEC,6BAXN;MAYLC,IAAI,EAAEC,wBAZD;MAaLC,IAAI,EAAEC,wBAbD;MAcLC,QAAQ,EAAE;QACNC,MAAM,EAAE,MAAM;MADR;IAdL;EApCkB,CAAxB,CAAP;AAuDH,CA5DM"}

package/graphql/schema/contentEntries.d.ts

@@ -0,0 +1,3 @@
+import { CmsContext } from "../../types";
+import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins/GraphQLSchemaPlugin";
+export declare const createContentEntriesSchema: (context: CmsContext) => GraphQLSchemaPlugin<CmsContext>;

package/{content/plugins → graphql}/schema/contentEntries.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createContentEntriesSchema = void 0;
 
 var _handlerGraphql = require("@webiny/handler-graphql");
 
@@ -13,7 +13,7 @@ var _apiSecurity = require("@webiny/api-security");
 
 var _GraphQLSchemaPlugin = require("@webiny/handler-graphql/plugins/GraphQLSchemaPlugin");
 
-var _getEntryTitle = require("../utils/getEntryTitle");
+var _getEntryTitle = require("../../utils/getEntryTitle");
 
 var _error = _interopRequireDefault(require("@webiny/error"));
 
@@ -157,7 +157,7 @@ const getContentEntry = async params => {
   });
 };
 
-const plugin = context => {
+const createContentEntriesSchema = context => {
   if (!context.cms.MANAGE) {
     return new _GraphQLSchemaPlugin.GraphQLSchemaPlugin({
       typeDefs: "",
@@ -324,59 +324,7 @@ const plugin = context => {
             args,
             context,
             type: "exact"
-          }); // const models = await context.cms.listModels();
-          //
-          // const modelsMap = models.reduce((collection, model) => {
-          //     collection[model.modelId] = model;
-          //     return collection;
-          // }, {} as Record<string, CmsModel>);
-          //
-          // const argsEntries = args.entries as Pick<CmsEntry, "id" | "modelId">[];
-          //
-          // const entriesByModel = argsEntries.reduce((collection, ref) => {
-          //     if (!collection[ref.modelId]) {
-          //         collection[ref.modelId] = [];
-          //     } else if (collection[ref.modelId].includes(ref.id)) {
-          //         return collection;
-          //     }
-          //     collection[ref.modelId].push(ref.id);
-          //     return collection;
-          // }, {} as EntriesByModel);
-          //
-          // const getters: Promise<CmsEntry[]>[] = Object.keys(entriesByModel).map(
-          //     async modelId => {
-          //         return context.cms.getEntriesByIds(
-          //             modelsMap[modelId],
-          //             entriesByModel[modelId]
-          //         );
-          //     }
-          // );
-          //
-          // if (getters.length === 0) {
-          //     return new Response([]);
-          // }
-          //
-          // const results = await Promise.all(getters);
-          //
-          // const entries = results.reduce((collection, items) => {
-          //     return collection.concat(
-          //         items.map(item => {
-          //             const model = modelsMap[item.modelId];
-          //
-          //             return {
-          //                 id: item.id,
-          //                 model: {
-          //                     modelId: model.modelId,
-          //                     name: model.name
-          //                 },
-          //                 status: item.status,
-          //                 title: getEntryTitle(model, item)
-          //             };
-          //         })
-          //     );
-          // }, [] as any[]);
-          //
-          // return new Response(entries);
+          });
         },
 
         async getLatestContentEntries(_, args, context) {
@@ -400,5 +348,4 @@ const plugin = context => {
   });
 };
 
-var _default = plugin;
-exports.default = _default;
+exports.createContentEntriesSchema = createContentEntriesSchema;

package/graphql/schema/contentEntries.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["getFetchMethod","type","context","getContentEntriesMethods","WebinyError","methodName","cms","GetContentEntryMethods","latest","published","exact","getContentEntries","params","args","method","models","listModels","modelsMap","reduce","collection","model","modelId","argsEntries","entries","entriesByModel","ref","includes","id","push","getters","Object","keys","map","length","Response","results","Promise","all","items","concat","item","entryId","name","status","title","getEntryTitle","filter","Boolean","getContentEntry","entry","find","m","NotAuthorizedResponse","data","result","shift","createContentEntriesSchema","MANAGE","GraphQLSchemaPlugin","typeDefs","resolvers","CmsContentEntry","parent","_","getPublishedEntriesByIds","ex","Query","searchContentEntries","modelIds","fields","query","limit","modelManager","getModelManager","where","listLatest","search","undefined","savedOn","then","sort","a","b","Date","parse","slice","getLatestContentEntry","getPublishedContentEntry","getLatestContentEntries","getPublishedContentEntries"],"sources":["contentEntries.ts"],"sourcesContent":["import { Response } from \"@webiny/handler-graphql\";\nimport { CmsEntry, CmsContext, CmsModel, CmsEntryListWhere } from \"~/types\";\nimport { NotAuthorizedResponse } from \"@webiny/api-security\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins/GraphQLSchemaPlugin\";\nimport { getEntryTitle } from \"~/utils/getEntryTitle\";\nimport WebinyError from \"@webiny/error\";\n\ninterface EntriesByModel {\n    [key: string]: string[];\n}\n\ntype GetContentEntryType = \"latest\" | \"published\" | \"exact\";\n\ninterface CmsEntryRecord {\n    id: string;\n    entryId: string;\n    model: {\n        modelId: string;\n        name: string;\n    };\n    status: string;\n    title: string;\n}\n\ninterface FetchMethod {\n    (model: CmsModel, ids: string[]): Promise<CmsEntry[]>;\n}\n\nconst getFetchMethod = (type: GetContentEntryType, context: CmsContext): FetchMethod => {\n    if (!getContentEntriesMethods[type]) {\n        throw new WebinyError(\n            `Unknown getContentEntries method \"${type}\". Could not fetch content entries.`,\n            \"UNKNOWN_METHOD_ERROR\",\n            {\n                type\n            }\n        );\n    }\n    const methodName = getContentEntriesMethods[type] as GetContentEntryMethods;\n    if (!context.cms[methodName]) {\n        throw new WebinyError(\n            `Unknown context.cms method \"${methodName}\". Could not fetch content entries.`,\n            \"UNKNOWN_METHOD_ERROR\",\n            {\n                type,\n                methodName\n            }\n        );\n    }\n\n    return context.cms[methodName];\n};\n/**\n * Function to get the list of content entries depending on latest, published or exact GraphQL queries.\n */\ninterface GetContentEntriesParams {\n    args: {\n        entries: Pick<CmsEntry, \"id\" | \"modelId\">[];\n    };\n    context: CmsContext;\n    type: GetContentEntryType;\n}\nenum GetContentEntryMethods {\n    getLatestEntriesByIds = \"getLatestEntriesByIds\",\n    getPublishedEntriesByIds = \"getPublishedEntriesByIds\",\n    getEntriesByIds = \"getEntriesByIds\"\n}\nconst getContentEntriesMethods = {\n    latest: \"getLatestEntriesByIds\",\n    published: \"getPublishedEntriesByIds\",\n    exact: \"getEntriesByIds\"\n};\nconst getContentEntries = async (params: GetContentEntriesParams): Promise<Response> => {\n    const { args, context, type } = params;\n\n    const method = getFetchMethod(type, context);\n\n    const models = await context.cms.listModels();\n\n    const modelsMap = models.reduce((collection, model) => {\n        collection[model.modelId] = model;\n        return collection;\n    }, {} as Record<string, CmsModel>);\n\n    const argsEntries = args.entries as Pick<CmsEntry, \"id\" | \"modelId\">[];\n\n    const entriesByModel = argsEntries.reduce((collection, ref) => {\n        if (!collection[ref.modelId]) {\n            collection[ref.modelId] = [];\n        } else if (collection[ref.modelId].includes(ref.id)) {\n            return collection;\n        }\n        collection[ref.modelId].push(ref.id);\n        return collection;\n    }, {} as EntriesByModel);\n\n    const getters: Promise<CmsEntry[]>[] = Object.keys(entriesByModel).map(async modelId => {\n        return method(modelsMap[modelId], entriesByModel[modelId]);\n    });\n\n    if (getters.length === 0) {\n        return new Response([]);\n    }\n\n    const results = await Promise.all(getters);\n\n    const entries = results\n        .reduce((collection, items) => {\n            return collection.concat(\n                items.map(item => {\n                    const model = modelsMap[item.modelId];\n\n                    return {\n                        id: item.id,\n                        entryId: item.entryId,\n                        model: {\n                            modelId: model.modelId,\n                            name: model.name\n                        },\n                        status: item.status,\n                        title: getEntryTitle(model, item)\n                    };\n                })\n            );\n        }, [] as CmsEntryRecord[])\n        .filter(Boolean);\n\n    return new Response(entries);\n};\n\n/**\n * Function to fetch a single content entry depending on latest, published or exact GraphQL query.\n */\ninterface GetContentEntryParams {\n    args: {\n        entry: Pick<CmsEntry, \"id\" | \"modelId\">;\n    };\n    context: CmsContext;\n    type: \"latest\" | \"published\" | \"exact\";\n}\nconst getContentEntry = async (\n    params: GetContentEntryParams\n): Promise<Response | NotAuthorizedResponse> => {\n    const { args, context, type } = params;\n    if (!getContentEntriesMethods[type]) {\n        throw new WebinyError(\n            `Unknown getContentEntry method \"${type}\". Could not fetch content entry.`,\n            \"UNKNOWN_METHOD_ERROR\",\n            {\n                args,\n                type\n            }\n        );\n    }\n\n    const method = getFetchMethod(type, context);\n\n    const { modelId, id } = args.entry;\n    const models = await context.cms.listModels();\n    const model = models.find(m => m.modelId === modelId);\n\n    if (!model) {\n        return new NotAuthorizedResponse({\n            data: {\n                modelId\n            }\n        });\n    }\n\n    const result = await method(model, [id]);\n\n    const entry = result.shift();\n    if (!entry) {\n        return new Response(null);\n    }\n\n    return new Response({\n        id: entry.id,\n        entryId: entry.entryId,\n        model: {\n            modelId: model.modelId,\n            name: model.name\n        },\n        status: entry.status,\n        title: getEntryTitle(model, entry)\n    });\n};\n\nexport const createContentEntriesSchema = (\n    context: CmsContext\n): GraphQLSchemaPlugin<CmsContext> => {\n    if (!context.cms.MANAGE) {\n        return new GraphQLSchemaPlugin({\n            typeDefs: \"\",\n            resolvers: {}\n        });\n    }\n\n    return new GraphQLSchemaPlugin<CmsContext>({\n        typeDefs: /* GraphQL */ `\n            type CmsModelMeta {\n                modelId: String\n                name: String\n            }\n\n            type CmsPublishedContentEntry {\n                id: ID!\n                entryId: String!\n                title: String\n            }\n\n            type CmsContentEntry {\n                id: ID!\n                entryId: String!\n                model: CmsModelMeta\n                status: String\n                title: String\n                published: CmsPublishedContentEntry\n            }\n\n            type CmsContentEntriesResponse {\n                data: [CmsContentEntry]\n                error: CmsError\n            }\n\n            type CmsContentEntryResponse {\n                data: CmsContentEntry\n                error: CmsError\n            }\n\n            input CmsModelEntryInput {\n                modelId: ID!\n                id: ID!\n            }\n\n            extend type Query {\n                # Search content entries for given content models using the query string.\n                searchContentEntries(\n                    modelIds: [ID!]!\n                    query: String\n                    fields: [String!]\n                    limit: Int\n                ): CmsContentEntriesResponse\n\n                # Get content entry meta data\n                getContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse\n\n                getLatestContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse\n                getPublishedContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse\n\n                # Get content entries meta data\n                getContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse\n                getLatestContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse\n                getPublishedContentEntries(\n                    entries: [CmsModelEntryInput!]!\n                ): CmsContentEntriesResponse\n            }\n        `,\n        resolvers: {\n            CmsContentEntry: {\n                published: async (parent, _, context) => {\n                    try {\n                        const models = await context.cms.listModels();\n                        const model = models.find(({ modelId }) => {\n                            return parent.model.modelId === modelId;\n                        });\n                        if (!model) {\n                            return null;\n                        }\n                        const [entry] = await context.cms.getPublishedEntriesByIds(model, [\n                            parent.id\n                        ]);\n                        if (!entry) {\n                            return null;\n                        }\n                        return {\n                            id: entry.id,\n                            entryId: entry.entryId,\n                            title: getEntryTitle(model, entry)\n                        };\n                    } catch (ex) {\n                        return null;\n                    }\n                }\n            },\n            Query: {\n                async searchContentEntries(_, args: any, context) {\n                    const { modelIds, fields, query, limit = 10 } = args;\n                    const models = await context.cms.listModels();\n\n                    const getters = models\n                        .filter(model => modelIds.includes(model.modelId))\n                        .map(async model => {\n                            const modelManager = await context.cms.getModelManager(model.modelId);\n                            const where: CmsEntryListWhere = {};\n\n                            const [items] = await modelManager.listLatest({\n                                limit,\n                                where,\n                                search: !!query ? query : undefined,\n                                fields: fields || []\n                            });\n\n                            return items.map((entry: CmsEntry) => {\n                                return {\n                                    id: entry.id,\n                                    entryId: entry.entryId,\n                                    model: {\n                                        modelId: model.modelId,\n                                        name: model.name\n                                    },\n                                    status: entry.status,\n                                    title: getEntryTitle(model, entry),\n                                    // We need `savedOn` to sort entries from latest to oldest\n                                    savedOn: entry.savedOn\n                                };\n                            });\n                        });\n\n                    const entries = await Promise.all(getters).then(results =>\n                        results.reduce((result, item) => result.concat(item), [])\n                    );\n\n                    return new Response(\n                        entries\n                            .sort((a, b) => Date.parse(b.savedOn) - Date.parse(a.savedOn))\n                            .slice(0, limit)\n                    );\n                },\n                async getContentEntry(_, args: any, context) {\n                    return getContentEntry({\n                        args,\n                        context,\n                        type: \"exact\"\n                    });\n                },\n                async getLatestContentEntry(_, args: any, context) {\n                    return getContentEntry({\n                        args,\n                        context,\n                        type: \"latest\"\n                    });\n                },\n                async getPublishedContentEntry(_, args: any, context) {\n                    return getContentEntry({\n                        args,\n                        context,\n                        type: \"published\"\n                    });\n                },\n                async getContentEntries(_, args: any, context) {\n                    return getContentEntries({\n                        args,\n                        context,\n                        type: \"exact\"\n                    });\n                },\n                async getLatestContentEntries(_, args: any, context) {\n                    return getContentEntries({\n                        args,\n                        context,\n                        type: \"latest\"\n                    });\n                },\n                async getPublishedContentEntries(_, args: any, context) {\n                    return getContentEntries({\n                        args,\n                        context,\n                        type: \"published\"\n                    });\n                }\n            }\n        }\n    });\n};\n"],"mappings":"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"}

package/graphql/schema/contentModelGroups.d.ts

@@ -0,0 +1,3 @@
+import { CmsContext } from "../../types";
+import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins/GraphQLSchemaPlugin";
+export declare const createGroupsSchema: (context: CmsContext) => GraphQLSchemaPlugin<CmsContext>;

package/{content/plugins → graphql}/schema/contentModelGroups.js

@@ -3,15 +3,15 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createGroupsSchema = void 0;
 
 var _handlerGraphql = require("@webiny/handler-graphql");
 
 var _GraphQLSchemaPlugin = require("@webiny/handler-graphql/plugins/GraphQLSchemaPlugin");
 
-var _CmsGroupPlugin = require("../CmsGroupPlugin");
+var _CmsGroupPlugin = require("../../plugins/CmsGroupPlugin");
 
-const plugin = context => {
+const createGroupsSchema = context => {
   let manageSchema = "";
 
   if (context.cms.MANAGE) {
@@ -65,13 +65,25 @@ const plugin = context => {
           context.security.disableAuthorization();
           const models = await context.cms.listModels();
           context.security.enableAuthorization();
-          return models.filter(m => m.group.id === group.id);
+          return models.filter(model => {
+            if (model.isPrivate === true) {
+              return false;
+            }
+
+            return model.group.id === group.id;
+          });
         },
         totalContentModels: async (group, _, context) => {
           context.security.disableAuthorization();
           const models = await context.cms.listModels();
           context.security.enableAuthorization();
-          return models.filter(m => m.group === group.id).length;
+          return models.filter(model => {
+            if (model.isPrivate === true) {
+              return false;
+            }
+
+            return model.group === group.id;
+          }).length;
         },
         plugin: async (group, _, context) => {
           return context.plugins.byType(_CmsGroupPlugin.CmsGroupPlugin.type).some(item => item.contentModelGroup.id === group.id);
@@ -83,16 +95,21 @@ const plugin = context => {
             const {
               id
             } = args;
-            const model = await context.cms.getGroup(id);
-            return new _handlerGraphql.Response(model);
+            const group = await context.cms.getGroup(id);
+
+            if (group !== null && group !== void 0 && group.isPrivate) {
+              throw new _handlerGraphql.NotFoundError(`Cms Group "${id}" was not found!`);
+            }
+
+            return new _handlerGraphql.Response(group);
           } catch (e) {
             return new _handlerGraphql.ErrorResponse(e);
           }
         },
         listContentModelGroups: async (_, __, context) => {
           try {
-            const models = await context.cms.listGroups();
-            return new _handlerGraphql.Response(models);
+            const groups = await context.cms.listGroups();
+            return new _handlerGraphql.Response(groups.filter(group => group.isPrivate !== true));
           } catch (e) {
             return new _handlerGraphql.ErrorResponse(e);
           }
@@ -152,5 +169,4 @@ const plugin = context => {
   });
 };
 
-var _default = plugin;
-exports.default = _default;
+exports.createGroupsSchema = createGroupsSchema;

package/graphql/schema/contentModelGroups.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createGroupsSchema","context","manageSchema","cms","MANAGE","resolvers","CmsContentModelGroup","contentModels","group","_","security","disableAuthorization","models","listModels","enableAuthorization","filter","model","isPrivate","id","totalContentModels","length","plugin","plugins","byType","CmsGroupPlugin","type","some","item","contentModelGroup","Query","getContentModelGroup","args","getGroup","NotFoundError","Response","e","ErrorResponse","listContentModelGroups","__","groups","listGroups","Mutation","createContentModelGroup","createGroup","data","updateContentModelGroup","updateGroup","deleteContentModelGroup","deleteGroup","GraphQLSchemaPlugin","typeDefs"],"sources":["contentModelGroups.ts"],"sourcesContent":["import { ErrorResponse, NotFoundError, Response } from \"@webiny/handler-graphql\";\n\nimport { CmsContext } from \"~/types\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins/GraphQLSchemaPlugin\";\nimport { Resolvers } from \"@webiny/handler-graphql/types\";\nimport { CmsGroupPlugin } from \"~/plugins/CmsGroupPlugin\";\n\nexport const createGroupsSchema = (context: CmsContext): GraphQLSchemaPlugin<CmsContext> => {\n    let manageSchema = \"\";\n    if (context.cms.MANAGE) {\n        manageSchema = /* GraphQL */ `\n            input CmsContentModelGroupInput {\n                name: String!\n                slug: String\n                description: String\n                icon: String!\n            }\n\n            type CmsContentModelGroupResponse {\n                data: CmsContentModelGroup\n                error: CmsError\n            }\n\n            type CmsContentModelGroupListResponse {\n                data: [CmsContentModelGroup]\n                meta: CmsListMeta\n                error: CmsError\n            }\n\n            extend type Query {\n                getContentModelGroup(id: ID): CmsContentModelGroupResponse\n                listContentModelGroups: CmsContentModelGroupListResponse\n            }\n\n            extend type Mutation {\n                createContentModelGroup(\n                    data: CmsContentModelGroupInput!\n                ): CmsContentModelGroupResponse\n\n                updateContentModelGroup(\n                    id: ID!\n                    data: CmsContentModelGroupInput!\n                ): CmsContentModelGroupResponse\n\n                deleteContentModelGroup(id: ID!): CmsDeleteResponse\n            }\n        `;\n    }\n\n    let resolvers: Resolvers<CmsContext> = {};\n\n    if (context.cms.MANAGE) {\n        resolvers = {\n            CmsContentModelGroup: {\n                contentModels: async (group, _, context) => {\n                    context.security.disableAuthorization();\n                    const models = await context.cms.listModels();\n                    context.security.enableAuthorization();\n                    return models.filter(model => {\n                        if (model.isPrivate === true) {\n                            return false;\n                        }\n                        return model.group.id === group.id;\n                    });\n                },\n                totalContentModels: async (group, _, context) => {\n                    context.security.disableAuthorization();\n                    const models = await context.cms.listModels();\n                    context.security.enableAuthorization();\n                    return models.filter(model => {\n                        if (model.isPrivate === true) {\n                            return false;\n                        }\n                        return model.group === group.id;\n                    }).length;\n                },\n                plugin: async (group, _, context: CmsContext): Promise<boolean> => {\n                    return context.plugins\n                        .byType<CmsGroupPlugin>(CmsGroupPlugin.type)\n                        .some(item => item.contentModelGroup.id === group.id);\n                }\n            },\n            Query: {\n                getContentModelGroup: async (_, args: any, context) => {\n                    try {\n                        const { id } = args;\n                        const group = await context.cms.getGroup(id);\n                        if (group?.isPrivate) {\n                            throw new NotFoundError(`Cms Group \"${id}\" was not found!`);\n                        }\n                        return new Response(group);\n                    } catch (e) {\n                        return new ErrorResponse(e);\n                    }\n                },\n                listContentModelGroups: async (_, __, context) => {\n                    try {\n                        const groups = await context.cms.listGroups();\n                        return new Response(groups.filter(group => group.isPrivate !== true));\n                    } catch (e) {\n                        return new ErrorResponse(e);\n                    }\n                }\n            },\n            Mutation: {\n                createContentModelGroup: async (_, args: any, context) => {\n                    try {\n                        const model = await context.cms.createGroup(args.data);\n                        return new Response(model);\n                    } catch (e) {\n                        return new ErrorResponse(e);\n                    }\n                },\n                updateContentModelGroup: async (_, args: any, context) => {\n                    try {\n                        const group = await context.cms.updateGroup(args.id, args.data);\n                        return new Response(group);\n                    } catch (e) {\n                        return new ErrorResponse(e);\n                    }\n                },\n                deleteContentModelGroup: async (_, args: any, context) => {\n                    try {\n                        await context.cms.deleteGroup(args.id);\n                        return new Response(true);\n                    } catch (e) {\n                        return new ErrorResponse(e);\n                    }\n                }\n            }\n        };\n    }\n\n    return new GraphQLSchemaPlugin<CmsContext>({\n        typeDefs: /* GraphQL */ `\n            type CmsContentModelGroup {\n                id: ID!\n                createdOn: DateTime\n                savedOn: DateTime\n                name: String!\n                contentModels: [CmsContentModel!]\n                totalContentModels: Int!\n                slug: String!\n                description: String\n                icon: String\n                createdBy: CmsCreatedBy\n\n                # Returns true if the content model group is registered via a plugin.\n                plugin: Boolean!\n            }\n            ${manageSchema}\n        `,\n        resolvers\n    });\n};\n"],"mappings":"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"}

package/graphql/schema/contentModels.d.ts

@@ -0,0 +1,3 @@
+import { CmsContext } from "../../types";
+import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/plugins/GraphQLSchemaPlugin";
+export declare const createModelsSchema: (context: CmsContext) => GraphQLSchemaPlugin<CmsContext>;

package/{content/plugins → graphql}/schema/contentModels.js

@@ -3,20 +3,27 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createModelsSchema = void 0;
 
 var _handlerGraphql = require("@webiny/handler-graphql");
 
 var _GraphQLSchemaPlugin = require("@webiny/handler-graphql/plugins/GraphQLSchemaPlugin");
 
-var _CmsModelPlugin = require("../CmsModelPlugin");
+var _CmsModelPlugin = require("../../plugins/CmsModelPlugin");
 
-const plugin = context => {
+const createModelsSchema = context => {
   const resolvers = {
     Query: {
       getContentModel: async (_, args, context) => {
         try {
           const model = await context.cms.getModel(args.modelId);
+
+          if ((model === null || model === void 0 ? void 0 : model.isPrivate) === true) {
+            if (!model) {
+              throw new _handlerGraphql.NotFoundError(`Content model "${args.modelId}" was not found!`);
+            }
+          }
+
           return new _handlerGraphql.Response(model);
         } catch (e) {
           return new _handlerGraphql.ErrorResponse(e);
@@ -24,8 +31,8 @@ const plugin = context => {
       },
       listContentModels: async (_, __, context) => {
         try {
-          const model = await context.cms.listModels();
-          return new _handlerGraphql.Response(model);
+          const models = await context.cms.listModels();
+          return new _handlerGraphql.Response(models.filter(model => model.isPrivate !== true));
         } catch (e) {
           return new _handlerGraphql.ErrorResponse(e);
         }
@@ -246,5 +253,4 @@ const plugin = context => {
   });
 };
 
-var _default = plugin;
-exports.default = _default;
+exports.createModelsSchema = createModelsSchema;

package/graphql/schema/contentModels.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["createModelsSchema","context","resolvers","Query","getContentModel","_","args","model","cms","getModel","modelId","isPrivate","NotFoundError","Response","e","ErrorResponse","listContentModels","__","models","listModels","filter","CmsContentModel","plugin","plugins","byType","CmsModelPlugin","type","some","item","contentModel","manageSchema","MANAGE","createContentModel","createModel","data","createContentModelFrom","createModelFrom","updateContentModel","updateModel","deleteContentModel","deleteModel","GraphQLSchemaPlugin","typeDefs"],"sources":["contentModels.ts"],"sourcesContent":["import { ErrorResponse, NotFoundError, Response } from \"@webiny/handler-graphql\";\nimport { CmsContext } from \"~/types\";\nimport { GraphQLSchemaPlugin } from \"@webiny/handler-graphql/plugins/GraphQLSchemaPlugin\";\nimport { Resolvers } from \"@webiny/handler-graphql/types\";\nimport { CmsModelPlugin } from \"~/plugins/CmsModelPlugin\";\n\nexport const createModelsSchema = (context: CmsContext): GraphQLSchemaPlugin<CmsContext> => {\n    const resolvers: Resolvers<CmsContext> = {\n        Query: {\n            getContentModel: async (_: unknown, args: any, context) => {\n                try {\n                    const model = await context.cms.getModel(args.modelId);\n                    if (model?.isPrivate === true) {\n                        if (!model) {\n                            throw new NotFoundError(\n                                `Content model \"${args.modelId}\" was not found!`\n                            );\n                        }\n                    }\n                    return new Response(model);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            listContentModels: async (_: unknown, __: unknown, context: CmsContext) => {\n                try {\n                    const models = await context.cms.listModels();\n                    return new Response(models.filter(model => model.isPrivate !== true));\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        },\n        CmsContentModel: {\n            plugin: async (model, _, context): Promise<boolean> => {\n                return context.plugins\n                    .byType<CmsModelPlugin>(CmsModelPlugin.type)\n                    .some(item => item.contentModel.modelId === model.modelId);\n            }\n        }\n    };\n\n    let manageSchema = \"\";\n    if (context.cms.MANAGE) {\n        resolvers[\"Mutation\"] = {\n            createContentModel: async (_: unknown, args: any, context) => {\n                try {\n                    const model = await context.cms.createModel(args.data);\n                    return new Response(model);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            createContentModelFrom: async (_: unknown, args: any, context) => {\n                try {\n                    const model = await context.cms.createModelFrom(args.modelId, args.data);\n                    return new Response(model);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            updateContentModel: async (_: unknown, args: any, context) => {\n                const { modelId, data } = args;\n                try {\n                    const model = await context.cms.updateModel(modelId, data);\n                    return new Response(model);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            },\n            deleteContentModel: async (_: unknown, args: any, context) => {\n                const { modelId } = args;\n                try {\n                    await context.cms.deleteModel(modelId);\n                    return new Response(true);\n                } catch (e) {\n                    return new ErrorResponse(e);\n                }\n            }\n        };\n\n        manageSchema = /* GraphQL */ `\n            input CmsPredefinedValueInput {\n                label: String!\n                value: String!\n                selected: Boolean\n            }\n\n            input CmsPredefinedValuesInput {\n                enabled: Boolean\n                values: [CmsPredefinedValueInput]\n            }\n            input CmsFieldRendererInput {\n                name: String\n            }\n\n            input CmsFieldValidationInput {\n                name: String!\n                message: String\n                settings: JSON\n            }\n\n            input CmsContentModelFieldInput {\n                id: ID!\n                label: String!\n                helpText: String\n                placeholderText: String\n                fieldId: String!\n                type: String!\n                multipleValues: Boolean\n                predefinedValues: CmsPredefinedValuesInput\n                renderer: CmsFieldRendererInput\n                validation: [CmsFieldValidationInput]\n                listValidation: [CmsFieldValidationInput]\n                settings: JSON\n            }\n\n            input CmsContentModelCreateInput {\n                name: String!\n                modelId: String\n                group: RefInput!\n                description: String\n                layout: [[ID!]!]\n                fields: [CmsContentModelFieldInput!]\n                titleFieldId: String\n            }\n\n            input CmsContentModelCreateFromInput {\n                name: String!\n                modelId: String\n                group: RefInput!\n                description: String\n                locale: String\n            }\n\n            input CmsContentModelUpdateInput {\n                name: String\n                group: RefInput\n                description: String\n                layout: [[ID!]!]!\n                fields: [CmsContentModelFieldInput!]!\n                titleFieldId: String\n            }\n\n            extend type Mutation {\n                createContentModel(data: CmsContentModelCreateInput!): CmsContentModelResponse\n\n                createContentModelFrom(\n                    modelId: ID!\n                    data: CmsContentModelCreateFromInput!\n                ): CmsContentModelResponse\n\n                updateContentModel(\n                    modelId: ID!\n                    data: CmsContentModelUpdateInput!\n                ): CmsContentModelResponse\n\n                deleteContentModel(modelId: ID!): CmsDeleteResponse\n            }\n        `;\n    }\n\n    return new GraphQLSchemaPlugin<CmsContext>({\n        typeDefs: /* GraphQL */ `\n            type CmsFieldValidation {\n                name: String!\n                message: String\n                settings: JSON\n            }\n\n            type CmsFieldRenderer {\n                name: String\n            }\n\n            type CmsPredefinedValue {\n                label: String\n                value: String\n                selected: Boolean\n            }\n\n            type CmsPredefinedValues {\n                enabled: Boolean\n                values: [CmsPredefinedValue]\n            }\n\n            type CmsContentModelField {\n                id: ID!\n                fieldId: String!\n                label: String!\n                helpText: String\n                placeholderText: String\n                type: String!\n                multipleValues: Boolean\n                predefinedValues: CmsPredefinedValues\n                renderer: CmsFieldRenderer\n                validation: [CmsFieldValidation!]\n                listValidation: [CmsFieldValidation!]\n                settings: JSON\n            }\n\n            type CmsContentModel {\n                name: String!\n                modelId: String!\n                description: String\n                group: CmsContentModelGroup!\n                createdOn: DateTime\n                savedOn: DateTime\n                createdBy: CmsCreatedBy\n                fields: [CmsContentModelField!]!\n                lockedFields: [JSON]\n                layout: [[String!]!]!\n                titleFieldId: String\n\n                # Returns true if the content model is registered via a plugin.\n                plugin: Boolean!\n            }\n\n            type CmsContentModelResponse {\n                data: CmsContentModel\n                error: CmsError\n            }\n\n            type CmsContentModelListResponse {\n                data: [CmsContentModel]\n                meta: CmsListMeta\n                error: CmsError\n            }\n\n            extend type Query {\n                getContentModel(modelId: ID!, where: JSON, sort: String): CmsContentModelResponse\n\n                listContentModels: CmsContentModelListResponse\n            }\n\n            ${manageSchema}\n        `,\n        resolvers\n    });\n};\n"],"mappings":"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H,CAHD,CAGE,OAAOC,CAAP,EAAU;UACR,OAAO,IAAIC,6BAAJ,CAAkBD,CAAlB,CAAP;QACH;MACJ;IAlCmB,CAAxB;IAqCAgB,YAAY;IAAG;IAAe;AACtC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SA9EQ;EA+EH;;EAED,OAAO,IAAIW,wCAAJ,CAAoC;IACvCC,QAAQ;IAAE;IAAe;AACjC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,cAAcZ,YAAa;AAC3B,SAzE+C;IA0EvC5B;EA1EuC,CAApC,CAAP;AA4EH,CAxOM"}

package/{content/plugins → graphql}/schema/createFieldResolvers.d.ts

@@ -1,4 +1,4 @@
-import { CmsModelField, ApiEndpoint, CmsModel, CmsFieldTypePlugins } from "../../../types";
+import { CmsModelField, ApiEndpoint, CmsModel, CmsFieldTypePlugins } from "../../types";
 import { Resolvers } from "@webiny/handler-graphql/types";
 interface CreateFieldResolvers {
     graphQLType: string;