@reldens/cms 0.26.0 → 0.28.0

package/lib/template-engine/asset-transformer.js

@@ -1,41 +1,43 @@
-/**
- *
- * Reldens - CMS - AssetTransformer
- *
- */
-
-const { sc } = require('@reldens/utils');
-
-class AssetTransformer
-{
-
-    async transform(template, domain, req, systemVariables)
-    {
-        if(!template){
-            return template;
-        }
-        let currentRequest = sc.get(systemVariables, 'currentRequest', {});
-        let assetPattern = /\[asset\(([^)]+)\)\]/g;
-        let matches = [...template.matchAll(assetPattern)];
-        for(let i = matches.length - 1; i >= 0; i--){
-            let match = matches[i];
-            let assetPath = match[1].replace(/['"]/g, '');
-            let absoluteUrl = this.buildAssetUrl(assetPath, currentRequest);
-            template = template.substring(0, match.index) +
-                absoluteUrl +
-                template.substring(match.index + match[0].length);
-        }
-        return template;
-    }
-
-    buildAssetUrl(assetPath, currentRequest)
-    {
-        if(!assetPath || assetPath.startsWith('http')){
-            return assetPath;
-        }
-        return sc.get(currentRequest, 'baseUrl', '')+'/assets'+(assetPath.startsWith('/') ? assetPath : '/'+assetPath);
-    }
-
-}
-
-module.exports.AssetTransformer = AssetTransformer;
+/**
+ *
+ * Reldens - CMS - AssetTransformer
+ *
+ */
+
+const { sc } = require('@reldens/utils');
+
+class AssetTransformer
+{
+
+    async transform(template, domain, req, systemVariables)
+    {
+        if(!template){
+            return template;
+        }
+        let currentRequest = sc.get(systemVariables, 'currentRequest', {});
+        let assetPattern = /\[asset\(([^)]+)\)\]/g;
+        let matches = [...template.matchAll(assetPattern)];
+        for(let i = matches.length - 1; i >= 0; i--){
+            let match = matches[i];
+            let assetPath = match[1].replace(/['"]/g, '');
+            let absoluteUrl = this.buildAssetUrl(assetPath, currentRequest);
+            template = template.substring(0, match.index) +
+                absoluteUrl +
+                template.substring(match.index + match[0].length);
+        }
+        return template;
+    }
+
+    buildAssetUrl(assetPath, currentRequest)
+    {
+        if(!assetPath || assetPath.startsWith('http')){
+            return assetPath;
+        }
+        return sc.get(currentRequest, 'publicUrl', '')
+            +'/assets'
+            +(assetPath.startsWith('/') ? assetPath : '/'+assetPath);
+    }
+
+}
+
+module.exports.AssetTransformer = AssetTransformer;

package/lib/template-engine/system-variables-provider.js

@@ -1,108 +1,127 @@
-/**
- *
- * Reldens - CMS - SystemVariablesProvider
- *
- */
-
-const { sc } = require('@reldens/utils');
-
-class SystemVariablesProvider
-{
-
-    constructor(props)
-    {
-        this.defaultDomain = sc.get(props, 'defaultDomain', 'default');
-        this.projectRoot = sc.get(props, 'projectRoot', './');
-        this.publicPath = sc.get(props, 'publicPath', './public');
-    }
-
-    buildSystemVariables(req, route, domain)
-    {
-        let currentRequest = this.buildCurrentRequestData(req, domain);
-        let currentRoute = this.buildCurrentRouteData(route);
-        let currentDomain = this.buildCurrentDomainData(domain);
-        let systemInfo = this.buildSystemInfo();
-        return {
-            currentRequest,
-            currentRoute,
-            currentDomain,
-            systemInfo
-        };
-    }
-
-    buildCurrentRequestData(req, domain)
-    {
-        if(!req){
-            return {};
-        }
-        let protocol = sc.get(req, 'protocol', 'http');
-        let host = req.get('host') || 'localhost';
-        let originalUrl = sc.get(req, 'originalUrl', sc.get(req, 'path', '/'));
-        let fullUrl = protocol+'://'+host+originalUrl;
-        return {
-            method: sc.get(req, 'method', 'GET'),
-            path: sc.get(req, 'path', '/'),
-            originalUrl,
-            fullUrl,
-            protocol,
-            host,
-            domain: domain || host.split(':')[0],
-            query: sc.get(req, 'query', {}),
-            params: sc.get(req, 'params', {}),
-            headers: sc.get(req, 'headers', {}),
-            userAgent: req.get('user-agent') || '',
-            ip: sc.get(req, 'ip', ''),
-            baseUrl: protocol+'://'+host,
-            timestamp: sc.getCurrentDate(),
-            isSecure: 'https' === protocol
-        };
-    }
-
-    buildCurrentRouteData(route)
-    {
-        if(!route){
-            return null;
-        }
-        return {
-            id: sc.get(route, 'id', null),
-            path: sc.get(route, 'path', ''),
-            router: sc.get(route, 'router', ''),
-            domain: sc.get(route, 'domain', null),
-            enabled: sc.get(route, 'enabled', false),
-            title: sc.get(route, 'title', ''),
-            template: sc.get(route, 'template', ''),
-            layout: sc.get(route, 'layout', ''),
-            meta_title: sc.get(route, 'meta_title', ''),
-            meta_description: sc.get(route, 'meta_description', ''),
-            sort_order: sc.get(route, 'sort_order', 0)
-        };
-    }
-
-    buildCurrentDomainData(domain)
-    {
-        return {
-            current: domain || this.defaultDomain,
-            default: this.defaultDomain,
-            resolved: domain || this.defaultDomain
-        };
-    }
-
-    buildSystemInfo()
-    {
-        let date = new Date();
-        return {
-            projectRoot: this.projectRoot,
-            publicPath: this.publicPath,
-            nodeVersion: process.version,
-            platform: process.platform,
-            environment: process.env.NODE_ENV || 'development',
-            timestamp: sc.getCurrentDate(),
-            uptime: process.uptime(),
-            currentDate: sc.formatDate(date),
-            currentYear: sc.formatDate(date, 'Y')
-        };
-    }
-
-}
-
-module.exports.SystemVariablesProvider = SystemVariablesProvider;
+/**
+ *
+ * Reldens - CMS - SystemVariablesProvider
+ *
+ */
+
+const { sc } = require('@reldens/utils');
+
+class SystemVariablesProvider
+{
+
+    constructor(props)
+    {
+        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', '');
+    }
+
+    buildSystemVariables(req, route, domain)
+    {
+        let currentRequest = this.buildCurrentRequestData(req, domain);
+        let currentRoute = this.buildCurrentRouteData(route);
+        let currentDomain = this.buildCurrentDomainData(domain);
+        let systemInfo = this.buildSystemInfo();
+        return {
+            currentRequest,
+            currentRoute,
+            currentDomain,
+            systemInfo
+        };
+    }
+
+    buildCurrentRequestData(req, domain)
+    {
+        if(!req){
+            return {};
+        }
+        let protocol = sc.get(req, 'protocol', 'http');
+        let host = req.get('host') || 'localhost';
+        let originalUrl = sc.get(req, 'originalUrl', sc.get(req, 'path', '/'));
+        let baseUrl = protocol+'://'+host;
+        let publicUrl = baseUrl;
+        let customPublicUrl = req.get('x-public-url');
+        if(customPublicUrl){
+            publicUrl = customPublicUrl;
+        }
+        if(!customPublicUrl && domain && sc.hasOwn(this.domainPublicUrlMapping, domain)){
+            publicUrl = this.domainPublicUrlMapping[domain];
+        }
+        if(publicUrl === baseUrl && '' !== this.defaultPublicUrl){
+            publicUrl = this.defaultPublicUrl;
+        }
+        if('' === baseUrl && '' !== this.defaultPublicUrl){
+            baseUrl = this.defaultPublicUrl;
+        }
+        let fullUrl = protocol+'://'+host+originalUrl;
+        return {
+            method: sc.get(req, 'method', 'GET'),
+            path: sc.get(req, 'path', '/'),
+            originalUrl,
+            fullUrl,
+            protocol,
+            host,
+            domain: domain || host.split(':')[0],
+            query: sc.get(req, 'query', {}),
+            params: sc.get(req, 'params', {}),
+            headers: sc.get(req, 'headers', {}),
+            userAgent: req.get('user-agent') || '',
+            ip: sc.get(req, 'ip', ''),
+            baseUrl,
+            publicUrl,
+            defaultPublicUrl: this.defaultPublicUrl,
+            timestamp: sc.getCurrentDate(),
+            isSecure: 'https' === protocol
+        };
+    }
+
+    buildCurrentRouteData(route)
+    {
+        if(!route){
+            return null;
+        }
+        return {
+            id: sc.get(route, 'id', null),
+            path: sc.get(route, 'path', ''),
+            router: sc.get(route, 'router', ''),
+            domain: sc.get(route, 'domain', null),
+            enabled: sc.get(route, 'enabled', false),
+            title: sc.get(route, 'title', ''),
+            template: sc.get(route, 'template', ''),
+            layout: sc.get(route, 'layout', ''),
+            meta_title: sc.get(route, 'meta_title', ''),
+            meta_description: sc.get(route, 'meta_description', ''),
+            sort_order: sc.get(route, 'sort_order', 0)
+        };
+    }
+
+    buildCurrentDomainData(domain)
+    {
+        return {
+            current: domain || this.defaultDomain,
+            default: this.defaultDomain,
+            resolved: domain || this.defaultDomain
+        };
+    }
+
+    buildSystemInfo()
+    {
+        let date = new Date();
+        return {
+            projectRoot: this.projectRoot,
+            publicPath: this.publicPath,
+            nodeVersion: process.version,
+            platform: process.platform,
+            environment: process.env.NODE_ENV || 'development',
+            timestamp: sc.getCurrentDate(),
+            uptime: process.uptime(),
+            currentDate: sc.formatDate(date),
+            currentYear: sc.formatDate(date, 'Y')
+        };
+    }
+
+}
+
+module.exports.SystemVariablesProvider = SystemVariablesProvider;

package/lib/template-engine/url-transformer.js

@@ -1,41 +1,41 @@
-/**
- *
- * Reldens - CMS - UrlTransformer
- *
- */
-
-const { sc } = require('@reldens/utils');
-
-class UrlTransformer
-{
-
-    async transform(template, domain, req, systemVariables)
-    {
-        if(!template){
-            return template;
-        }
-        let currentRequest = sc.get(systemVariables, 'currentRequest', {});
-        let urlPattern = /\[url\(([^)]+)\)\]/g;
-        let matches = [...template.matchAll(urlPattern)];
-        for(let i = matches.length - 1; i >= 0; i--){
-            let match = matches[i];
-            let urlPath = match[1].replace(/['"]/g, '');
-            let absoluteUrl = this.buildAbsoluteUrl(urlPath, currentRequest);
-            template = template.substring(0, match.index) +
-                absoluteUrl +
-                template.substring(match.index + match[0].length);
-        }
-        return template;
-    }
-
-    buildAbsoluteUrl(relativePath, currentRequest)
-    {
-        if(!relativePath || relativePath.startsWith('http')){
-            return relativePath;
-        }
-        return sc.get(currentRequest, 'baseUrl', '') + relativePath;
-    }
-
-}
-
-module.exports.UrlTransformer = UrlTransformer;
+/**
+ *
+ * Reldens - CMS - UrlTransformer
+ *
+ */
+
+const { sc } = require('@reldens/utils');
+
+class UrlTransformer
+{
+
+    async transform(template, domain, req, systemVariables)
+    {
+        if(!template){
+            return template;
+        }
+        let currentRequest = sc.get(systemVariables, 'currentRequest', {});
+        let urlPattern = /\[url\(([^)]+)\)\]/g;
+        let matches = [...template.matchAll(urlPattern)];
+        for(let i = matches.length - 1; i >= 0; i--){
+            let match = matches[i];
+            let urlPath = match[1].replace(/['"]/g, '');
+            let absoluteUrl = this.buildAbsoluteUrl(urlPath, currentRequest);
+            template = template.substring(0, match.index) +
+                absoluteUrl +
+                template.substring(match.index + match[0].length);
+        }
+        return template;
+    }
+
+    buildAbsoluteUrl(relativePath, currentRequest)
+    {
+        if(!relativePath || relativePath.startsWith('http')){
+            return relativePath;
+        }
+        return sc.get(currentRequest, 'publicUrl', '') + relativePath;
+    }
+
+}
+
+module.exports.UrlTransformer = UrlTransformer;