@websolutespa/bom-core 1.10.0-next.1 → 2.0.1-next.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-core
 
+## 2.0.1-next.2
+
+### Patch Changes
+
+- Updating: dependencies and build step
+
+## 2.0.1-next.0
+
+### Major Changes
+
+- e74b305: Release: Payload 3.7.0
+
 ## 1.10.0-next.1
 
 ### Patch Changes
@@ -12,6 +24,18 @@
 
 - Updating: React 19.x, Payload 3.x
 
+## 1.8.22
+
+### Patch Changes
+
+- Fixing: JsonService whereItem\_ unresolved relations
+
+## 1.8.21
+
+### Patch Changes
+
+- Modified: IMeta
+
 ## 1.8.20
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-import { IncomingMessage, ServerResponse, IncomingHttpHeaders } from 'http';
-import { ParsedUrlQuery } from 'querystring';
-import React from 'react';
+import { IncomingMessage, ServerResponse, IncomingHttpHeaders } from 'node:http';
+import { ParsedUrlQuery } from 'node:querystring';
+import { FC } from 'react';
 
 declare function base64ToString(text: string): string;
 declare function stringToBase64(text: string): string;
@@ -20,11 +20,13 @@ type IContextParams = IContextBaseParams & {
 };
 type StaticPropsContext<Q extends ParsedUrlQuery = ParsedUrlQuery, D extends PreviewData = PreviewData> = {
     params: Q;
-    preview?: boolean;
-    previewData?: D;
+    draftMode?: boolean;
     locale?: string;
     locales?: string[];
     defaultLocale?: string;
+    revalidateReason?: 'build' | 'stale' | 'on-demand';
+    preview?: boolean;
+    previewData?: D;
 };
 type IStaticContext<T extends {} = {}> = StaticPropsContext<IContextParams & T>;
 declare type NextApiRequestCookies = Partial<{
@@ -36,13 +38,15 @@ type ServerSidePropsContext<Q extends ParsedUrlQuery = ParsedUrlQuery, D extends
     };
     res: ServerResponse;
     params: Q;
+    draftMode?: boolean;
     query: ParsedUrlQuery;
-    preview?: boolean;
-    previewData?: D;
     resolvedUrl: string;
     locale?: string;
     locales?: string[];
     defaultLocale?: string;
+    revalidateReason?: 'build' | 'stale' | 'on-demand';
+    preview?: boolean;
+    previewData?: D;
 };
 type IServerSideSplatContext<T extends {} = {}> = ServerSidePropsContext<IContextBaseParams & T>;
 type IServerSideContext<T extends {} = {}> = ServerSidePropsContext<IContextParams & T>;
