@ozdao/martyrs 0.2.602 → 0.2.603

package/dist/{abac-BPl9Bmf9.js → abac-Blt8bUTL.js}

@@ -1520,8 +1520,8 @@ const getInstance = (db, options) => {
 const resetInstance = () => {
   instance = null;
 };
-const coreabac = { getInstance, resetInstance };
+const ABAC = { getInstance, resetInstance };
 export {
-  LoggerNamespaced as L,
-  coreabac as c
+  ABAC as A,
+  LoggerNamespaced as L
 };

package/dist/{addUserStatusFields-Cc-JpmPo.js → addUserStatusFields-CjV_sbh7.js}

@@ -82,6 +82,6 @@ const addUserStatusFields = (user) => {
   };
 };
 export {
-  addUserStatusFields as a,
-  addMembersQuantity as b
+  addMembersQuantity as a,
+  addUserStatusFields as b
 };

package/dist/auth.server.js

@@ -5,7 +5,9 @@ import { Types } from "mongoose";
 import jwkToPem from "jwk-to-pem";
 import { g as getSessionsService } from "./sessions.service-COcwjd0f.js";
 import { g as getVisitorsService } from "./visitors.service-B1dhhuSo.js";
-import { a as addUserStatusFields, b as addMembersQuantity } from "./addUserStatusFields-Cc-JpmPo.js";
+import { a as addMembersQuantity, b as addUserStatusFields } from "./addUserStatusFields-CjV_sbh7.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
+import { A as ABAC } from "./abac-Blt8bUTL.js";
 import { a as applyCredentialsSchema } from "./credentials.schema--2vvcu8c.js";
 import { a as applyProfileSchema } from "./profile.schema-C31Lynn3.js";
 import { a as applySocialsSchema } from "./socials.schema-DxnnaBgO.js";
@@ -356,6 +358,7 @@ const controllerFactory = (db) => {
       });
     }
     if (matchConditions.length > 0) query.push({ $match: { $and: matchConditions } });
+    query.push(...queryProcessorCore.getFilterDate(req.query.dateStart, req.query.dateEnd));
     query.push({
       $lookup: {
         from: "orders",
@@ -389,6 +392,7 @@ const controllerFactory = (db) => {
         __v: 0
       }
     });
+    query.push(...queryProcessorCore.getSortingOptions(req.query.sortParam, req.query.sortOrder));
     query.push({
       $skip: skip
     });
@@ -465,19 +469,70 @@ const controllerFactory = (db) => {
       return res.status(500).send({ errorCode: "INTERNAL_SERVER_ERROR", message: err });
     }
   };
+  const getStats = async (req, res) => {
+    try {
+      const now = /* @__PURE__ */ new Date();
+      const startOfMonth = new Date(now.getFullYear(), now.getMonth(), 1);
+      const thirtyDaysAgo = new Date(now.getTime() - 30 * 24 * 60 * 60 * 1e3);
+      const startDate = req.query.startDate ? new Date(req.query.startDate) : null;
+      const endDate = req.query.endDate ? new Date(req.query.endDate) : null;
+      const dateFilter = startDate && endDate ? { createdAt: { $gte: startDate, $lte: endDate } } : null;
+      const [totals, dailyRegistrations] = await Promise.all([
+        User.aggregate([
+          ...dateFilter ? [{ $match: dateFilter }] : [],
+          { $facet: {
+            total: [{ $count: "count" }],
+            active: [{ $match: { status: "active" } }, { $count: "count" }],
+            newThisMonth: [{ $match: { createdAt: dateFilter ? { $gte: startDate, $lte: endDate } : { $gte: startOfMonth } } }, { $count: "count" }]
+          } }
+        ]),
+        User.aggregate([
+          { $match: dateFilter || { createdAt: { $gte: thirtyDaysAgo } } },
+          { $group: {
+            _id: { $dateToString: { format: "%Y-%m-%d", date: "$createdAt" } },
+            count: { $sum: 1 }
+          } },
+          { $sort: { _id: 1 } }
+        ])
+      ]);
+      const facet = totals[0];
+      res.status(200).send({
+        total: facet.total[0]?.count || 0,
+        active: facet.active[0]?.count || 0,
+        newThisMonth: facet.newThisMonth[0]?.count || 0,
+        dailyRegistrations
+      });
+    } catch (err) {
+      console.error(err);
+      res.status(500).send({
+        errorCode: "GET_USER_STATS_FAILED",
+        message: "Error occurred while fetching user stats.",
+        error: err.message
+      });
+    }
+  };
   return {
     read,
     create,
     update,
     updateEmail,
-    updatePhone
+    updatePhone,
+    getStats
   };
 };
