@builder6/pages 3.2.0 → 3.2.1

package/dist/pages/pages.controller.d.ts

@@ -1,8 +1,13 @@
-import { Response } from 'express';
+import { Request, Response } from 'express';
 import { PagesService } from './pages.service';
+import { TailwindService } from './tailwind.service';
 export declare class PagesController {
     private readonly pagesService;
-    constructor(pagesService: PagesService);
-    queryPages(apiKey: string, userAttributesString: string, noTargeting: boolean, modalName: string, res: Response): Promise<Response<any, Record<string, any>>>;
+    private readonly tailwindService;
+    constructor(pagesService: PagesService, tailwindService: TailwindService);
+    queryPageSchema(type: string, app: string, objectApiName: string, recordId: string, pageId: string, formFactor: string, res: Response, req: Request): Promise<Response<any, Record<string, any>>>;
+    queryPage(pageApiName: string, res: Response): Promise<Response<any, Record<string, any>>>;
+    queryPageVersion(pageApiName: string, versionId: string, res: Response): Promise<Response<any, Record<string, any>>>;
+    queryPageCss(pageApiName: string, versionId: string, res: Response): Promise<Response<any, Record<string, any>>>;
     trackPages(events: any, res: Response): Promise<Response<any, Record<string, any>>>;
 }

package/dist/pages/pages.controller.js

@@ -14,17 +14,38 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PagesController = void 0;
 const common_1 = require("@nestjs/common");
+const auth_1 = require("@steedos/auth");
 const pages_service_1 = require("./pages.service");
