@websolutespa/bom-mixer-store 1.1.1 → 1.2.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-mixer-store
 
+## 1.2.1
+
+### Patch Changes
+
+- Fixing: MockMenuService collectPages.
+
+## 1.2.0
+
+### Minor Changes
+
+- Updating: next 13.
+
 ## 1.1.1
 
 ### Patch Changes

package/dist/index.js

@@ -271,8 +271,7 @@ var COLLECTIONS = [...ENV_COLLECTIONS, ...KNOWN_COLLECTIONS];
 var import_bom_core7 = require("@websolutespa/bom-core");
 
 // src/fs/fs.service.ts
-var path = require("path");
-var fs = require("fs");
+var fs = __toESM(require("fs"));
 async function fsRead(pathname, option) {
   try {
     const data = await fs.promises.readFile(pathname, option?.encoding || "utf8");
@@ -696,7 +695,7 @@ async function collectPages(store, items, params = {}) {
   }
   for (const item of items) {
     if (item.type === "page" && typeof item.page.value === "number" && store[item.page.relationTo] !== void 0) {
-      const value = await store[item.page.relationTo].findOne(item.page.value, params);
+      const value = await store[item.page.relationTo].findOne(item.page.value, { ...params });
       if (value) {
         item.page.value = value;
       }
@@ -971,8 +970,8 @@ function getMockStoreFromData_(data) {
 }
 async function getStoreData_() {
   if (import_bom_core7.isDevelopment) {
-    const path2 = require("path");
-    const pathname = path2.join(process.cwd(), ".mixer", "store.json");
+    const path = require("path");
+    const pathname = path.join(process.cwd(), ".mixer", "store.json");
     return await fsReadJson(pathname) || {};
   } else {
     const store = process.env.STORE_ || {};

package/dist/index.mjs

@@ -190,8 +190,7 @@ var COLLECTIONS = [...ENV_COLLECTIONS, ...KNOWN_COLLECTIONS];
 import { isDevelopment } from "@websolutespa/bom-core";
 
 // src/fs/fs.service.ts
-var path = __require("path");
-var fs = __require("fs");
+import * as fs from "fs";
 async function fsRead(pathname, option) {
   try {
     const data = await fs.promises.readFile(pathname, option?.encoding || "utf8");
@@ -617,7 +616,7 @@ async function collectPages(store, items, params = {}) {
   }
   for (const item of items) {
     if (item.type === "page" && typeof item.page.value === "number" && store[item.page.relationTo] !== void 0) {
-      const value = await store[item.page.relationTo].findOne(item.page.value, params);
+      const value = await store[item.page.relationTo].findOne(item.page.value, { ...params });
       if (value) {
         item.page.value = value;
       }
@@ -892,8 +891,8 @@ function getMockStoreFromData_(data) {
 }
 async function getStoreData_() {
   if (isDevelopment) {
-    const path2 = __require("path");
-    const pathname = path2.join(process.cwd(), ".mixer", "store.json");
+    const path = __require("path");
+    const pathname = path.join(process.cwd(), ".mixer", "store.json");
     return await fsReadJson(pathname) || {};
   } else {
     const store = process.env.STORE_ || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-store",
-  "version": "1.1.1",
+  "version": "1.2.1",
   "description": "Mixer Store module of the BOM Repository",
   "keywords": [
     "bom",
@@ -28,19 +28,19 @@
   "peerDependencies": {
     "@websolutespa/bom-core": "*",
     "iron-session": ">= 6.2.1",
-    "next": ">= 12.3.2"
+    "next": ">= 13.4.19"
   },
   "devDependencies": {
     "@types/mime": "^3.0.1",
     "@websolutespa/bom-cli": "*",
     "@websolutespa/test": "*",
     "@websolutespa/tsconfig": "*",
-    "eslint": "^8.36.0",
+    "eslint": "^8.46.0",
     "eslint-config-websolute": "*",
     "npm-run-all": "^4.1.5",
     "ts-node": "^10.9.1",
     "tsup": "^6.7.0",
-    "typescript": "^4.8.4"
+    "typescript": "^5.1.6"
   },
   "publishConfig": {
     "access": "public"

package/src/fs/fs.service.ts

@@ -1,15 +1,17 @@
 import { Json } from '@websolutespa/bom-core';
+import * as fs from 'fs';
+import * as path from 'path';
 
-/* eslint-disable @typescript-eslint/no-var-requires */
-const path = require('path');
-const fs = require('fs');
-
-export type TFsReadOption = {
+export type fsReadOptions = {
   encoding?: null | undefined;
   flag?: number | string | undefined;
   signal?: AbortSignal | undefined;
 };
 
+export type fsWatchOptions = (fs.WatchOptions & { encoding: 'buffer' }) | 'buffer';
+export type fsWatchFileOptions = (fs.WatchFileOptions & { bigint?: false });
+export type fsWriteFileOptions = (fs.ObjectEncodingOptions & { mode?: fs.Mode; flag?: fs.OpenMode }) | BufferEncoding | null;
+
 export async function fsExists(pathname: string): Promise<boolean> {
   try {
     await fs.promises.access(pathname);
@@ -19,7 +21,7 @@ export async function fsExists(pathname: string): Promise<boolean> {
   }
 }
 
-export async function fsRead(pathname: string, option?: TFsReadOption): Promise<string | undefined> {
+export async function fsRead(pathname: string, option?: fsReadOptions): Promise<string | undefined> {
   try {
     const data = await fs.promises.readFile(pathname, option?.encoding || 'utf8');
     return data || undefined;
@@ -45,7 +47,7 @@ export async function fsReadJson<T = Json>(pathname: string): Promise<T | undefi
   }
 }
 
-export async function fsWrite(pathname: string, data: string, encoding = 'utf8'): Promise<void> {
+export async function fsWrite(pathname: string, data: string, encoding: fsWriteFileOptions = 'utf8'): Promise<void> {
   try {
     await fs.promises.mkdir(path.dirname(pathname), { recursive: true });
     await fs.promises.writeFile(pathname, data, encoding);
@@ -54,7 +56,7 @@ export async function fsWrite(pathname: string, data: string, encoding = 'utf8')
   }
 }
 
-export async function fsWriteJson(pathname: string, data: any): Promise<void> {
+export async function fsWriteJson(pathname: string, data: Json): Promise<void> {
   try {
     await fsWrite(pathname, JSON.stringify(data, null, 2));
   } catch (error) {
@@ -111,12 +113,12 @@ export async function fsReadJsonDirectory(pathname: string): Promise<{ name: str
   }
 }
 
-export function fsWatch(pathname: string, callback: (eventType: any, fileName: string) => void, options?: { interval: 2000 }): void {
+export function fsWatch(pathname: string, callback: (eventType: fs.WatchEventType, fileName: string) => void, options: fsWatchOptions) {
   const debounced = debounce(callback);
   return fs.watch(pathname, options, debounced);
 }
 
-export function fsWatchFile(pathname: string, callback: (eventType: any, fileName: string) => void, options?: { interval: 2000 }): void {
+export function fsWatchFile(pathname: string, callback: (eventType: fs.WatchEventType, fileName: string) => void, options?: fsWatchFileOptions) {
   const debounced = debounce(callback);
   return fs.watchFile(pathname, options, debounced);
 }

package/src/mock/mock-menu.service.ts

@@ -59,7 +59,9 @@ async function collectPages(store: IStore, items?: IUndecoratedMenuItem[], param
       typeof item.page.value === 'number' &&
       store[item.page.relationTo] !== undefined
     ) {
-      const value = await store[item.page.relationTo].findOne<ICategorized>(item.page.value, params);
+      // console.log('collectPages', item.page.relationTo, item.page.value);
+      // !!! cloned params due to recursion
+      const value = await store[item.page.relationTo].findOne<ICategorized>(item.page.value, { ...params });
       if (value) {
         item.page.value = value;
       }
@@ -88,9 +90,9 @@ export async function decorateMenu(store: IStore, item: IUndecoratedMenu, market
       },
       locale: {
         equals: locale,
-      }
+      },
     },
-    market, locale
+    market, locale,
   });
   await collectPages(store, items, { market, locale });
   decoratedItem.items = items.filter(x => hasMarket(x, market)).map(x => decorateMenuItem(x, categories, routes, market));
@@ -106,7 +108,7 @@ export function decorateMenuCategory(
   categories: ICategory[],
   routes: IRoute[],
   market: string,
-  depth: number = 0,
+  depth: number = 0
 ): IMenuItem {
   const decoratedItem: IMenuCategory = {
     abstract: item.abstract,
@@ -174,7 +176,7 @@ export function decorateMenuCategory(
 }
 
 export function decorateMenuRoute(
-  item: IRoute,
+  item: IRoute
 ): IMenuItem {
   const decoratedItem: IMenuRoute = {
     id: item.page,
@@ -192,7 +194,7 @@ export function decorateMenuGroup(
   item: IUndecoratedMenuGroup,
   categories: ICategory[],
   routes: IRoute[],
-  market: string,
+  market: string
 ): IMenuItem {
   const items = item.items || [];
   const decoratedItem: IMenuGroup = {
@@ -210,7 +212,7 @@ export function decorateMenuLink(
   item: IUndecoratedMenuLink,
   categories: ICategory[],
   routes: IRoute[],
-  market: string,
+  market: string
 ): IMenuItem {
   const items = item.items || [];
   const decoratedItem: IMenuLink = {
@@ -230,7 +232,7 @@ export function decorateMenuPage(
   item: IUndecoratedMenuPage,
   categories: ICategory[],
   routes: IRoute[],
-  market: string,
+  market: string
 ): IMenuItem {
   const items = item.items || [];
   const route = routes.find(x => x.schema === item.page.relationTo && x.page === item.page.value.id);
@@ -254,7 +256,7 @@ export function decorateMenuItem(
   categories: ICategory[],
   routes: IRoute[],
   market: string,
-  depth: number = 0,
+  depth: number = 0
 ): IMenuItem {
   let decoratedItem: IMenuItem;
   switch (item.type) {