@simple-reporting/base 1.0.28 → 1.0.29

package/dev/package.json

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

package/livingdocs/040.Media/010.table/table.html

@@ -1,5 +1,5 @@
 <div class="srl-table">
-  <srl-ld-table data-remove-from-xhtml="transient" data-remove-from-pdf="transient">
+  <srl-ld-table data-replace-tag="div" data-remove-from-xhtml="transient" data-remove-from-pdf="transient">
     <div ref="wrapper" class="srl-table__container" doc-include="nswow-table">
       <p class="srl-grid srl-paragraph">
         <span class="srl-grid__inner srl-paragraph__text">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simple-reporting/base",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "Manage srl templates, build and publish",
   "repository": {
     "url": "https://github.com/mmssolutionsio/simple-reporting-library"

package/plugins/viteSrlPlugin.js

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
-import { join, relative } from 'node:path/posix';
+import { join } from 'node:path/posix';
 import { execSync } from 'node:child_process';
 import folders from '../scripts/folders.js';
 import { beaver } from '../scripts/beaver.js';
@@ -77,11 +77,17 @@ function checkForUpdates() {
   try {
     if (!data.version) return;
 
+    /*
     const tag = `v${data.version.split('.')[0]}-lts`;
 
     const latest = execSync(`npm view ${packageName}@${tag} version`)
       .toString()
       .trim();
+     */
+
+    const latest = execSync(`npm view ${packageName} version`)
+      .toString()
+      .trim();
 
     if (isVersionGreater(latest, data.version)) {
       printPromptsMessage([

package/srl/.srl/composables/article.ts

@@ -1,24 +1,24 @@
 import { computed, type ComputedRef } from 'vue';
-import { useRoute } from 'vue-router';
+import { useInstance } from '#composables/instance.ts'
 import useArticles from './articles';
 
 const articles = useArticles();
+const instance = useInstance();
 
-export default function useArticle(): ComputedRef<NsWowArticle | undefined> {
-  const route = useRoute();
-  return computed<NsWowArticle | undefined>(() => {
-    const slug = route.params.slug
-      ? (route.params.slug[0] as string)
-      : undefined;
-    const article = !slug
-      ? articles.value.find((article) => article.index)
-      : articles.value.find((article) => article.slug === slug);
+const slug = computed(() => {
+  return instance.value?.config.globalProperties.$route?.params?.slug
+    ? (instance.value?.config.globalProperties.$route?.params?.slug[0] as string)
+    : undefined;
+});
 
-    if (!article) {
-      console.error(`Article not found for slug: ${route.path}`);
-      return undefined;
-    }
+const article = computed<NsWowArticle | undefined>(() => {
+  const slugValue = slug.value;
+  const a = articles.value
+  return !slugValue
+    ? a.find((article) => article.index)
+    : a.find((article) => article.slug === slugValue);
+});
 
-    return article;
-  });
+export default function useArticle(): ComputedRef<NsWowArticle | undefined> {
+  return article;
 }

package/srl/.srl/composables/articles.ts

@@ -29,11 +29,17 @@
  */
 import { computed, type ComputedRef } from 'vue';
 import useConfig from './config.ts';
+import { useInstance } from '#composables/instance.ts';
 
 const config = useConfig();
+const instance = useInstance();
+const locale = computed(() => instance.value?.config.globalProperties.$route.params.locale);
 
 const articles = computed<NsWowArticle[]>(
-  () => config.value?.articles[config.value.locale],
+  () => {
+    const lang = locale.value || config.value.locale;
+    return config.value?.articles[lang] ?? [];
+  },
 );
 
 export default function useArticles(): ComputedRef<NsWowArticle[]> {

package/srl/.srl/composables/index.ts

@@ -1,3 +1,4 @@
+import _instance from './instance';
 import _useArticle from './article';
 import _useArticles from './articles';
 import _useConfig from './config';
@@ -10,6 +11,8 @@ import _useViewPort from './viewPort';
 import _useLanguageSwitch from './languageSwitch';
 import * as cssStyles from './cssStyles.ts'
 
+export const setInstance = _instance.setInstance;
+export const useInstance = _instance.useInstance;
 export const useArticle = _useArticle;
 export const useArticles = _useArticles;
 export const useConfig = _useConfig;
@@ -24,6 +27,8 @@ export const addCssStyles = cssStyles.addCssStyles;
 export const useCssStyles = cssStyles.useCssStyles;
 
 export default {
+  setInstance,
+  useInstance,
   useArticle,
   useArticles,
   useConfig,

package/srl/.srl/composables/instance.ts

@@ -0,0 +1,13 @@
+import { ref } from 'vue';
+const app = ref();
+
+export function setInstance(instance) {
+  app.value = instance;
+}
+export function useInstance() {
+  return app;
+}
+export default {
+  setInstance,
+  useInstance,
+}

package/srl/.srl/composables/languageSwitch.ts

@@ -23,9 +23,6 @@ const languageSwitch = computed<NsWowLanguageSwitch>(() => {
       res.items.push({
         label: locale,
         href: `/${locale}`,
-        callback: () => {
-          Tr.switchLanguage(locale)
-        }
       })
     }
   }

package/srl/.srl/plugins/initProject.ts

@@ -1,8 +1,10 @@
 import { setConfig } from '#composables/config';
+import { setInstance } from '#composables/instance.ts'
 import { createApp } from 'vue';
 import { initI18n } from '@/i18n';
 import srlVuePlugin from '#plugins/vueSrlPlugin';
 import { clearPageState } from '#utils'
+import Translate from '@/i18n/translation.ts'
 
 import '#imports/app.scss';
 
@@ -10,15 +12,24 @@ import SrlPageApp from '../App.vue';
 import router from '@/router';
 
 export default async function initProject() {
+    const config = await setConfig();
     router.beforeEach((to, from, next) => {
         clearPageState();
         next();
     });
-    await setConfig();
+    router.afterEach(() => {
+        if (
+          router.currentRoute.value.params.locale
+          && config.value.locale !== router.currentRoute.value.params.locale
+        ) {
+            Translate.switchLanguage(router.currentRoute.value.params.locale as string);
+        }
+    })
     const i18n = initI18n();
     const app = (window.app = createApp(SrlPageApp));
     app.use(i18n);
     app.use(router);
     app.use(srlVuePlugin);
+    setInstance(app);
     return app;
 }

package/srl/.srl/utils/index.ts

@@ -1,5 +1,5 @@
-import { isRouterPath, isExternalPath } from './uri';
-import { camelCase } from './camelCase';
+import { isFilePath, isRouterPath, isExternalPath } from './uri';
+import { camelCase } from './string';
 import { prepareHtmlContent } from './html';
 import {
     usePageState,
@@ -15,6 +15,7 @@ import {
 } from './pageState.ts';
 
 export {
+    isFilePath,
     isRouterPath,
     isExternalPath,
     camelCase,

package/srl/.srl/utils/uri.ts

@@ -1,36 +1,47 @@
+export function isFilePath(path: string): boolean {
+  return (
+    path.endsWith('.pdf') ||
+    path.endsWith('.doc') ||
+    path.endsWith('.docx') ||
+    path.endsWith('.xls') ||
+    path.endsWith('.xlsx') ||
+    path.endsWith('.ppt') ||
+    path.endsWith('.pptx') ||
+    path.endsWith('.zip') ||
+    path.endsWith('.html') ||
+    path.endsWith('.htm') ||
+    path.endsWith('.php') ||
+    path.endsWith('.asp') ||
+    path.endsWith('.aspx') ||
+    path.endsWith('.jsp') ||
+    path.endsWith('.xml') ||
+    path.endsWith('.json') ||
+    path.endsWith('.txt') ||
+    path.endsWith('.svg') ||
+    path.endsWith('.png') ||
+    path.endsWith('.jpg') ||
+    path.endsWith('.jpeg') ||
+    path.endsWith('.gif') ||
+    path.endsWith('.webp')
+  );
+}
+
 export function isRouterPath(path: string): boolean {
   return (
-    (path.startsWith('/') || path.startsWith('./')) &&
-    !path.startsWith('//') &&
-    !path.startsWith('javascript:') &&
-    !path.endsWith('.html') &&
-    !path.endsWith('.htm') &&
-    !path.endsWith('.php') &&
-    !path.endsWith('.asp') &&
-    !path.endsWith('.aspx') &&
-    !path.endsWith('.jsp') &&
-    !path.endsWith('.xml') &&
-    !path.endsWith('.json') &&
-    !path.endsWith('.txt') &&
-    !path.endsWith('.svg') &&
-    !path.endsWith('.png') &&
-    !path.endsWith('.jpg') &&
-    !path.endsWith('.jpeg') &&
-    !path.endsWith('.gif') &&
-    !path.endsWith('.webp') &&
-    !path.endsWith('.pdf') &&
-    !path.endsWith('.doc') &&
-    !path.endsWith('.docx') &&
-    !path.endsWith('.xls') &&
-    !path.endsWith('.xlsx') &&
-    !path.endsWith('.ppt') &&
-    !path.endsWith('.pptx') &&
-    !path.endsWith('.zip')
+    (
+      (
+        path.startsWith('/') &&
+        !path.startsWith('//')
+      ) ||
+      path.startsWith('./')
+    ) &&
+    !isFilePath(path)
   );
 }
 
 export function isExternalPath(path: string): boolean {
   return (
+    isFilePath(path) ||
     path.startsWith('http') ||
     path.startsWith('//') ||
     path.startsWith('mailto') ||
@@ -49,6 +60,7 @@ export function isExternalPath(path: string): boolean {
 }
 
 export default {
+  isFilePath,
   isRouterPath,
   isExternalPath,
 };