+const { getInstance } = ABAC;
 const usersRoutes = (function(app, db, origins) {
   const controller = controllerFactory(db);
   const { authJwt, verifyUser, otp } = middlewareIndexFactory(db);
+  const abac = getInstance(db);
   app.post("/api/users", [authJwt.verifyToken(), verifyUser.checkDuplicateUsername], controller.create);
   app.get("/api/users", controller.read);
+  app.get(
+    "/api/users/stats",
+    authJwt.verifyToken(),
+    abac.middleware("users", "read"),
+    controller.getStats
+  );
   app.put("/api/users/:_id", [
     authJwt.verifyToken(),
     verifyUser.checkOwnership,

package/dist/builder.js

@@ -439,15 +439,20 @@ function createSsrDevServer(projectRoot, configs, createServer) {
         });
         return;
       }
-      const { entrypoints, outputPath } = jsonStats;
-      const { main: { assets: [mainChunkPath] } } = entrypoints;
-      const mainModulePath = path.resolve(outputPath, mainChunkPath.name);
-      const module = await import(`${mainModulePath}?t=${Date.now()}`);
-      renderApp = module._renderApp;
-      performance.mark("loading-3-end");
-      performance.measure("loading-3", "loading-2-start", "loading-3-end");
-      const measure3 = performance.getEntriesByName("loading-3")[0];
-      console.log(`[LOADING 3] SSR module compiled in ${measure3?.duration?.toFixed(2)}ms`);
+      try {
+        const { entrypoints, outputPath } = jsonStats;
+        const { main: { assets: [mainChunkPath] } } = entrypoints;
+        const mainModulePath = path.resolve(outputPath, mainChunkPath.name);
+        const module = await import(`${mainModulePath}?t=${Date.now()}`);
+        renderApp = module._renderApp;
+        performance.mark("loading-3-end");
+        performance.measure("loading-3", "loading-2-start", "loading-3-end");
+        const measure3 = performance.getEntriesByName("loading-3")[0];
+        console.log(`[LOADING 3] SSR module compiled in ${measure3?.duration?.toFixed(2)}ms`);
+        await startServer();
+      } catch (err) {
+        console.error(chalk.red("[SSR] Failed to load SSR module:"), err);
+      }
     }
   );
   const createDevRenderer = () => {
@@ -569,6 +574,10 @@ function createSsrDevServer(projectRoot, configs, createServer) {
       console.error("Серверный модуль еще не скомпилирован");
       return;
     }
+    if (!renderApp) {
+      console.error("SSR модуль еще не скомпилирован");
+      return;
+    }
     let { app, server, env } = await serverModule.createServer();
     app.use(clientDevMiddleware);
     if (!rendererInstance) {
@@ -714,6 +723,7 @@ class MartyrsJIT {
     this.rules = options.rules || [];
     this.variants = options.variants || [];
     this.cache = /* @__PURE__ */ new Map();
+    this.tokenMeta = /* @__PURE__ */ new Map();
     this.usedTokens = /* @__PURE__ */ new Set();
   }
   /**
@@ -755,11 +765,14 @@ class MartyrsJIT {
       }
       if (!found) break;
     }
-    for (const [pattern, handler] of this.rules) {
+    for (let ruleIdx = 0; ruleIdx < this.rules.length; ruleIdx++) {
+      const [pattern, handler] = this.rules[ruleIdx];
       const match = baseToken.match(pattern);
       if (match) {
         let css = handler(match, this);
         if (!css) continue;
+        const altIndex = this._getAlternationIndex(pattern, match);
+        this.tokenMeta.set(token, { ruleIndex: ruleIdx, altIndex });
         const selector = this.escapeSelector(token);
         if (appliedVariants.length === 0) {
           css = `body .${selector} { ${css} }`;
@@ -859,42 +872,53 @@ class MartyrsJIT {
       const css = this.generateForToken(token);
       if (!css) continue;
       this.usedTokens.add(token);
-      if (token.includes("mobile:")) groups.mobile.push(css);
-      else if (token.includes("tablet:")) groups.tablet.push(css);
-      else if (token.includes("desktop:")) groups.desktop.push(css);
-      else if (token.includes("widescreen:")) groups.widescreen.push(css);
-      else if (token.includes("dark:")) groups.dark.push(css);
-      else if (token.includes("light:")) groups.light.push(css);
-      else if (token.includes("print:")) groups.print.push(css);
-      else if (token.includes("group-hover:")) groups.groupHover.push(css);
-      else if (token.includes("hover:")) groups.hover.push(css);
-      else if (token.includes("focus:")) groups.focus.push(css);
-      else if (token.includes("active:")) groups.active.push(css);
-      else if (token.includes("disabled:")) groups.disabled.push(css);
-      else if (token.includes("first:")) groups.first.push(css);
-      else if (token.includes("last:")) groups.last.push(css);
-      else if (token.includes("odd:")) groups.odd.push(css);
-      else if (token.includes("even:")) groups.even.push(css);
-      else groups.base.push(css);
+      const entry = { css, token };
+      if (token.includes("mobile:")) groups.mobile.push(entry);
+      else if (token.includes("tablet:")) groups.tablet.push(entry);
+      else if (token.includes("desktop:")) groups.desktop.push(entry);
+      else if (token.includes("widescreen:")) groups.widescreen.push(entry);
+      else if (token.includes("dark:")) groups.dark.push(entry);
+      else if (token.includes("light:")) groups.light.push(entry);
+      else if (token.includes("print:")) groups.print.push(entry);
+      else if (token.includes("group-hover:")) groups.groupHover.push(entry);
+      else if (token.includes("hover:")) groups.hover.push(entry);
+      else if (token.includes("focus:")) groups.focus.push(entry);
+      else if (token.includes("active:")) groups.active.push(entry);
+      else if (token.includes("disabled:")) groups.disabled.push(entry);
+      else if (token.includes("first:")) groups.first.push(entry);
+      else if (token.includes("last:")) groups.last.push(entry);
+      else if (token.includes("odd:")) groups.odd.push(entry);
+      else if (token.includes("even:")) groups.even.push(entry);
+      else groups.base.push(entry);
     }
+    const sortByRule = (a, b) => {
+      const metaA = this.tokenMeta.get(a.token) || { ruleIndex: 0, altIndex: 0 };
+      const metaB = this.tokenMeta.get(b.token) || { ruleIndex: 0, altIndex: 0 };
+      if (metaA.ruleIndex !== metaB.ruleIndex) return metaA.ruleIndex - metaB.ruleIndex;
+      return metaA.altIndex - metaB.altIndex;
+    };
+    for (const key in groups) {
+      groups[key].sort(sortByRule);
+    }
+    const toCSS = (arr) => arr.map((e) => e.css);
     return [
-      ...groups.base,
-      ...groups.hover,
-      ...groups.focus,
-      ...groups.active,
-      ...groups.disabled,
-      ...groups.first,
-      ...groups.last,
-      ...groups.odd,
-      ...groups.even,
-      ...groups.groupHover,
-      ...groups.widescreen,
-      ...groups.desktop,
-      ...groups.tablet,
-      ...groups.mobile,
-      ...groups.dark,
-      ...groups.light,
-      ...groups.print
+      ...toCSS(groups.base),
+      ...toCSS(groups.hover),
+      ...toCSS(groups.focus),
+      ...toCSS(groups.active),
+      ...toCSS(groups.disabled),
+      ...toCSS(groups.first),
+      ...toCSS(groups.last),
+      ...toCSS(groups.odd),
+      ...toCSS(groups.even),
+      ...toCSS(groups.groupHover),
+      ...toCSS(groups.widescreen),
+      ...toCSS(groups.desktop),
+      ...toCSS(groups.tablet),
+      ...toCSS(groups.mobile),
+      ...toCSS(groups.dark),
+      ...toCSS(groups.light),
+      ...toCSS(groups.print)
     ].join("\n");
   }
   /**
@@ -918,11 +942,25 @@ class MartyrsJIT {
   getCSS() {
     return Array.from(this.cache.values()).join("\n");
   }
+  /**
+   * Определяет позицию совпавшего значения в альтернации regex
+   * pos-(relative|absolute|fixed) + match "absolute" → 1
+   */
+  _getAlternationIndex(pattern, match) {
+    if (!match[1]) return 0;
+    const src = pattern.source;
+    const groupMatch = src.match(/\(([^()]+)\)/);
+    if (!groupMatch || !groupMatch[1].includes("|")) return 0;
+    const alts = groupMatch[1].split("|");
+    const idx = alts.indexOf(match[1]);
+    return idx >= 0 ? idx : 0;
+  }
   /**
    * Очистить кэш (для watch mode)
    */
   reset() {
     this.cache.clear();
+    this.tokenMeta.clear();
     this.usedTokens.clear();
   }
 }
@@ -1058,7 +1096,11 @@ const rules = [
     if (n > 0) return `display: grid; grid-template-rows: repeat(${n}, minmax(0, 1fr));`;
     return null;
   }],
