@htmlplus/element 0.4.8 → 0.4.9

package/compiler/utils/tags.js

@@ -2,39 +2,28 @@ export const getTag = (node, key) => {
     return getTags(node, key).pop();
 };
 export const getTags = (node, filter) => {
-    var _a;
-    let tags = (_a = node['tags']) !== null && _a !== void 0 ? _a : [];
-    if (!node['tags']) {
-        const lines = [];
-        const comments = (node.leadingComments || [])
-            .slice(-1)
-            .map((comment) => comment.value)
-            .join('\r\n')
-            .split('\r\n');
-        for (const comment of comments) {
-            let line = comment.trimStart();
-            if (line.startsWith('*'))
-                line = line.slice(1);
-            if (!line)
-                continue;
-            const isTag = line.trim().startsWith('@');
-            if (isTag || !lines.length)
-                lines.push(line);
-            else
-                lines[lines.length - 1] += line;
+    var _a, _b, _c, _d;
+    const tags = [];
+    const lines = (_d = (_c = (_b = (_a = node.leadingComments) === null || _a === void 0 ? void 0 : _a.map((comment) => {
+        const { type, value } = comment;
+        if (type == 'CommentLine')
+            return value;
+        return value.replace(/\r\n/g, '\n').split('\n');
+    })) === null || _b === void 0 ? void 0 : _b.flat()) === null || _c === void 0 ? void 0 : _c.filter((line) => line.trim().replace(/\*/g, ''))) === null || _d === void 0 ? void 0 : _d.map((line) => line.replace(/^( +)?(\*+)?( +)?/, ''));
+    for (const line of lines || []) {
+        const has = !!tags.length;
+        const isTag = line.startsWith('@');
+        if (isTag) {
+            const [key, ...values] = line.split(' ');
+            tags.push({
+                key: key.slice(1).trim(),
+                value: values.join(' ').trimStart()
+            });
+            continue;
         }
-        for (const line of lines) {
-            let value = line.trim();
-            if (!value.startsWith('@')) {
-                tags.push({ value });
-                continue;
-            }
-            const sections = value.split(' ');
-            const key = sections[0].slice(1);
-            value = sections.slice(1).join(' ').trim();
-            tags.push({ key, value });
-        }
-        node['tags'] = tags;
+        if (!has)
+            tags.push({ key: '', value: '' });
+        tags[tags.length - 1].value += line;
     }
     return tags.filter((tag) => !filter || filter === tag.key);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@htmlplus/element",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "license": "MIT",
   "author": "Masood Abdolian <m.abdolian@gmail.com>",
   "description": "Compiler of HTMLPlus",