@reldens/cms 0.34.0 → 0.36.0

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

@@ -30,10 +30,23 @@ class AssetTransformer
 
     buildAssetUrl(assetPath, currentRequest)
     {
-        if(!assetPath || assetPath.startsWith('http')){
+        // if the path is a url, we will not transform it:
+        if(assetPath && assetPath.startsWith('http')){
             return assetPath;
         }
-        return sc.get(currentRequest, 'assetUrl', '')+'/assets'+(assetPath.startsWith('/') ? assetPath : '/'+assetPath);
+        let assetUrl = sc.get(currentRequest, 'assetUrl', '');
+        let publicUrl = sc.get(currentRequest, 'publicUrl', '');
+        if(!assetPath){
+            if(assetUrl){
+                return assetUrl;
+            }
+            return '';
+        }
+        let normalizedPath = assetPath.startsWith('/') ? assetPath : '/'+assetPath;
+        if(assetUrl){
+            return assetUrl+normalizedPath;
+        }
+        return publicUrl+'/assets'+normalizedPath;
     }
 
 }

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

@@ -0,0 +1,52 @@
+/**
+ *
+ * Reldens - CMS - CdnTransformer
+ *
+ */
+
+const { sc } = require('@reldens/utils');
+
+class CdnTransformer
+{
+
+    async transform(template, domain, req, systemVariables)
+    {
+        if(!template){
+            return template;
+        }
+        let currentRequest = sc.get(systemVariables, 'currentRequest', {});
+        let cdnPattern = /\[cdn\(([^)]+)\)\]/g;
+        let matches = [...template.matchAll(cdnPattern)];
+        for(let i = matches.length - 1; i >= 0; i--){
+            let match = matches[i];
+            let cdnPath = match[1].replace(/['"]/g, '');
+            let absoluteUrl = this.buildCdnUrl(cdnPath, currentRequest);
+            template = template.substring(0, match.index)+absoluteUrl+template.substring(match.index+match[0].length);
+        }
+        return template;
+    }
+
+    buildCdnUrl(cdnPath, currentRequest)
+    {
+        // if the path is a url, we will not transform it:
+        if(cdnPath && cdnPath.startsWith('http')){
+            return cdnPath;
+        }
+        let assetUrl = sc.get(currentRequest, 'assetUrl', '');
+        let publicUrl = sc.get(currentRequest, 'publicUrl', '');
+        if(!cdnPath){
+            if(assetUrl){
+                return assetUrl;
+            }
+            return publicUrl;
+        }
+        let normalizedPath = cdnPath.startsWith('/') ? cdnPath : '/'+cdnPath;
+        if(assetUrl){
+            return assetUrl+normalizedPath;
+        }
+        return publicUrl+normalizedPath;
+    }
+
+}
+
+module.exports.CdnTransformer = CdnTransformer;

package/lib/template-engine.js

@@ -12,6 +12,7 @@ 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 { CdnTransformer } = require('./template-engine/cdn-transformer');
 const { DateTransformer } = require('./template-engine/date-transformer');
 const { TranslateTransformer } = require('./template-engine/translate-transformer');
 const { SystemVariablesProvider } = require('./template-engine/system-variables-provider');
@@ -84,6 +85,7 @@ class TemplateEngine
         }
         this.urlTransformer = new UrlTransformer();
         this.assetTransformer = new AssetTransformer();
+        this.cdnTransformer = new CdnTransformer();
         this.dateTransformer = new DateTransformer({
             defaultFormat: sc.get(props, 'defaultDateFormat', 'Y-m-d H:i:s')
         });
@@ -99,6 +101,7 @@ class TemplateEngine
             this.partialsTransformer,
             this.urlTransformer,
             this.assetTransformer,
+            this.cdnTransformer,
             this.dateTransformer,
             this.translateTransformer
         ];

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.34.0",
+    "version": "0.36.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",
@@ -33,7 +33,7 @@
         "url": "https://github.com/damian-pastorini/reldens-cms/issues"
     },
     "dependencies": {
-        "@reldens/server-utils": "^0.34.0",
+        "@reldens/server-utils": "^0.36.0",
         "@reldens/storage": "^0.73.0",
         "@reldens/utils": "^0.53.0",
         "dotenv": "17.2.3",