@@ -240,6 +244,7 @@ type IMeta = {
     description?: string;
     keywords?: string;
     robots?: string;
+    image?: IMedia;
 };
 
 type ICategory = IEntity & {
@@ -886,6 +891,7 @@ declare class JsonService<T extends IEntity = IEntity> implements IQuerable<T> {
     items: T[];
     constructor(items: T[]);
     getItems<B extends T = T>(): Promise<B[]>;
+    protected whereId_(id: IEquatable): WhereField;
     findOne<B extends T = T>(id: IEquatable, params?: QueryParams): Promise<B | undefined>;
     findMany<B extends T = T>(params?: QueryParams): Promise<B[]>;
     findPaged<B extends T = T>(params?: QueryParams): Promise<IPagedResult<B>>;
@@ -1355,7 +1361,7 @@ declare const isProduction: boolean;
 declare const isStage: boolean;
 declare const isBrowser: boolean;
 declare function getEnv(): Record<string, Json>;
-declare function withSchema<Component extends React.FC<any>, Schema>(component: Component, schema: Schema): Component & Schema;
+declare function withSchema<Component extends FC<any>, Schema>(component: Component, schema: Schema): Component & Schema;
 declare function asServerProps(props: any): any;
 declare function awaitAll(array: any, callback: (item: any, index: number) => Promise<any>): Promise<any[]>;
 declare function merge(target: any, source: any): any;

package/dist/index.js

@@ -830,10 +830,17 @@ var JsonService = class {
   async getItems() {
     return this.items;
   }
+  whereId_(id) {
+    return typeof id === "string" && /^[0-9]+$/.test(id) ? {
+      in: [id, parseInt(id)]
+    } : {
+      equals: id
+    };
+  }
   async findOne(id, params = {}) {
     let items = await this.getItems();
     params.where = params.where || {};
-    params.where.id = params.where.id || { equals: id };
+    params.where.id = params.where.id || this.whereId_(id);
     items = this.whereItems_(items, params.where);
     if (items.length > 0) {
       return await this.decorateOne_(items[0], params);
@@ -878,7 +885,7 @@ var JsonService = class {
   async updateOne(id, payload, params = {}) {
     let items = await this.getItems();
     params.where = params.where || {};
-    params.where.id = params.where.id || { equals: id };
+    params.where.id = params.where.id || this.whereId_(id);
     const whereItems = this.whereItems_(items, params.where);
     if (whereItems.length > 0) {
       const index = items.indexOf(whereItems[0]);
@@ -916,7 +923,7 @@ var JsonService = class {
   async deleteOne(id, params = {}) {
     let items = await this.getItems();
     params.where = params.where || {};
-    params.where.id = params.where.id || { equals: id };
+    params.where.id = params.where.id || this.whereId_(id);
     const whereItems = this.whereItems_(items, params.where);
     if (whereItems.length > 0) {
       const index = items.indexOf(whereItems[0]);
@@ -1224,7 +1231,11 @@ function getValue(item, key) {
   const keys = key.split(".");
   const value = keys.reduce((p, c) => {
     if (isObject(p)) {
-      return p[c];
+      const v = p[c];
+      if (isUnresolvedRelation(v)) {
+        return v.value;
+      }
+      return v;
     } else {
       return void 0;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-core",
-  "version": "1.10.0-next.1",
+  "version": "2.0.1-next.2",
   "description": "Core module of the BOM Repository",
   "keywords": [
     "bom",
@@ -14,41 +14,42 @@
   },
   "scripts": {
     "lint": "eslint *.ts*",
-    "test": "jest",
-    "test-watch": "npm test -- --watch --silent=false",
-    "coverage:integration": "npm run test -- --coverage",
+    "test": "vitest run",
+    "test-watch": "vitest",
+    "coverage:integration": "npm run test -- --coverage.enabled --coverage.provider=istanbul --coverage.all",
     "coverage": "run-s -c --silent coverage:*",
-    "compile": "tsup ./src/index.ts --format esm,cjs --dts --external react",
+    "compile": "tsup ./src/index.ts --format esm --dts --external react",
     "prepack": "bom prepack",
-    "postpack": "bom postpack"
+    "postpack": "bom postpack",
+    "types": "tsc --noemit"
   },
   "dependencies": {
-    "pluralize": "latest"
-  },
-  "peerDependencies": {
-    "next": ">= 15.3.0"
+    "pluralize": "8.0.0"
   },
+  "peerDependencies": {},
   "devDependencies": {
-    "@websolutespa/bom-cli": "1.10.0-next.1",
-    "@websolutespa/eslint-config": "1.10.0-next.1",
-    "@websolutespa/test": "1.10.0-next.1",
-    "@websolutespa/tsconfig": "1.10.0-next.1",
-    "eslint": "^9.28.0",
-    "npm-run-all": "^4.1.5",
-    "raw-loader": "^4.0.2",
-    "ts-node": "^10.9.2",
-    "tsup": "^8.5.0",
-    "typescript": "5.8.2"
+    "@types/pluralize": "0.0.33",
+    "@types/react": "19.2.1",
+    "@websolutespa/eslint-config": "2.0.1-next.2",
+    "@websolutespa/test": "2.0.1-next.2",
+    "@websolutespa/tsconfig": "2.0.1-next.2",
+    "eslint": "9.31.0",
+    "npm-run-all": "4.1.5",
+    "raw-loader": "4.0.2",
+    "react": "19.2.1",
+    "tsup": "8.5.0",
+    "typescript": "5.8.3",
+    "vitest": "3.2.3"
   },
-  "type": "module",
   "publishConfig": {
     "access": "public"
   },
   "sideEffects": false,
+  "type": "module",
   "prepack": {
     "types": "./dist/index.d.ts",
     "main": "./dist/index.js",
-    "module": "./dist/index.mjs"
+    "module": "./dist/index.js"
   },
   "postpack": {
     "types": "./src/index.ts",
@@ -56,5 +57,5 @@
   },
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
-  "module": "./dist/index.mjs"
+  "module": "./dist/index.js"
 }