+const tailwind_service_1 = require("./tailwind.service");
+const core_1 = require("@builder6/core");
 let PagesController = class PagesController {
-    constructor(pagesService) {
+    constructor(pagesService, tailwindService) {
         this.pagesService = pagesService;
+        this.tailwindService = tailwindService;
     }
-    async queryPages(apiKey, userAttributesString, noTargeting, modalName, res) {
-        const userAttributes = userAttributesString ? JSON.parse(userAttributesString) : {};
-        const pages = await this.pagesService.queryPages({ modalName, apiKey, userAttributes, noTargeting });
-        return res.json({
-            results: pages,
-        });
+    async queryPageSchema(type, app, objectApiName, recordId, pageId, formFactor, res, req) {
+        const user = req["user"];
+        const userSession = await (0, auth_1.getSessionByUserId)(user.user, user.space);
+        const page = await this.pagesService.getMeSchema(type, app, objectApiName, recordId, pageId, formFactor, userSession);
+        if (!page) {
+            return res.json({});
+        }
+        page.css = await this.tailwindService.compileTailwind(page.schema, page.name);
+        return res.json(page);
+    }
+    async queryPage(pageApiName, res) {
+        const page = await this.pagesService.getPage(pageApiName);
+        return res.json(page);
+    }
+    async queryPageVersion(pageApiName, versionId, res) {
+        const page = await this.pagesService.getPage(pageApiName, versionId);
+        return res.json(page);
+    }
+    async queryPageCss(pageApiName, versionId, res) {
+        const page = await this.pagesService.getPage(pageApiName, versionId);
+        const css = await this.tailwindService.compileTailwind(page.schema, pageApiName);
+        res.setHeader('Content-Type', 'text/css');
+        return res.send(css);
     }
     async trackPages(events, res) {
         return res.json({ success: true });
@@ -32,16 +53,45 @@ let PagesController = class PagesController {
 };
 exports.PagesController = PagesController;
 __decorate([
-    (0, common_1.Get)(':modalName'),
-    __param(0, (0, common_1.Query)('apiKey')),
-    __param(1, (0, common_1.Query)('userAttributes')),
-    __param(2, (0, common_1.Query)('noTargeting')),
-    __param(3, (0, common_1.Param)('modalName')),
-    __param(4, (0, common_1.Res)()),
+    (0, common_1.Get)('schema/:type'),
+    __param(0, (0, common_1.Param)('type')),
+    __param(1, (0, common_1.Query)('app')),
+    __param(2, (0, common_1.Query)('objectApiName')),
+    __param(3, (0, common_1.Query)('recordId')),
+    __param(4, (0, common_1.Query)('pageId')),
+    __param(5, (0, common_1.Query)('formFactor')),
+    __param(6, (0, common_1.Res)()),
+    __param(7, (0, common_1.Req)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String, String, String, String, String, Object, Object]),
+    __metadata("design:returntype", Promise)
+], PagesController.prototype, "queryPageSchema", null);
+__decorate([
+    (0, common_1.Get)(':pageApiName'),
+    __param(0, (0, common_1.Param)('pageApiName')),
+    __param(1, (0, common_1.Res)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, Object]),
+    __metadata("design:returntype", Promise)
+], PagesController.prototype, "queryPage", null);
+__decorate([
+    (0, common_1.Get)(':pageApiName/:versionId'),
+    __param(0, (0, common_1.Param)('pageApiName')),
+    __param(1, (0, common_1.Param)('versionId')),
+    __param(2, (0, common_1.Res)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [String, String, Object]),
+    __metadata("design:returntype", Promise)
+], PagesController.prototype, "queryPageVersion", null);
+__decorate([
+    (0, common_1.Get)(':pageApiName/:versionId/tailwind.css'),
+    __param(0, (0, common_1.Param)('pageApiName')),
+    __param(1, (0, common_1.Param)('versionId')),
+    __param(2, (0, common_1.Res)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, String, Boolean, String, Object]),
+    __metadata("design:paramtypes", [String, String, Object]),
     __metadata("design:returntype", Promise)
-], PagesController.prototype, "queryPages", null);
+], PagesController.prototype, "queryPageCss", null);
 __decorate([
     (0, common_1.Post)('track'),
     __param(0, (0, common_1.Body)('events')),
@@ -51,7 +101,9 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], PagesController.prototype, "trackPages", null);
 exports.PagesController = PagesController = __decorate([
-    (0, common_1.Controller)('api/v6/content'),
-    __metadata("design:paramtypes", [pages_service_1.PagesService])
+    (0, common_1.Controller)('api/v6/pages'),
+    (0, common_1.UseGuards)(core_1.AuthGuard),
+    __metadata("design:paramtypes", [pages_service_1.PagesService,
+        tailwind_service_1.TailwindService])
 ], PagesController);
 //# sourceMappingURL=pages.controller.js.map

package/dist/pages/pages.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"pages.controller.js","sourceRoot":"","sources":["../../src/pages/pages.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAgF;AAIhF,mDAA+C;AAGxC,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAIrD,AAAN,KAAK,CAAC,UAAU,CACG,MAAc,EACN,oBAA4B,EAC/B,WAAoB,EACtB,SAAiB,EAC9B,GAAa;QAEpB,MAAM,cAAc,GAAG,oBAAoB,CAAA,CAAC,CAAA,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAA,CAAC,CAAA,EAAE,CAAC;QAChF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAC,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,WAAW,EAAC,CAAC,CAAC;QACnG,OAAO,GAAG,CAAC,IAAI,CAAC;YACd,OAAO,EAAE,KAAK;SACf,CAAC,CAAC;IACL,CAAC;IAIK,AAAN,KAAK,CAAC,UAAU,CACE,MAAW,EACpB,GAAa;QAEpB,OAAO,GAAG,CAAC,IAAI,CAAC,EAAC,OAAO,EAAE,IAAI,EAAC,CAAC,CAAC;IACnC,CAAC;CACF,CAAA;AA3BY,0CAAe;AAKpB;IADL,IAAA,YAAG,EAAC,YAAY,CAAC;IAEf,WAAA,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;IACf,WAAA,IAAA,cAAK,EAAC,gBAAgB,CAAC,CAAA;IACvB,WAAA,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;IACpB,WAAA,IAAA,cAAK,EAAC,WAAW,CAAC,CAAA;IAClB,WAAA,IAAA,YAAG,GAAE,CAAA;;;;iDAOP;AAIK;IADL,IAAA,aAAI,EAAC,OAAO,CAAC;IAEX,WAAA,IAAA,aAAI,EAAC,QAAQ,CAAC,CAAA;IACd,WAAA,IAAA,YAAG,GAAE,CAAA;;;;iDAGP;0BA1BU,eAAe;IAD3B,IAAA,mBAAU,EAAC,gBAAgB,CAAC;qCAEgB,4BAAY;GAD5C,eAAe,CA2B3B"}
+{"version":3,"file":"pages.controller.js","sourceRoot":"","sources":["../../src/pages/pages.controller.ts"],"names":[],"mappings":"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"}

