@websolutespa/bom-core 1.7.2 → 1.7.4

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-core
 
+## 1.7.4
+
+### Patch Changes
+
+- Added: getOrigin, getHost
+
+## 1.7.3
+
+### Patch Changes
+
+- Updating: dependencies
+
 ## 1.7.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { IncomingMessage, ServerResponse } from 'http';
+import { IncomingMessage, ServerResponse, IncomingHttpHeaders } from 'http';
 import { ParsedUrlQuery } from 'querystring';
 import React from 'react';
 
@@ -149,7 +149,6 @@ type IMediaType = 'image' | 'video' | string;
 type IMedia = {
     abstract?: string;
     alt?: string;
-    height?: number;
     media?: IMedia;
     mimeType?: string;
     src: string;
@@ -157,6 +156,7 @@ type IMedia = {
     type: IMediaType;
     url?: string;
     width?: number;
+    height?: number;
 };
 declare function resolveMediaType(media: IMedia): IMediaType;
 
@@ -632,6 +632,11 @@ declare function qsSerializeRaw(queryParams?: {}): string;
 declare function qsDeserialize(query?: string, deserializedParams?: {}): QueryParams;
 declare function qsDeserializeRaw(query?: string, deserializedParams?: {}): {};
 
+declare function isHeaders(headers?: IncomingHttpHeaders | Headers): headers is Headers;
+declare function isIncomingHttpHeaders(headers?: IncomingHttpHeaders | Headers): headers is IncomingHttpHeaders;
+declare function getHost(headers?: IncomingHttpHeaders | Headers): string | null;
+declare function getOrigin(headers?: IncomingHttpHeaders): string;
+
 declare function collectRoutes(store: IMemoryStore<ICategorized>, categories: ICategory[], markets: IMarket[], locales: ILocale[]): IRoute[];
 declare function eachMarketLocale(markets: IMarket[], locales: ILocale[], callback: (market: IMarket, locale: ILocale, markets: IMarket[], locales: ILocale[]) => void): void;
 declare function eachCategorized(store: IMemoryStore<ICategorized>, callback: (item: ICategorized, key: string) => void): void;
@@ -672,6 +677,25 @@ declare function collectFeatureTypes<T extends IEntity = IEntity>(items: T[], ..
 
 declare function collectOptions<T extends IEntity = IEntity>(items: T[], ...keys: string[]): Promise<Partial<Record<keyof T, IOption[]>>>;
 
+/**
+ * Represents a primitive value that can be used in the deep merge operation.
+ */
+type Primitive = ((...args: any[]) => any) | string | number | boolean | null;
+/**
+ * Represents a dynamic value that can be used in the deep merge operation.
+ */
+type Dynamic = {
+    [key: string]: Dynamic;
+} | Dynamic[] | Primitive;
+/**
+ * Deeply merges two objects or arrays.
+ *
+ * @param target - The target object or array to merge into.
+ * @param source - The source object or array to merge from.
+ * @returns The merged object or array.
+ */
+declare function deepMerge<T extends Dynamic, R extends Dynamic = T>(target?: Partial<T>, source?: Partial<R>): T & R;
+
 type ListItem<T> = {
     [K in keyof T]: {
         readonly key: string;
@@ -709,4 +733,4 @@ 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;
 
-export { FetchError, FetchRequestOptions, FetchService, FindParams, FindWhereParams, IAction, IAnchor, ICategorized, ICategory, ICategoryItem, IClassName, IClassNameCollection, IClassNameValue, ICollectionDescription, IComponent, IConfig, IConsentPreference, IContextBaseParams, IContextParams, IDecoratedNav, IEndUser, IEntity, IEquatable, IFeature, IFeatureType, ILabel, ILayout, ILegalNotice, ILetter, ILocale, ILocaleId, ILocalizable, ILocalized, ILocalizedString, IMarket, IMedia, IMediaType, IMemoryStore, IMenu, IMenuBase, IMenuCategory, IMenuCustom, IMenuGroup, IMenuHref, IMenuItem, IMenuLink, IMenuPage, IMenuRoute, INamedEntity, IOption, IOverride, IOverrideReturnValue, IOverrideValue, IPackages, IPage, IPageRelation, IPageRelationResult, IPageUnresolvedRelation, IPagedResult, IPaginationResult, IPartial, IPreference, IPrettify, IQuerable, IRedirect, IRoute, IRouteCanonical, IRouteLink, IRouteParams, ISchema, ISerializedCollection, ISerializedStore, IServerSideContext, IServerSideSplatContext, IStaticContext, IStore, ITemplate, ITitledEntity, IUndecoratedMenu, IUndecoratedMenuBase, IUndecoratedMenuCategory, IUndecoratedMenuCustom, IUndecoratedMenuGroup, IUndecoratedMenuItem, IUndecoratedMenuLink, IUndecoratedMenuPage, IUndecoratedNav, Json, JsonService, LiteralUnion, Logger, LoggerLevel, NextApiRequestCookies, Operator, PageProps, Pagination, PreviewData, QueryParams, RedirectReason, RouteStrategy, SchemaType, ServerSidePropsContext, StateValue, StaticPropsContext, User, UserRole, UserWithRoles, ValueOf, Where, WhereAndOr, WhereBase, WhereField, asCategoryId, asEquatable, asServerProps, awaitAll, camelToSnakeCase, cloneItem, collectFeatureTypes, collectOptions, collectRoutes, consoleWarn, defaultLocale, defaultMarket, eachCategorized, eachMarketLocale, enumToList, getCategorySegments, getCategorySegmentsByCategory, getClassNames, getCollectionDescription, getEnv, getIsDevelopment, getIsProduction, getParentCategoriesById, getRootCategory, getRouteHref, httpDelete, httpFetch, httpGet, httpPatch, httpPost, httpPut, isArray, isBrowser, isCategory, isDevelopment, isEntity, isEquatable, isLocalizedString, isMenuHref, isNotNullString, isObject, isProduction, isRelation, isReservedCollectionDescription, isStage, isUndecoratedMenuCategory, isUndecoratedMenuItem, isUndecoratedMenuPage, isUndecoratedNav, isUnresolvedRelation, isValidCollectionDescription, localize, localizeItem, localizeValue, localizedToString, merge, pascalCaseToCamelCase, pascalCaseToCharCase, pascalCaseToKebabCase, pascalCaseToSnakeCase, qsDeserialize, qsDeserializeRaw, qsSerialize, qsSerializeRaw, resolveMediaType, textToSlug, toCamelCase, toCharCase, toDisplayName, toFindParams, toKebabCase, toPascalCase, toPluralName, toSnakeCase, toTitleCase, toValidCollectionName, unknownCaseToPascalCase, withSchema };
+export { Dynamic, FetchError, FetchRequestOptions, FetchService, FindParams, FindWhereParams, IAction, IAnchor, ICategorized, ICategory, ICategoryItem, IClassName, IClassNameCollection, IClassNameValue, ICollectionDescription, IComponent, IConfig, IConsentPreference, IContextBaseParams, IContextParams, IDecoratedNav, IEndUser, IEntity, IEquatable, IFeature, IFeatureType, ILabel, ILayout, ILegalNotice, ILetter, ILocale, ILocaleId, ILocalizable, ILocalized, ILocalizedString, IMarket, IMedia, IMediaType, IMemoryStore, IMenu, IMenuBase, IMenuCategory, IMenuCustom, IMenuGroup, IMenuHref, IMenuItem, IMenuLink, IMenuPage, IMenuRoute, INamedEntity, IOption, IOverride, IOverrideReturnValue, IOverrideValue, IPackages, IPage, IPageRelation, IPageRelationResult, IPageUnresolvedRelation, IPagedResult, IPaginationResult, IPartial, IPreference, IPrettify, IQuerable, IRedirect, IRoute, IRouteCanonical, IRouteLink, IRouteParams, ISchema, ISerializedCollection, ISerializedStore, IServerSideContext, IServerSideSplatContext, IStaticContext, IStore, ITemplate, ITitledEntity, IUndecoratedMenu, IUndecoratedMenuBase, IUndecoratedMenuCategory, IUndecoratedMenuCustom, IUndecoratedMenuGroup, IUndecoratedMenuItem, IUndecoratedMenuLink, IUndecoratedMenuPage, IUndecoratedNav, Json, JsonService, LiteralUnion, Logger, LoggerLevel, NextApiRequestCookies, Operator, PageProps, Pagination, PreviewData, Primitive, QueryParams, RedirectReason, RouteStrategy, SchemaType, ServerSidePropsContext, StateValue, StaticPropsContext, User, UserRole, UserWithRoles, ValueOf, Where, WhereAndOr, WhereBase, WhereField, asCategoryId, asEquatable, asServerProps, awaitAll, camelToSnakeCase, cloneItem, collectFeatureTypes, collectOptions, collectRoutes, consoleWarn, deepMerge, defaultLocale, defaultMarket, eachCategorized, eachMarketLocale, enumToList, getCategorySegments, getCategorySegmentsByCategory, getClassNames, getCollectionDescription, getEnv, getHost, getIsDevelopment, getIsProduction, getOrigin, getParentCategoriesById, getRootCategory, getRouteHref, httpDelete, httpFetch, httpGet, httpPatch, httpPost, httpPut, isArray, isBrowser, isCategory, isDevelopment, isEntity, isEquatable, isHeaders, isIncomingHttpHeaders, isLocalizedString, isMenuHref, isNotNullString, isObject, isProduction, isRelation, isReservedCollectionDescription, isStage, isUndecoratedMenuCategory, isUndecoratedMenuItem, isUndecoratedMenuPage, isUndecoratedNav, isUnresolvedRelation, isValidCollectionDescription, localize, localizeItem, localizeValue, localizedToString, merge, pascalCaseToCamelCase, pascalCaseToCharCase, pascalCaseToKebabCase, pascalCaseToSnakeCase, qsDeserialize, qsDeserializeRaw, qsSerialize, qsSerializeRaw, resolveMediaType, textToSlug, toCamelCase, toCharCase, toDisplayName, toFindParams, toKebabCase, toPascalCase, toPluralName, toSnakeCase, toTitleCase, toValidCollectionName, unknownCaseToPascalCase, withSchema };

package/dist/index.js

@@ -45,6 +45,7 @@ __export(src_exports, {
   collectOptions: () => collectOptions,
   collectRoutes: () => collectRoutes,
   consoleWarn: () => consoleWarn,
+  deepMerge: () => deepMerge,
   defaultLocale: () => defaultLocale,
   defaultMarket: () => defaultMarket,
   eachCategorized: () => eachCategorized,
@@ -55,8 +56,10 @@ __export(src_exports, {
   getClassNames: () => getClassNames,
   getCollectionDescription: () => getCollectionDescription,
   getEnv: () => getEnv,
+  getHost: () => getHost,
   getIsDevelopment: () => getIsDevelopment,
   getIsProduction: () => getIsProduction,
+  getOrigin: () => getOrigin,
   getParentCategoriesById: () => getParentCategoriesById,
   getRootCategory: () => getRootCategory,
   getRouteHref: () => getRouteHref,
@@ -72,6 +75,8 @@ __export(src_exports, {
   isDevelopment: () => isDevelopment,
   isEntity: () => isEntity,
   isEquatable: () => isEquatable,
+  isHeaders: () => isHeaders,
+  isIncomingHttpHeaders: () => isIncomingHttpHeaders,
   isLocalizedString: () => isLocalizedString,
   isMenuHref: () => isMenuHref,
   isNotNullString: () => isNotNullString,
@@ -447,6 +452,24 @@ async function collectOptions(items, ...keys) {
   return optionsGroup;
 }
 
+// src/utils/deepMerge.ts
+function deepMerge(target, source) {
+  const output = { ...target };
+  if (isObject(target) && isObject(source)) {
+    Object.entries(source).forEach(([k, v]) => {
+      if (isArray(v)) {
+        output[k] = v.map((x) => deepMerge(x, x));
+      } else if (isObject(v)) {
+        const targetValue = k in target ? target[k] : void 0;
+        output[k] = isObject(targetValue) ? deepMerge(targetValue, v) : deepMerge(v, v);
+      } else {
+        output[k] = v;
+      }
+    });
+  }
+  return output;
+}
+
 // src/utils/enumToList.ts
 function enumToList(enumeration, separatorRegex = /_/g) {
   const array = Object.keys(enumeration);
@@ -814,7 +837,7 @@ var JsonService = class {
 // src/locale/locale.ts
 function getDefaultLocale() {
   let defaultLocale2 = "en";
-  if (process && process.env.DEFAULT_LOCALE) {
+  if (typeof process !== "undefined" && process.env.DEFAULT_LOCALE) {
     defaultLocale2 = process.env.DEFAULT_LOCALE;
   }
   return defaultLocale2;
@@ -908,7 +931,7 @@ Logger.level_ = 5 /* ALL */;
 // src/market/market.ts
 function getDefaultMarket() {
   let defaultMarket2 = "ww";
-  if (process && process.env.DEFAULT_MARKET) {
+  if (typeof process !== "undefined" && process.env.DEFAULT_MARKET) {
     defaultMarket2 = process.env.DEFAULT_MARKET;
   }
   return defaultMarket2;
@@ -1028,6 +1051,31 @@ function qsDeserializeRaw(query = "", deserializedParams = {}) {
   return deserializedParams;
 }
 
+// src/request/request.ts
+function isHeaders(headers) {
+  return typeof headers === "object" && "get" in headers ? typeof headers.get === "function" : false;
+}
+function isIncomingHttpHeaders(headers) {
+  return typeof headers === "object" && !("get" in headers);
+}
+function getHost(headers) {
+  if (isIncomingHttpHeaders(headers)) {
+    return headers["x-forwarded-host"] || headers.forwarded || headers.host || null;
+  } else if (isHeaders(headers)) {
+    return headers.get("X-Forwarded-Host") || headers.get("Forwarded") || headers.get("Host") || null;
+  } else {
+    return null;
+  }
+}
+function getOrigin(headers) {
+  const host = getHost(headers);
+  if (host) {
+    return host.indexOf("localhost") !== -1 ? "http://" + host : "https://" + host;
+  } else {
+    return process.env.NEXT_PUBLIC_URL || "";
+  }
+}
+
 // src/route/route.ts
 function collectRoutes(store, categories, markets, locales) {
   const routes = [];
@@ -1199,6 +1247,7 @@ var RedirectReason = /* @__PURE__ */ ((RedirectReason2) => {
   collectOptions,
   collectRoutes,
   consoleWarn,
+  deepMerge,
   defaultLocale,
   defaultMarket,
   eachCategorized,
@@ -1209,8 +1258,10 @@ var RedirectReason = /* @__PURE__ */ ((RedirectReason2) => {
   getClassNames,
   getCollectionDescription,
   getEnv,
+  getHost,
   getIsDevelopment,
   getIsProduction,
+  getOrigin,
   getParentCategoriesById,
   getRootCategory,
   getRouteHref,
@@ -1226,6 +1277,8 @@ var RedirectReason = /* @__PURE__ */ ((RedirectReason2) => {
   isDevelopment,
   isEntity,
   isEquatable,
+  isHeaders,
+  isIncomingHttpHeaders,
   isLocalizedString,
   isMenuHref,
   isNotNullString,

package/dist/index.mjs

@@ -329,6 +329,24 @@ async function collectOptions(items, ...keys) {
   return optionsGroup;
 }
 
+// src/utils/deepMerge.ts
+function deepMerge(target, source) {
+  const output = { ...target };
+  if (isObject(target) && isObject(source)) {
+    Object.entries(source).forEach(([k, v]) => {
+      if (isArray(v)) {
+        output[k] = v.map((x) => deepMerge(x, x));
+      } else if (isObject(v)) {
+        const targetValue = k in target ? target[k] : void 0;
+        output[k] = isObject(targetValue) ? deepMerge(targetValue, v) : deepMerge(v, v);
+      } else {
+        output[k] = v;
+      }
+    });
+  }
+  return output;
+}
+
 // src/utils/enumToList.ts
 function enumToList(enumeration, separatorRegex = /_/g) {
   const array = Object.keys(enumeration);
@@ -696,7 +714,7 @@ var JsonService = class {
 // src/locale/locale.ts
 function getDefaultLocale() {
   let defaultLocale2 = "en";
-  if (process && process.env.DEFAULT_LOCALE) {
+  if (typeof process !== "undefined" && process.env.DEFAULT_LOCALE) {
     defaultLocale2 = process.env.DEFAULT_LOCALE;
   }
   return defaultLocale2;
@@ -790,7 +808,7 @@ Logger.level_ = 5 /* ALL */;
 // src/market/market.ts
 function getDefaultMarket() {
   let defaultMarket2 = "ww";
-  if (process && process.env.DEFAULT_MARKET) {
+  if (typeof process !== "undefined" && process.env.DEFAULT_MARKET) {
     defaultMarket2 = process.env.DEFAULT_MARKET;
   }
   return defaultMarket2;
@@ -910,6 +928,31 @@ function qsDeserializeRaw(query = "", deserializedParams = {}) {
   return deserializedParams;
 }
 
+// src/request/request.ts
+function isHeaders(headers) {
+  return typeof headers === "object" && "get" in headers ? typeof headers.get === "function" : false;
+}
+function isIncomingHttpHeaders(headers) {
+  return typeof headers === "object" && !("get" in headers);
+}
+function getHost(headers) {
+  if (isIncomingHttpHeaders(headers)) {
+    return headers["x-forwarded-host"] || headers.forwarded || headers.host || null;
+  } else if (isHeaders(headers)) {
+    return headers.get("X-Forwarded-Host") || headers.get("Forwarded") || headers.get("Host") || null;
+  } else {
+    return null;
+  }
+}
+function getOrigin(headers) {
+  const host = getHost(headers);
+  if (host) {
+    return host.indexOf("localhost") !== -1 ? "http://" + host : "https://" + host;
+  } else {
+    return process.env.NEXT_PUBLIC_URL || "";
+  }
+}
+
 // src/route/route.ts
 function collectRoutes(store, categories, markets, locales) {
   const routes = [];
@@ -1080,6 +1123,7 @@ export {
   collectOptions,
   collectRoutes,
   consoleWarn,
+  deepMerge,
   defaultLocale,
   defaultMarket,
   eachCategorized,
@@ -1090,8 +1134,10 @@ export {
   getClassNames,
   getCollectionDescription,
   getEnv,
+  getHost,
   getIsDevelopment,
   getIsProduction,
+  getOrigin,
   getParentCategoriesById,
   getRootCategory,
   getRouteHref,
@@ -1107,6 +1153,8 @@ export {
   isDevelopment,
   isEntity,
   isEquatable,
+  isHeaders,
+  isIncomingHttpHeaders,
   isLocalizedString,
   isMenuHref,
   isNotNullString,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-core",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "description": "Core module of the BOM Repository",
   "keywords": [
     "bom",
@@ -26,19 +26,19 @@
     "pluralize": "latest"
   },
   "peerDependencies": {
-    "next": ">= 13.4.19"
+    "next": ">= 14.1.4"
   },
   "devDependencies": {
     "@websolutespa/bom-cli": "*",
     "@websolutespa/test": "*",
     "@websolutespa/tsconfig": "*",
-    "eslint": "^8.46.0",
+    "eslint": "^9.0.0",
     "eslint-config-websolute": "*",
     "npm-run-all": "^4.1.5",
     "raw-loader": "^4.0.2",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.9.2",
     "tsup": "^6.7.0",
-    "typescript": "^5.1.6"
+    "typescript": "^5.4.5"
   },
   "publishConfig": {
     "access": "public"