@simple-reporting/base 1.0.15 → 1.0.16

package/dev/package.json

@@ -19,7 +19,7 @@
     "postinstall": "srl prepare"
   },
   "dependencies": {
-    "@simple-reporting/base": "^1.0.15",
+    "@simple-reporting/base": "^1.0.16",
     "axios": "^1.12.2",
     "chalk": "^5.6.2",
     "exceljs": "^4.4.0",

package/dev/src/App.vue

@@ -1,9 +1,4 @@
 <script setup lang="ts">
-import PageHeader from '@/components/PageHeader.vue'
-import PageMain from '@/components/PageMain.vue'
-import PageFooter from '@/components/PageFooter.vue'
-import MainNavigation from '@/components/MainNavigation.vue'
-import BypassLinks from '@/components/BypassLinks.vue'
 import { useMenu } from '#composables'
 
 const mainNavigation = useMenu('menuMain')
@@ -11,9 +6,9 @@ const mainNavigation = useMenu('menuMain')
 
 <template>
   <div class="srl-page__wrap">
-    <BypassLinks />
+    <PageBypassLinks />
     <PageHeader />
-    <MainNavigation :mainNavigation="mainNavigation" />
+    <PageMainNavigation :mainNavigation="mainNavigation" />
     <PageMain :mainNavigation="mainNavigation" />
     <PageFooter />
   </div>

package/dev/src/components/{PageHeader.vue → Page/Header.vue}

@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-import NavLanguages from '@/components/NavLanguages.vue'
 import { useLocale } from '#composables'
 
 const locale = useLocale()
@@ -12,7 +11,7 @@ const locale = useLocale()
         <img class="srl-logo__img" src="@/assets/images/mms-logo-white.svg" alt="MMS Solutions" />
       </router-link>
     </div>
-    <NavLanguages />
+    <PageNavLanguages />
   </header>
 </template>
 

package/dev/src/views/ArticleView.vue

@@ -1,12 +1,11 @@
 <script setup lang="ts">
-import PrevNext from '@/components/PrevNext.vue'
 const props = defineProps<{
   mainNavigation: NsWowNavigationItem[]
 }>()
 </script>
 
 <template>
-  <PrevNext :mainNavigation="props.mainNavigation">
+  <PagePrevNext :mainNavigation="props.mainNavigation">
     <SrlArticleRoot />
-  </PrevNext>
+  </PagePrevNext>
 </template>

package/package.json

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

package/plugins/viteSrlPlugin.js

@@ -137,6 +137,7 @@ export default function viteSrlPlugin() {
       config.resolve.alias = config.resolve.alias || {};
       config.resolve.alias['~'] = folders.root;
       config.resolve.alias['@'] = folders.srlSrc;
+      config.resolve.alias['#srl'] = folders.srlRoot;
       config.resolve.alias['#components'] = folders.srlComponents;
       config.resolve.alias['#composables'] = folders.srlComposables;
       config.resolve.alias['#plugins'] = folders.srlPlugins;
@@ -199,7 +200,7 @@ export default function viteSrlPlugin() {
         }
 
         if (
-          path.includes('src/components/Srl') &&
+          path.includes('src/components/') &&
           path.endsWith('.vue')
         ) {
           triggerAction(vueComponents);
@@ -241,7 +242,7 @@ export default function viteSrlPlugin() {
         }
 
         if (
-          path.includes('src/components/Srl') &&
+          path.includes('src/components/') &&
           path.endsWith('.vue')
         ) {
           triggerAction(vueComponents);

package/scripts/build.js

@@ -243,6 +243,23 @@ async function zipApp() {
 async function zipLdd() {
   console.log("\n\nCreate zip file for LDD");
   await checkFolders();
+
+  const lddPdfDir = join(folders.srlOutput, 'ldd', 'pdf');
+
+  try {
+    const pdfDir = join(folders.srlOutput, 'pdf');
+    statSync(pdfDir);
+    await cpSync(pdfDir, lddPdfDir, { recursive: true });
+    console.log('PDF folder has been copied to ' + lddPdfDir);
+  } catch (e) {}
+
+  try {
+    const customerDir = join(folders.root, 'pdf', 'customer');
+    statSync(customerDir);
+    await cpSync(customerDir, lddPdfDir, { recursive: true });
+    console.log('Contents of pdf/customer have been copied to ' + lddPdfDir);
+  } catch (e) {}
+
   const archiver = require('archiver');
   const output = createWriteStream(join(outputPath, 'design.zip'));
   const archive = archiver('zip', {

package/scripts/ldd/mapLdd.js

@@ -184,8 +184,8 @@ async function mapComponents(lddJson) {
 
   // write async components
   const asyncComponents = [
-    `import { defineAsyncComponent } from 'vue'`,
-    `export default function asyncLdComponent(app) {`,
+    `import { defineAsyncComponent, type App } from 'vue'`,
+    `export default function asyncLdComponent(app: App): void {`,
   ];
 
   for (let i = 0; i < vueComponents.length; i++) {

package/scripts/vue/components.js

@@ -7,7 +7,6 @@ function toPascalAfterSlash(str) {
 }
 function readVueDir(entryPath, prefix = '') {
   const componentsPath = join(entryPath, 'components');
-  const baseDir = join(componentsPath, 'Srl');
   const result = {};
 
   function search(dir) {
@@ -29,47 +28,47 @@ function readVueDir(entryPath, prefix = '') {
     }
   }
 
-  if (existsSync(baseDir) && statSync(baseDir).isDirectory()) {
-    search(baseDir);
+  if (existsSync(componentsPath) && statSync(componentsPath).isDirectory()) {
+    search(componentsPath);
   }
 
   return result;
 }
 
 export async function vueComponents() {
-  const srlComponents = readVueDir(folders.srlRoot, '#');
   const appComponents = readVueDir(folders.srlSrc, '@/');
+  const srlComponents = readVueDir(folders.srlRoot, '#');
 
   const components = []
   const types = []
 
-  for (const [name, info] of Object.entries(srlComponents)) {
-    const componentPath = appComponents[name] ? appComponents[name].component : info.component
-    const typePath = appComponents[name] ? appComponents[name].type : info.type
+  for (const [name, info] of Object.entries(appComponents)) {
     components.push(
-      `app.component('${name}', defineAsyncComponent(() => import('${componentPath}')));`,
+      `app.component('${name}', defineAsyncComponent(() => import('${info.component}')));`,
     )
     types.push({
       name: name,
-      type: `  type ${name} = typeof import('${typePath}')['default'];`,
+      type: `  type ${name} = typeof import('${info.type}')['default'];`,
     })
   }
 
-  for (const [name, info] of Object.entries(appComponents)) {
-    if (!srlComponents[name]) {
+  for (const [name, info] of Object.entries(srlComponents)) {
+    const componentPath = appComponents[name] ? appComponents[name].component : info.component
+    const typePath = appComponents[name] ? appComponents[name].type : info.type
+    if (!appComponents[name]) {
       components.push(
-        `app.component('${name}', defineAsyncComponent(() => import('${info.component}')));`,
+        `app.component('${name}', defineAsyncComponent(() => import('${componentPath}')));`,
       )
       types.push({
         name: name,
-        type: `  type ${name} = typeof import('${info.type}')['default'];`,
+        type: `  type ${name} = typeof import('${typePath}')['default'];`,
       })
     }
   }
 
   writeFileSync(join(folders.srlPlugins, 'asyncSrlComponents.ts'),
-`import { defineAsyncComponent } from 'vue';
-export default function asyncSrlComponents(app) {
+`import { defineAsyncComponent, type App } from 'vue';
+export default function asyncSrlComponents(app: App): void {
   ${components.join('\n  ')}
 }
 `, 'utf8');

package/srl/components/Srl/Menu/Item.vue

@@ -167,11 +167,12 @@ const classListItem = computed(() => {
 </script>
 
 <template>
-  <li v-if="!item.children && props.item.href" :class="classListLi">
+  <li v-if="!item.children && props.item.href" role="none" :class="classListLi">
     <router-link
       v-if="!external"
       ref="$el"
       tabindex="-1"
+      role="menuitem"
       :to="props.item.href"
       :class="classListItem"
       :title="props.item.title ?? props.item.label"
@@ -195,6 +196,7 @@ const classListItem = computed(() => {
       v-else
       tabindex="-1"
       ref="$el"
+      role="menuitem"
       :href="props.item.href"
       :title="props.item.title ?? props.item.label"
       :class="classListItem"
@@ -217,11 +219,12 @@ const classListItem = computed(() => {
       />
     </a>
   </li>
-  <li v-else-if="props.item.callback" :class="classListLi">
+  <li v-else-if="props.item.callback" role="none" :class="classListLi">
     <button
       type="button"
       ref="$el"
       tabindex="-1"
+      role="menuitem"
       :class="classListItem"
       :title="props.item.title ?? props.item.label"
       :aria-label="props.item.icon ? props.item.title ?? props.item.label : undefined"
@@ -242,11 +245,12 @@ const classListItem = computed(() => {
       />
     </button>
   </li>
-  <li v-else :class="classListLi">
+  <li v-else :class="classListLi" role="none">
     <button
       type="button"
       ref="$el"
       tabindex="-1"
+      role="menuitem"
       :aria-haspopup="props.item.children ? 'true' : 'false'"
       :aria-expanded="opened"
       :aria-controls="`${props.name}-${id}`"

package/srl/components/Srl/Menu.vue

@@ -167,7 +167,7 @@ function routerChange() {
 }
 
 function closeAll(keep?: number | string) {
-  items.value.forEach((item: typeof MenuItem, index: number) => {
+  items.value.forEach((item: SrlMenuItem, index: number) => {
     if (keep !== index) item.closeItem()
   })
 }

package/srl/composables/config.ts

@@ -61,11 +61,6 @@ async function setConfig(): Promise<Ref<NsWowConfig>> {
   await loadSettings();
   await loadTranslations();
 
-  const defaultMessages = import.meta.glob('@/locales/*.json', {
-    eager: true,
-    import: 'default',
-  });
-
   for (const locale of config.value.settings.languages) {
     await loadRouting(locale);
     await loadDownloads(locale);
@@ -97,7 +92,8 @@ async function loadSettings() {
     config.value.locale = data.defaultLanguage;
     document.documentElement.lang = data.defaultLanguage;
   } catch (e) {
-    errorLog(`"${file}" could not be loaded.`, e);
+    const o = e as Error;
+    errorLog(`"${file}" could not be loaded.`, o);
   }
 }
 
@@ -105,10 +101,10 @@ async function loadTranslations() {
   const file = `./json/translations_hosting.json`;
   try {
     const response: Response = await fetch(file);
-    const data: NsWowTranslations = await response.json();
-    config.value.translations = data;
+    config.value.translations = await response.json() as NsWowTranslations;
   } catch (e) {
-    errorLog(`"${file}" could not be loaded.`, e);
+    const o = e as Error;
+    errorLog(`"${file}" could not be loaded.`, o);
   }
 }
 
@@ -120,19 +116,22 @@ async function loadRouting(locale: string) {
     config.value.articles[locale] = routing.pages;
     config.value.menus[locale] = routing.menu;
   } catch (e) {
-    errorLog(`"${file}" could not be loaded.`, e);
+    const o = e as Error;
+    errorLog(`"${file}" could not be loaded.`, o);
   }
 }
 
 async function loadDownloads(locale: string) {
-  config.value.downloads[locale] = {};
+  config.value.downloads[locale] = {
+    structure: [],
+  };
   const file: string = `./downloads/downloads_${locale}.json`;
   try {
     const response: Response = await fetch(file);
-    const data = await response.json();
-    config.value.downloads[locale] = data;
+    config.value.downloads[locale] = await response.json();
   } catch (e) {
-    errorLog(`"${file}" could not be loaded.`, e);
+    const o = e as Error;
+    errorLog(`"${file}" could not be loaded.`, o);
   }
 }
 

package/srl/composables/cssStyles.ts

@@ -6,7 +6,7 @@ export function addCssStyles(cssString: string): void {
   cssStyles.value.includes(cssString) || cssStyles.value.push(cssString);
 }
 
-export function useCssStyles(): string[] {
+export function useCssStyles(): typeof cssStyles {
   return cssStyles;
 }
 

package/srl/composables/menu.ts

@@ -35,8 +35,12 @@ import {
 import { isRouterPath } from '#utils/uri';
 import useConfig from './config';
 
+type Menus = {
+  [key: string]: ComputedRef<NsWowNavigationItem[]>;
+}
+
 const config = useConfig();
-const menus = {};
+const menus: Menus = {};
 
 function buildNav(
   item: NsWowMenu,

package/srl/composables/viewPort.ts

@@ -50,17 +50,18 @@ type ViewPorts = {
 };
 
 const { breakpoints } = grid;
+const bp = breakpoints as Breakpoints;
 const innerWidth = ref<number>(window.innerWidth);
 
 const viewPorts = computed<ViewPorts>(() => {
   const res: ViewPorts = {
-    breakPoints: breakpoints,
+    breakPoints: bp,
     innerWidth: window.innerWidth,
     viewPort: null,
   };
 
-  for (const key in breakpoints) {
-    if (breakpoints[key] <= innerWidth.value) {
+  for (const key in bp) {
+    if (bp[key] <= innerWidth.value) {
       res.viewPort = key;
     } else {
       break;

package/srl/plugins/initProject.ts

@@ -5,7 +5,7 @@ import srlVuePlugin from '#plugins/vueSrlPlugin';
 
 import '#imports/app.scss';
 
-import SrlPageApp from '#components/App.vue';
+import SrlPageApp from '../App.vue';
 import router from '@/router';
 
 export default async function initProject() {

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 v-slot="{ accordion }"${attrs}>${innerContent}</srl-note-accordion>`;
+    result += `<srl-category-accordion v-slot="{ accordion }"${attrs}>${innerContent}</srl-category-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 :accordion="accordion"${attrs}>${innerContent}</srl-note-accordion-toggle>`;
+    result += `<srl-category-accordion-toggle :accordion="accordion"${attrs}>${innerContent}</srl-category-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 :accordion="accordion"${attrs}>${innerContent}</srl-note-accordion-content>`;
+    result += `<srl-category-accordion-content :accordion="accordion"${attrs}>${innerContent}</srl-category-accordion-content>`;
     lastIndex = end;
     openTagRegex.lastIndex = end;
   }