@simple-reporting/base 1.0.18 → 1.0.20

package/dev/package.json

@@ -19,7 +19,7 @@
     "postinstall": "srl prepare"
   },
   "dependencies": {
-    "@simple-reporting/base": "^1.0.18",
+    "@simple-reporting/base": "^1.0.20",
     "axios": "^1.12.2",
     "chalk": "^5.6.2",
     "exceljs": "^4.4.0",
@@ -29,7 +29,6 @@
     "node-html-parser": "^7.0.1",
     "pinia": "^2.3.1",
     "scrollmonitor": "^1.2.11",
-    "standard-scss": "github:mms-neidhartschoen/nsfd_standard-scss",
     "vite-plugin-pwa": "^0.21.2",
     "vue": "^3.5.13",
     "vue-i18n": "^11.1.12",

package/package.json

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

package/scripts/beaver.js

@@ -46,7 +46,7 @@ function mapValues(values) {
  * @returns {string} - The generated SCSS code.
  */
 function writeTypographyScss(typography) {
-  let r = [`@use "config";`, `@forward "../scss/typography";`];
+  let r = [`@use "config";`, `@forward "@simple-reporting/base/scss/typography";`];
   if (typography) {
     if (typography.typography) {
       let o = [];
@@ -57,7 +57,7 @@ function writeTypographyScss(typography) {
         o.push(`}\n`);
       }
       if (o.length) {
-        r.push(`@use "../scss/typography";\n`);
+        r.push(`@use "@simple-reporting/base/scss/typography";\n`);
         r.push(o.join(`\n`));
       }
     }
@@ -72,7 +72,7 @@ function writeTypographyScss(typography) {
  * @returns {string} - The SCSS code for importing and forwarding colors.
  */
 function writeColorsScss(colors) {
-  let r = [`@use "config";`, `@forward "../scss/colors";`];
+  let r = [`@use "config";`, `@forward "@simple-reporting/base/scss/colors";`];
   if (colors) {
     if (colors.colors) {
       let o = [];
@@ -84,7 +84,7 @@ function writeColorsScss(colors) {
       }
 
       if (o.length) {
-        r.push(`@use "../scss/colors";\n`);
+        r.push(`@use "@simple-reporting/base/scss/colors";\n`);
         r.push(o.join(`\n`));
       }
     }
@@ -263,7 +263,7 @@ async function beaver(verbose = 0) {
     if (typeof map[file] !== 'undefined') {
       const o = [];
       o.push(
-        `@use "../scss/${file}/variables.scss" as ${file}Variables with (`,
+        `@use "@simple-reporting/base/scss/${file}/variables.scss" as ${file}Variables with (`,
       );
       let v = [];
       for (const variable in map[file]) {

package/scripts/build.js

@@ -448,10 +448,10 @@ async function buildLdd(version) {
                 input: importFile,
                 output: {
                   assetFileNames: (assetInfo) => {
-                    if (/woff|woff2|ttf|otf|svg|jpe?g|png|gif|webp|avif|bmp|ico|apng/.test(assetInfo.name)) {
-                      return '[name]-[hash][extname]';
+                    if (/css/.test(assetInfo.name)) {
+                      return '[name][extname]';
                     }
-                    return '[name][extname]';
+                    return '[name]-[hash][extname]';
                   }
                 }
               }
@@ -478,7 +478,19 @@ async function buildLdd(version) {
 }
 
 async function buildPdfCustomer(customer) {
-  const customerDir = join(folders.root, 'pdf', 'customers', customer);
+
+  const customersDir = join(folders.root, 'pdf', 'customers');
+
+  if (customer === 'all') {
+    const customers = readdirSync(customersDir);
+    for (let i = 0; i < customers.length; i++) {
+      await buildPdfCustomer(customers[i]);
+    }
+    return true;
+  }
+
+  const customerDir = join(customersDir, customer);
+  const customerName = customer.split('-')[0];
 
   try {
     statSync(customerDir);
@@ -502,7 +514,7 @@ async function buildPdfCustomer(customer) {
 
   try {
     statSync(customerDir);
-    const customerTarget = join(lddPdfDir, customer);
+    const customerTarget = join(lddPdfDir, customerName);
     mkdirSync(customerTarget, { recursive: true });
     const jsReferences = [
       'pdf.js'
@@ -514,6 +526,7 @@ async function buildPdfCustomer(customer) {
     try {
       const tsPath = join(customerDir, 'custom.ts');
       statSync(tsPath);
+
       const config = {
         css: {
           preprocessorOptions: {
@@ -524,12 +537,22 @@ async function buildPdfCustomer(customer) {
         },
         base: './',
         build: {
+          assetsInlineLimit: 0,
           outDir: customerTarget,
-          lib: {
-            fileName: 'custom',
-            entry: tsPath,
-            formats: ['es'],
-          },
+          assetsDir: '',
+          rollupOptions: {
+            input: tsPath,
+            output: {
+              entryFileNames: '[name].js',
+              chunkFileNames: '[name].js',
+              assetFileNames: (assetInfo) => {
+                if (/css/.test(assetInfo.name)) {
+                  return '[name][extname]';
+                }
+                return 'assets/[name]-[hash][extname]';
+              }
+            }
+          }
         },
         publicDir: false,
       };
@@ -862,32 +885,32 @@ async function mapScss() {
       join(folders.srlImports, 'app.scss'),
       `@use ` +
         output.app.join(';\n@use ') +
-        `;\n@use "../scss/core-styles.scss" as *;\n`,
+        `;\n@use "@simple-reporting/base/scss/core-styles.scss" as *;\n`,
     );
     await writeFileSync(
       join(folders.srlImports, 'ldd.scss'),
       `@use ` +
         output.ldd.join(';\n@use ') +
-        `;\n@use "../scss/core-styles.scss" as *;\n`,
+        `;\n@use "@simple-reporting/base/scss/core-styles.scss" as *;\n`,
     );
     await writeFileSync(
       join(folders.srlImports, 'pdf.scss'),
       `@use ` +
         output.pdf.join(';\n@use ') +
-        `;\n@use "../scss/core-styles.scss" as *;\n`,
+        `;\n@use "@simple-reporting/base/scss/core-styles.scss" as *;\n`,
     );
     await writeFileSync(
       join(folders.srlImports, 'word.scss'),
       `@use ` +
         output.word.join(';\n@use ') +
-        `;\n@use "../scss/core-styles.scss" as *;\n`,
+        `;\n@use "@simple-reporting/base/scss/core-styles.scss" as *;\n`,
     );
 
     await writeFileSync(
       join(folders.srlImports, 'xbrl.scss'),
       output.xbrl.length
         ? `@use ` + output.xbrl.join(';\n@use ')
-        : '' + `;\n@use "../scss/xbrl-core-styles.scss" as *;\n`,
+        : '' + `;\n@use "@simple-reporting/base/scss/xbrl-core-styles.scss" as *;\n`,
     );
 
     return true;

package/scripts/folders.js

@@ -7,7 +7,7 @@ export const packagePath = join(root, 'node_modules', packageName);
 export const packageSrl = join(packagePath, 'srl');
 export const packageLd = join(packagePath, 'livingdocs');
 export const srlRoot = join(root, '.srl');
-export const srlSystem = join(srlRoot, 'srl');
+export const srlSystem = join(root, 'srl');
 export const srlComponents = join(srlRoot, 'components');
 export const srlComposables = join(srlRoot, 'composables');
 export const srlUtils = join(srlRoot, 'utils');

package/scripts/prepare.js

@@ -1,11 +1,23 @@
 import folders from './folders.js';
 import fs from 'fs';
+import { join } from 'path/posix';
 
 async function prepare() {
   if (fs.existsSync(folders.srlRoot)) {
     await fs.rmSync(folders.srlRoot, { recursive: true, force: true });
   }
-  await fs.cpSync(folders.packageSrl, folders.srlRoot, { recursive: true });
+  const srlFolders = fs.readdirSync(folders.packageSrl, { withFileTypes: true });
+  for (const srlFolder of srlFolders) {
+    const srcPath = join(folders.packageSrl, srlFolder.name);
+    const destPath = join(folders.root, srlFolder.name);
+    fs.cpSync(srcPath, destPath, { recursive: true });
+  }
+  const srlIgnoresFiles = fs.readdirSync(join(folders.packageSrl, 'srl'), { withFileTypes: true });
+  const srlIgnoreContent = [];
+  for (const srlIgnoreFile of srlIgnoresFiles) {
+    srlIgnoreContent.push(`/${srlIgnoreFile.name}`);
+  }
+  fs.writeFileSync(join(folders.root, 'srl', '.gitignore'), srlIgnoreContent.join('\n'));
 }
 
 export default prepare;

package/srl/{tsconfig.srl.json → .srl/tsconfig.srl.json}

@@ -79,10 +79,10 @@
         "../src/assets/*"
       ],
       "srl": [
-        "./srl"
+        "../srl"
       ],
       "srl/*": [
-        "./srl/*"
+        "../srl/*"
       ]
     }
   }

package/srl/.srl/utils/html.ts

@@ -0,0 +1,85 @@
+import { isRouterPath } from '#utils/uri.ts';
+import { useArticles, useLocale, addCssStyles } from '#composables';
+
+type AttrObj = { [key: string]: string | null };
+function attributesToString(attributes: Record<string, string | null>): string {
+  return Object.entries(attributes)
+    .map(([key, value]) => (value !== null ? `${key}="${value}"` : key))
+    .join(' ');
+}
+
+export function prepareHtmlContent(text: string): string {
+  const articles = useArticles();
+  const locale = useLocale();
+
+  const regex = /<a\s+([^>]+)>(.*?)<\/a>/gis;
+  text = text.replace(regex, (match, attrString, innerText) => {
+
+    const attrObj: AttrObj = {};
+    attrString.replace(/([a-zA-Z0-9\-_]+)(?:="([^"]*)")?/g, (m, key: string, value: string | null) => {
+      attrObj[key] = value || null;
+      return m;
+    });
+
+    if (
+      attrObj['data-note-target'] &&
+      attrObj['data-note-target'] === 'popup'
+    ) {
+      attrObj.uuid = attrObj.href;
+      delete attrObj.href;
+      const attrs = attributesToString(attrObj);
+      return `<srl-article-dialog-button ${attrs}>${innerText}</srl-article-dialog-button>`;
+    }
+
+    if (attrObj.href) {
+      const arrLink = attrObj.href.split('#');
+
+      if (isRouterPath(arrLink[0])) {
+        delete attrObj.href;
+        if (arrLink[0].startsWith('./')) {
+          arrLink[0] = arrLink[0].substring(1);
+        }
+        if (arrLink[0] === `/${locale.value}/home`) {
+          arrLink[0] = `/${locale.value}`;
+        }
+        attrObj.to = arrLink[0];
+        if (arrLink[1]) {
+          attrObj.to += `#${arrLink[1]}`;
+        }
+        const attrs = attributesToString(attrObj);
+        return `<router-link ${attrs}>${innerText}</router-link>`;
+      }
+
+      const a = articles.value.find((i) => i.uuid === arrLink[0]);
+      if (a) {
+        delete attrObj.href;
+        attrObj.to = a.index
+          ? `/${locale.value}`
+          : `/${locale.value}/${a.slug}`;
+        if (arrLink[1]) {
+          attrObj.to += `#${arrLink[1]}`;
+        }
+        const attrs = attributesToString(attrObj);
+        return `<router-link ${attrs}>${innerText}</router-link>`;
+      }
+    }
+
+    return match;
+  });
+
+  text = text.replace(
+    /<template-([a-z]+)>([\s\S]*?)<\/template-\1>/g,
+    (_match, name, content) => `<template #${name}>${content}</template>`
+  );
+
+  text = text.replace(/<style[^>]*>([\s\S]*?)<\/style>/gi, (match, p1) => {
+    addCssStyles(p1);
+    return '';
+  });
+
+  return text;
+}
+
+export default {
+  prepareHtmlContent,
+};

package/srl/srl/colors.scss

@@ -1,3 +1,3 @@
 @use 'config';
-@forward '../scss/colors';
-@use '../scss/colors';
+@forward '@simple-reporting/base/scss/colors';
+@use '@simple-reporting/base/scss/colors';

package/srl/srl/config.scss

@@ -1,7 +1,7 @@
-@use '../scss/system/variables' as systemVariables;
-@use '../scss/meta/variables' as metaVariables;
-@use '../scss/grid/variables' as gridVariables;
-@use '../scss/colors/variables' as colorsVariables;
-@use '../scss/typography/variables' as typographyVariables;
-@use '../scss/spacer/variables' as spacerVariables;
-@use '../scss/helpers/variables' as helpersVariables;
+@use '@simple-reporting/base/scss/system/variables' as systemVariables;
+@use '@simple-reporting/base/scss/meta/variables' as metaVariables;
+@use '@simple-reporting/base/scss/grid/variables' as gridVariables;
+@use '@simple-reporting/base/scss/colors/variables' as colorsVariables;
+@use '@simple-reporting/base/scss/typography/variables' as typographyVariables;
+@use '@simple-reporting/base/scss/spacer/variables' as spacerVariables;
+@use '@simple-reporting/base/scss/helpers/variables' as helpersVariables;

package/srl/srl/core-styles.scss

@@ -1,2 +1,2 @@
 @use 'config';
-@forward '../scss/core-styles';
+@forward '@simple-reporting/base/scss/core-styles';

package/srl/srl/fonts.scss

@@ -1,2 +1,2 @@
 @use 'config';
-@forward '../scss/fonts';
+@forward '@simple-reporting/base/scss/fonts';

package/srl/srl/grid.scss

@@ -1,2 +1,2 @@
 @use 'config';
-@forward '../scss/grid';
+@forward '@simple-reporting/base/scss/grid';

package/srl/srl/helpers.scss

@@ -1,2 +1,2 @@
 @use 'config';
-@forward '../scss/helpers';
+@forward '@simple-reporting/base/scss/helpers';

package/srl/srl/index.scss

@@ -1,9 +1,9 @@
-@use 'config';
-@forward 'system' as system-*;
-@forward 'fonts' as fonts-*;
-@forward 'grid' as grid-*;
-@forward 'colors' as colors-*;
-@forward 'typography' as typography-*;
-@forward 'helpers' as helpers-*;
-@forward 'spacer' as spacer-*;
-@forward 'meta';
+@use './config';
+@forward './system' as system-*;
+@forward './fonts' as fonts-*;
+@forward './grid' as grid-*;
+@forward './colors' as colors-*;
+@forward './typography' as typography-*;
+@forward './helpers' as helpers-*;
+@forward './spacer' as spacer-*;
+@forward './meta';

package/srl/srl/meta.scss

@@ -1,2 +1,2 @@
 @use 'config';
-@forward '../scss/meta';
+@forward '@simple-reporting/base/scss/meta';

package/srl/srl/pdf.scss

@@ -1,2 +1,2 @@
 @use 'config';
-@forward '../scss/pdf';
+@forward '@simple-reporting/base/scss/pdf';

package/srl/srl/spacer.scss

@@ -1,2 +1,2 @@
 @use 'config';
-@forward '../scss/spacer';
+@forward '@simple-reporting/base/scss/spacer';

package/srl/srl/system.scss

@@ -1,2 +1,2 @@
 @use 'config';
-@forward '../scss/system';
+@forward '@simple-reporting/base/scss/system';

package/srl/srl/typography.scss

@@ -1,3 +1,3 @@
 @use 'config';
-@forward '../scss/typography';
-@use '../scss/typography';
+@forward '@simple-reporting/base/scss/typography';
+@use '@simple-reporting/base/scss/typography';

package/srl/utils/html.ts

@@ -1,188 +0,0 @@
-import { isRouterPath } from '#utils/uri.ts';
-import { useArticles, useLocale, addCssStyles } from '#composables';
-
-type AttrObj = { [key: string]: string | null };
-function attributesToString(attributes: Record<string, string | null>): string {
-  return Object.entries(attributes)
-    .map(([key, value]) => (value !== null ? `${key}="${value}"` : key))
-    .join(' ');
-}
-
-function replaceAccordionContainer(text: string): string {
-  const openTagRegex = /<div([^>]*\bclass\s*=\s*["']lc-accordion\s[^"']*["'][^>]*)>/gi;
-  let result = '';
-  let lastIndex = 0;
-  let match;
-
-  while ((match = openTagRegex.exec(text)) !== null) {
-    const start = match.index;
-    const attrs = match[1];
-    let depth = 1;
-    let end = openTagRegex.lastIndex;
-
-    while (depth > 0) {
-      const nextOpen = text.indexOf('<div', end);
-      const nextClose = text.indexOf('</div>', end);
-      if (nextClose === -1) break;
-      if (nextOpen !== -1 && nextOpen < nextClose) {
-        depth++;
-        end = nextOpen + 4;
-      } else {
-        depth--;
-        end = nextClose + 6;
-      }
-    }
-
-    const innerContent = replaceAccordionContainer(text.slice(openTagRegex.lastIndex, end - 6));
-
-    result += text.slice(lastIndex, start);
-    result += `<srl-category-accordion v-slot="{ accordion }"${attrs}>${innerContent}</srl-category-accordion>`;
-    lastIndex = end;
-    openTagRegex.lastIndex = end;
-  }
-  result += text.slice(lastIndex);
-  return result;
-}
-
-function replaceAccordionToggle(text: string): string {
-  const openTagRegex = /<div([^>]*\bclass\s*=\s*["']lc-accordion__head\s[^"']*["'][^>]*)>/gi;
-  let result = '';
-  let lastIndex = 0;
-  let match;
-
-  while ((match = openTagRegex.exec(text)) !== null) {
-    const start = match.index;
-    const attrs = match[1];
-    const contentStart = openTagRegex.lastIndex;
-    const closeTag = '</div>';
-    const end = text.indexOf(closeTag, contentStart);
-    if (end === -1) break;
-
-    const innerContent = text.slice(contentStart, end);
-
-    result += text.slice(lastIndex, start);
-    result += `<srl-category-accordion-toggle :accordion="accordion"${attrs}>${innerContent}</srl-category-accordion-toggle>`;
-    lastIndex = end + closeTag.length;
-    openTagRegex.lastIndex = lastIndex;
-  }
-  result += text.slice(lastIndex);
-  return result;
-}
-
-function replaceAccordionContent(text: string): string {
-  const openTagRegex = /<div([^>]*\bclass\s*=\s*["']lc-accordion__content(?:\s[^"']*)?["'][^>]*)>/gi;
-  let result = '';
-  let lastIndex = 0;
-  let match;
-
-  while ((match = openTagRegex.exec(text)) !== null) {
-    const start = match.index;
-    const attrs = match[1];
-    let depth = 1;
-    let end = openTagRegex.lastIndex;
-
-    while (depth > 0) {
-      const nextOpen = text.indexOf('<div', end);
-      const nextClose = text.indexOf('</div>', end);
-      if (nextClose === -1) break;
-      if (nextOpen !== -1 && nextOpen < nextClose) {
-        depth++;
-        end = nextOpen + 4;
-      } else {
-        depth--;
-        end = nextClose + 6;
-      }
-    }
-
-    const innerContent = replaceAccordionContent(text.slice(openTagRegex.lastIndex, end - 6));
-
-    result += text.slice(lastIndex, start);
-    result += `<srl-category-accordion-content :accordion="accordion"${attrs}>${innerContent}</srl-category-accordion-content>`;
-    lastIndex = end;
-    openTagRegex.lastIndex = end;
-  }
-  result += text.slice(lastIndex);
-  return result;
-}
-
-export function prepareHtmlContent(text: string): string {
-  const articles = useArticles();
-  const locale = useLocale();
-
-  const regex = /<a\s+([^>]+)>(.*?)<\/a>/gis;
-  text = text.replace(regex, (match, attrString, innerText) => {
-    // Attribute in ein Array umwandeln
-    const attrObj: AttrObj = {};
-    attrString.replace(/([a-zA-Z0-9\-_]+)(?:="([^"]*)")?/g, (m, key: string, value: string | null) => {
-      attrObj[key] = value || null;
-      return m;
-    });
-
-    if (
-      attrObj['data-note-target'] &&
-      attrObj['data-note-target'] === 'popup'
-    ) {
-      attrObj.uuid = attrObj.href;
-      delete attrObj.href;
-      const attrs = attributesToString(attrObj);
-      return `<srl-article-dialog-button ${attrs}>${innerText}</srl-article-dialog-button>`;
-    }
-
-    if (attrObj.href) {
-      const arrLink = attrObj.href.split('#');
-
-      if (isRouterPath(arrLink[0])) {
-        delete attrObj.href;
-        if (arrLink[0].startsWith('./')) {
-          arrLink[0] = arrLink[0].substring(1);
-        }
-        if (arrLink[0] === `/${locale.value}/home`) {
-          arrLink[0] = `/${locale.value}`;
-        }
-        attrObj.to = arrLink[0];
-        if (arrLink[1]) {
-          attrObj.to += `#${arrLink[1]}`;
-        }
-        const attrs = attributesToString(attrObj);
-        return `<router-link ${attrs}>${innerText}</router-link>`;
-      }
-
-      const a = articles.value.find((i) => i.uuid === arrLink[0]);
-      if (a) {
-        delete attrObj.href;
-        attrObj.to = a.index
-          ? `/${locale.value}`
-          : `/${locale.value}/${a.slug}`;
-        if (arrLink[1]) {
-          attrObj.to += `#${arrLink[1]}`;
-        }
-        const attrs = attributesToString(attrObj);
-        return `<router-link ${attrs}>${innerText}</router-link>`;
-      }
-    }
-
-    return match;
-  });
-
-  text = text.replace(
-    /<template-([a-z]+)>([\s\S]*?)<\/template-\1>/g,
-    (_match, name, content) => `<template #${name}>${content}</template>`
-  );
-
-  text = replaceAccordionContainer(text);
-  text = replaceAccordionToggle(text);
-  text = replaceAccordionContent(text);
-
-  text = text.replaceAll('../', `./`);
-
-  text = text.replace(/<style[^>]*>([\s\S]*?)<\/style>/gi, (match, p1) => {
-    addCssStyles(p1);
-    return '';
-  });
-
-  return text;
-}
-
-export default {
-  prepareHtmlContent,
-};