package/dist/pages/pages.service.d.ts

@@ -1,73 +1,19 @@
-import { ConfigService } from '@nestjs/config';
-import { MongodbService } from '@builder6/core';
+import { ServiceBroker } from "moleculer";
 export declare class PagesService {
-    private configService;
-    private mongodbService;
+    private readonly broker;
     private engine;
-    private config;
-    constructor(configService: ConfigService, mongodbService: MongodbService);
+    constructor(broker: ServiceBroker);
     renderLiquid(template: string, data: Record<string, any>): Promise<string>;
+    getMeSchema(type: string, app: string, objectApiName: string, recordId: string, pageId: string, formFactor: string, userSession: any): Promise<any>;
+    getPage(pageApiName: string, versionId?: string): Promise<any>;
+    getPageVersionById(pageId: string, versionId: string): Promise<any>;
+    getLatestPageVersion(pageId: string, isActive?: boolean): Promise<any>;
     renderAmis(schema: any, data: any, env: any, userSession: any): Promise<string>;
-    queryPages({ modalName, apiKey, userAttributes, noTargeting }: {
-        modalName: string;
-        apiKey: string;
-        userAttributes: any;
-        noTargeting: boolean;
-    }): Promise<any[]>;
-    getPageSchema(pageId: any): Promise<any>;
-    formatBuilderPage(modalName: any, page: object): Promise<{
-        id: any;
-        name: any;
-        published: string;
-        rev: any;
-        meta: {
-            kind: any;
-        };
-        data: {
-            title: any;
-            url: string;
-            blocks: {
-                "@type": string;
-                "@version": number;
-                layerName: string;
-                id: string;
-                component: {
-                    name: string;
-                };
-                children: {
-                    id: string;
-                    "@type": string;
-                    "@version": number;
-                    component: {
-                        name: string;
-                        options: {
-                            schema: any;
-                            data: {};
-                            env: {};
-                        };
-                    };
-                    responsiveStyles: {
-                        large: {
-                            display: string;
-                            flexDirection: string;
-                            position: string;
-                            flexShrink: string;
-                            boxSizing: string;
-                            width: string;
-                        };
-                    };
-                }[];
-                responsiveStyles: {
-                    large: {
-                        display: string;
-                        flexDirection: string;
-                        position: string;
-                        flexShrink: string;
-                        boxSizing: string;
-                        width: string;
-                    };
-                };
-            }[];
-        };
-    }>;
+    private getTypePages;
+    private getAssignments;
+    private getAppProfileAssignment;
+    private getAppDefaultAssignment;
+    private getOrgDefaultAssignment;
+    private getAssignmentPage;
+    private getUserPage;
 }

package/dist/pages/pages.service.js

@@ -8,36 +8,95 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PagesService = void 0;
 const common_1 = require("@nestjs/common");
-const config_1 = require("@nestjs/config");
 const path_1 = __importDefault(require("path"));
 const liquidjs_1 = require("liquidjs");
