@websolutespa/bom-core 1.7.5 → 1.7.7

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @websolutespa/bom-core
 
+## 1.7.7
+
+### Patch Changes
+
+- Modified: Media resolveMediaType
+- Added: isMediaImage, isMediaVideo, isMediaJson, isMediaPdf
+
+## 1.7.6
+
+### Patch Changes
+
+- Added: getProto
+
 ## 1.7.5
 
 ### Patch Changes

package/dist/index.d.ts

@@ -49,6 +49,9 @@ type StateValue = StateValue[] | {
 type IPartial<T> = {
     [P in keyof T]?: Partial<T[P]>;
 };
+type DeepPartial<T> = T extends object ? {
+    [P in keyof T]?: DeepPartial<T[P]>;
+} : T;
 type IPrettify<T> = {
     [K in keyof T]: T[K];
 } & {};
@@ -145,20 +148,61 @@ type IFeatureType = {
     features?: IFeature[];
 };
 
-type IMediaType = 'image' | 'video' | string;
-type IMedia = {
-    abstract?: string;
+type IMediaType = 'image' | 'video' | 'json' | 'pdf' | string;
+type IMediaInfo = {
+    id: string;
     alt?: string;
-    media?: IMedia;
-    mimeType?: string;
-    src: string;
+    filename: string;
+    mimeType: string;
+    filesize: number;
+    sizes?: Record<string, {
+        url: string | null;
+    }>;
+    createdAt: Date | string;
+    updatedAt?: Date | string;
+    url: string;
+};
+type IMedia = Record<string, unknown> & Partial<IMediaInfo> & {
     title?: string;
+    abstract?: string;
     type: IMediaType;
-    url?: string;
-    width?: number;
-    height?: number;
+    src: string;
+    media?: IMedia;
+    width?: string | number;
+    height?: string | number;
+};
+type IMediaImage = Omit<IMedia, 'type'> & {
+    type: 'image';
 };
-declare function resolveMediaType(media: IMedia): IMediaType;
+type IMediaVideo = Omit<IMedia, 'type'> & {
+    type: 'video';
+};
+type IMediaJson = Omit<IMedia, 'type'> & {
+    type: 'json';
+};
+type IMediaPdf = Omit<IMedia, 'type'> & {
+    type: 'pdf';
+};
+declare function resolveMediaType(media: {
+    type?: string;
+    mimeType?: string;
+}): IMediaType;
+declare function isMediaImage(media: {
+    type?: string;
+    mimeType?: string;
+}): media is IMediaImage;
+declare function isMediaVideo(media: {
+    type?: string;
+    mimeType?: string;
+}): media is IMediaVideo;
+declare function isMediaJson(media: {
+    type?: string;
+    mimeType?: string;
+}): media is IMediaJson;
+declare function isMediaPdf(media: {
+    type?: string;
+    mimeType?: string;
+}): media is IMediaPdf;
 
 type IMeta = {
     title?: string;
@@ -635,7 +679,8 @@ 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 getProto(headers?: IncomingHttpHeaders | Headers): string;
+declare function getOrigin(headers?: IncomingHttpHeaders | Headers): 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;
@@ -733,4 +778,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 { 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 };
+export { DeepPartial, 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, IMediaImage, IMediaInfo, IMediaJson, IMediaPdf, IMediaType, IMediaVideo, 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, getProto, getRootCategory, getRouteHref, httpDelete, httpFetch, httpGet, httpPatch, httpPost, httpPut, isArray, isBrowser, isCategory, isDevelopment, isEntity, isEquatable, isHeaders, isIncomingHttpHeaders, isLocalizedString, isMediaImage, isMediaJson, isMediaPdf, isMediaVideo, 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

@@ -61,6 +61,7 @@ __export(src_exports, {
   getIsProduction: () => getIsProduction,
   getOrigin: () => getOrigin,
   getParentCategoriesById: () => getParentCategoriesById,
+  getProto: () => getProto,
   getRootCategory: () => getRootCategory,
   getRouteHref: () => getRouteHref,
   httpDelete: () => httpDelete,
@@ -78,6 +79,10 @@ __export(src_exports, {
   isHeaders: () => isHeaders,
   isIncomingHttpHeaders: () => isIncomingHttpHeaders,
   isLocalizedString: () => isLocalizedString,
+  isMediaImage: () => isMediaImage,
+  isMediaJson: () => isMediaJson,
+  isMediaPdf: () => isMediaPdf,
+  isMediaVideo: () => isMediaVideo,
   isMenuHref: () => isMenuHref,
   isNotNullString: () => isNotNullString,
   isObject: () => isObject,
@@ -1067,10 +1072,19 @@ function getHost(headers) {
     return null;
   }
 }
+function getProto(headers) {
+  if (isIncomingHttpHeaders(headers)) {
+    return headers["x-forwarded-proto"] || "https://";
+  } else if (isHeaders(headers)) {
+    return headers.get("X-Forwarded-Proto") || "https://";
+  } else {
+    return "https://";
+  }
+}
 function getOrigin(headers) {
   const host = getHost(headers);
   if (host) {
-    return host.indexOf("localhost") !== -1 ? "http://" + host : "https://" + host;
+    return host.indexOf("localhost") !== -1 ? "http://" + host : getProto(headers) + host;
   } else {
     return process.env.NEXT_PUBLIC_URL || "";
   }
@@ -1204,7 +1218,46 @@ function textToSlug(title) {
 
 // src/types/media.ts
 function resolveMediaType(media) {
-  return media.type || (media.mimeType ? media.mimeType.split("/")[0] : "image");
+  if (typeof media.type === "string" && media.type.length > 0) {
+    return media.type;
+  }
+  if (typeof media.mimeType === "string" && media.mimeType.length > 0) {
+    const mime = media.mimeType.split("/");
+    return mime[0] === "application" ? mime[1] : mime[0];
+  }
+  return "unknown";
+}
+function isMediaImage(media) {
+  const type = resolveMediaType(media);
+  if (type === "image") {
+    media.type = type;
+    return true;
+  }
+  return false;
+}
+function isMediaVideo(media) {
+  const type = resolveMediaType(media);
+  if (type === "video") {
+    media.type = type;
+    return true;
+  }
+  return false;
+}
+function isMediaJson(media) {
+  const type = resolveMediaType(media);
+  if (type === "json") {
+    media.type = type;
+    return true;
+  }
+  return false;
+}
+function isMediaPdf(media) {
+  const type = resolveMediaType(media);
+  if (type === "pdf") {
+    media.type = type;
+    return true;
+  }
+  return false;
 }
 
 // src/types/menu.ts
@@ -1263,6 +1316,7 @@ var RedirectReason = /* @__PURE__ */ ((RedirectReason2) => {
   getIsProduction,
   getOrigin,
   getParentCategoriesById,
+  getProto,
   getRootCategory,
   getRouteHref,
   httpDelete,
@@ -1280,6 +1334,10 @@ var RedirectReason = /* @__PURE__ */ ((RedirectReason2) => {
   isHeaders,
   isIncomingHttpHeaders,
   isLocalizedString,
+  isMediaImage,
+  isMediaJson,
+  isMediaPdf,
+  isMediaVideo,
   isMenuHref,
   isNotNullString,
   isObject,

package/dist/index.mjs

@@ -944,10 +944,19 @@ function getHost(headers) {
     return null;
   }
 }
+function getProto(headers) {
+  if (isIncomingHttpHeaders(headers)) {
+    return headers["x-forwarded-proto"] || "https://";
+  } else if (isHeaders(headers)) {
+    return headers.get("X-Forwarded-Proto") || "https://";
+  } else {
+    return "https://";
+  }
+}
 function getOrigin(headers) {
   const host = getHost(headers);
   if (host) {
-    return host.indexOf("localhost") !== -1 ? "http://" + host : "https://" + host;
+    return host.indexOf("localhost") !== -1 ? "http://" + host : getProto(headers) + host;
   } else {
     return process.env.NEXT_PUBLIC_URL || "";
   }
@@ -1081,7 +1090,46 @@ function textToSlug(title) {
 
 // src/types/media.ts
 function resolveMediaType(media) {
-  return media.type || (media.mimeType ? media.mimeType.split("/")[0] : "image");
+  if (typeof media.type === "string" && media.type.length > 0) {
+    return media.type;
+  }
+  if (typeof media.mimeType === "string" && media.mimeType.length > 0) {
+    const mime = media.mimeType.split("/");
+    return mime[0] === "application" ? mime[1] : mime[0];
+  }
+  return "unknown";
+}
+function isMediaImage(media) {
+  const type = resolveMediaType(media);
+  if (type === "image") {
+    media.type = type;
+    return true;
+  }
+  return false;
+}
+function isMediaVideo(media) {
+  const type = resolveMediaType(media);
+  if (type === "video") {
+    media.type = type;
+    return true;
+  }
+  return false;
+}
+function isMediaJson(media) {
+  const type = resolveMediaType(media);
+  if (type === "json") {
+    media.type = type;
+    return true;
+  }
+  return false;
+}
+function isMediaPdf(media) {
+  const type = resolveMediaType(media);
+  if (type === "pdf") {
+    media.type = type;
+    return true;
+  }
+  return false;
 }
 
 // src/types/menu.ts
@@ -1139,6 +1187,7 @@ export {
   getIsProduction,
   getOrigin,
   getParentCategoriesById,
+  getProto,
   getRootCategory,
   getRouteHref,
   httpDelete,
@@ -1156,6 +1205,10 @@ export {
   isHeaders,
   isIncomingHttpHeaders,
   isLocalizedString,
+  isMediaImage,
+  isMediaJson,
+  isMediaPdf,
+  isMediaVideo,
   isMenuHref,
   isNotNullString,
   isObject,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-core",
-  "version": "1.7.5",
+  "version": "1.7.7",
   "description": "Core module of the BOM Repository",
   "keywords": [
     "bom",