refactor module exports

apps/app/src/server/models/index.js

@@ -22,3 +22,5 @@ export * as PageRedirect from './page-redirect';
 export * as ShareLink from './share-link';
 export * as Tag from './tag';
 export * as UserGroup from './user-group';
+
+export * from './serializers';

apps/app/src/server/models/serializers/bookmark-serializer.js

@@ -7,7 +7,7 @@ function serializeInsecurePageAttributes(bookmark) {
   return bookmark;
 }
 
-function serializeBookmarkSecurely(bookmark) {
+export function serializeBookmarkSecurely(bookmark) {
   let serialized = bookmark;
 
   // invoke toObject if bookmark is a model instance
@@ -19,7 +19,3 @@ function serializeBookmarkSecurely(bookmark) {
 
   return serialized;
 }
-
-module.exports = {
-  serializeBookmarkSecurely,
-};

apps/app/src/server/models/serializers/index.ts

@@ -0,0 +1,5 @@
+export * from './bookmark-serializer';
+export * from './page-serializer';
+export * from './revision-serializer';
+export * from './user-group-relation-serializer';
+export * from './user-serializer';

apps/app/src/server/models/serializers/page-serializer.js

@@ -20,7 +20,7 @@ function serializeInsecureUserAttributes(page) {
   return page;
 }
 
-function serializePageSecurely(page) {
+export function serializePageSecurely(page) {
   let serialized = page;
 
   // invoke toObject if page is a model instance
@@ -36,7 +36,3 @@ function serializePageSecurely(page) {
 
   return serialized;
 }
-
-module.exports = {
-  serializePageSecurely,
-};

apps/app/src/server/models/serializers/revision-serializer.js

@@ -7,14 +7,10 @@ function serializeInsecureUserAttributes(revision) {
   return revision;
 }
 
-function serializeRevisionSecurely(revision) {
+export function serializeRevisionSecurely(revision) {
   const serialized = revision;
 
   serializeInsecureUserAttributes(serialized);
 
   return serialized;
 }
-
-module.exports = {
-  serializeRevisionSecurely,
-};

apps/app/src/server/models/serializers/user-group-relation-serializer.js

@@ -7,7 +7,7 @@ function serializeInsecureUserAttributes(userGroupRelation) {
   return userGroupRelation;
 }
 
-function serializeUserGroupRelationSecurely(userGroupRelation) {
+export function serializeUserGroupRelationSecurely(userGroupRelation) {
   let serialized = userGroupRelation;
 
   // invoke toObject if page is a model instance
@@ -19,7 +19,3 @@ function serializeUserGroupRelationSecurely(userGroupRelation) {
 
   return serialized;
 }
-
-module.exports = {
-  serializeUserGroupRelationSecurely,
-};

apps/app/src/server/models/serializers/user-serializer.js

@@ -1,7 +1,7 @@
 const mongoose = require('mongoose');
 
 
-function omitInsecureAttributes(user) {
+export function omitInsecureAttributes(user) {
   // omit password
   delete user.password;
   // omit apiToken
@@ -14,7 +14,7 @@ function omitInsecureAttributes(user) {
   return user;
 }
 
-function serializeUserSecurely(user) {
+export function serializeUserSecurely(user) {
   const User = mongoose.model('User');
 
   // return when it is not a user object
@@ -33,8 +33,3 @@ function serializeUserSecurely(user) {
 
   return serialized;
 }
-
-module.exports = {
-  omitInsecureAttributes,
-  serializeUserSecurely,
-};

apps/app/src/server/routes/attachment.js → apps/app/src/server/routes/attachment/attachment.js

@@ -4,16 +4,14 @@ import { SupportedAction } from '~/interfaces/activity';
 import { AttachmentType } from '~/server/interfaces/attachment';
 import loggerFactory from '~/utils/logger';
 
-import { Attachment } from '../models';
+import { Attachment, serializePageSecurely, serializeRevisionSecurely } from '../../models';
 
 /* eslint-disable no-use-before-define */
 
 
 const logger = loggerFactory('growi:routes:attachment');
 
-const { serializePageSecurely } = require('../models/serializers/page-serializer');
-const { serializeRevisionSecurely } = require('../models/serializers/revision-serializer');
-const ApiResponse = require('../util/apiResponse');
+const ApiResponse = require('../../util/apiResponse');
 
 /**
  * @swagger
@@ -135,7 +133,7 @@ const ApiResponse = require('../util/apiResponse');
  *            example: "/download/5e0734e072560e001761fa67"
  */
 
-module.exports = function(crowi, app) {
+export const attachmentRoutesFactory = (crowi) => {
   const Page = crowi.model('Page');
   const User = crowi.model('User');
   const GlobalNotificationSetting = crowi.model('GlobalNotificationSetting');

apps/app/src/server/routes/attachment/index.ts

@@ -0,0 +1 @@
+export * from './attachment';

apps/app/src/server/routes/index.js

@@ -15,6 +15,7 @@ import {
   generateUnavailableWhenMaintenanceModeMiddleware, generateUnavailableWhenMaintenanceModeMiddlewareForApi,
 } from '../middlewares/unavailable-when-maintenance-mode';
 
+import { attachmentRoutesFactory } from './attachment';
 import * as forgotPassword from './forgot-password';
 import nextFactory from './next';
 import * as userActivation from './user-activation';
@@ -43,7 +44,7 @@ module.exports = function(crowi, app) {
   const loginPassport = require('./login-passport')(crowi, app);
   const me = require('./me')(crowi, app);
   const admin = require('./admin')(crowi, app);
-  const attachment = require('./attachment')(crowi, app);
+  const attachment = attachmentRoutesFactory(crowi);
   const comment = require('./comment')(crowi, app);
   const tag = require('./tag')(crowi, app);
   const search = require('./search')(crowi, app);