@ozdao/martyrs 0.2.564 → 0.2.566

package/dist/builder.js

@@ -162,14 +162,14 @@ const template = `
           requestIdleCallback(() => {
             const link = document.createElement('link');
             link.rel = 'manifest';
-            link.href = '/manifest.json';
+            link.href = '/pwa-manifest.json';
             document.head.appendChild(link);
           });
         } else {
           setTimeout(() => {
             const link = document.createElement('link');
             link.rel = 'manifest';
-            link.href = '/manifest.json';
+            link.href = '/pwa-manifest.json';
             document.head.appendChild(link);
           }, 0);
         }
@@ -510,9 +510,10 @@ function createSsrDevServer(projectRoot, configs, createServer) {
     try {
       performance.mark("loading-6-start");
       console.log("[LOADING 6] Loading server module...");
-      const { outputPath } = stats.toJson();
-      const entryName = Object.keys(stats.toJson().entrypoints)[0];
-      const assetName = stats.toJson().entrypoints[entryName].assets[0].name;
+      const jsonStats = stats.toJson();
+      const { outputPath } = jsonStats;
+      const entryName = Object.keys(jsonStats.entrypoints)[0];
+      const assetName = jsonStats.entrypoints[entryName].assets[0].name;
       serverModule = await import(`file://${path.resolve(outputPath, assetName)}?t=${Date.now()}`);
       if (typeof serverModule.createServer !== "function") {
         throw new Error("Экспорт createServer не найден");
@@ -727,7 +728,7 @@ const baseConfig = (projectRoot) => {
               template: {
                 preprocess: (content, { filename }) => {
                   const rewritten = content.replace(
-                    /<(\w+)\s+v-slot(:[\w\-]+)?=("|'){([^"'}]+)}("|')\s*>/g,
+                    /<(\w+)\s+v-slot(:[\w-]+)?=("|'){([^"'}]+)}("|')\s*>/g,
                     (_match, tag, slotName, _q1, slotProps, _q2) => {
                       const slotAttr = slotName || "";
                       return `<template v-slot${slotAttr}="{${slotProps}}"><${tag}>`;
@@ -736,12 +737,12 @@ const baseConfig = (projectRoot) => {
                     /<\/(\w+)>\s*<!--\s*v-slot-close\s*-->/g,
                     (_match, tag) => `</${tag}></template>`
                   ).replace(
-                    /<(\w+)(\s+#[\w\-]+)([^>]*)\/>/g,
+                    /<(\w+)(\s+#[\w-]+)([^>]*)\/>/g,
                     (_match, tag, slotDirective, attrs) => {
                       return `<template${slotDirective}><${tag}${attrs}/></template>`;
                     }
                   ).replace(
-                    /<(\w+)(\s+#[\w\-]+)([^>]*)>(.*?)<\/\1>/gs,
+                    /<(\w+)(\s+#[\w-]+)([^>]*)>(.*?)<\/\1>/gs,
                     (_match, tag, slotDirective, attrs, content2) => {
                       return `<template${slotDirective}><${tag}${attrs}>${content2}</${tag}></template>`;
                     }
@@ -902,7 +903,7 @@ const clientConfig = (projectRoot) => {
         extractors: [
           {
             extractor: (content) => {
-              const normalClasses = content.match(/[A-Za-z0-9-_:\/]+/g) || [];
+              const normalClasses = content.match(/[A-Za-z0-9-_:/]+/g) || [];
               const scopedAttrs = content.match(/\[data-v-[a-zA-Z0-9]*\]/g) || [];
               return [...normalClasses, ...scopedAttrs];
             },
@@ -916,6 +917,33 @@ const clientConfig = (projectRoot) => {
         fileName: "manifest.json",
         publicPath: "/"
       }),
+      new RspackManifestPlugin({
+        fileName: "pwa-manifest.json",
+        seed: {
+          name: process.env.APP_NAME || "App by Martyrs Framework",
+          short_name: process.env.APP_SHORT_NAME || "App",
+          description: process.env.APP_DESCRIPTION || "Progressive Web App by Martyrs Framework",
+          theme_color: "#000000",
+          background_color: "#ffffff",
+          display: "standalone",
+          orientation: "portrait",
+          scope: "/",
+          start_url: "/",
+          icons: [
+            {
+              src: "/favicon/android-chrome-192x192.png",
+              sizes: "192x192",
+              type: "image/png"
+            },
+            {
+              src: "/favicon/android-chrome-512x512.png",
+              sizes: "512x512",
+              type: "image/png"
+            }
+          ]
+        },
+        generate: (seed) => seed
+      }),
       ...isProd2 ? [
         new InjectManifest({
           swSrc: path.resolve(projectRoot, "../public/sw.js"),
@@ -941,33 +969,6 @@ const clientConfig = (projectRoot) => {
               return { manifest };
             }
           ]
-        }),
-        new RspackManifestPlugin({
-          fileName: "pwa-manifest.json",
-          seed: {
-            name: process.env.APP_NAME || "App by Martyrs Framework",
-            short_name: process.env.APP_SHORT_NAME || "App",
-            description: process.env.APP_DESCRIPTION || "Progressive Web App by Martyrs Framework",
-            theme_color: "#000000",
-            background_color: "#ffffff",
-            display: "standalone",
-            orientation: "portrait",
-            scope: "/",
-            start_url: "/",
-            icons: [
-              {
-                src: "/favicon/android-chrome-192x192.png",
-                sizes: "192x192",
-                type: "image/png"
-              },
-              {
-                src: "/favicon/android-chrome-512x512.png",
-                sizes: "512x512",
-                type: "image/png"
-              }
-            ]
-          },
-          generate: (seed) => seed
         })
       ] : []
     ],
@@ -1153,18 +1154,25 @@ const apiConfig = (projectRoot) => {
   return {
     target: "node",
     mode: "development",
-    entry: [path.resolve(projectRoot, "src/server.js")],
+    entry: {
+      server: path.resolve(projectRoot, "src/server.js")
+    },
     output: {
       filename: "server.js",
+      chunkFilename: "[name].server.js",
       path: path.resolve(projectRoot, "builds/web/server"),
       libraryTarget: "module",
       chunkFormat: "module",
+      chunkLoading: "import",
       module: true,
       clean: true
     },
     experiments: {
       outputModule: true
     },
+    optimization: {
+      minimize: false
+    },
     resolve: {
       alias: {
         "@martyrs": path.resolve(projectRoot, "martyrs")
@@ -1183,13 +1191,17 @@ const apiConfig = (projectRoot) => {
       }),
       // Для .node файлов тоже используем module
       function({ context, request }, callback) {
-        if (/\.node$/.test(request)) {
+        if (request.endsWith(".node")) {
           return callback(null, `module ${request}`);
         }
         callback();
       }
     ],
-    plugins: [],
+    plugins: [
+      new rspack.optimize.LimitChunkCountPlugin({
+        maxChunks: 1
+      })
+    ],
     module: {
       rules: [
         {

package/dist/{common.schema-GFSlNJo7.js → common.schema-DswiUXKB.js}

@@ -2,7 +2,7 @@ const applyCommonSchema = (function applyCommonSchema2(schema, db) {
   schema.add({
     status: {
       type: String,
-      enum: ["draft", "published", "featured", "archived", "removed"],
+      enum: ["draft", "published", "internal", "archived", "removed"],
       default: "draft",
       required: true
     }

package/dist/community.server.js

@@ -1,11 +1,11 @@
 import { Types } from "mongoose";
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
-import { a as applyCommonSchema } from "./common.schema-GFSlNJo7.js";
+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 applyMetadataSchema } from "./metadata.schema-CIRR_WQ-.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { m as middlewareIndexFactory$1 } from "./index-_Edcmck_.js";
-import { c as coreabac } from "./core.abac-DUPBnlk6.js";
+import { c as coreabac } from "./abac-BPl9Bmf9.js";
 const ObjectId$2 = { Types }.Types.ObjectId;
 function getCommentsLookupStage() {
   return {
@@ -749,10 +749,10 @@ const middlewareIndexFactory = (db) => {
     verifyBlogpost
   };
 };
-const { getInstance: getInstance$2 } = coreabac;
+const { getInstance: getInstance$1 } = coreabac;
 const blogRoutes = (function(app, db, origins) {
   const controller = controllerFactory(db);
-  const abac = getInstance$2(db);
+  const abac = getInstance$1(db);
   const { authJwt } = middlewareIndexFactory$1(db);
   const { verifyBlogpost } = middlewareIndexFactory(db);
   app.get(
@@ -770,10 +770,10 @@ 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: getInstance$1 } = coreabac;
+const { getInstance } = coreabac;
 const commentsRoutes = (function(app, db) {
   const controller = commentControllerFactory(db);
-  const abac = getInstance$1(db);
+  const abac = getInstance(db);
   const { authJwt } = middlewareIndexFactory$1(db);
   app.get(
     "/comments/read",
@@ -790,20 +790,59 @@ const commentsRoutes = (function(app, db) {
   app.post("/comments/update/:url", [authJwt.verifyToken(), abac.middleware("comments", "edit")], controller.update);
   app.delete("/comments/delete/:url", [authJwt.verifyToken(), abac.middleware("comments", "delete")], controller.delete);
 });
-const { getInstance } = coreabac;
 const reactionsRoutes = (function(app, db) {
   const controller = reactionControllerFactory(db);
-  getInstance(db);
   const { authJwt } = middlewareIndexFactory$1(db);
   app.get("/api/reactions/read", [authJwt.verifyToken(true)], controller.read);
   app.post("/api/reactions/create", [authJwt.verifyToken()], controller.create);
   app.post("/api/reactions/update", [authJwt.verifyToken()], controller.update);
   app.post("/api/reactions/delete", [authJwt.verifyToken()], controller.delete);
 });
+function initBlogPolicies(abac, db) {
+  abac.registerResourcePolicy(
+    "blogposts",
+    async (context) => {
+      const allowed = ["published", "active", "featured"];
+      if (context.action === "read" && !context.user && (context.options?.allowPublished || context.req?.method === "GET")) {
+        const current = context.data?.query?.status;
+        const list = Array.isArray(current) ? current : current ? [current] : [];
+        const filtered = list.filter((s) => allowed.includes(s));
+        context.req.query.status = filtered.length ? filtered : allowed;
+        context.data.query.status = context.req.query.status;
+      }
+      if (context.action === "read" && context.currentResource) {
+        const status = context.currentResource.status;
+        if (!allowed.includes(status)) {
+          if (!context.user) {
+            return { allow: false, reason: "DRAFT_POST_REQUIRES_AUTH" };
+          }
+          const ownerId = context.currentResource.owner?.target || context.currentResource.creator?.target;
+          if (String(ownerId) === String(context.user)) {
+            return { allow: true };
+          }
+          if (context.currentResource.owner?.type === "organization" && context.checkOrganizationRight) {
+            const hasOrgAccess = await context.checkOrganizationRight("blogposts", "read");
+            if (hasOrgAccess) {
+              return { allow: true, reason: "ORGANIZATION_MEMBER_ACCESS" };
+            }
+          }
+          return { allow: false, reason: "DRAFT_POST_ACCESS_DENIED" };
+        }
+      }
+      return { allow: true };
+    },
+    { modelName: "blogpost" }
+    // важно для loadResource
+  );
+  return abac;
+}
 function initializeCommunity(app, db, origins, publicPath) {
   db.blogpost = BlogpostModel(db);
   db.comment = CommentModel(db);
   db.reaction = ReactionModel(db);
+  const { getInstance: getInstance2 } = coreabac;
+  const abac = getInstance2(db);
+  initBlogPolicies(abac);
   if (app) {
     blogRoutes(app, db);
     commentsRoutes(app, db);

package/dist/core.server.js

@@ -1,4 +1,4 @@
-import { A as ABAC } from "./abac-DYoheWuc.js";
+import { c as coreabac } from "./abac-BPl9Bmf9.js";
 const initCorePolicies = (function initializeDefaultPolicies(abacAccessControl) {
   abacAccessControl.registerGlobalPolicy("AdminModeratorAccessPolicy", async (context) => {
     const { user, req } = context;
@@ -34,8 +34,10 @@ const initCorePolicies = (function initializeDefaultPolicies(abacAccessControl)
   abacAccessControl.registerGlobalPolicy("PersonalResourceOwnerPolicy", async (context) => {
     let { user, action, data, currentResource, options } = context;
     const ObjectId = abacAccessControl.db.mongoose.Types.ObjectId;
-    if (action === "create" && data.owner?.type === "user") {
-      if (data.owner.target === user && data.creator.target === user) {
+    if (action === "create" && data.body?.owner?.type === "user") {
+      const ownerTarget = data.body.owner.target;
+      const creatorTarget = data.body.creator?.target;
+      if (ownerTarget === user && creatorTarget === user) {
         return { allow: true, force: false };
       } else {
         return {
@@ -99,7 +101,7 @@ const initCorePolicies = (function initializeDefaultPolicies(abacAccessControl)
   });
   return abacAccessControl;
 });
-const { getInstance } = ABAC;
+const { getInstance } = coreabac;
 let _WebSocketManagerClass = null;
 async function createWebSocketManager(...args) {
   if (!_WebSocketManagerClass) {

package/dist/{crud-C7FSTUes.js → crud-q1ye5IhV.js}

@@ -1,7 +1,7 @@
 import { m as middlewareFactory } from "./authJwt-J1csaMWA.js";
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 import { O as ObserverNamespaced } from "./core.observer-MZsqaE6F.js";
-import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
+import { L as LoggerNamespaced } from "./abac-BPl9Bmf9.js";
 import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
 class CRUDCore {
   constructor(crud) {
@@ -679,9 +679,9 @@ class CRUDPolicies {
           action,
           req,
           data: {
-            ...req.body,
-            ...req.query,
-            params: req.params
+            body: req.body || {},
+            query: req.query || {},
+            params: req.params || {}
           },
           params: req.params
         };
@@ -734,8 +734,8 @@ class CRUDPolicies {
       action: "read",
       req,
       data: {
-        ...req.query,
-        params: req.params
+        query: req.query || {},
+        params: req.params || {}
       },
       params: req.params
     };

package/dist/events.server.js

@@ -1,13 +1,13 @@
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 import { c as createFriendlyURL, a as applyMetadataSchema } from "./metadata.schema-CIRR_WQ-.js";
 import Stripe from "stripe";
 import { Types } from "mongoose";
 import { c as controllerFactory } from "./tickets.controller-B7r0mK-5.js";
-import { a as applyCommonSchema } from "./common.schema-GFSlNJo7.js";
+import { a as applyCommonSchema } from "./common.schema-DswiUXKB.js";
 import { a as applyEngagementSchema } from "./engagement.schema-fh6W1fb_.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { m as middlewareIndexFactory$1 } from "./index-_Edcmck_.js";
-import { c as coreabac } from "./core.abac-DUPBnlk6.js";
+import { c as coreabac } from "./abac-BPl9Bmf9.js";
 class serviceIntegrations {
   async createProduct(event) {
     throw new Error("createProduct method not implemented");

package/dist/gallery.server.js

@@ -1,6 +1,6 @@
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 import path from "path";
-import { a as applyCommonSchema } from "./common.schema-GFSlNJo7.js";
+import { a as applyCommonSchema } from "./common.schema-DswiUXKB.js";
 import { a as applyEngagementSchema } from "./engagement.schema-fh6W1fb_.js";
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { m as middlewareIndexFactory } from "./index-_Edcmck_.js";

package/dist/inventory.server.js

@@ -1,13 +1,11 @@
 import { a as applyOwnershipSchema } from "./ownership.schema-fwwDf_e5.js";
 import { m as middlewareFactory } from "./authJwt-J1csaMWA.js";
-import { c as coreabac } from "./core.abac-DUPBnlk6.js";
-import { q as queryProcessorCore } from "./queryProcessor-CBQgZycY.js";
+import { L as LoggerNamespaced, c as coreabac } from "./abac-BPl9Bmf9.js";
+import { q as queryProcessorCore } from "./queryProcessor-C_5Iipam.js";
 import { C as CacheNamespaced } from "./core.cache-DALYFDdy.js";
-import { L as LoggerNamespaced } from "./core.logger-C3q8A9dl.js";
 import { O as ObserverNamespaced } from "./core.observer-MZsqaE6F.js";
 import { a as Validator, V as Verifier } from "./core.verifier-gPPX_jhf.js";
-import { C as CRUD } from "./crud-C7FSTUes.js";
-import { A as ABAC } from "./abac-DYoheWuc.js";
+import { C as CRUD } from "./crud-q1ye5IhV.js";
 const StockAdjustmentModel = (db) => {
   const StockAdjustmentSchema = new db.mongoose.Schema({
     product: {
@@ -969,7 +967,7 @@ function stockAlertsVerifierFactory(db) {
     deleteVerifier
   };
 }
-const { getInstance: getInstance$2 } = ABAC;
+const { getInstance: getInstance$2 } = coreabac;
 function setupStockAlertsRoutes(app, db) {
   const abac = getInstance$2(db);
   const verifier = stockAlertsVerifierFactory();