@skaldapp/shared 1.2.59 → 1.2.61

package/dist/index.d.ts

@@ -23,7 +23,7 @@ export type TPage = FromSchema<typeof Page> & {
 };
 export declare const sharedStore: {
     $nodes: TPage[];
-    isRedirect: ({ $parent, $prev }: TPage) => unknown;
+    isRedirect: (branch: TPage[]) => unknown;
     kvNodes: Record<string, TPage>;
     LEAD_TRAIL_SLASH_RE: RegExp;
     nodes: TPage[];

package/dist/index.js

@@ -7,7 +7,7 @@ import Credential from "./schemas/credential.js";
 import Nodes from "./schemas/nodes.js";
 import Page from "./schemas/page.js";
 dynamicDefaults.DEFAULTS["uuid"] = () => generateSlug;
-const removeHiddens = (pages) => pages.filter(({ frontmatter: { hidden }, path }) => path !== undefined && !hidden);
+const isVisible = ({ frontmatter: { hidden }, path }) => path !== undefined && !hidden;
 const esm = true, code = { esm }, coerceTypes = true, keywords = [dynamicDefaults()], removeAdditional = true, schemas = [Nodes, Page], useDefaults = true, ajv = new AJV({
     code,
     coerceTypes,
@@ -15,15 +15,18 @@ const esm = true, code = { esm }, coerceTypes = true, keywords = [dynamicDefault
     removeAdditional,
     schemas,
     useDefaults,
-}), immediate = true, isRedirect = ({ $parent, $prev }) => $parent?.frontmatter["template"] && !$prev, LEAD_TRAIL_SLASH_RE = /^\/?|\/?$/g, properties = {
+}), immediate = true, isRedirect = (branch) => ((reversedBranch) => ((i) => reversedBranch[i]?.frontmatter["template"] &&
+    !reversedBranch
+        .slice(0, i)
+        .some(({ index, siblings }) => siblings.slice(0, index).some(isVisible)))(reversedBranch.findIndex((value, index) => index && isVisible(value))))([...branch].reverse()), LEAD_TRAIL_SLASH_RE = /^\/?|\/?$/g, properties = {
     $branch: {
         get() {
-            return removeHiddens(this.branch);
+            return this.branch.filter(isVisible);
         },
     },
     $children: {
         get() {
-            return removeHiddens(this.children);
+            return this.children.filter(isVisible);
         },
     },
     $index: {
@@ -48,7 +51,7 @@ const esm = true, code = { esm }, coerceTypes = true, keywords = [dynamicDefault
     },
     $siblings: {
         get() {
-            return removeHiddens(this.siblings);
+            return this.siblings.filter(isVisible);
         },
     },
     path: {
@@ -64,12 +67,14 @@ const esm = true, code = { esm }, coerceTypes = true, keywords = [dynamicDefault
     },
     to: {
         get() {
-            const { path } = [...this.$branch].reverse().find((node) => !isRedirect(node)) ?? this;
+            const { path } = [...this.$branch]
+                .reverse()
+                .find(({ branch }) => !isRedirect(branch)) ?? this;
             return path?.replace(LEAD_TRAIL_SLASH_RE, "/");
         },
     },
 }, tree = ref([]), validate = Object.fromEntries(schemas.map(({ $id }) => [$id, ajv.getSchema($id)])), { kvNodes, nodes, ...flatJsonTree } = useFlatJsonTree(tree);
-const $nodes = computed(() => removeHiddens(nodes.value));
+const $nodes = computed(() => nodes.value.filter(isVisible));
 export const sharedStore = reactive({
     tree,
     ...flatJsonTree,

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://www.schemastore.org/package",
   "name": "@skaldapp/shared",
-  "version": "1.2.59",
+  "version": "1.2.61",
   "description": "A TypeScript library providing reactive data structures, JSON schema validation, and tree utilities for Vue-based applications in the skald ecosystem.",
   "keywords": [
     "vue",
@@ -37,7 +37,7 @@
   },
   "prettier": "@skaldapp/configs/prettierrc",
   "dependencies": {
-    "@skaldapp/flat-json-tree": "^2.2.43",
+    "@skaldapp/flat-json-tree": "^2.2.48",
     "ajv": "^8.18.0",
     "ajv-keywords": "^5.1.0",
     "json-schema-to-ts": "^3.1.1",
@@ -45,8 +45,8 @@
     "vue": "^3.5.30"
   },
   "devDependencies": {
-    "@skaldapp/configs": "^1.2.72",
+    "@skaldapp/configs": "^1.2.78",
     "@types/node": "^25.5.0",
-    "eslint": "^10.0.3"
+    "eslint": "^10.1.0"
   }
 }