-  // Gap (специфичные перед общими)
+  // Gap (общие перед специфичными — для правильного каскада CSS)
+  [/^gap-(.+)$/, (m, jit) => {
+    const v = resolveValue(m[1], jit);
+    return v ? `gap: ${v};` : null;
+  }],
   [/^gap-x-(.+)$/, (m, jit) => {
     const v = resolveValue(m[1], jit);
     return v ? `column-gap: ${v};` : null;
@@ -1067,11 +1109,15 @@ const rules = [
     const v = resolveValue(m[1], jit);
     return v ? `row-gap: ${v};` : null;
   }],
-  [/^gap-(.+)$/, (m, jit) => {
+  // Size (общие перед специфичными — для правильного каскада CSS)
+  [/^w-(.+)$/, (m, jit) => {
     const v = resolveValue(m[1], jit);
-    return v ? `gap: ${v};` : null;
+    return v ? `width: ${v};` : null;
+  }],
+  [/^h-(.+)$/, (m, jit) => {
+    const v = resolveValue(m[1], jit);
+    return v ? `height: ${v};` : null;
   }],
-  // Size (специфичные перед общими)
   [/^w-min-(.+)$/, (m, jit) => {
     const v = resolveValue(m[1], jit);
     return v ? `min-width: ${v};` : null;
@@ -1088,33 +1134,29 @@ const rules = [
     const v = resolveValue(m[1], jit);
     return v ? `max-height: ${v};` : null;
   }],
-  [/^w-(.+)$/, (m, jit) => {
-    const v = resolveValue(m[1], jit);
-    return v ? `width: ${v};` : null;
-  }],
-  [/^h-(.+)$/, (m, jit) => {
+  // Padding (общие перед специфичными — для правильного каскада CSS)
+  [/^pd-(.+)$/, (m, jit) => {
     const v = resolveValue(m[1], jit);
-    return v ? `height: ${v};` : null;
+    return v ? `padding: ${v};` : null;
   }],
-  // Padding (специфичные перед общими)
   [/^pd-(t|r|b|l)-(.+)$/, (m, jit) => {
     const v = handleNegative(m[2], jit);
     return v ? `padding-${dir[m[1]]}: ${v};` : null;
   }],
-  [/^pd-(.+)$/, (m, jit) => {
+  // Margin (общие перед специфичными — для правильного каскада CSS)
+  [/^mn-(.+)$/, (m, jit) => {
     const v = resolveValue(m[1], jit);
-    return v ? `padding: ${v};` : null;
+    return v ? `margin: ${v};` : null;
   }],
-  // Margin (специфичные перед общими)
   [/^mn-(t|r|b|l)-(.+)$/, (m, jit) => {
     const v = handleNegative(m[2], jit);
     return v ? `margin-${dir[m[1]]}: ${v};` : null;
   }],
-  [/^mn-(.+)$/, (m, jit) => {
+  // Border radius (общие перед специфичными — для правильного каскада CSS)
+  [/^radius-(.+)$/, (m, jit) => {
     const v = resolveValue(m[1], jit);
-    return v ? `margin: ${v};` : null;
+    return v ? `border-radius: ${v};` : null;
   }],
-  // Border radius (специфичные перед общими)
   [/^radius-tl-(.+)$/, (m, jit) => {
     const v = resolveValue(m[1], jit);
     return v ? `border-top-left-radius: ${v};` : null;
@@ -1131,10 +1173,6 @@ const rules = [
     const v = resolveValue(m[1], jit);
     return v ? `border-bottom-right-radius: ${v};` : null;
   }],
-  [/^radius-(.+)$/, (m, jit) => {
-    const v = resolveValue(m[1], jit);
-    return v ? `border-radius: ${v};` : null;
-  }],
   // Inset
   [/^top-(.+)$/, (m, jit) => {
     const v = resolveValue(m[1], jit);
@@ -1439,24 +1477,24 @@ const rules = [
   [/^scroll-snap-(start|end|center|none)$/, (m) => `scroll-snap-align: ${m[1]};`],
   // Scroll behavior (scroll-smooth, scroll-auto)
   [/^scroll-(auto|smooth)$/, (m) => `scroll-behavior: ${m[1]};`],
-  // Scroll padding (scroll-pd-medium, scroll-pd-t-small) - через resolveValue
-  [/^scroll-pd-(t|r|b|l)-(.+)$/, (m, jit) => {
-    const v = resolveValue(m[2], jit);
-    return v ? `scroll-padding-${dir[m[1]]}: ${v};` : null;
-  }],
+  // Scroll padding (общие перед специфичными — для правильного каскада CSS)
   [/^scroll-pd-(.+)$/, (m, jit) => {
     const v = resolveValue(m[1], jit);
     return v ? `scroll-padding: ${v};` : null;
   }],
-  // Scroll margin (scroll-mn-medium, scroll-mn-t-small) - через resolveValue
-  [/^scroll-mn-(t|r|b|l)-(.+)$/, (m, jit) => {
+  [/^scroll-pd-(t|r|b|l)-(.+)$/, (m, jit) => {
     const v = resolveValue(m[2], jit);
-    return v ? `scroll-margin-${dir[m[1]]}: ${v};` : null;
+    return v ? `scroll-padding-${dir[m[1]]}: ${v};` : null;
   }],
+  // Scroll margin (общие перед специфичными — для правильного каскада CSS)
   [/^scroll-mn-(.+)$/, (m, jit) => {
     const v = resolveValue(m[1], jit);
     return v ? `scroll-margin: ${v};` : null;
   }],
+  [/^scroll-mn-(t|r|b|l)-(.+)$/, (m, jit) => {
+    const v = resolveValue(m[2], jit);
+    return v ? `scroll-margin-${dir[m[1]]}: ${v};` : null;
+  }],
   // Overscroll (overscroll-x-contain, overscroll-none)
   [/^overscroll-(x|y)-(auto|contain|none)$/, (m) => `overscroll-behavior-${m[1]}: ${m[2]};`],
   [/^overscroll-(auto|contain|none)$/, (m) => `overscroll-behavior: ${m[1]};`],
@@ -1819,8 +1857,8 @@ class MartyrsJitPlugin {
     const isIncluded = this.options.include.some(
       (dir2) => filename.includes(`/${dir2}/`) || filename.includes(`\\${dir2}\\`) || filename.includes(dir2)
     );
-    const isMartyrsPackage = filename.includes("@ozdao/martyrs") || filename.includes("@ozdao\\martyrs");
-    const isExcluded = !isMartyrsPackage && this.options.exclude.some(
+    const isMartyrs = filename.includes("@ozdao/martyrs") || filename.includes("@ozdao\\martyrs") || filename.includes("/martyrs/") || filename.includes("\\martyrs\\");
+    const isExcluded = !isMartyrs && this.options.exclude.some(
       (dir2) => filename.includes(dir2)
     );
     if (!isIncluded || isExcluded) {
@@ -1859,10 +1897,17 @@ const baseConfig = (projectRoot) => {
         "vue": path.resolve(projectRoot, "node_modules/vue"),
         "vue-router": path.resolve(projectRoot, "node_modules/vue-router"),
         "vue-i18n": path.resolve(projectRoot, "node_modules/vue-i18n")
-      }
+      },
+      conditionNames: process.env.NODE_ENV !== "production" ? ["development", "import", "module", "webpack", "default"] : ["import", "module", "webpack", "default"]
     },
     module: {
       rules: [
+        {
+          test: /\.m?js$/,
+          resolve: {
+            fullySpecified: false
+          }
+        },
         {
           test: /\.m?js$/,
           exclude: /node_modules\/(?!(vue-meta)\/).*/,
@@ -2014,14 +2059,17 @@ const clientConfig = (projectRoot) => {
     mode: !isProd2 ? "development" : "production",
     devtool: !isProd2 ? "eval-cheap-module-source-map" : "source-map",
     entry: {
-      main: path.resolve(projectRoot, "src/client.js")
+      main: [
+        ...!isProd2 ? ["webpack-hot-middleware/client?reload=true&noInfo=true"] : [],
+        path.resolve(projectRoot, "src/client.js")
+      ]
     },
     module: {
       rules: []
     },
     output: {
-      filename: "[name].[contenthash:8].js",
-      chunkFilename: "chunks/[name].[contenthash:8].js",
+      filename: isProd2 ? "[name].[contenthash:8].js" : "[name].js",
+      chunkFilename: isProd2 ? "chunks/[name].[contenthash:8].js" : "chunks/[name].js",
       path: path.resolve(projectRoot, "builds/web/client"),
       publicPath: "/",
       clean: true
@@ -2035,7 +2083,7 @@ const clientConfig = (projectRoot) => {
       // Отключаем lazy compilation для dev - все chunks компилируются при старте
     },
     plugins: [
-      // ...(!isProd ? [new rspack.HotModuleReplacementPlugin()] : []),
+      ...!isProd2 ? [new rspack$2.HotModuleReplacementPlugin()] : [],
       new StatsWriterPlugin({
         filename: "stats.json",
         stats: {
@@ -2113,7 +2161,7 @@ const clientConfig = (projectRoot) => {
       ] : []
     ],
     optimization: {
-      sideEffects: false,
+      sideEffects: true,
       usedExports: true,
       innerGraph: true,
       providedExports: true,
@@ -2328,6 +2376,7 @@ const apiConfig = (projectRoot) => {
       alias: {
         "@martyrs": path.resolve(projectRoot, "martyrs")
       },
+      conditionNames: process.env.NODE_ENV !== "production" ? ["development", "import", "module", "node", "default"] : ["import", "module", "node", "default"],
       fallback: {
         path: false
       }

package/dist/community.server.js

@@ -1,11 +1,11 @@
 import { Types } from "mongoose";
 import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 import { a as applyCommonSchema } from "./common.schema-DswiUXKB.js";
-import { a as applyEngagementSchema } from "./engagement.schema-fh6W1fb_.js";
+import { a as applyEngagementSchema } from "./engagement.schema-B-Cc_NsG.js";
 import { a as applyMetadataSchema } from "./metadata.schema-CIRR_WQ-.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { m as middlewareIndexFactory$1 } from "./index-kvBwwb0w.js";
-import { c as coreabac } from "./abac-BPl9Bmf9.js";
+import { A as ABAC } from "./abac-Blt8bUTL.js";
 const ObjectId$2 = { Types }.Types.ObjectId;
 function getCommentsLookupStage() {
   return {
@@ -203,6 +203,10 @@ const controllerFactory = (db) => {
       ...await AggregationProcessor.getFollowingStage(Membership, req.query.following),
       // Blocking
       ...await AggregationProcessor.getBlockedStage(Membership, req.query.user),
+      // Sorting and Pagination BEFORE lookups
+      ...queryProcessorCore.getSortingOptions(req.query.sortParam, req.query.sortOrder),
+      ...queryProcessorCore.getPaginationOptions(req.query.skip, req.query.limit),
+      // Lookups (only on paginated documents)
       queryProcessorReactions.getCommentsLookupStage(),
       queryProcessorReactions.getReactionsLookupStage(),
       queryProcessorReactions.getReactionsCommentsFields(req.query.user),
@@ -211,12 +215,7 @@ const controllerFactory = (db) => {
       // For owner
       queryProcessorCore.getOwnerUserLookupStage(),
       queryProcessorCore.getOwnerOrganizationLookupStage(),
-      queryProcessorCore.getAddFieldsCreatorOwnerStage(),
-      // Sorting and Pagination
-      ...queryProcessorCore.getSortingOptions(req.query.sortParam, req.query.sortOrder),
-      ...queryProcessorCore.getPaginationOptions(req.query.skip, req.query.limit)
-      // For creator
-      // { $sample: { size: Number(req.query.limit) } },
+      queryProcessorCore.getAddFieldsCreatorOwnerStage()
     ];
     try {
       const posts = await Blogpost.aggregate(stages).exec();
@@ -695,6 +694,7 @@ const ReactionModel = (db) => {
       strict: false
     }
   );
+  ReactionSchema.index({ target: 1 });
   const Reaction = db.mongoose.model("Reaction", ReactionSchema);
   return Reaction;
 };
@@ -749,7 +749,7 @@ const middlewareIndexFactory = (db) => {
     verifyBlogpost
   };
 };
-const { getInstance: getInstance$1 } = coreabac;
+const { getInstance: getInstance$1 } = ABAC;
 const blogRoutes = (function(app, db, origins) {
   const controller = controllerFactory(db);
   const abac = getInstance$1(db);
@@ -770,7 +770,7 @@ const blogRoutes = (function(app, db, origins) {
   app.post("/api/blog/update", [authJwt.verifyToken(), abac.middleware("blogposts", "edit"), verifyBlogpost.checkNameNotEmpty, verifyBlogpost.checkBlogpostExistOrNot], controller.update);
   app.delete("/api/blog/delete/:_id", [authJwt.verifyToken(), abac.middleware("blogposts", "delete")], controller.delete);
 });
-const { getInstance } = coreabac;
+const { getInstance } = ABAC;
 const commentsRoutes = (function(app, db) {
   const controller = commentControllerFactory(db);
   const abac = getInstance(db);
@@ -840,7 +840,7 @@ function initializeCommunity({ app, db, origins, publicPath }) {
   db.blogpost = BlogpostModel(db);
   db.comment = CommentModel(db);
   db.reaction = ReactionModel(db);
-  const { getInstance: getInstance2 } = coreabac;
+  const { getInstance: getInstance2 } = ABAC;
   const abac = getInstance2(db);
   initBlogPolicies(abac);
   if (app) {

package/dist/core.server.js

@@ -1,4 +1,4 @@
-import { c as coreabac } from "./abac-BPl9Bmf9.js";
+import { A as ABAC } from "./abac-Blt8bUTL.js";
 import { i as initSessionsService } from "./sessions.service-COcwjd0f.js";
 import { g as getVisitorsService, i as initVisitorsService } from "./visitors.service-B1dhhuSo.js";
 const initCorePolicies = (function initializeDefaultPolicies(abacAccessControl) {
@@ -289,7 +289,7 @@ const createVisitorLogger = () => {
   };
   return { visitorLogger };
 };
-const { getInstance } = coreabac;
+const { getInstance } = ABAC;
 let _WebSocketManagerClass = null;
 async function createWebSocketManager(...args) {
   if (!_WebSocketManagerClass) {

package/dist/{core.verifier-gPPX_jhf.js → core.verifier-DVB2a21y.js}

@@ -342,7 +342,12 @@ class Validator {
           if (!(validator instanceof Validator)) {
             throw new TypeError(`Property "${key}" must be a Validator instance`);
           }
-          const result = validator.validate(value[key]);
+          const fieldValue = value[key];
+          const isRequired = validator.rules.some((r) => r.type === "required");
+          if ((fieldValue === null || fieldValue === void 0) && !isRequired) {
+            continue;
+          }
+          const result = validator.validate(fieldValue);
           if (!result.isValid) {
             this.errors.push(`"${key}" ${result.errors.join(", ")}`);
             return false;
@@ -610,7 +615,6 @@ class Verifier {
       if (Object.keys(result.verificationErrors).length === 0) {
         result.verificationErrors = null;
       }
-      console.log("Verification result:", result);
       return result;
     };
     if (paramPromises.length > 0) {
@@ -634,7 +638,6 @@ class Verifier {
           req.query = validationResult.verifiedData;
           next();
         };
-        console.log("verifier result is", processResult);
         if (result instanceof Promise) {
           result.then(processResult).catch(next);
         } else {

package/dist/{crud-DpOXTZep.js → crud-BT5FIvQC.js}

@@ -1,7 +1,7 @@
 import { m as middlewareFactory } from "./authJwt-DKbMMjw0.js";
 import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 import { O as ObserverNamespaced } from "./core.observer-MZsqaE6F.js";
-import { L as LoggerNamespaced } from "./abac-BPl9Bmf9.js";
+import { L as LoggerNamespaced } from "./abac-Blt8bUTL.js";
 import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
 class CRUDCore {
   constructor(crud) {
@@ -342,7 +342,6 @@ class CRUDController {
   // Обработка ошибок
   _handleError(error, res) {
     if (res.headersSent) return;
-    console.log(error);
     const statusCode = error.statusCode || error.code === "NOT_FOUND" ? 404 : 500;
     const message = error.message || "Internal Server Error";
     res.status(statusCode).json({
@@ -366,7 +365,6 @@ class CRUDController {
           errors: result.verificationErrors || result.errors
         });
       }
-      console.log("verified result", result);
       req.verified = result.verifiedData || data;
       next();
     };
@@ -563,6 +561,7 @@ class CRUDService {
       stages.push(...await extensions.before(query, context));
     }
     stages.push(...queryProcessorCore.getBasicOptions(query));
+    stages.push(...queryProcessorCore.getFilterDate(query.dateStart, query.dateEnd));
     if (extensions.middle) {
       stages.push(...await extensions.middle(query, context));
     }

package/dist/engagement.schema-B-Cc_NsG.js

@@ -0,0 +1,6 @@
+const applyEngagementSchema = (function applyEngagementSchema2(schema, db) {
+  schema.add({ views: { type: Number, default: 0 } });
+});
+export {
+  applyEngagementSchema as a
+};