@reldens/cms 0.27.0 → 0.29.0

package/lib/template-engine.js

@@ -1,213 +1,223 @@
-/**
- *
- * Reldens - CMS - TemplateEngine
- *
- */
-
-const { JsonFieldsParser } = require('./json-fields-parser');
-const { EntitiesTransformer } = require('./template-engine/entities-transformer');
-const { CollectionsTransformer } = require('./template-engine/collections-transformer');
-const { CollectionsSingleTransformer } = require('./template-engine/collections-single-transformer');
-const { PartialsTransformer } = require('./template-engine/partials-transformer');
-const { FormsTransformer } = require('./template-engine/forms-transformer');
-const { UrlTransformer } = require('./template-engine/url-transformer');
-const { AssetTransformer } = require('./template-engine/asset-transformer');
-const { DateTransformer } = require('./template-engine/date-transformer');
-const { TranslateTransformer } = require('./template-engine/translate-transformer');
-const { SystemVariablesProvider } = require('./template-engine/system-variables-provider');
-const { Logger, sc } = require('@reldens/utils');
-
-class TemplateEngine
-{
-
-    constructor(props)
-    {
-        this.renderEngine = sc.get(props, 'renderEngine', false);
-        this.dataServer = sc.get(props, 'dataServer', false);
-        this.getPartials = sc.get(props, 'getPartials', false);
-        this.events = sc.get(props, 'events', false);
-        this.defaultDomain = sc.get(props, 'defaultDomain', 'default');
-        this.projectRoot = sc.get(props, 'projectRoot', './');
-        this.publicPath = sc.get(props, 'publicPath', './public');
-        this.dynamicForm = sc.get(props, 'dynamicForm', false);
-        this.dynamicFormRenderer = sc.get(props, 'dynamicFormRenderer', false);
-        this.jsonFieldsParser = new JsonFieldsParser({entitiesConfig: sc.get(props, 'entitiesConfig', {})});
-        this.systemVariablesProvider = new SystemVariablesProvider({
-            defaultDomain: this.defaultDomain,
-            projectRoot: this.projectRoot,
-            publicPath: this.publicPath
-        });
-        this.entitiesTransformer = new EntitiesTransformer({
-            dataServer: this.dataServer,
-            jsonFieldsParser: this.jsonFieldsParser,
-            processAllTemplateFunctions: this.processAllTemplateFunctions.bind(this)
-        });
-        this.collectionsSingleTransformer = new CollectionsSingleTransformer({
-            dataServer: this.dataServer,
-            jsonFieldsParser: this.jsonFieldsParser,
-            renderEngine: this.renderEngine,
-            getPartials: this.getPartials,
-            findAllPartialTags: this.findAllPartialTags.bind(this),
-            loadPartialTemplate: this.loadPartialTemplate.bind(this),
-            processAllTemplateFunctions: this.processAllTemplateFunctions.bind(this)
-        });
-        this.collectionsTransformer = new CollectionsTransformer({
-            dataServer: this.dataServer,
-            jsonFieldsParser: this.jsonFieldsParser,
-            renderEngine: this.renderEngine,
-            getPartials: this.getPartials,
-            findAllPartialTags: this.findAllPartialTags.bind(this),
-            loadPartialTemplate: this.loadPartialTemplate.bind(this),
-            processAllTemplateFunctions: this.processAllTemplateFunctions.bind(this)
-        });
-        this.partialsTransformer = new PartialsTransformer({
-            renderEngine: this.renderEngine,
-            getPartials: this.getPartials,
-            processAllTemplateFunctions: this.processAllTemplateFunctions.bind(this)
-        });
-        this.formsTransformer = false;
-        if(this.dynamicForm && this.dynamicFormRenderer){
-            this.formsTransformer = new FormsTransformer({
-                renderEngine: this.renderEngine,
-                getPartials: this.getPartials,
-                processAllTemplateFunctions: this.processAllTemplateFunctions.bind(this),
-                dynamicForm: this.dynamicForm,
-                dynamicFormRenderer: this.dynamicFormRenderer,
-                events: this.events
-            });
-        }
-        this.urlTransformer = new UrlTransformer();
-        this.assetTransformer = new AssetTransformer();
-        this.dateTransformer = new DateTransformer({
-            defaultFormat: sc.get(props, 'defaultDateFormat', 'Y-m-d H:i:s')
-        });
-        this.translateTransformer = new TranslateTransformer({
-            projectRoot: this.projectRoot,
-            defaultLocale: sc.get(props, 'defaultLocale', 'en'),
-            fallbackLocale: sc.get(props, 'fallbackLocale', 'en')
-        });
-        this.transformers = [
-            this.entitiesTransformer,
-            this.collectionsSingleTransformer,
-            this.collectionsTransformer,
-            this.partialsTransformer,
-            this.urlTransformer,
-            this.assetTransformer,
-            this.dateTransformer,
-            this.translateTransformer
-        ];
-        if(this.formsTransformer){
-            this.transformers.push(this.formsTransformer);
-        }
-    }
-
-    async processAllTemplateFunctions(template, domain, req, systemVariables, enhancedData = {})
-    {
-        let processedTemplate = template;
-        for(let transformer of this.transformers){
-            if(!transformer){
-                continue;
-            }
-            if(!sc.isFunction(transformer.transform)){
-                continue;
-            }
-            processedTemplate = await transformer.transform(processedTemplate, domain, req, systemVariables, enhancedData);
-        }
-        return processedTemplate;
-    }
-
-    async render(template, data, partials, domain, req, route, currentEntityData)
-    {
-        if(!this.renderEngine){
-            Logger.critical('Render engine not provided');
-            return '';
-        }
-        if(!sc.isFunction(this.renderEngine.render)){
-            Logger.critical('Render engine does not contain a render method');
-            return '';
-        }
-        if(!this.events){
-            Logger.critical('Events manager not provided');
-            return '';
-        }
-        let systemVariables = this.systemVariablesProvider.buildSystemVariables(req, route, domain);
-        let renderContext = {
-            template,
-            data,
-            partials,
-            domain,
-            req,
-            route,
-            currentEntityData
-        };
-        let eventData = {
-            variables: systemVariables,
-            renderContext
-        };
-        await this.events.emit('reldens.afterVariablesCreated', eventData);
-        let enhancedData = this.buildEnhancedRenderData(data, eventData.variables, currentEntityData);
-        let beforeProcessData = {
-            content: template,
-            variables: enhancedData,
-            renderContext
-        };
-        await this.events.emit('reldens.beforeContentProcess', beforeProcessData);
-        let processedTemplate = await this.processAllTemplateFunctions(
-            beforeProcessData.content,
-            domain,
-            req,
-            eventData.variables,
-            enhancedData
-        );
-        let afterProcessData = {
-            processedContent: processedTemplate,
-            variables: enhancedData,
-            renderContext
-        };
-        await this.events.emit('reldens.afterContentProcess', afterProcessData);
-        return this.renderEngine.render(
-            this.unescapeHtml(afterProcessData.processedContent),
-            enhancedData,
-            partials
-        );
-    }
-
-    buildEnhancedRenderData(originalData, systemVariables, currentEntityData)
-    {
-        let enhancedData = Object.assign({}, originalData);
-        enhancedData.currentRequest = systemVariables.currentRequest;
-        enhancedData.currentRoute = systemVariables.currentRoute;
-        enhancedData.currentDomain = systemVariables.currentDomain;
-        enhancedData.systemInfo = systemVariables.systemInfo;
-        if(currentEntityData){
-            enhancedData.currentEntity = currentEntityData;
-        }
-        return enhancedData;
-    }
-
-    unescapeHtml(text)
-    {
-        return text
-            .replace(/"/g, '"')
-            .replace(/'/g, "'")
-            .replace(/'/g, "'")
-            .replace(/=/g, '=')
-            .replace(///g, '/')
-            .replace(/&lt;/g, '<')
-            .replace(/&gt;/g, '>')
-            .replace(/&amp;/g, '&');
-    }
-
-    findAllPartialTags(template)
-    {
-        return this.partialsTransformer.findAllPartialTags(template);
-    }
-
-    loadPartialTemplate(partialName, domain)
-    {
-        return this.partialsTransformer.loadPartialTemplate(partialName, domain);
-    }
-
-}
-
-module.exports.TemplateEngine = TemplateEngine;
+/**
+ *
+ * Reldens - CMS - TemplateEngine
+ *
+ */
+
+const { JsonFieldsParser } = require('./json-fields-parser');
+const { EntitiesTransformer } = require('./template-engine/entities-transformer');
+const { CollectionsTransformer } = require('./template-engine/collections-transformer');
+const { CollectionsSingleTransformer } = require('./template-engine/collections-single-transformer');
+const { PartialsTransformer } = require('./template-engine/partials-transformer');
+const { FormsTransformer } = require('./template-engine/forms-transformer');
+const { UrlTransformer } = require('./template-engine/url-transformer');
+const { AssetTransformer } = require('./template-engine/asset-transformer');
+const { DateTransformer } = require('./template-engine/date-transformer');
+const { TranslateTransformer } = require('./template-engine/translate-transformer');
+const { SystemVariablesProvider } = require('./template-engine/system-variables-provider');
+const { Logger, sc } = require('@reldens/utils');
+
+class TemplateEngine
+{
+
+    constructor(props)
+    {
+        this.renderEngine = sc.get(props, 'renderEngine', false);
+        this.dataServer = sc.get(props, 'dataServer', false);
+        this.getPartials = sc.get(props, 'getPartials', false);
+        this.events = sc.get(props, 'events', false);
+        this.defaultDomain = sc.get(props, 'defaultDomain', 'default');
+        this.projectRoot = sc.get(props, 'projectRoot', './');
+        this.publicPath = sc.get(props, 'publicPath', './public');
+        this.domainPublicUrlMapping = sc.get(props, 'domainPublicUrlMapping', {});
+        this.defaultPublicUrl = sc.get(props, 'defaultPublicUrl', '');
+        this.dynamicForm = sc.get(props, 'dynamicForm', false);
+        this.dynamicFormRenderer = sc.get(props, 'dynamicFormRenderer', false);
+        this.jsonFieldsParser = new JsonFieldsParser({entitiesConfig: sc.get(props, 'entitiesConfig', {})});
+        this.systemVariablesProvider = new SystemVariablesProvider({
+            defaultDomain: this.defaultDomain,
+            projectRoot: this.projectRoot,
+            publicPath: this.publicPath,
+            domainPublicUrlMapping: this.domainPublicUrlMapping,
+            defaultPublicUrl: this.defaultPublicUrl
+        });
+        this.entitiesTransformer = new EntitiesTransformer({
+            dataServer: this.dataServer,
+            jsonFieldsParser: this.jsonFieldsParser,
+            processAllTemplateFunctions: this.processAllTemplateFunctions.bind(this)
+        });
+        this.collectionsSingleTransformer = new CollectionsSingleTransformer({
+            dataServer: this.dataServer,
+            jsonFieldsParser: this.jsonFieldsParser,
+            renderEngine: this.renderEngine,
+            getPartials: this.getPartials,
+            findAllPartialTags: this.findAllPartialTags.bind(this),
+            loadPartialTemplate: this.loadPartialTemplate.bind(this),
+            processAllTemplateFunctions: this.processAllTemplateFunctions.bind(this)
+        });
+        this.collectionsTransformer = new CollectionsTransformer({
+            dataServer: this.dataServer,
+            jsonFieldsParser: this.jsonFieldsParser,
+            renderEngine: this.renderEngine,
+            getPartials: this.getPartials,
+            findAllPartialTags: this.findAllPartialTags.bind(this),
+            loadPartialTemplate: this.loadPartialTemplate.bind(this),
+            processAllTemplateFunctions: this.processAllTemplateFunctions.bind(this)
+        });
+        this.partialsTransformer = new PartialsTransformer({
+            renderEngine: this.renderEngine,
+            getPartials: this.getPartials,
+            processAllTemplateFunctions: this.processAllTemplateFunctions.bind(this)
+        });
+        this.formsTransformer = false;
+        if(this.dynamicForm && this.dynamicFormRenderer){
+            this.formsTransformer = new FormsTransformer({
+                renderEngine: this.renderEngine,
+                getPartials: this.getPartials,
+                processAllTemplateFunctions: this.processAllTemplateFunctions.bind(this),
+                dynamicForm: this.dynamicForm,
+                dynamicFormRenderer: this.dynamicFormRenderer,
+                events: this.events
+            });
+        }
+        this.urlTransformer = new UrlTransformer();
+        this.assetTransformer = new AssetTransformer();
+        this.dateTransformer = new DateTransformer({
+            defaultFormat: sc.get(props, 'defaultDateFormat', 'Y-m-d H:i:s')
+        });
+        this.translateTransformer = new TranslateTransformer({
+            projectRoot: this.projectRoot,
+            defaultLocale: sc.get(props, 'defaultLocale', 'en'),
+            fallbackLocale: sc.get(props, 'fallbackLocale', 'en')
+        });
+        this.transformers = [
+            this.entitiesTransformer,
+            this.collectionsSingleTransformer,
+            this.collectionsTransformer,
+            this.partialsTransformer,
+            this.urlTransformer,
+            this.assetTransformer,
+            this.dateTransformer,
+            this.translateTransformer
+        ];
+        if(this.formsTransformer){
+            this.transformers.push(this.formsTransformer);
+        }
+    }
+
+    async processAllTemplateFunctions(template, domain, req, systemVariables, enhancedData = {})
+    {
+        let processedTemplate = template;
+        for(let transformer of this.transformers){
+            if(!transformer){
+                continue;
+            }
+            if(!sc.isFunction(transformer.transform)){
+                continue;
+            }
+            processedTemplate = await transformer.transform(
+                processedTemplate,
+                domain,
+                req,
+                systemVariables,
+                enhancedData
+            );
+        }
+        return processedTemplate;
+    }
+
+    async render(template, data, partials, domain, req, route, currentEntityData)
+    {
+        if(!this.renderEngine){
+            Logger.critical('Render engine not provided');
+            return '';
+        }
+        if(!sc.isFunction(this.renderEngine.render)){
+            Logger.critical('Render engine does not contain a render method');
+            return '';
+        }
+        if(!this.events){
+            Logger.critical('Events manager not provided');
+            return '';
+        }
+        let systemVariables = this.systemVariablesProvider.buildSystemVariables(req, route, domain);
+        let renderContext = {
+            template,
+            data,
+            partials,
+            domain,
+            req,
+            route,
+            currentEntityData
+        };
+        let eventData = {
+            variables: systemVariables,
+            renderContext
+        };
+        await this.events.emit('reldens.afterVariablesCreated', eventData);
+        let enhancedData = this.buildEnhancedRenderData(data, eventData.variables, currentEntityData);
+        let beforeProcessData = {
+            content: template,
+            variables: enhancedData,
+            renderContext
+        };
+        await this.events.emit('reldens.beforeContentProcess', beforeProcessData);
+        let processedTemplate = await this.processAllTemplateFunctions(
+            beforeProcessData.content,
+            domain,
+            req,
+            eventData.variables,
+            enhancedData
+        );
+        let afterProcessData = {
+            processedContent: processedTemplate,
+            variables: enhancedData,
+            renderContext
+        };
+        await this.events.emit('reldens.afterContentProcess', afterProcessData);
+        return this.renderEngine.render(
+            this.unescapeHtml(afterProcessData.processedContent),
+            enhancedData,
+            partials
+        );
+    }
+
+    buildEnhancedRenderData(originalData, systemVariables, currentEntityData)
+    {
+        let enhancedData = Object.assign({}, originalData);
+        enhancedData.currentRequest = systemVariables.currentRequest;
+        enhancedData.currentRoute = systemVariables.currentRoute;
+        enhancedData.currentDomain = systemVariables.currentDomain;
+        enhancedData.systemInfo = systemVariables.systemInfo;
+        if(currentEntityData){
+            enhancedData.currentEntity = currentEntityData;
+        }
+        return enhancedData;
+    }
+
+    unescapeHtml(text)
+    {
+        return text
+            .replace(/&quot;/g, '"')
+            .replace(/&#x27;/g, "'")
+            .replace(/&#39;/g, "'")
+            .replace(/&#x3D;/g, '=')
+            .replace(/&#x2F;/g, '/')
+            .replace(/&lt;/g, '<')
+            .replace(/&gt;/g, '>')
+            .replace(/&amp;/g, '&');
+    }
+
+    findAllPartialTags(template)
+    {
+        return this.partialsTransformer.findAllPartialTags(template);
+    }
+
+    loadPartialTemplate(partialName, domain)
+    {
+        return this.partialsTransformer.loadPartialTemplate(partialName, domain);
+    }
+
+}
+
+module.exports.TemplateEngine = TemplateEngine;

package/migrations/default-homepage.sql

@@ -1,7 +1,7 @@
 -- Default homepage:
 
 -- Create a default route first
-REPLACE INTO `routes` (`id`, `path`, `router`, `cache_ttl_seconds`, `enabled`, `created_at`) VALUES (1, '/home', 'cmsPages', 3600, 1, NOW());
+REPLACE INTO `routes` (`id`, `path`, `router`, `cache_ttl_seconds`, `enabled`, `created_at`) VALUES (1, '/', 'cmsPages', 3600, 1, NOW());
 
 -- Create a default homepage with route_id reference
 REPLACE INTO `cms_pages` (

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.27.0",
+    "version": "0.29.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -33,10 +33,10 @@
         "url": "https://github.com/damian-pastorini/reldens-cms/issues"
     },
     "dependencies": {
-        "@reldens/server-utils": "^0.26.0",
-        "@reldens/storage": "^0.69.0",
+        "@reldens/server-utils": "^0.29.0",
+        "@reldens/storage": "^0.71.0",
         "@reldens/utils": "^0.53.0",
-        "dotenv": "^17.2.2",
-        "mustache": "^4.2.0"
+        "dotenv": "17.2.2",
+        "mustache": "4.2.0"
     }
 }

package/templates/.env.dist

@@ -14,3 +14,4 @@ RELDENS_ADMIN_SECRET={{&adminSecret}}
 # Server Configuration
 RELDENS_APP_HOST={{&host}}
 RELDENS_APP_PORT={{&port}}
+RELDENS_PUBLIC_URL={{&publicUrl}}

package/templates/index.js.dist

@@ -1,32 +1,30 @@
-/**
- *
- * Reldens - CMS
- *
- */
-
-const { Manager } = require('@reldens/cms');
-const { Logger } = require('@reldens/utils');
-const { rawRegisteredEntities, entitiesConfig, entitiesTranslations } = require('./generated-entities/models/{{driverKey}}/registered-models-{{driverKey}}');
-{{prismaClientImports}}
-let args = process.argv.slice(2);
-let projectRoot = args[0] || process.cwd();
-
-let manager = new Manager({
-    projectRoot,
-    rawRegisteredEntities,
-    entitiesConfig,
-    entitiesTranslations{{prismaClientParam}}
-});
-Logger.debug('Reldens CMS Manager instance created.', {configuration: manager.config});
-
-manager.start().then((result) => {
-    if(!result){
-        Logger.info('Reldens CMS started by command failed.');
-        return false;
-    }
-    Logger.info('Reldens CMS started by command.');
-    return true;
-}).catch((error) => {
-    Logger.critical('Failed to start CMS: ' + error.message);
-    process.exit();
-});
+/**
+ *
+ * Reldens - CMS
+ *
+ */
+
+const { Manager } = require('@reldens/cms');
+const { Logger } = require('@reldens/utils');
+const { rawRegisteredEntities, entitiesConfig, entitiesTranslations } = require('./generated-entities/models/{{driverKey}}/registered-models-{{driverKey}}');
+{{&prismaClientImports}}
+
+let manager = new Manager({
+    projectRoot: __dirname,
+    rawRegisteredEntities,
+    entitiesConfig,
+    entitiesTranslations{{&prismaClientParam}}
+});
+Logger.debug('Reldens CMS Manager instance created.', {configuration: manager.config});
+
+manager.start().then((result) => {
+    if(!result){
+        Logger.info('Reldens CMS started by command failed.');
+        return false;
+    }
+    Logger.info('Reldens CMS started by command.');
+    return true;
+}).catch((error) => {
+    Logger.critical('Failed to start CMS: ' + error.message);
+    process.exit();
+});