@simple-reporting/base 1.0.10 → 1.0.12

package/dev/package.json

@@ -19,7 +19,7 @@
     "postinstall": "npx srl prepare"
   },
   "dependencies": {
-    "@simple-reporting/base": "^1.0.10",
+    "@simple-reporting/base": "^1.0.12",
     "axios": "^1.9.0",
     "chalk": "^5.4.1",
     "exceljs": "^4.4.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simple-reporting/base",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Manage srl templates, build and publish",
   "bin": {
     "srl": "cli.js"

package/scripts/doPublish.js

@@ -3,6 +3,16 @@ import { preparePublish } from './preparePublish.js';
 import { packageName } from './config.js';
 import { getPackageVersion } from './utils.js';
 
+function isVersionGreater(v1, v2) {
+  const a = v1.split('.').map(Number);
+  const b = v2.split('.').map(Number);
+  for (let i = 0; i < 3; i++) {
+    if (a[i] > b[i]) return true;
+    if (a[i] < b[i]) return false;
+  }
+  return false;
+}
+
 export async function doPublish(version = null) {
   try {
     const publishVersion = await preparePublish(version);
@@ -13,7 +23,7 @@ export async function doPublish(version = null) {
 
     const latest = await getPackageVersion(packageName);
 
-    if (publishVersion > latest) {
+    if (isVersionGreater(publishVersion, latest)) {
       await execSync(
         `npm dist-tag add ${packageName}@${publishVersion} latest`,
         {

package/srl/plugins/viteSrlPlugin.ts

@@ -24,6 +24,16 @@ function centerText(text: string): string {
   );
 }
 
+function isVersionGreater(v1, v2) {
+  const a = v1.split('.').map(Number);
+  const b = v2.split('.').map(Number);
+  for (let i = 0; i < 3; i++) {
+    if (a[i] > b[i]) return true;
+    if (a[i] < b[i]) return false;
+  }
+  return false; // gleich
+}
+
 function checkSrlVersion() {
   try {
     const pkgPath = join(folders.packagePath, 'package.json');
@@ -37,7 +47,7 @@ function checkSrlVersion() {
       .toString()
       .trim();
 
-    if (current < latest) {
+    if (isVersionGreater(latest, current)) {
       console.log('');
       console.log(chalk.bgWhiteBright(centerText('')));
       console.log(

package/srl/utils/html.ts

@@ -36,7 +36,7 @@ function replaceAccordionContainer(text: string): string {
     const innerContent = replaceAccordionContainer(text.slice(openTagRegex.lastIndex, end - 6));
 
     result += text.slice(lastIndex, start);
-    result += `<srl-note-accordion${attrs}>${innerContent}</srl-note-accordion>`;
+    result += `<srl-note-accordion v-slot="{ id, open, toggle }"${attrs}>${innerContent}</srl-note-accordion>`;
     lastIndex = end;
     openTagRegex.lastIndex = end;
   }
@@ -61,7 +61,7 @@ function replaceAccordionToggle(text: string): string {
     const innerContent = text.slice(contentStart, end);
 
     result += text.slice(lastIndex, start);
-    result += `<srl-note-accordion-toggle${attrs}>${innerContent}</srl-note-accordion-toggle>`;
+    result += `<srl-note-accordion-toggle :id="id" :open="open" :toggle="toggle"${attrs}>${innerContent}</srl-note-accordion-toggle>`;
     lastIndex = end + closeTag.length;
     openTagRegex.lastIndex = lastIndex;
   }
@@ -97,7 +97,7 @@ function replaceAccordionContent(text: string): string {
     const innerContent = replaceAccordionContent(text.slice(openTagRegex.lastIndex, end - 6));
 
     result += text.slice(lastIndex, start);
-    result += `<srl-note-accordion-content${attrs}>${innerContent}</srl-note-accordion-content>`;
+    result += `<srl-note-accordion-content :id="id" :open="open"${attrs}>${innerContent}</srl-note-accordion-content>`;
     lastIndex = end;
     openTagRegex.lastIndex = end;
   }
@@ -169,9 +169,9 @@ export function prepareHtmlContent(text: string): string {
     (_match, name, content) => `<template #${name}>${content}</template>`
   );
 
-  text = replaceAccordionContainer(text)
-  text = replaceAccordionToggle(text)
-  text = replaceAccordionContent(text)
+  text = replaceAccordionContainer(text);
+  text = replaceAccordionToggle(text);
+  text = replaceAccordionContent(text);
 
   text = text.replaceAll('../', `./`);