@reldens/cms 0.36.0 → 0.37.0

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

@@ -1,54 +1,41 @@
-/**
- *
- * 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 the path is a url, we will not transform it:
-        if(assetPath && assetPath.startsWith('http')){
-            return 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;
-    }
-
-}
-
-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, 'assetUrl', '')+'/assets'+(assetPath.startsWith('/') ? assetPath : '/'+assetPath);
+    }
+
+}
+
+module.exports.AssetTransformer = AssetTransformer;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@reldens/cms",
     "scope": "@reldens",
-    "version": "0.36.0",
+    "version": "0.37.0",
     "description": "Reldens - CMS",
     "author": "Damian A. Pastorini",
     "license": "MIT",