@dani-builder/strapi-plugin-builder 0.2.0 → 0.4.0

package/dist/server/src/register.js

@@ -5,6 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
+const PROXY_RATE_LIMIT_WARNING = 'Rate limiting uses request.ip, but server.proxy.koa is not enabled. ' +
+    'When running behind a proxy or CDN, set server: { proxy: { koa: true } } ' +
+    'to prevent all clients from sharing one rate-limit bucket.';
 function upperFirst(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
 }
@@ -19,18 +22,32 @@ function camelCase(str) {
  * and Content-Type Builder without manual schema creation.
  */
 const register = ({ strapi }) => {
+    if (!strapi.config.get('server.proxy.koa')) {
+        strapi.log.warn(PROXY_RATE_LIMIT_WARNING);
+    }
     const componentsDir = path_1.default.join(__dirname, 'components');
     const categories = ['blocks', 'elements', 'shared'];
     const componentsMap = {};
+    const componentRegistry = strapi.get('components');
     for (const category of categories) {
         const categoryDir = path_1.default.join(componentsDir, category);
         if (!fs_1.default.existsSync(categoryDir))
             continue;
-        const files = fs_1.default.readdirSync(categoryDir).filter((f) => f.endsWith('.json'));
+        const files = fs_1.default
+            .readdirSync(categoryDir)
+            .filter((f) => f.endsWith('.json'));
         for (const file of files) {
             const schema = JSON.parse(fs_1.default.readFileSync(path_1.default.join(categoryDir, file), 'utf-8'));
             const componentName = file.replace('.json', '');
             const uid = `${category}.${componentName}`;
+            if (componentRegistry.get(uid)) {
+                const appComponentPath = `src/components/${category}/${file}`;
+                throw new Error(`Builder component UID conflict: "${uid}" is already registered by "${appComponentPath}". ` +
+                    '플러그인 컴포넌트는 앱 파일로 덮어쓸 수 없습니다. ' +
+                    `Remove "${appComponentPath}" and extend Builder through ` +
+                    '"src/extensions/builder/strapi-server.ts" instead. ' +
+                    'Guide: https://github.com/HJ-company/daniworks-builder-v2/blob/main/docs/guides/extending-builder.md');
+            }
             componentsMap[uid] = {
                 ...schema,
                 __schema__: JSON.parse(JSON.stringify(schema)),
@@ -42,7 +59,43 @@ const register = ({ strapi }) => {
             };
         }
     }
-    strapi.get('components').add(componentsMap);
+    componentRegistry.add(componentsMap);
+    const pluginConfig = strapi.config.get('plugin::builder');
+    const extraBlocks = Object.entries(pluginConfig.blocks.extra);
+    const page = strapi.contentTypes['plugin::builder.page'];
+    const global = strapi.contentTypes['plugin::builder.global'];
+    const pageBlocks = page.attributes.blocks;
+    const globalBlocks = global.attributes.siteWideBlocks;
+    const pageSchemaBlocks = page.__schema__.attributes
+        .blocks;
+    const globalSchemaBlocks = global.__schema__.attributes
+        .siteWideBlocks;
+    const populateService = strapi.plugin('builder').service('populate');
+    for (const [uid, populate] of extraBlocks) {
+        if (!componentRegistry.get(uid)) {
+            throw new Error(`[builder] config.blocks.extra references unknown component UID: "${uid}"`);
+        }
+        if (!pageBlocks.components.includes(uid)) {
+            pageBlocks.components.push(uid);
+        }
+        if (!pageSchemaBlocks.components.includes(uid)) {
+            pageSchemaBlocks.components.push(uid);
+        }
+        if (pluginConfig.blocks.includeInGlobal &&
+            !globalBlocks.components.includes(uid)) {
+            globalBlocks.components.push(uid);
+        }
+        if (pluginConfig.blocks.includeInGlobal &&
+            !globalSchemaBlocks.components.includes(uid)) {
+            globalSchemaBlocks.components.push(uid);
+        }
+        populateService.registerBlock(uid, populate, pluginConfig.blocks.includeInGlobal);
+    }
+    for (const [uid, extension] of Object.entries(pluginConfig.components)) {
+        const component = componentRegistry.get(uid);
+        Object.assign(component.attributes, extension.attributes);
+        Object.assign(component.__schema__.attributes, extension.attributes);
+    }
 };
 exports.default = register;
 //# sourceMappingURL=register.js.map

package/dist/server/src/register.js.map

@@ -1 +1 @@
-{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../server/src/register.ts"],"names":[],"mappings":";;;;;AACA,gDAAwB;AACxB,4CAAoB;AAEpB,SAAS,UAAU,CAAC,GAAW;IAC7B,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,SAAS,CAAC,GAAW;IAC5B,OAAO,GAAG;SACP,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;SAC/D,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AAC/C,CAAC;AAED;;;;GAIG;AACH,MAAM,QAAQ,GAAG,CAAC,EAAE,MAAM,EAA2B,EAAE,EAAE;IACvD,MAAM,aAAa,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACzD,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IACpD,MAAM,aAAa,GAAwB,EAAE,CAAC;IAE9C,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;QAClC,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QACvD,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,WAAW,CAAC;YAAE,SAAS;QAE1C,MAAM,KAAK,GAAG,YAAE,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QAE7E,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;YAClF,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAChD,MAAM,GAAG,GAAG,GAAG,QAAQ,IAAI,aAAa,EAAE,CAAC;YAE3C,aAAa,CAAC,GAAG,CAAC,GAAG;gBACnB,GAAG,MAAM;gBACT,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;gBAC9C,GAAG;gBACH,QAAQ;gBACR,SAAS,EAAE,WAAW;gBACtB,SAAS,EAAE,aAAa;gBACxB,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,UAAU,CAAC,SAAS,CAAC,aAAa,GAAG,EAAE,CAAC,CAAC;aACvE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;AAC9C,CAAC,CAAC;AAEF,kBAAe,QAAQ,CAAC"}
+{"version":3,"file":"register.js","sourceRoot":"","sources":["../../../server/src/register.ts"],"names":[],"mappings":"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"}

package/dist/server/src/routes/content-api.d.ts

@@ -1,14 +1,11 @@
-declare const _default: {
-    type: string;
-    routes: {
-        method: string;
-        path: string;
-        handler: string;
-        config: {
-            policies: never[];
-            description: string;
-        };
-    }[];
-};
-export default _default;
+interface ContentApiRoute {
+    method: string;
+    path: string;
+}
+interface ContentApiRouter {
+    type: 'content-api';
+    routes: ContentApiRoute[] | (() => ContentApiRoute[]);
+}
+declare const contentApi: ContentApiRouter;
+export default contentApi;
 //# sourceMappingURL=content-api.d.ts.map

package/dist/server/src/routes/content-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content-api.d.ts","sourceRoot":"","sources":["../../../../server/src/routes/content-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wBA+BE"}
+{"version":3,"file":"content-api.d.ts","sourceRoot":"","sources":["../../../../server/src/routes/content-api.ts"],"names":[],"mappings":"AAEA,UAAU,eAAe;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,eAAe,EAAE,GAAG,CAAC,MAAM,eAAe,EAAE,CAAC,CAAC;CACvD;AAyBD,QAAA,MAAM,UAAU,EAAE,gBAkBjB,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/server/src/routes/content-api.js

@@ -1,35 +1,39 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
+const strapi_1 = require("@strapi/strapi");
+const contentTypes = [
+    'plugin::builder.article',
+    'plugin::builder.author',
+    'plugin::builder.category',
+    'plugin::builder.faq',
+    'plugin::builder.global',
+    'plugin::builder.navigation',
+    'plugin::builder.page',
+    'plugin::builder.series',
+    'plugin::builder.site-setting',
+    'plugin::builder.tag',
+];
+let cachedRoutes;
+function getCoreRoutes(uid, config) {
+    const router = strapi_1.factories.createCoreRouter(uid, config);
+    return typeof router.routes === 'function' ? router.routes() : router.routes;
+}
+const contentApi = {
     type: 'content-api',
-    routes: [
-        {
-            method: 'GET',
-            path: '/pages',
-            handler: 'page.find',
-            config: {
-                policies: [],
-                description: 'List pages with minimal populate',
-            },
-        },
-        {
-            method: 'GET',
-            path: '/pages/:documentId',
-            handler: 'page.findOne',
-            config: {
-                policies: [],
-                description: 'Get single page with deep block populate',
-            },
-        },
-        {
-            method: 'GET',
-            path: '/global',
-            handler: 'global.find',
-            config: {
-                policies: [],
-                description: 'Get global settings with deep populate',
-            },
-        },
-    ],
+    get routes() {
+        // Strapi reads `.routes` several times while registering a plugin and
+        // annotates the first result with auth scopes. Keep the same route objects
+        // for every read so those annotations reach the registered router.
+        if (!cachedRoutes) {
+            const coreRoutes = contentTypes.flatMap((uid) => getCoreRoutes(uid));
+            const inquiryRoutes = getCoreRoutes('plugin::builder.inquiry', {
+                only: ['create'],
+                config: { create: { policies: ['plugin::builder.rate-limit'] } },
+            });
+            cachedRoutes = [...coreRoutes, ...inquiryRoutes];
+        }
+        return cachedRoutes;
+    },
 };
+exports.default = contentApi;
 //# sourceMappingURL=content-api.js.map

package/dist/server/src/routes/content-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"content-api.js","sourceRoot":"","sources":["../../../../server/src/routes/content-api.ts"],"names":[],"mappings":";;AAAA,kBAAe;IACb,IAAI,EAAE,aAAa;IACnB,MAAM,EAAE;QACN;YACE,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,WAAW;YACpB,MAAM,EAAE;gBACN,QAAQ,EAAE,EAAE;gBACZ,WAAW,EAAE,kCAAkC;aAChD;SACF;QACD;YACE,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,oBAAoB;YAC1B,OAAO,EAAE,cAAc;YACvB,MAAM,EAAE;gBACN,QAAQ,EAAE,EAAE;gBACZ,WAAW,EAAE,0CAA0C;aACxD;SACF;QACD;YACE,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,aAAa;YACtB,MAAM,EAAE;gBACN,QAAQ,EAAE,EAAE;gBACZ,WAAW,EAAE,wCAAwC;aACtD;SACF;KACF;CACF,CAAC"}
+{"version":3,"file":"content-api.js","sourceRoot":"","sources":["../../../../server/src/routes/content-api.ts"],"names":[],"mappings":";;AAAA,2CAA2C;AAY3C,MAAM,YAAY,GAAG;IACnB,yBAAyB;IACzB,wBAAwB;IACxB,0BAA0B;IAC1B,qBAAqB;IACrB,wBAAwB;IACxB,4BAA4B;IAC5B,sBAAsB;IACtB,wBAAwB;IACxB,8BAA8B;IAC9B,qBAAqB;CACb,CAAC;AAEX,IAAI,YAA2C,CAAC;AAEhD,SAAS,aAAa,CACpB,GAAqD,EACrD,MAAyE;IAEzE,MAAM,MAAM,GAAG,kBAAS,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACvD,OAAO,OAAO,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;AAC/E,CAAC;AAED,MAAM,UAAU,GAAqB;IACnC,IAAI,EAAE,aAAa;IACnB,IAAI,MAAM;QACR,sEAAsE;QACtE,2EAA2E;QAC3E,mEAAmE;QACnE,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,MAAM,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC;YACrE,MAAM,aAAa,GAAG,aAAa,CAAC,yBAAyB,EAAE;gBAC7D,IAAI,EAAE,CAAC,QAAQ,CAAC;gBAChB,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,CAAC,4BAA4B,CAAC,EAAE,EAAE;aACjE,CAAC,CAAC;YAEH,YAAY,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,aAAa,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;CACF,CAAC;AAEF,kBAAe,UAAU,CAAC"}

package/dist/server/src/routes/index.d.ts

@@ -1,16 +1,11 @@
-declare const _default: {
-    'content-api': {
-        type: string;
-        routes: {
-            method: string;
-            path: string;
-            handler: string;
-            config: {
-                policies: never[];
-                description: string;
-            };
-        }[];
-    };
-};
-export default _default;
+interface ContentApiRoute {
+    method: string;
+    path: string;
+}
+interface ContentApiRouter {
+    type: 'content-api';
+    routes: ContentApiRoute[] | (() => ContentApiRoute[]);
+}
+declare const routes: Record<string, ContentApiRouter>;
+export default routes;
 //# sourceMappingURL=index.d.ts.map

package/dist/server/src/routes/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/src/routes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA,wBAEE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/src/routes/index.ts"],"names":[],"mappings":"AAEA,UAAU,eAAe;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,gBAAgB;IACxB,IAAI,EAAE,aAAa,CAAC;IACpB,MAAM,EAAE,eAAe,EAAE,GAAG,CAAC,MAAM,eAAe,EAAE,CAAC,CAAC;CACvD;AAED,QAAA,MAAM,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAE5C,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/server/src/routes/index.js

@@ -4,7 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const content_api_1 = __importDefault(require("./content-api"));
-exports.default = {
+const routes = {
     'content-api': content_api_1.default,
 };
+exports.default = routes;
 //# sourceMappingURL=index.js.map

package/dist/server/src/routes/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/src/routes/index.ts"],"names":[],"mappings":";;;;;AAAA,gEAAuC;AAEvC,kBAAe;IACb,aAAa,EAAE,qBAAU;CAC1B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/src/routes/index.ts"],"names":[],"mappings":";;;;;AAAA,gEAAuC;AAYvC,MAAM,MAAM,GAAqC;IAC/C,aAAa,EAAE,qBAAU;CAC1B,CAAC;AAEF,kBAAe,MAAM,CAAC"}

package/dist/server/src/services/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/src/services/index.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAErC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../server/src/services/index.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAarC,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/dist/server/src/services/index.js

@@ -3,9 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const strapi_1 = require("@strapi/strapi");
 const populate_1 = __importDefault(require("./populate"));
 const services = {
+    article: strapi_1.factories.createCoreService('plugin::builder.article'),
+    author: strapi_1.factories.createCoreService('plugin::builder.author'),
+    category: strapi_1.factories.createCoreService('plugin::builder.category'),
+    faq: strapi_1.factories.createCoreService('plugin::builder.faq'),
+    global: strapi_1.factories.createCoreService('plugin::builder.global'),
+    inquiry: strapi_1.factories.createCoreService('plugin::builder.inquiry'),
+    navigation: strapi_1.factories.createCoreService('plugin::builder.navigation'),
+    page: strapi_1.factories.createCoreService('plugin::builder.page'),
     populate: populate_1.default,
+    series: strapi_1.factories.createCoreService('plugin::builder.series'),
+    'site-setting': strapi_1.factories.createCoreService('plugin::builder.site-setting'),
+    tag: strapi_1.factories.createCoreService('plugin::builder.tag'),
 };
 exports.default = services;
 //# sourceMappingURL=index.js.map

package/dist/server/src/services/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/src/services/index.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAElC,MAAM,QAAQ,GAA4B;IACxC,QAAQ,EAAR,kBAAQ;CACT,CAAC;AAEF,kBAAe,QAAQ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/src/services/index.ts"],"names":[],"mappings":";;;;;AAAA,2CAA2C;AAC3C,0DAAkC;AAElC,MAAM,QAAQ,GAA4B;IACxC,OAAO,EAAE,kBAAS,CAAC,iBAAiB,CAAC,yBAAyB,CAAC;IAC/D,MAAM,EAAE,kBAAS,CAAC,iBAAiB,CAAC,wBAAwB,CAAC;IAC7D,QAAQ,EAAE,kBAAS,CAAC,iBAAiB,CAAC,0BAA0B,CAAC;IACjE,GAAG,EAAE,kBAAS,CAAC,iBAAiB,CAAC,qBAAqB,CAAC;IACvD,MAAM,EAAE,kBAAS,CAAC,iBAAiB,CAAC,wBAAwB,CAAC;IAC7D,OAAO,EAAE,kBAAS,CAAC,iBAAiB,CAAC,yBAAyB,CAAC;IAC/D,UAAU,EAAE,kBAAS,CAAC,iBAAiB,CAAC,4BAA4B,CAAC;IACrE,IAAI,EAAE,kBAAS,CAAC,iBAAiB,CAAC,sBAAsB,CAAC;IACzD,QAAQ,EAAR,kBAAQ;IACR,MAAM,EAAE,kBAAS,CAAC,iBAAiB,CAAC,wBAAwB,CAAC;IAC7D,cAAc,EAAE,kBAAS,CAAC,iBAAiB,CAAC,8BAA8B,CAAC;IAC3E,GAAG,EAAE,kBAAS,CAAC,iBAAiB,CAAC,qBAAqB,CAAC;CACxD,CAAC;AAEF,kBAAe,QAAQ,CAAC"}

package/dist/server/src/services/populate.d.ts

@@ -13,7 +13,7 @@ declare const populate: ({ strapi }: {
      * Register a custom block's populate configuration.
      * Called by client projects in their register() lifecycle.
      */
-    registerBlock(componentId: string, populateConfig: object): void;
+    registerBlock(componentId: string, populateConfig: object, includeInGlobal?: boolean): void;
     /**
      * Get the full Dynamic Zone populate for Page.blocks
      */

package/dist/server/src/services/populate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../server/src/services/populate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE3C,QAAA,MAAM,QAAQ,GAAI,YAAY;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CAAE;IAyJjD;;;OAGG;;;;IAKH;;;OAGG;+BACwB,MAAM,kBAAkB,MAAM;IAIzD;;OAEG;;;;IAUH;;OAEG;;;;;;;;;;;IAYH;;OAEG;;;;;;;;IAWH;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;CA+CN,CAAC;AAEF,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"populate.d.ts","sourceRoot":"","sources":["../../../../server/src/services/populate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAE3C,QAAA,MAAM,QAAQ,GAAI,YAAY;IAAE,MAAM,EAAE,IAAI,CAAC,MAAM,CAAA;CAAE;IAiKjD;;;OAGG;;;;IAKH;;;OAGG;+BAEY,MAAM,kBACH,MAAM;IAWxB;;OAEG;;;;IAUH;;OAEG;;;;;;;;;;;IAYH;;OAEG;;;;;;;;IAWH;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;CA+CN,CAAC;AAEF,eAAe,QAAQ,CAAC"}

package/dist/server/src/services/populate.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const populate = ({ strapi }) => {
     const customBlocks = new Map();
+    const globalCustomBlocks = new Set();
     // Section populate — reused by nearly every block
     const sectionPopulate = {
         populate: {
@@ -10,13 +11,19 @@ const populate = ({ strapi }) => {
     };
     // Link populate — flat component, no nested relations
     const linkPopulate = true;
+    // shared.image — media + scalar fit/alt; one extra level (ADR 0003)
+    const imagePopulate = {
+        populate: {
+            media: true,
+        },
+    };
     // Core block populate definitions (Plugin owns these components,
     // so it knows the exact nesting structure)
     const coreBlocks = {
         'blocks.hero': {
             populate: {
                 section: sectionPopulate,
-                heroMedia: true,
+                image: imagePopulate,
                 ctaLink: linkPopulate,
                 secondaryLink: linkPopulate,
             },
@@ -24,7 +31,7 @@ const populate = ({ strapi }) => {
         'blocks.features': {
             populate: {
                 section: sectionPopulate,
-                media: true,
+                image: imagePopulate,
                 items: {
                     populate: {
                         link: linkPopulate,
@@ -35,7 +42,7 @@ const populate = ({ strapi }) => {
         'blocks.cta': {
             populate: {
                 section: sectionPopulate,
-                ctaMedia: true,
+                image: imagePopulate,
                 ctaLink: linkPopulate,
                 secondaryLink: linkPopulate,
             },
@@ -46,7 +53,7 @@ const populate = ({ strapi }) => {
                 items: {
                     populate: {
                         link: linkPopulate,
-                        media: true,
+                        image: imagePopulate,
                     },
                 },
             },
@@ -69,10 +76,10 @@ const populate = ({ strapi }) => {
         'blocks.highlights': {
             populate: {
                 section: sectionPopulate,
-                media: true,
+                image: imagePopulate,
                 items: {
                     populate: {
-                        media: true,
+                        image: imagePopulate,
                         link: linkPopulate,
                     },
                 },
@@ -83,7 +90,7 @@ const populate = ({ strapi }) => {
                 section: sectionPopulate,
                 items: {
                     populate: {
-                        media: true,
+                        image: imagePopulate,
                         link: linkPopulate,
                     },
                 },
@@ -92,7 +99,7 @@ const populate = ({ strapi }) => {
         'blocks.testimonials': {
             populate: {
                 section: sectionPopulate,
-                media: true,
+                image: imagePopulate,
                 items: {
                     populate: {
                         avatar: true,
@@ -115,7 +122,7 @@ const populate = ({ strapi }) => {
         'blocks.stats': {
             populate: {
                 section: sectionPopulate,
-                media: true,
+                image: imagePopulate,
                 items: true,
             },
         },
@@ -160,8 +167,14 @@ const populate = ({ strapi }) => {
          * Register a custom block's populate configuration.
          * Called by client projects in their register() lifecycle.
          */
-        registerBlock(componentId, populateConfig) {
+        registerBlock(componentId, populateConfig, includeInGlobal = true) {
             customBlocks.set(componentId, populateConfig);
+            if (includeInGlobal) {
+                globalCustomBlocks.add(componentId);
+            }
+            else {
+                globalCustomBlocks.delete(componentId);
+            }
         },
         /**
          * Get the full Dynamic Zone populate for Page.blocks
@@ -219,7 +232,7 @@ const populate = ({ strapi }) => {
             }
             // Also include any custom blocks registered for siteWideBlocks
             for (const [key, value] of customBlocks) {
-                if (!siteWideOn[key]) {
+                if (globalCustomBlocks.has(key) && !siteWideOn[key]) {
                     siteWideOn[key] = value;
                 }
             }

package/dist/server/src/services/populate.js.map

@@ -1 +1 @@
-{"version":3,"file":"populate.js","sourceRoot":"","sources":["../../../../server/src/services/populate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"populate.js","sourceRoot":"","sources":["../../../../server/src/services/populate.ts"],"names":[],"mappings":";;AAEA,MAAM,QAAQ,GAAG,CAAC,EAAE,MAAM,EAA2B,EAAE,EAAE;IACvD,MAAM,YAAY,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC/C,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAU,CAAC;IAE7C,kDAAkD;IAClD,MAAM,eAAe,GAAG;QACtB,QAAQ,EAAE;YACR,eAAe,EAAE,IAAI;SACtB;KACF,CAAC;IAEF,sDAAsD;IACtD,MAAM,YAAY,GAAG,IAAI,CAAC;IAE1B,oEAAoE;IACpE,MAAM,aAAa,GAAG;QACpB,QAAQ,EAAE;YACR,KAAK,EAAE,IAAI;SACZ;KACF,CAAC;IAEF,iEAAiE;IACjE,2CAA2C;IAC3C,MAAM,UAAU,GAA2B;QACzC,aAAa,EAAE;YACb,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE,aAAa;gBACpB,OAAO,EAAE,YAAY;gBACrB,aAAa,EAAE,YAAY;aAC5B;SACF;QACD,iBAAiB,EAAE;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE,aAAa;gBACpB,KAAK,EAAE;oBACL,QAAQ,EAAE;wBACR,IAAI,EAAE,YAAY;qBACnB;iBACF;aACF;SACF;QACD,YAAY,EAAE;YACZ,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE,aAAa;gBACpB,OAAO,EAAE,YAAY;gBACrB,aAAa,EAAE,YAAY;aAC5B;SACF;QACD,eAAe,EAAE;YACf,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE;oBACL,QAAQ,EAAE;wBACR,IAAI,EAAE,YAAY;wBAClB,KAAK,EAAE,aAAa;qBACrB;iBACF;aACF;SACF;QACD,qBAAqB,EAAE;YACrB,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;aACzB;SACF;QACD,YAAY,EAAE;YACZ,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE;oBACL,QAAQ,EAAE;wBACR,QAAQ,EAAE,IAAI;qBACf;iBACF;aACF;SACF;QACD,mBAAmB,EAAE;YACnB,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE,aAAa;gBACpB,KAAK,EAAE;oBACL,QAAQ,EAAE;wBACR,KAAK,EAAE,aAAa;wBACpB,IAAI,EAAE,YAAY;qBACnB;iBACF;aACF;SACF;QACD,mBAAmB,EAAE;YACnB,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE;oBACL,QAAQ,EAAE;wBACR,KAAK,EAAE,aAAa;wBACpB,IAAI,EAAE,YAAY;qBACnB;iBACF;aACF;SACF;QACD,qBAAqB,EAAE;YACrB,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE,aAAa;gBACpB,KAAK,EAAE;oBACL,QAAQ,EAAE;wBACR,MAAM,EAAE,IAAI;wBACZ,IAAI,EAAE,IAAI;qBACX;iBACF;aACF;SACF;QACD,mBAAmB,EAAE;YACnB,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE;oBACL,QAAQ,EAAE;wBACR,IAAI,EAAE,IAAI;wBACV,IAAI,EAAE,YAAY;qBACnB;iBACF;aACF;SACF;QACD,cAAc,EAAE;YACd,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE,aAAa;gBACpB,KAAK,EAAE,IAAI;aACZ;SACF;QACD,gBAAgB,EAAE;YAChB,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE;oBACL,QAAQ,EAAE;wBACR,OAAO,EAAE,YAAY;qBACtB;iBACF;aACF;SACF;QACD,gBAAgB,EAAE;YAChB,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;aACzB;SACF;QACD,aAAa,EAAE;YACb,QAAQ,EAAE;gBACR,OAAO,EAAE,eAAe;gBACxB,KAAK,EAAE;oBACL,QAAQ,EAAE;wBACR,KAAK,EAAE,IAAI;wBACX,WAAW,EAAE,YAAY;qBAC1B;iBACF;aACF;SACF;QACD,8EAA8E;QAC9E,kBAAkB,EAAE,eAAe;KACpC,CAAC;IAEF,OAAO;QACL;;;WAGG;QACH,mBAAmB;YACjB,OAAO,EAAE,GAAG,UAAU,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;QAChE,CAAC;QAED;;;WAGG;QACH,aAAa,CACX,WAAmB,EACnB,cAAsB,EACtB,eAAe,GAAG,IAAI;YAEtB,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;YAC9C,IAAI,eAAe,EAAE,CAAC;gBACpB,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACtC,CAAC;iBAAM,CAAC;gBACN,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QAED;;WAEG;QACH,qBAAqB;YACnB,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7C,MAAM,UAAU,GAA2B,EAAE,CAAC;YAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrD,UAAU,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC1B,CAAC;YACD,OAAO,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC;QAC5B,CAAC;QAED;;WAEG;QACH,eAAe;YACb,OAAO;gBACL,GAAG,EAAE;oBACH,QAAQ,EAAE;wBACR,OAAO,EAAE,IAAI;qBACd;iBACF;gBACD,MAAM,EAAE,IAAI,CAAC,qBAAqB,EAAE;aACrC,CAAC;QACJ,CAAC;QAED;;WAEG;QACH,mBAAmB;YACjB,OAAO;gBACL,GAAG,EAAE;oBACH,QAAQ,EAAE;wBACR,OAAO,EAAE,IAAI;qBACd;iBACF;aACF,CAAC;QACJ,CAAC;QAED;;WAEG;QACH,iBAAiB;YACf,yCAAyC;YACzC,MAAM,iBAAiB,GAAG;gBACxB,eAAe;gBACf,qBAAqB;gBACrB,aAAa;gBACb,iBAAiB;aAClB,CAAC;YACF,MAAM,SAAS,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC7C,MAAM,UAAU,GAA2B,EAAE,CAAC;YAC9C,KAAK,MAAM,GAAG,IAAI,iBAAiB,EAAE,CAAC;gBACpC,IAAI,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;oBACnB,UAAU,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC;YACD,+DAA+D;YAC/D,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,YAAY,EAAE,CAAC;gBACxC,IAAI,kBAAkB,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;oBACpD,UAAU,CAAC,GAAG,CAAC,GAAG,KAAe,CAAC;gBACpC,CAAC;YACH,CAAC;YAED,OAAO;gBACL,GAAG,EAAE;oBACH,QAAQ,EAAE;wBACR,OAAO,EAAE,IAAI;qBACd;iBACF;gBACD,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE;oBACN,QAAQ,EAAE;wBACR,WAAW,EAAE,YAAY;wBACzB,UAAU,EAAE,YAAY;wBACxB,OAAO,EAAE;4BACP,QAAQ,EAAE;gCACR,KAAK,EAAE,YAAY;6BACpB;yBACF;wBACD,IAAI,EAAE,IAAI;qBACX;iBACF;gBACD,cAAc,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE;gBAClC,OAAO,EAAE,IAAI;aACd,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,QAAQ,CAAC"}

package/dist/server/src/utils/query.d.ts

@@ -0,0 +1,11 @@
+export interface PublicQueryOptions {
+    /**
+     * Top-level field names a caller may filter/sort on (exact key match, not
+     * nested relation paths). Omit to drop filters/sort entirely.
+     */
+    filterFields?: string[];
+}
+export declare function pickPublicQuery(query?: Record<string, unknown>, opts?: PublicQueryOptions): Record<string, unknown>;
+/** Public, non-PII scalar fields a caller may filter/sort pages by. */
+export declare const PAGE_PUBLIC_FIELDS: string[];
+//# sourceMappingURL=query.d.ts.map

package/dist/server/src/utils/query.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../server/src/utils/query.ts"],"names":[],"mappings":"AA+EA,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,wBAAgB,eAAe,CAC7B,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,IAAI,GAAE,kBAAuB,GAC5B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgBzB;AAED,uEAAuE;AACvE,eAAO,MAAM,kBAAkB,UAO9B,CAAC"}

package/dist/server/src/utils/query.js

@@ -0,0 +1,112 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PAGE_PUBLIC_FIELDS = void 0;
+exports.pickPublicQuery = pickPublicQuery;
+/**
+ * Whitelist the query params a public smart-API request may forward to the
+ * Document Service.
+ *
+ * The smart-API controllers pin `populate` and `status` server-side, but they
+ * previously spread the *entire* `ctx.query` into the Document Service call.
+ * Crucially, the Document Service bypasses the Content API sanitize/validate
+ * layer, so any params reach the DB raw. That let a caller pass arbitrary keys
+ * (e.g. `publicationState`, unexpected `populate` shapes) and — via
+ * `filters`/`sort` on internal relations such as `createdBy` — probe admin PII
+ * as an oracle (existence/ordering leaks).
+ *
+ * Only the keys below are forwarded for anonymous read traffic, and `filters`
+ * / `sort` are additionally constrained to an allowlist of public top-level
+ * field names (see `filterFields`). `fields` is intentionally NOT forwarded —
+ * the smart API returns a fixed server-shaped payload, so callers have no need
+ * to project, and dropping it removes an arbitrary projection surface.
+ * `populate`/`status` are set by the controller after the whitelisted spread,
+ * so they cannot be overridden or smuggled through.
+ */
+const ALLOWED_QUERY_KEYS = ['locale', 'sort', 'pagination', 'filters'];
+const LOGICAL_OPERATORS = new Set(['$and', '$or', '$not']);
+/**
+ * Recursively strip filter field paths that are not in `allowed`. Logical
+ * operators ($and/$or/$not) are preserved and their operands recursed. A field
+ * key that survives keeps its operator object (e.g. `{ $eq: 'home' }`) intact.
+ *
+ * `allowed` matches TOP-LEVEL field names only. Nested relation paths such as
+ * `category.slug` are not supported here (a `{ category: { slug } }` filter
+ * would be dropped) — the page/global smart APIs only need flat scalar filters
+ * (slug/title/locale/timestamps), and relations stay closed by design.
+ */
+function sanitizeFilters(filters, allowed) {
+    if (!filters || typeof filters !== 'object')
+        return undefined;
+    if (Array.isArray(filters)) {
+        const arr = filters
+            .map((f) => sanitizeFilters(f, allowed))
+            .filter((f) => f !== undefined);
+        return arr.length ? arr : undefined;
+    }
+    const out = {};
+    for (const [key, val] of Object.entries(filters)) {
+        if (LOGICAL_OPERATORS.has(key)) {
+            const nested = sanitizeFilters(val, allowed);
+            if (nested !== undefined)
+                out[key] = nested;
+        }
+        else if (allowed.includes(key)) {
+            out[key] = val;
+        }
+        // disallowed field keys (e.g. createdBy, updatedBy, private fields) dropped
+    }
+    return Object.keys(out).length ? out : undefined;
+}
+/** Keep only sort clauses whose field is in `allowed`. Supports the string,
+ *  array-of-strings, and object forms Strapi accepts. */
+function sanitizeSort(sort, allowed) {
+    const fieldOf = (s) => s.split(':')[0];
+    const okStr = (s) => typeof s === 'string' && allowed.includes(fieldOf(s));
+    if (typeof sort === 'string')
+        return okStr(sort) ? sort : undefined;
+    if (Array.isArray(sort)) {
+        const arr = sort.filter(okStr);
+        return arr.length ? arr : undefined;
+    }
+    if (sort && typeof sort === 'object') {
+        const out = {};
+        for (const [k, v] of Object.entries(sort)) {
+            if (allowed.includes(k))
+                out[k] = v;
+        }
+        return Object.keys(out).length ? out : undefined;
+    }
+    return undefined;
+}
+function pickPublicQuery(query = {}, opts = {}) {
+    const allowed = opts.filterFields ?? [];
+    const out = {};
+    for (const key of ALLOWED_QUERY_KEYS) {
+        if (query[key] === undefined)
+            continue;
+        if (key === 'filters') {
+            const scoped = sanitizeFilters(query.filters, allowed);
+            if (scoped !== undefined)
+                out.filters = scoped;
+        }
+        else if (key === 'sort') {
+            const scoped = sanitizeSort(query.sort, allowed);
+            if (scoped !== undefined)
+                out.sort = scoped;
+        }
+        else {
+            out[key] = query[key];
+        }
+    }
+    return out;
+}
+/** Public, non-PII scalar fields a caller may filter/sort pages by. */
+exports.PAGE_PUBLIC_FIELDS = [
+    'slug',
+    'title',
+    'locale',
+    'createdAt',
+    'updatedAt',
+    'publishedAt',
+];
+//# sourceMappingURL=query.js.map

package/dist/server/src/utils/query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../server/src/utils/query.ts"],"names":[],"mappings":"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"}