-const core_1 = require("@builder6/core");
+const objectql_1 = require("@steedos/objectql");
+const moleculer_1 = require("@builder6/moleculer");
+const moleculer_2 = require("moleculer");
+const lodash_1 = __importDefault(require("lodash"));
 let PagesService = class PagesService {
-    constructor(configService, mongodbService) {
-        this.configService = configService;
-        this.mongodbService = mongodbService;
+    constructor(broker) {
+        this.broker = broker;
         this.engine = new liquidjs_1.Liquid({
             root: path_1.default.resolve(__dirname, '../../views'),
             extname: '.liquid',
         });
-        process.env.B6_AMIS_PACKAGE = process.env.B6_AMIS_PACKAGE || 'amis';
-        process.env.B6_AMIS_VERSION = process.env.B6_AMIS_VERSION || '6.10.0';
-        this.config = (0, core_1.getConfigs)();
     }
     async renderLiquid(template, data) {
         return this.engine.renderFile(template, data);
     }
+    async getMeSchema(type, app, objectApiName, recordId, pageId, formFactor, userSession) {
+        if (pageId) {
+            const records = await (0, objectql_1.getObject)('pages').find({ filters: [['name', '=', pageId]] });
+            let pageInfo = {};
+            if (records.length > 0) {
+                pageInfo = records[0];
+                const pageVersion = await this.getLatestPageVersion(pageInfo._id, true);
+                if (pageVersion && pageVersion.schema) {
+                    return Object.assign({}, pageInfo, { schema: pageVersion.schema });
+                }
+            }
+            return;
+        }
+        const userPage = await this.getUserPage(type, app, objectApiName, recordId, formFactor, userSession);
+        if (userPage) {
+            const pageVersion = await this.getLatestPageVersion(userPage._id, true);
+            if (pageVersion && pageVersion.schema) {
+                return Object.assign({}, userPage, { schema: pageVersion.schema });
+            }
+        }
+    }
+    async getPage(pageApiName, versionId = 'current') {
+        const records = await (0, objectql_1.getObject)('pages').find({ filters: [['name', '=', pageApiName]] });
+        let page = {};
+        if (records.length > 0) {
+            page = records[0];
+            let pageVersion = null;
+            if (versionId === 'latest') {
+                pageVersion = await this.getLatestPageVersion(page._id);
+            }
+            else if (versionId === 'current') {
+                pageVersion = await this.getLatestPageVersion(page._id, true);
+            }
+            else {
+                pageVersion = await this.getPageVersionById(page._id, versionId);
+            }
+            if (pageVersion && pageVersion.schema) {
+                return Object.assign({}, page, { schema: pageVersion.schema });
+            }
+        }
+        return page;
+    }
+    async getPageVersionById(pageId, versionId) {
+        return await (0, objectql_1.getObject)('page_versions').findOne({ filters: [['page', '=', pageId], ['_id', '=', versionId]] });
+    }
+    async getLatestPageVersion(pageId, isActive = false) {
+        const filters = [['page', '=', pageId]];
+        if (isActive) {
+            filters.push(['is_active', '=', true]);
+        }
+        const pageVersions = await (0, objectql_1.getObject)('page_versions').find({ filters: filters, sort: 'version desc', top: 1 });
+        if (pageVersions.length === 1) {
+            return pageVersions[0];
+        }
+        else {
+            return null;
+        }
+    }
     async renderAmis(schema, data, env, userSession) {
         const dataMerged = {
             ...data,
             context: {
-                rootUrl: this.config.rootUrl,
+                rootUrl: '',
                 tenantId: userSession?.space,
                 userId: userSession?.user,
                 authToken: userSession?.auth_token,
@@ -48,118 +107,81 @@ let PagesService = class PagesService {
             schema,
             data: dataMerged,
             env,
-            config: this.config,
         });
     }
-    async queryPages({ modalName, apiKey, userAttributes = {}, noTargeting = false }) {
-        let { urlPath } = userAttributes;
-        const prefix = `/${modalName}`;
-        if (urlPath.startsWith(prefix)) {
-            urlPath = urlPath.slice(prefix.length);
+    async getTypePages(type, objectApiName, userSession) {
+        const filters = [['type', '=', type], ['is_active', '=', true]];
+        if (type === 'list' || type === 'record' || type === 'form') {
+            filters.push(['object_name', '=', objectApiName]);
         }
-        urlPath = urlPath.replace(/^\//, '');
-        const query = {
-            space: apiKey,
-        };
-        if (!noTargeting) {
-            query['$or'] = [
-                { name: urlPath },
-                { _id: urlPath },
-            ];
+        return await (0, objectql_1.getObject)('pages').find({ filters: filters, sort: 'modified desc' });
+    }
+    async getAssignments(formFactor, typePages) {
+        if (!typePages || typePages.length < 1) {
+            return;
+        }
+        const filters = [['page', 'in', lodash_1.default.map(typePages, '_id')]];
+        if (formFactor === 'SMALL') {
+            filters.push(['mobile', '=', true]);
         }
-        console.log(query);
-        const pages = await this.mongodbService.find('pages', query);
-        for (const page of pages) {
-            page['schema'] = await this.getPageSchema(page['_id']);
+        else {
+            filters.push(['desktop', '=', true]);
         }
-        return Promise.all(pages.map(async (page) => {
-            return await this.formatBuilderPage(modalName, page);
-        }));
+        return await (0, objectql_1.getObject)('page_assignments').find({ filters: filters, sort: 'modified desc' });
     }
-    async getPageSchema(pageId) {
-        const version = await this.mongodbService.findOne('page_versions', {
-            page: pageId,
-        }, {
-            sort: { version: -1 },
+    getAppProfileAssignment(app, assignments, userSession) {
+        return lodash_1.default.filter(assignments, (assignment) => {
+            return assignment.app === app && userSession.profile;
         });
+    }
+    getAppDefaultAssignment(app, assignments) {
+        return lodash_1.default.filter(assignments, (assignment) => {
+            return assignment.app === app;
+        });
+    }
+    getOrgDefaultAssignment(assignments) {
+        return lodash_1.default.filter(assignments, (assignment) => {
+            return !assignment.app && !assignment.profile;
+        });
+    }
+    async getAssignmentPage(assignment, typePages) {
+        const page = lodash_1.default.find(typePages, (typePage) => {
+            return typePage.name == assignment.page || typePage._id == assignment.page;
+        });
+        if (page) {
+            return page;
+        }
+    }
+    async getUserPage(type, app, objectApiName, recordId, formFactor, userSession) {
         try {
-            return JSON.parse(version?.schema || '{}');
+            const typePages = await this.getTypePages(type, objectApiName, userSession);
+            if (type === 'app') {
+                return typePages.length > 0 ? typePages[0] : null;
+            }
+            const assignments = await this.getAssignments(formFactor, typePages);
+            const appProfileassignment = this.getAppProfileAssignment(app, assignments, userSession);
+            if (appProfileassignment && appProfileassignment.length > 0) {
+                return await this.getAssignmentPage(appProfileassignment[0], typePages);
+            }
+            const appDefaultAssignment = this.getAppDefaultAssignment(app, assignments);
+            if (appDefaultAssignment && appDefaultAssignment.length > 0) {
+                return await this.getAssignmentPage(appDefaultAssignment[0], typePages);
+            }
+            const orgDefaultAssignment = this.getOrgDefaultAssignment(assignments);
+            if (orgDefaultAssignment && orgDefaultAssignment.length > 0) {
+                return await this.getAssignmentPage(orgDefaultAssignment[0], typePages);
+            }
         }
         catch (error) {
-            console.error('Error parsing page schema', error);
-            return {};
+            console.error(`getUserPage error`, error);
+            return;
         }
     }
-    async formatBuilderPage(modalName, page) {
-        const data = {};
-        const schema = await this.getPageSchema(page['_id']);
-        const env = {};
-        const builderPage = {
-            id: page['_id'],
-            name: page['label'],
-            published: page['is_active'] ? 'published' : 'draft',
-            rev: page['_id'],
-            meta: {
-                kind: modalName,
-            },
-            data: {
-                title: page['label'],
-                url: `/${modalName}/` + page['_id'],
-                blocks: [
-                    {
-                        "@type": "@builder.io/sdk:Element",
-                        "@version": 2,
-                        layerName: "Page",
-                        id: `builder-assets`,
-                        component: {
-                            name: "Core:AssetsLoader",
-                        },
-                        children: [
-                            {
-                                id: `builder-amis`,
-                                "@type": "@builder.io/sdk:Element",
-                                "@version": 2,
-                                component: {
-                                    name: "Core:Amis",
-                                    options: {
-                                        schema: schema,
-                                        data: data,
-                                        env,
-                                    },
-                                },
-                                responsiveStyles: {
-                                    large: {
-                                        display: "flex",
-                                        flexDirection: "column",
-                                        position: "relative",
-                                        flexShrink: "0",
-                                        boxSizing: "border-box",
-                                        width: "100%",
-                                    },
-                                },
-                            },
-                        ],
-                        responsiveStyles: {
-                            large: {
-                                display: "flex",
-                                flexDirection: "column",
-                                position: "relative",
-                                flexShrink: "0",
-                                boxSizing: "border-box",
-                                width: "100%",
-                            },
-                        },
-                    },
-                ],
-            }
-        };
-        return builderPage;
-    }
 };
 exports.PagesService = PagesService;
 exports.PagesService = PagesService = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [config_1.ConfigService,
-        core_1.MongodbService])
+    __param(0, (0, moleculer_1.InjectBroker)()),
+    __metadata("design:paramtypes", [moleculer_2.ServiceBroker])
 ], PagesService);
 //# sourceMappingURL=pages.service.js.map

package/dist/pages/pages.service.js.map

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

package/dist/pages/tailwind.service.d.ts

@@ -0,0 +1,8 @@
+export declare class TailwindService {
+    private readonly logger;
+    private readonly cssCache;
+    constructor();
+    private generateCacheKey;
+    private extractPotentialClasses;
+    compileTailwind(content: any, id: string): Promise<string>;
+}

package/dist/pages/tailwind.service.js

@@ -0,0 +1,88 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+var TailwindService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TailwindService = void 0;
+const common_1 = require("@nestjs/common");
+const lru_cache_1 = require("lru-cache");
+const crypto_1 = require("crypto");
+const postcss_1 = __importDefault(require("postcss"));
+const tailwindcss_1 = __importDefault(require("tailwindcss"));
+const autoprefixer_1 = __importDefault(require("autoprefixer"));
+const cssnano_1 = __importDefault(require("cssnano"));
+let TailwindService = TailwindService_1 = class TailwindService {
+    constructor() {
+        this.logger = new common_1.Logger(TailwindService_1.name);
+        this.cssCache = new lru_cache_1.LRUCache({
+            max: 500,
+            ttl: 1000 * 60 * 60 * 24,
+            allowStale: false,
+            updateAgeOnGet: true,
+        });
+    }
+    generateCacheKey(id, content) {
+        const hash = (0, crypto_1.createHash)('md5').update(content).digest('hex');
+        return `tw:${id}:${hash}`;
+    }
+    extractPotentialClasses(data, classes) {
+        if (!data)
+            return;
+        if (typeof data === 'string') {
+            data.split(/\s+/).forEach(cls => cls && classes.add(cls));
+        }
+        else if (Array.isArray(data)) {
+            data.forEach(item => this.extractPotentialClasses(item, classes));
+        }
+        else if (typeof data === 'object') {
+            Object.values(data).forEach(val => this.extractPotentialClasses(val, classes));
+        }
+    }
+    async compileTailwind(content, id) {
+        const classSet = new Set();
+        this.extractPotentialClasses(content, classSet);
+        const rawContent = Array.from(classSet).join(' ');
+        const cacheKey = this.generateCacheKey(id, rawContent);
+        const cachedResult = this.cssCache.get(cacheKey);
+        if (cachedResult) {
+            return cachedResult;
+        }
+        try {
+            const tailwindConfig = {
+                important: `.page-${id}`,
+                content: [{ raw: rawContent, extension: 'html' }],
+                corePlugins: {
+                    preflight: false,
+                },
+                theme: {},
+            };
+            const result = await (0, postcss_1.default)([
+                (0, tailwindcss_1.default)(tailwindConfig),
+                (0, autoprefixer_1.default)(),
+                (0, cssnano_1.default)(),
+            ]).process('@tailwind components; @tailwind utilities;', { from: undefined });
+            this.cssCache.set(cacheKey, result.css);
+            return result.css;
+        }
+        catch (error) {
+            this.logger.error(`Tailwind build failed for ${id}: ${error.message}`);
+            throw new common_1.InternalServerErrorException('CSS Generation Failed');
+        }
+    }
+};
+exports.TailwindService = TailwindService;
+exports.TailwindService = TailwindService = TailwindService_1 = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [])
+], TailwindService);
+//# sourceMappingURL=tailwind.service.js.map

package/dist/pages/tailwind.service.js.map

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

package/dist/plugin.module.d.ts

@@ -1,2 +1,4 @@
-export { PagesModule as default } from './pages/pages.module';
-export * from './pages';
+export declare class PagesModule {
+}
+export * from './pages/pages.service';
+export default PagesModule;

package/dist/plugin.module.js

@@ -10,12 +10,34 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = void 0;
-var pages_module_1 = require("./pages/pages.module");
-Object.defineProperty(exports, "default", { enumerable: true, get: function () { return pages_module_1.PagesModule; } });
-__exportStar(require("./pages"), exports);
+exports.PagesModule = void 0;
+const common_1 = require("@nestjs/common");
+const pages_service_1 = require("./pages/pages.service");
+const pages_controller_1 = require("./pages/pages.controller");
+const app_controller_1 = require("./pages/app.controller");
+const core_1 = require("@builder6/core");
+const tailwind_service_1 = require("./pages/tailwind.service");
+let PagesModule = class PagesModule {
+};
+exports.PagesModule = PagesModule;
+exports.PagesModule = PagesModule = __decorate([
+    (0, common_1.Module)({
+        imports: [core_1.AuthModule, core_1.MongodbModule],
+        providers: [pages_service_1.PagesService, tailwind_service_1.TailwindService],
+        controllers: [pages_controller_1.PagesController, app_controller_1.PagesAppController],
+        exports: [pages_service_1.PagesService],
+    })
+], PagesModule);
+__exportStar(require("./pages/pages.service"), exports);
+exports.default = PagesModule;
 //# sourceMappingURL=plugin.module.js.map

package/dist/plugin.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.module.js","sourceRoot":"","sources":["../src/plugin.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAA8D;AAArD,uGAAA,WAAW,OAAW;AAE/B,0CAAwB"}
+{"version":3,"file":"plugin.module.js","sourceRoot":"","sources":["../src/plugin.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAAwC;AACxC,yDAAqD;AACrD,+DAA2D;AAC3D,2DAA4D;AAC5D,yCAA2D;AAC3D,+DAA2D;AAQpD,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IANvB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,iBAAU,EAAE,oBAAa,CAAC;QACpC,SAAS,EAAE,CAAC,4BAAY,EAAE,kCAAe,CAAC;QAC1C,WAAW,EAAE,CAAC,kCAAe,EAAE,mCAAkB,CAAC;QAClD,OAAO,EAAE,CAAC,4BAAY,CAAC;KACxB,CAAC;GACW,WAAW,CAAG;AAE3B,wDAAsC;AAEtC,kBAAe,WAAW,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder6/pages",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "main": "dist/plugin.module.js",
   "license": "MIT",
   "files": [
@@ -9,22 +9,29 @@
   ],
   "scripts": {
     "format": "prettier --write \"src/**/*.ts\"",
-    "build": "rimraf dist && tsc",
-    "build:watch": "rimraf dist && tsc --watch"
+    "build": "npx rimraf dist && npx tsc",
+    "build:watch": "npx rimraf dist && npx tsc --watch"
   },
   "dependencies": {
+    "@tailwindcss/typography": "^0.5.19",
+    "autoprefixer": "^10.4.23",
+    "cssnano": "^7.1.2",
     "dataloader": "^2.2.3",
-    "liquidjs": "^10.24.0"
+    "liquidjs": "^10.24.0",
+    "lru-cache": "^11.2.4",
+    "tailwindcss": "^3.4.19"
   },
   "peerDependencies": {
     "@builder6/core": "^3.0.10",
     "@builder6/moleculer": "^3.0.10",
     "@nestjs/common": "^11.0.0",
     "@nestjs/core": "^11.0.0",
-    "@nestjs/swagger": "^11.0.7"
+    "@nestjs/swagger": "^11.0.7",
+    "@steedos/auth": "^3.0",
+    "@steedos/objectql": "^3.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "efdeb015056349b38906d35a72f443419c740acb"
+  "gitHead": "da86657f07eb4bf3124bb090c6bc1b76b2cebeb0"
 }

package/dist/pages/index.d.ts

@@ -1,3 +0,0 @@
-export * from './app.controller';
-export * from './pages.module';
-export * from './pages.service';

package/dist/pages/index.js

@@ -1,20 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./app.controller"), exports);
-__exportStar(require("./pages.module"), exports);
-__exportStar(require("./pages.service"), exports);
-//# sourceMappingURL=index.js.map

package/dist/pages/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/pages/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,iDAA+B;AAC/B,kDAAgC"}

package/dist/pages/pages.module.d.ts

@@ -1,2 +0,0 @@
-export declare class PagesModule {
-}

package/dist/pages/pages.module.js

@@ -1,26 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PagesModule = void 0;
-const common_1 = require("@nestjs/common");
-const pages_service_1 = require("./pages.service");
-const pages_controller_1 = require("./pages.controller");
-const app_controller_1 = require("./app.controller");
-const core_1 = require("@builder6/core");
-let PagesModule = class PagesModule {
-};
-exports.PagesModule = PagesModule;
-exports.PagesModule = PagesModule = __decorate([
-    (0, common_1.Module)({
-        imports: [core_1.AuthModule, core_1.MongodbModule],
-        providers: [pages_service_1.PagesService, pages_controller_1.PagesController],
-        controllers: [pages_controller_1.PagesController, app_controller_1.PagesAppController],
-        exports: [pages_service_1.PagesService],
-    })
-], PagesModule);
-//# sourceMappingURL=pages.module.js.map

package/dist/pages/pages.module.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"pages.module.js","sourceRoot":"","sources":["../../src/pages/pages.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,mDAA+C;AAC/C,yDAAqD;AACrD,qDAAsD;AACtD,yCAA2D;AAQpD,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,kCAAW;sBAAX,WAAW;IANvB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,iBAAU,EAAE,oBAAa,CAAC;QACpC,SAAS,EAAE,CAAC,4BAAY,EAAE,kCAAe,CAAC;QAC1C,WAAW,EAAE,CAAC,kCAAe,EAAE,mCAAkB,CAAC;QAClD,OAAO,EAAE,CAAC,4BAAY,CAAC;KACxB,CAAC;GACW,WAAW,CAAG"}