strapi-plugin-comments 2.0.11 → 2.1.1

package/build/server/controllers/admin.js

@@ -3,122 +3,133 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const functions_1 = require("./../utils/functions");
 const functions_2 = require("./utils/functions");
 const controllers = {
-  getService(name = "admin") {
-    return (0, functions_1.getPluginService)(name);
-  },
-  async config(ctx) {
-    try {
-      return await this.getService().config();
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
-  async settingsConfig(ctx) {
-    try {
-      return this.getService().config(true);
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
-  async settingsUpdateConfig(ctx) {
-    try {
-      const {
-        request: { body },
-      } = ctx;
-      (0, functions_1.assertNotEmpty)(body);
-      return this.getService().updateConfig(body);
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
-  async settingsRestoreConfig(ctx) {
-    try {
-      return this.getService().restoreConfig();
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
-  async settingsRestart(ctx) {
-    try {
-      await this.getService().restart();
-      return ctx.send({ status: 200 });
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
-  async findAll(ctx) {
-    return this.getService().findAll(ctx.query);
-  },
-  async findOne(ctx) {
-    const { params = {}, query } = ctx;
-    const { id } = (0, functions_2.parseParams)(params);
-    try {
-      return await this.getService().findOneAndThread(id, query);
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
-  async blockComment(ctx) {
-    const { params = {} } = ctx;
-    const { id } = (0, functions_2.parseParams)(params);
-    try {
-      return await this.getService().blockComment(id, true);
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
-  async unblockComment(ctx) {
-    const { params = {} } = ctx;
-    const { id } = (0, functions_2.parseParams)(params);
-    try {
-      return await this.getService().blockComment(id, false);
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
-  async blockCommentThread(ctx) {
-    const { params = {} } = ctx;
-    const { id } = (0, functions_2.parseParams)(params);
-    try {
-      return await this.getService().blockCommentThread(id, true);
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
-  async unblockCommentThread(ctx) {
-    const { params = {} } = ctx;
-    const { id } = (0, functions_2.parseParams)(params);
-    try {
-      return await this.getService().blockCommentThread(id, false);
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
-  async resolveAbuseReport(ctx) {
-    const { params = {} } = ctx;
-    const { id: commentId, reportId } = (0, functions_2.parseParams)(params);
-    try {
-      return await this.getService().resolveAbuseReport(reportId, commentId);
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
-  async approveComment(ctx) {
-    const { id } = (0, functions_2.parseParams)(ctx.params || {});
-    try {
-      return await this.getService().approveComment(id);
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
-  async rejectComment(ctx) {
-    const { id } = (0, functions_2.parseParams)(ctx.params || {});
-    try {
-      return await this.getService().rejectComment(id);
-    } catch (e) {
-      throw (0, functions_2.throwError)(ctx, e);
-    }
-  },
+    getService(name = "admin") {
+        return (0, functions_1.getPluginService)(name);
+    },
+    async config(ctx) {
+        try {
+            return await this.getService().config();
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async settingsConfig(ctx) {
+        try {
+            return this.getService().config(true);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async settingsUpdateConfig(ctx) {
+        try {
+            const { request: { body }, } = ctx;
+            (0, functions_1.assertNotEmpty)(body);
+            return this.getService().updateConfig(body);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async settingsRestoreConfig(ctx) {
+        try {
+            return this.getService().restoreConfig();
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async settingsRestart(ctx) {
+        try {
+            await this.getService().restart();
+            return ctx.send({ status: 200 });
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async findAll(ctx) {
+        return this.getService().findAll(ctx.query);
+    },
+    async findOne(ctx) {
+        const { params = {}, query } = ctx;
+        const { id } = (0, functions_2.parseParams)(params);
+        try {
+            return await this.getService().findOneAndThread(id, query);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async blockComment(ctx) {
+        const { params = {} } = ctx;
+        const { id } = (0, functions_2.parseParams)(params);
+        try {
+            return await this.getService().blockComment(id, true);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async unblockComment(ctx) {
+        const { params = {} } = ctx;
+        const { id } = (0, functions_2.parseParams)(params);
+        try {
+            return await this.getService().blockComment(id, false);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async blockCommentThread(ctx) {
+        const { params = {} } = ctx;
+        const { id } = (0, functions_2.parseParams)(params);
+        try {
+            return await this.getService().blockCommentThread(id, true);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async unblockCommentThread(ctx) {
+        const { params = {} } = ctx;
+        const { id } = (0, functions_2.parseParams)(params);
+        try {
+            return await this.getService().blockCommentThread(id, false);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async resolveAbuseReport(ctx) {
+        const { params = {} } = ctx;
+        const { id: commentId, reportId } = (0, functions_2.parseParams)(params);
+        try {
+            return await this.getService().resolveAbuseReport(reportId, commentId);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async approveComment(ctx) {
+        const { id } = (0, functions_2.parseParams)(ctx.params || {});
+        try {
+            return await this.getService().approveComment(id);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async rejectComment(ctx) {
+        const { id } = (0, functions_2.parseParams)(ctx.params || {});
+        try {
+            return await this.getService().rejectComment(id);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
 };
 exports.default = controllers;
-//# sourceMappingURL=admin.js.map
+//# sourceMappingURL=admin.js.map

package/build/server/controllers/client.js

@@ -14,10 +14,16 @@ const controllers = {
     async findAllFlat(ctx) {
         const { params = {}, query, sort, pagination } = ctx;
         const { relation } = (0, functions_2.parseParams)(params);
-        const { sort: querySort, pagination: queryPagination, ...filterQuery } = query || {};
+        const { sort: querySort, pagination: queryPagination, fields, ...filterQuery } = query || {};
         try {
             (0, functions_1.assertParamsPresent)(params, ["relation"]);
-            return this.getService("common").findAllFlat((0, parsers_1.flatInput)(relation, filterQuery, sort || querySort, pagination || queryPagination));
+            return this.getService("common").findAllFlat((0, parsers_1.flatInput)({
+                relation,
+                query: filterQuery,
+                sort: sort || querySort,
+                pagination: pagination || queryPagination,
+                fields,
+            }));
         }
         catch (e) {
             throw (0, functions_2.throwError)(ctx, e);
@@ -26,11 +32,16 @@ const controllers = {
     async findAllInHierarchy(ctx) {
         const { params, query, sort } = ctx;
         const { relation } = (0, functions_2.parseParams)(params);
-        const { sort: querySort, ...filterQuery } = query || {};
+        const { sort: querySort, fields, ...filterQuery } = query || {};
         try {
             (0, functions_1.assertParamsPresent)(params, ["relation"]);
             return await this.getService("common").findAllInHierarchy({
-                ...(0, parsers_1.flatInput)(relation, filterQuery, sort || querySort),
+                ...(0, parsers_1.flatInput)({
+                    relation,
+                    query: filterQuery,
+                    sort: sort || querySort,
+                    fields,
+                }),
                 dropBlockedThreads: true,
             });
         }

package/build/server/controllers/index.js

@@ -1,15 +1,13 @@
 "use strict";
-var __importDefault =
-  (this && this.__importDefault) ||
-  function (mod) {
-    return mod && mod.__esModule ? mod : { default: mod };
-  };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const admin_1 = __importDefault(require("./admin"));
 const client_1 = __importDefault(require("./client"));
 const controllers = {
-  admin: admin_1.default,
-  client: client_1.default,
+    admin: admin_1.default,
+    client: client_1.default,
 };
 exports.default = controllers;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/build/server/controllers/utils/functions.d.ts

@@ -2,6 +2,6 @@ import { Id, StringMap, StrapiRequestContext } from "strapi-typed";
 import PluginError from "../../utils/error";
 declare type ParseResponse = StringMap<string | number | Id>;
 export declare const parseParams: <T extends ParseResponse>(params: StringMap<string | number>) => T;
-export declare const throwError: <T extends {} = never>(ctx: StrapiRequestContext<T, {}>, e: PluginError | Error | unknown) => PluginError | Error | unknown | never;
+export declare const throwError: <T extends {} = never>(ctx: StrapiRequestContext<T, StringMap<string | number>, StringMap<string | number>>, e: PluginError | Error | unknown) => PluginError | Error | unknown | never;
 export {};
 //# sourceMappingURL=functions.d.ts.map

package/build/server/controllers/utils/parsers.d.ts

@@ -1,15 +1,10 @@
-import { Id } from "strapi-typed";
-import { ToBeFixed } from "../../../types";
-export declare const flatInput: (relation: Id, query: ToBeFixed, sort: ToBeFixed, pagination?: ToBeFixed) => {
+import { OnlyStrings } from "strapi-typed";
+import { FlatInput } from "../../../types";
+export declare const flatInput: <T, TKeys = keyof T>(payload: FlatInput<OnlyStrings<TKeys>>) => {
     query: any;
-    populate: {
-        threadOf: {
-            populate: {
-                authorUser: boolean;
-            };
-        };
-    };
+    populate: any;
     pagination: any;
     sort: any;
+    fields: import("strapi-typed").StrapiRequestQueryFieldsClause<OnlyStrings<TKeys>> | undefined;
 };
 //# sourceMappingURL=parsers.d.ts.map

package/build/server/controllers/utils/parsers.js

@@ -1,25 +1,51 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.flatInput = void 0;
-const flatInput = (relation, query, sort, pagination) => {
-  const filters = query?.filters || query;
-  const orOperator = (filters?.$or || []).filter(
-    (_) => !Object.keys(_).includes("removed")
-  );
-  return {
-    query: {
-      ...filters,
-      $or: [...orOperator, { removed: { $null: true } }, { removed: false }],
-      related: relation,
-    },
-    populate: {
-      threadOf: {
-        populate: { authorUser: true },
-      },
-    },
-    pagination,
-    sort,
-  };
+const flatInput = (payload) => {
+    const { relation, query, sort, pagination, fields } = payload;
+    const { populate = {}, ...restQuery } = query;
+    const filters = restQuery?.filters || restQuery;
+    const orOperator = (filters?.$or || []).filter((_) => !Object.keys(_).includes("removed"));
+    let basePopulate = {
+        ...populate,
+    };
+    let threadOfPopulate = {
+        threadOf: {
+            populate: {
+                authorUser: true,
+                ...populate,
+            },
+        },
+    };
+    if (populate.author) {
+        const { author, ...restPopulate } = populate;
+        basePopulate = {
+            ...restPopulate,
+            authorUser: author,
+        };
+        threadOfPopulate = {
+            threadOf: {
+                populate: {
+                    authorUser: author,
+                    ...restPopulate,
+                },
+            },
+        };
+    }
+    return {
+        query: {
+            ...filters,
+            $or: [...orOperator, { removed: { $null: true } }, { removed: false }],
+            related: relation,
+        },
+        populate: {
+            ...basePopulate,
+            ...threadOfPopulate,
+        },
+        pagination,
+        sort,
+        fields,
+    };
 };
 exports.flatInput = flatInput;
-//# sourceMappingURL=parsers.js.map
+//# sourceMappingURL=parsers.js.map

package/build/server/destroy.d.ts

@@ -1,3 +1,3 @@
 declare const _default: () => void;
 export = _default;
-//# sourceMappingURL=destroy.d.ts.map
+//# sourceMappingURL=destroy.d.ts.map

package/build/server/destroy.js

@@ -1,3 +1,4 @@
 "use strict";
-module.exports = () => {};
-//# sourceMappingURL=destroy.js.map
+module.exports = () => {
+};
+//# sourceMappingURL=destroy.js.map

package/build/server/graphql/index.js

@@ -1,37 +1,27 @@
 "use strict";
-var __importDefault =
-  (this && this.__importDefault) ||
-  function (mod) {
-    return mod && mod.__esModule ? mod : { default: mod };
-  };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 const types_1 = __importDefault(require("./types"));
 const queries_1 = __importDefault(require("./queries"));
 const mutations_1 = __importDefault(require("./mutations"));
 const resolvers_config_1 = __importDefault(require("./resolvers-config"));
 const functions_1 = require("../services/utils/functions");
 module.exports = async ({ strapi, config }) => {
-  const extensionService = strapi.plugin("graphql").service("extension");
-  extensionService
-    .shadowCRUD((0, functions_1.getModelUid)("comment"))
-    .disableQueries();
-  extensionService
-    .shadowCRUD((0, functions_1.getModelUid)("comment"))
-    .disableMutations();
-  extensionService
-    .shadowCRUD((0, functions_1.getModelUid)("comment-report"))
-    .disableQueries();
-  extensionService
-    .shadowCRUD((0, functions_1.getModelUid)("comment-report"))
-    .disableMutations();
-  extensionService.use(({ strapi, nexus }) => {
-    const types = (0, types_1.default)({ strapi, nexus, config });
-    const queries = (0, queries_1.default)({ strapi, nexus, config });
-    const mutations = (0, mutations_1.default)({ strapi, nexus, config });
-    const resolversConfig = (0, resolvers_config_1.default)({ strapi, config });
-    return {
-      types: [types, queries, mutations],
-      resolversConfig,
-    };
-  });
+    const extensionService = strapi.plugin("graphql").service("extension");
+    extensionService.shadowCRUD((0, functions_1.getModelUid)("comment")).disableQueries();
+    extensionService.shadowCRUD((0, functions_1.getModelUid)("comment")).disableMutations();
+    extensionService.shadowCRUD((0, functions_1.getModelUid)("comment-report")).disableQueries();
+    extensionService.shadowCRUD((0, functions_1.getModelUid)("comment-report")).disableMutations();
+    extensionService.use(({ strapi, nexus }) => {
+        const types = (0, types_1.default)({ strapi, nexus, config });
+        const queries = (0, queries_1.default)({ strapi, nexus, config });
+        const mutations = (0, mutations_1.default)({ strapi, nexus, config });
+        const resolversConfig = (0, resolvers_config_1.default)({ strapi, config });
+        return {
+            types: [types, queries, mutations],
+            resolversConfig,
+        };
+    });
 };
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/build/server/graphql/mutations/createAbuseReport.js

@@ -1,27 +1,23 @@
 "use strict";
 const functions_1 = require("../../utils/functions");
 module.exports = ({ nexus }) => {
-  const { nonNull } = nexus;
-  return {
-    type: nonNull("Report"),
-    args: {
-      input: nonNull("CreateReport"),
-    },
-    async resolve(_, args, ctx) {
-      const { input } = args;
-      const { state: { user = undefined } = {} } = ctx;
-      const { commentId, relation, ...body } = input;
-      try {
-        return await (0, functions_1.getPluginService)("client").reportAbuse(
-          commentId,
-          relation,
-          body,
-          user
-        );
-      } catch (e) {
-        throw new Error(e);
-      }
-    },
-  };
+    const { nonNull } = nexus;
+    return {
+        type: nonNull("Report"),
+        args: {
+            input: nonNull("CreateReport"),
+        },
+        async resolve(_, args, ctx) {
+            const { input } = args;
+            const { state: { user = undefined } = {} } = ctx;
+            const { commentId, relation, ...body } = input;
+            try {
+                return await (0, functions_1.getPluginService)("client").reportAbuse(commentId, relation, body, user);
+            }
+            catch (e) {
+                throw new Error(e);
+            }
+        },
+    };
 };
-//# sourceMappingURL=createAbuseReport.js.map
+//# sourceMappingURL=createAbuseReport.js.map

package/build/server/graphql/mutations/createComment.d.ts

@@ -8,7 +8,7 @@ declare const _default: ({ nexus }: StrapiGraphQLContext) => {
     args: {
         input: any;
     };
-    resolve(_: Object, args: CreateCommentProps, ctx: StrapiRequestContext<never> & ToBeFixed): Promise<import("../../../types").Comment>;
+    resolve(_: Object, args: CreateCommentProps, ctx: StrapiRequestContext<never> & ToBeFixed): Promise<import("../../../types").Comment<import("../../../types").CommentAuthor>>;
 };
 export = _default;
 //# sourceMappingURL=createComment.d.ts.map

package/build/server/graphql/mutations/createComment.js

@@ -1,26 +1,23 @@
 "use strict";
 const functions_1 = require("../../utils/functions");
 module.exports = ({ nexus }) => {
-  const { nonNull } = nexus;
-  return {
-    type: nonNull("CommentSingle"),
-    args: {
-      input: nonNull("CreateComment"),
-    },
-    async resolve(_, args, ctx) {
-      const { input } = args;
-      const { state: { user = undefined } = {} } = ctx;
-      const { relation, ...body } = input;
-      try {
-        return await (0, functions_1.getPluginService)("client").create(
-          relation,
-          body,
-          user
-        );
-      } catch (e) {
-        throw new Error(e);
-      }
-    },
-  };
+    const { nonNull } = nexus;
+    return {
+        type: nonNull("CommentSingle"),
+        args: {
+            input: nonNull("CreateComment"),
+        },
+        async resolve(_, args, ctx) {
+            const { input } = args;
+            const { state: { user = undefined } = {} } = ctx;
+            const { relation, ...body } = input;
+            try {
+                return await (0, functions_1.getPluginService)("client").create(relation, body, user);
+            }
+            catch (e) {
+                throw new Error(e);
+            }
+        },
+    };
 };
-//# sourceMappingURL=createComment.js.map
+//# sourceMappingURL=createComment.js.map

package/build/server/graphql/mutations/index.js

@@ -1,28 +1,26 @@
 "use strict";
-var __importDefault =
-  (this && this.__importDefault) ||
-  function (mod) {
-    return mod && mod.__esModule ? mod : { default: mod };
-  };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 const createComment_1 = __importDefault(require("./createComment"));
 const updateComment_1 = __importDefault(require("./updateComment"));
 const removeComment_1 = __importDefault(require("./removeComment"));
 const createAbuseReport_1 = __importDefault(require("./createAbuseReport"));
 module.exports = (context) => {
-  const mutations = {
-    createComment: createComment_1.default,
-    updateComment: updateComment_1.default,
-    removeComment: removeComment_1.default,
-    createAbuseReport: createAbuseReport_1.default,
-  };
-  return context.nexus.extendType({
-    type: "Mutation",
-    definition(t) {
-      for (const [name, configFactory] of Object.entries(mutations)) {
-        const config = configFactory(context);
-        t.field(name, config);
-      }
-    },
-  });
+    const mutations = {
+        createComment: createComment_1.default,
+        updateComment: updateComment_1.default,
+        removeComment: removeComment_1.default,
+        createAbuseReport: createAbuseReport_1.default,
+    };
+    return context.nexus.extendType({
+        type: "Mutation",
+        definition(t) {
+            for (const [name, configFactory] of Object.entries(mutations)) {
+                const config = configFactory(context);
+                t.field(name, config);
+            }
+        },
+    });
 };
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map