als-layout 1.3.1 → 1.3.3

package/lib/elements/link.js

@@ -1,7 +1,7 @@
 const { SingleNode } = require('als-document')
 function addLink(href, version, layout) {
    if(!href || typeof href !== 'string') return layout
-   const selector = `link[rel=stylesheet][href="${href}"]`
+   const selector = `link[rel=stylesheet][href^="${href}"]`
    let linkElement = layout.root.$(selector)
    if (linkElement) return
    if (href && version) href += href.includes('?') ? '&' : '?' + `v=${version}`
@@ -10,5 +10,4 @@ function addLink(href, version, layout) {
    return layout
 }
 
-
 module.exports = addLink

package/lib/elements/style.js

@@ -6,7 +6,7 @@ function checkStyles(styles, minified) {
    else if(typeof styles === 'string') {
       styles = styles.trim()
       if (minified) {
-         const cssParser = new CssParser(rawCss);
+         const cssParser = new CssParser(styles);
          styles = cssParser.minified()
       }
    } else return null

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "als-layout",
-  "version": "1.3.1",
+  "version": "1.3.3",
   "description": "Html layout constructor",
   "main": "index.js",
   "directories": {
     "lib": "lib"
   },
   "scripts": {
-    "test": "node ./tests/run-tests.js"
+    "test": "node --test --experimental-test-coverage"
   },
   "keywords": [],
   "author": "Alex Sorkin",
   "license": "ISC",
   "dependencies": {
     "als-css-parser": "^0.5.0",
-    "als-document": "^1.1.1",
+    "als-document": "^1.1.2",
     "als-simple-css": "^9.1.0"
   }
 }

package/tests/elements.test.js

@@ -1,6 +1,6 @@
 const assert = require('assert');
 const Layout = require('../lib/layout');
-const { describe, it,beforeEach } = require('node:test')
+const { describe, it, beforeEach } = require('node:test')
 const Simple = require('als-simple-css')
 describe('Elements Integration', () => {
    let layout;
@@ -78,8 +78,8 @@ describe('Elements Integration', () => {
       assert(layout.root.$('style').innerHTML.includes(styles), 'Styles not set correctly');
    });
 
-   it('Should add simple styles',() => {
-      const styles = [{body:{bgc:'black'}}]
+   it('Should add simple styles', () => {
+      const styles = [{ body: { bgc: 'black' } }]
       const css = new Simple(styles).stylesheet()
       layout.style(styles);
       assert(layout.root.$('style').innerHTML.includes(css), 'Styles not set correctly');
@@ -97,5 +97,91 @@ describe('Elements Integration', () => {
       assert(inner.includes(styles1));
       assert(inner.includes(styles2));
    });
-   
-});
+
+});
+
+describe('Scripts', () => {
+   let layout;
+
+   beforeEach(() => layout = new Layout());
+
+   it('should not add script if attributes are not an object', () => {
+      layout.script("not-an-object");
+      assert.strictEqual(layout.root.$('script'), null, 'Script should not be added when attributes are not an object');
+   });
+
+   it('should not add script if src already exists', () => {
+      layout.script({ src: 'existingscript.js' }, 'console.log("test");');
+      layout.script({ src: 'existingscript.js' }, 'console.log("duplicate");');
+      assert.strictEqual(layout.root.$$(`script[src="existingscript.js"]`).length, 1, 'Duplicate script should not be added');
+   });
+
+   it('should handle empty innerHTML correctly', () => {
+      layout.script({ src: 'test.js' }, '');
+      assert.strictEqual(layout.root.$('script').innerHTML, '', 'Script innerHTML should be empty');
+   });
+
+})
+
+describe('Styles', () => {
+   let layout;
+   beforeEach(() => layout = new Layout());
+
+   it('should not add style if styles are invalid', () => {
+      layout.style(123);
+      assert.strictEqual(layout.root.$('style'), null, 'Style should not be added when styles are invalid');
+   });
+
+   it('should add minified style', () => {
+      const styles = 'body { color: blue; } div { font-size: 12px; }';
+      layout.style(styles, true);
+      console.log(layout.root.$('style').innerHTML)
+      assert.strictEqual(layout.root.$('style').innerHTML, 'body{color:blue}div{font-size:12px}', 'Styles should be minified');
+   });
+})
+
+describe('Url', () => {
+   let layout;
+   beforeEach(() => layout = new Layout());
+
+   it('should not add canonical URL if URL is invalid', () => {
+      layout.url('not-a-url', 'aa');
+      assert.strictEqual(layout.root.$('link[rel="canonical"]'), null, 'Canonical URL should not be added for invalid URLs');
+   });
+
+})
+
+describe('Link', () => {
+   let layout;
+   beforeEach(() => layout = new Layout());
+
+   it('should add a new link element without version', () => {
+      const href = 'style.css';
+      layout.link(href);
+      assert.strictEqual(layout.root.$('link[rel="stylesheet"]').getAttribute('href'), href, 'Link href should match the provided href');
+   });
+
+   it('should add a new link element with version', () => {
+      const href = 'style.css';
+      const version = '1.0';
+      layout.link(href, version);
+      assert.strictEqual(layout.root.$('link[rel="stylesheet"]').getAttribute('href'), `${href}?v=${version}`, 'Link href should include version query parameter');
+   });
+
+   it('should not add a link if one with the same href and version already exists', () => {
+      const href = 'style.css';
+      const version = '1.0';
+      layout.link(href, version);
+      layout.link(href, version);
+      assert.strictEqual(layout.root.$$(`link[rel="stylesheet"][href="${href}?v=${version}"]`).length, 1, 'Should not add duplicate link with the same version');
+   });
+
+   it('should handle invalid href or version correctly', () => {
+      layout.link('', '1.0');
+      layout.link(null, '1.0');
+      // layout.link('style.css', '');
+      // layout.link('style.css', null);
+      assert.strictEqual(layout.root.$('link[rel="stylesheet"]'), null, 'Should not add a link when href or version are invalid');
+   });
+
+})