The work with a text has been changed.

Now the text can be added only through one comment.

Now the text is set through comments, which have <@> and </@>

Author: Ulyanov-programmer

elementOfHtml.js

@@ -56,7 +56,7 @@ export class ElementOfHtml {
 
     this.#setAttributes(entryRule)
     this.#setText(entryRule)
-    this.#setTextFromComments(entryRule)
+    this.#setTextFromComment(entryRule)
     this.#setTag()
     this.#setId()
     this.#setClasses()
@@ -152,37 +152,22 @@ export class ElementOfHtml {
     this.textBefore = this?.textBefore?.slice(1, -1)
     this.textAfter = this?.textAfter?.slice(1, -1)
   }
-  #setTextFromComments(entryRule) {
-    for (let decl of entryRule.declarations) {
-      let textDeclarations = decl?.comment?.match(/@(inside|before|after)/gi)
-
-      if (!textDeclarations) continue
+  #setTextFromComment(entryRule) {
+    let commentWithText = entryRule.declarations.find(decl =>
+      decl?.comment?.match(/<@>.*<\/@>/s)[0]
+    )
+    if (!commentWithText) return
 
-      for (let declType of textDeclarations) {
-        let position = declType.toLowerCase().replace('@', '')
-        let text = decl.comment
-          // Pulling text only for a specific position
-          .match(new RegExp(`(?<=${position}).*?(?=@|$)`, 's'))[0]
+    // Removing spaces necessary for readability of a comment
+    commentWithText.comment = commentWithText.comment.slice(1, -1)
 
-        // Removing spaces necessary for readability of a comment
-        if (text.at(0) == ' ')
-          text = text.replace(' ', '')
-        if (text.at(-1) == ' ')
-          text = text.replace(/.$/, '')
+    let textBefore = commentWithText.comment.match(/^.*(?=<@>)/s)?.at(0)
+    let text = commentWithText.comment.match(/(?<=<@>).*?(?=<\/@>|$)/s)?.at(0)
+    let textAfter = commentWithText.comment.match(/(?<=<\/@>).*$/s)?.at(0)
 
-        switch (position) {
-          case 'inside':
-            this.text = text
-            break
-          case 'before':
-            this.textBefore = text
-            break
-          case 'after':
-            this.textAfter = text
-            break
-        }
-      }
-    }
+    this.textBefore = textBefore
+    this.text = text
+    this.textAfter = textAfter
   }
   #setParentAndSelfSelector(fullSelector) {
     let partsOfSelector = fullSelector.split(' ')

tests/IO.test.js

@@ -71,7 +71,7 @@ test('Empty CSS should not be processed.', () => {
 })
 
 test('The code from the CSS file must be processed.', () => {
-  fs.writeFileSync(cssFilePath, 'div {} div span { /* @inside text */ }')
+  fs.writeFileSync(cssFilePath, 'div {} div span { /* <@>text</@> */ }')
 
   assert.equal(
     new CssToHtml({

tests/text.test.js

@@ -2,73 +2,76 @@ import { CssToHtml } from '../cssToHtml.js'
 import assert from 'assert'
 import test from 'node:test'
 
-test('The text without additional spaces should be saved without spaces.', () => {
+test('The text inside the tag must be processed', () => {
   assert.equal(
     new CssToHtml({
-      css:
-        `div { /* 
-            @before before text @inside inner text @after after text  
-        */ }`,
+      css: `div { /* <@>inner text</@> */ }`,
     })
       .outputHTML,
 
-    `before text<div>inner text</div>after text
-`
+    `<div>inner text</div>\n`
   )
 })
-test('The text with additional spaces should keep them.', () => {
-  assert.match(
+test('The text before the tag must be processed', () => {
+  assert.equal(
     new CssToHtml({
-      css:
-        `div { /* 
-            @before  before text  @inside  inner text  @after  after text  
-        */ }`,
+      css: `div { /* before text<@></@> */ }`,
     })
       .outputHTML,
 
-    / +before text +<div> +inner text +<\/div> +after text[\n]/,
+    `before text<div></div>\n`
   )
 })
-test('The text should be saved from different comments.', () => {
+test('The text after the tag must be processed', () => {
   assert.equal(
+    new CssToHtml({
+      css: `div { /* <@></@>after text */ }`,
+    })
+      .outputHTML,
+
+    `<div></div>after text\n`
+  )
+})
+test('The text without additional spaces should be saved without spaces.', () => {
+  assert.equal(
+    new CssToHtml({
+      css: `div { /* before text<@>inner text</@>after text */ }`,
+    })
+      .outputHTML,
+
+    `before text<div>inner text</div>after text\n`
+  )
+})
+test('The text with additional spaces should keep them.', () => {
+  assert.match(
     new CssToHtml({
       css:
-        `div { /* 
-            @before before text @inside inner text @after after text  
-        */
-        /* 
-          @inside inner text
-        */
-        /* 
-          @after after text  
-        */
-}`,
+        `div { /*  before text  <@>  inner text </@>  after text  */ }`,
     })
       .outputHTML,
 
-    `before text<div>inner text
-</div>after text
-`,
+    / +before text +<div> +inner text +<\/div> +after text[\n]/,
   )
 })
 test('The text should be processed along with the new lines.', () => {
   assert.equal(
     new CssToHtml({
       css: `
 div { /* 
-  @before before 1
+    before 1
     before 2
-  @inside
+  <@>
     inner 1
     inner 2
-    inner 3 
-  @after after 1
+    inner 3
+  </@>after 1
     after 2 
 */ }`,
     })
       .outputHTML,
 
-    `before 1
+    `
+before 1
 before 2
 <div>
   inner 1