@builder6/pages 0.9.3 → 0.10.0

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

@@ -1,15 +1,11 @@
 import { Response } from 'express';
-import { LiquidService } from './liquid.service';
+import { PagesService } from './pages.service';
 export declare class PagesController {
-    private readonly liquidService;
-    constructor(liquidService: LiquidService);
+    private readonly pagesService;
+    constructor(pagesService: PagesService);
     Hello(): Promise<string>;
     getDemo(template: string, query: Record<string, any>, res: Response): Promise<{
         error: string;
         details: any;
     }>;
-    getRooms(roomId: string, query: Record<string, any>, res: Response): Promise<{
-        error: string;
-        details: any;
-    }>;
 }

package/dist/pages/pages.controller.js

@@ -15,10 +15,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PagesController = void 0;
 const common_1 = require("@nestjs/common");
 const core_1 = require("@builder6/core");
-const liquid_service_1 = require("./liquid.service");
+const pages_service_1 = require("./pages.service");
 let PagesController = class PagesController {
-    constructor(liquidService) {
-        this.liquidService = liquidService;
+    constructor(pagesService) {
+        this.pagesService = pagesService;
     }
     async Hello() {
         return 'Welcome to Builder6 Pages!';
@@ -26,7 +26,7 @@ let PagesController = class PagesController {
     async getDemo(template, query, res) {
         const config = (0, core_1.getConfigs)();
         try {
-            const rendered = await this.liquidService.render(template, {
+            const rendered = await this.pagesService.renderLiquid(template, {
                 ...query,
                 config,
             });
@@ -37,21 +37,6 @@ let PagesController = class PagesController {
             return { error: 'Template rendering failed', details: error.message };
         }
     }
-    async getRooms(roomId = 'test', query, res) {
-        const config = (0, core_1.getConfigs)();
-        try {
-            const rendered = await this.liquidService.render('rooms', {
-                ...query,
-                config,
-                roomId: roomId
-            });
-            res.status(200).send(rendered);
-        }
-        catch (error) {
-            console.log(error);
-            return { error: 'Template rendering failed', details: error.message };
-        }
-    }
 };
 __decorate([
     (0, common_1.Get)(''),
@@ -60,7 +45,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], PagesController.prototype, "Hello", null);
 __decorate([
-    (0, common_1.Get)('templates/:template'),
+    (0, common_1.Get)('liquid/:template'),
     __param(0, (0, common_1.Param)('template')),
     __param(1, (0, common_1.Query)()),
     __param(2, (0, common_1.Res)()),
@@ -68,18 +53,9 @@ __decorate([
     __metadata("design:paramtypes", [String, Object, Object]),
     __metadata("design:returntype", Promise)
 ], PagesController.prototype, "getDemo", null);
-__decorate([
-    (0, common_1.Get)('rooms/:roomId'),
-    __param(0, (0, common_1.Param)('roomId')),
-    __param(1, (0, common_1.Query)()),
-    __param(2, (0, common_1.Res)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object, Object]),
-    __metadata("design:returntype", Promise)
-], PagesController.prototype, "getRooms", null);
 PagesController = __decorate([
     (0, common_1.Controller)('/b6'),
-    __metadata("design:paramtypes", [liquid_service_1.LiquidService])
+    __metadata("design:paramtypes", [pages_service_1.PagesService])
 ], PagesController);
 exports.PagesController = 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,2CAAoE;AAEpE,yCAA4C;AAG5C,qDAAiD;AAK1C,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAA6B,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAGvD,AAAN,KAAK,CAAC,KAAK;QACT,OAAO,4BAA4B,CAAC;IACtC,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACQ,QAAgB,EAC1B,KAA0B,EAC5B,GAAa;QAEpB,MAAM,MAAM,GAAG,IAAA,iBAAU,GAAE,CAAC;QAC5B,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACzD,GAAG,KAAK;gBACR,MAAM;aACP,CAAC,CAAC;YAEH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAChC;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAClB,OAAO,EAAE,KAAK,EAAE,2BAA2B,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;SACvE;IACH,CAAC;IAGK,AAAN,KAAK,CAAC,QAAQ,CACK,SAAiB,MAAM,EAC/B,KAA0B,EAC5B,GAAa;QAEpB,MAAM,MAAM,GAAG,IAAA,iBAAU,GAAE,CAAC;QAC5B,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE;gBACxD,GAAG,KAAK;gBACR,MAAM;gBACN,MAAM,EAAE,MAAM;aACf,CAAC,CAAC;YAEH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAChC;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAClB,OAAO,EAAE,KAAK,EAAE,2BAA2B,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;SACvE;IACH,CAAC;CAEF,CAAA;AA7CO;IADL,IAAA,YAAG,EAAC,EAAE,CAAC;;;;4CAGP;AAGK;IADL,IAAA,YAAG,EAAC,qBAAqB,CAAC;IAExB,WAAA,IAAA,cAAK,EAAC,UAAU,CAAC,CAAA;IACjB,WAAA,IAAA,cAAK,GAAE,CAAA;IACP,WAAA,IAAA,YAAG,GAAE,CAAA;;;;8CAcP;AAGK;IADL,IAAA,YAAG,EAAC,eAAe,CAAC;IAElB,WAAA,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAA;IACf,WAAA,IAAA,cAAK,GAAE,CAAA;IACP,WAAA,IAAA,YAAG,GAAE,CAAA;;;;+CAeP;AA/CU,eAAe;IAD3B,IAAA,mBAAU,EAAC,KAAK,CAAC;qCAE4B,8BAAa;GAD9C,eAAe,CAiD3B;AAjDY,0CAAe"}
+{"version":3,"file":"pages.controller.js","sourceRoot":"","sources":["../../src/pages/pages.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoE;AAEpE,yCAA4C;AAE5C,mDAA+C;AAKxC,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAA6B,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAAG,CAAC;IAGrD,AAAN,KAAK,CAAC,KAAK;QACT,OAAO,4BAA4B,CAAC;IACtC,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CACQ,QAAgB,EAC1B,KAA0B,EAC5B,GAAa;QAEpB,MAAM,MAAM,GAAG,IAAA,iBAAU,GAAE,CAAC;QAC5B,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,QAAQ,EAAE;gBAC9D,GAAG,KAAK;gBACR,MAAM;aACP,CAAC,CAAC;YAEH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SAChC;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YAClB,OAAO,EAAE,KAAK,EAAE,2BAA2B,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;SACvE;IACH,CAAC;CAGF,CAAA;AAzBO;IADL,IAAA,YAAG,EAAC,EAAE,CAAC;;;;4CAGP;AAGK;IADL,IAAA,YAAG,EAAC,kBAAkB,CAAC;IAErB,WAAA,IAAA,cAAK,EAAC,UAAU,CAAC,CAAA;IACjB,WAAA,IAAA,cAAK,GAAE,CAAA;IACP,WAAA,IAAA,YAAG,GAAE,CAAA;;;;8CAcP;AA1BU,eAAe;IAD3B,IAAA,mBAAU,EAAC,KAAK,CAAC;qCAE2B,4BAAY;GAD5C,eAAe,CA6B3B;AA7BY,0CAAe"}

package/dist/pages/pages.module.js

@@ -10,13 +10,13 @@ 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 liquid_service_1 = require("./liquid.service");
 let PagesModule = class PagesModule {
 };
 PagesModule = __decorate([
     (0, common_1.Module)({
-        providers: [pages_service_1.PagesService, liquid_service_1.LiquidService],
-        controllers: [pages_controller_1.PagesController]
+        providers: [pages_service_1.PagesService, pages_controller_1.PagesController],
+        controllers: [pages_controller_1.PagesController],
+        exports: [pages_service_1.PagesService]
     })
 ], PagesModule);
 exports.PagesModule = PagesModule;

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

@@ -1 +1 @@
-{"version":3,"file":"pages.module.js","sourceRoot":"","sources":["../../src/pages/pages.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,mDAA+C;AAC/C,yDAAqD;AACrD,qDAAiD;AAM1C,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IAJvB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,4BAAY,EAAE,8BAAa,CAAC;QACxC,WAAW,EAAE,CAAC,kCAAe,CAAC;KAC/B,CAAC;GACW,WAAW,CAAG;AAAd,kCAAW"}
+{"version":3,"file":"pages.module.js","sourceRoot":"","sources":["../../src/pages/pages.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,mDAA+C;AAC/C,yDAAqD;AAO9C,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAG,CAAA;AAAd,WAAW;IALvB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,4BAAY,EAAE,kCAAe,CAAC;QAC1C,WAAW,EAAE,CAAC,kCAAe,CAAC;QAC9B,OAAO,EAAE,CAAC,4BAAY,CAAC;KACxB,CAAC;GACW,WAAW,CAAG;AAAd,kCAAW"}

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

@@ -1,2 +1,6 @@
 export declare class PagesService {
+    private engine;
+    constructor();
+    renderLiquid(template: string, data: Record<string, any>): Promise<string>;
+    renderAmis(schema: any, data: any, env: any, userSession: any): Promise<string>;
 }

package/dist/pages/pages.service.js

@@ -5,13 +5,48 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PagesService = void 0;
 const common_1 = require("@nestjs/common");
+const path = require("path");
+const liquidjs_1 = require("liquidjs");
+const core_1 = require("@builder6/core");
 let PagesService = class PagesService {
+    constructor() {
+        this.engine = new liquidjs_1.Liquid({
+            root: path.resolve(__dirname, '../../views'),
+            extname: '.liquid',
+        });
+    }
+    async renderLiquid(template, data) {
+        return this.engine.renderFile(template, data);
+    }
+    async renderAmis(schema, data, env, userSession) {
+        const config = (0, core_1.getConfigs)();
+        const dataMerged = {
+            ...data,
+            context: {
+                rootUrl: config.rootUrl,
+                tenantId: userSession?.space,
+                userId: userSession?.user,
+                authToken: userSession?.auth_token,
+                user: userSession
+            },
+        };
+        return this.engine.renderFile('amis', {
+            schema,
+            data: dataMerged,
+            env,
+            config,
+        });
+    }
 };
 PagesService = __decorate([
-    (0, common_1.Injectable)()
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [])
 ], PagesService);
 exports.PagesService = 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":";;;;;;;;;AAAA,2CAA4C;AAGrC,IAAM,YAAY,GAAlB,MAAM,YAAY;CAExB,CAAA;AAFY,YAAY;IADxB,IAAA,mBAAU,GAAE;GACA,YAAY,CAExB;AAFY,oCAAY"}
+{"version":3,"file":"pages.service.js","sourceRoot":"","sources":["../../src/pages/pages.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6BAA6B;AAC7B,uCAAkC;AAClC,yCAA4C;AAIrC,IAAM,YAAY,GAAlB,MAAM,YAAY;IAIvB;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,iBAAM,CAAC;YACvB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC;YAC5C,OAAO,EAAE,SAAS;SACnB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAAgB,EAAE,IAAyB;QAC5D,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW;QAC7C,MAAM,MAAM,GAAG,IAAA,iBAAU,GAAE,CAAC;QAC5B,MAAM,UAAU,GAAG;YACjB,GAAG,IAAI;YACP,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,QAAQ,EAAE,WAAW,EAAE,KAAK;gBAC5B,MAAM,EAAE,WAAW,EAAE,IAAI;gBACzB,SAAS,EAAE,WAAW,EAAE,UAAU;gBAClC,IAAI,EAAE,WAAW;aAClB;SACF,CAAA;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE;YACpC,MAAM;YACN,IAAI,EAAE,UAAU;YAChB,GAAG;YACH,MAAM;SACP,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAnCY,YAAY;IADxB,IAAA,mBAAU,GAAE;;GACA,YAAY,CAmCxB;AAnCY,oCAAY"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder6/pages",
-  "version": "0.9.3",
+  "version": "0.10.0",
   "main": "dist/plugin.module.js",
   "license": "MIT",
   "files": [
@@ -12,12 +12,12 @@
     "build:watch": "rimraf dist && tsc --watch"
   },
   "dependencies": {
-    "@builder6/core": "^0.9.3",
+    "@builder6/core": "^0.10.0",
     "dataloader": "^2.2.3",
     "liquidjs": "^10.19.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "22c1d555d9f1bb0d3ab8f7b04d197b774c5316d1"
+  "gitHead": "b131a05f3cb97de992f5e76061ec6f768e64ad21"
 }

package/views/ag-grid.liquid

@@ -1025,5 +1025,5 @@ const B6_TABLES_API = '/api/v6/tables';
       assetUrls: ['https://unpkg.com/@steedos-widgets/ag-grid@6.3.11-beta.20/dist/assets.json'], 
     }
     renderAmis(document.getElementById('root'), schema, data, env)
-  </script> 
+  </script>
 {% endblock %}

package/views/amis.liquid

@@ -0,0 +1,12 @@
+{% layout 'layout/theme.liquid' %}
+
+{% block content %}
+
+  <div id="root" class="w-full h-full"></div>
+  <script type="text/javascript">
+    const schema = {{ schema | json }}
+    const data = {{ data | json }}
+    const env = {{ env | json }}
+    renderAmis(document.getElementById('root'), schema, data, env)
+  </script> 
+{% endblock %}

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

@@ -1,5 +0,0 @@
-export declare class LiquidService {
-    private engine;
-    constructor();
-    render(template: string, data: Record<string, any>): Promise<string>;
-}

package/dist/pages/liquid.service.js

@@ -1,32 +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;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LiquidService = void 0;
-const common_1 = require("@nestjs/common");
-const path = require("path");
-const liquidjs_1 = require("liquidjs");
-let LiquidService = class LiquidService {
-    constructor() {
-        this.engine = new liquidjs_1.Liquid({
-            root: path.resolve(__dirname, '../../views'),
-            extname: '.liquid',
-        });
-    }
-    async render(template, data) {
-        return this.engine.renderFile(template, data);
-    }
-};
-LiquidService = __decorate([
-    (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [])
-], LiquidService);
-exports.LiquidService = LiquidService;
-//# sourceMappingURL=liquid.service.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"liquid.service.js","sourceRoot":"","sources":["../../src/pages/liquid.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6BAA6B;AAC7B,uCAAkC;AAG3B,IAAM,aAAa,GAAnB,MAAM,aAAa;IAIxB;QACE,IAAI,CAAC,MAAM,GAAG,IAAI,iBAAM,CAAC;YACvB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC;YAC5C,OAAO,EAAE,SAAS;SACnB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,QAAgB,EAAE,IAAyB;QACtD,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAChD,CAAC;CACF,CAAA;AAdY,aAAa;IADzB,IAAA,mBAAU,GAAE;;GACA,aAAa,CAczB;AAdY,sCAAa"}

package/views/rooms.liquid

@@ -1,25 +0,0 @@
-{% layout 'layout/theme.liquid' %}
-
-{% block content %}
-
-  <div id="root" class="w-full h-full"></div>
-  <script type="text/javascript">
-    const schema = {
-      type: "rooms-provider",
-      baseUrl: "",
-      body: [{
-        type: "rooms-inbox-popover",
-        className: "flex flex-col m-3 gap-3",
-      },{
-        type: "rooms-comments",
-        className: "flex flex-col m-3 gap-3",
-        roomId: "{{ roomId }}",
-      }]
-    }
-    const data = {}
-    const env = {
-      assetUrls: ['https://unpkg.com/@steedos-widgets/liveblocks@6.3.12-beta.1/dist/assets.json'], 
-    }
-    renderAmis(document.getElementById('root'), schema, data, env)
-  </script> 
-{% endblock %}