@websolutespa/bom-core 0.4.1 → 0.5.0

package/CHANGELOG.md

@@ -1,11 +1,18 @@
 # @websolutespa/bom-core
 
+## 0.5.0
+
+### Minor Changes
+
+- Modified: JsonService, qs.
+- Added: asEquatable, cloneItem, typeGuards.
+
 ## 0.4.1
 
 ### Patch Changes
 
 - Added: IAnchor, babelCase.
-- Modified: IApplication, IPageRelation. 
+- Modified: IApplication, IPageRelation.
 
 ## 0.4.0
 

package/dist/index.d.ts

@@ -183,23 +183,25 @@ type IRoute = {
     isDefault?: boolean;
     locale: string;
     market: string;
+    media?: IMedia;
     order?: number;
     page: IEquatable;
     schema: string;
     template?: string;
     title: string;
-    media?: IMedia;
-    useSplat?: boolean;
     updatedAt?: Date;
+    useSplat?: boolean;
 };
 type IRouteCanonical = IRoute & {
     alternates: IRoute[];
 };
 type IRouteLink = {
+    category: IEquatable;
     href: string;
     id: IEquatable;
     items?: IRouteLink[];
     media?: IMedia;
+    schema: string;
     title: string;
 };
 type IRouteParams = Record<string, any> & {
@@ -229,6 +231,10 @@ type IPageRelation<T extends ICategorized = ICategorized> = {
     relationTo: string;
     value: IPageRelationResult<T>;
 };
+type IPageUnresolvedRelation = {
+    relationTo: string;
+    value: IEquatable | IEquatable[];
+};
 type IPageResult<T extends ICategorized = ICategorized> = IPage & T;
 type PageProps<T extends ICategorized = ICategorized> = {
     layout: ILayout;
@@ -241,6 +247,7 @@ type PageProps<T extends ICategorized = ICategorized> = {
 
 type IMenuBase = {
     abstract?: ILocalizable;
+    extra?: ILocalizable;
     customClass?: string;
     id: IEquatable;
     items?: IMenuItem[];
@@ -286,6 +293,7 @@ type IMenu = {
  */
 type IUndecoratedMenuBase = {
     abstract?: ILocalizable;
+    extra?: ILocalizable;
     customClass?: string;
     id?: string;
     items: IUndecoratedMenuItem[];
@@ -337,6 +345,13 @@ type ILayout = {
     tree?: IRouteLink;
 };
 
+type IUndecoratedNav<T> = T & {
+    nav?: IUndecoratedMenuPage;
+};
+type IDecoratedNav<T> = T & {
+    nav?: IMenuPage;
+};
+
 type Pagination = {
     hasNextPage: boolean;
     hasPrevPage: boolean;
@@ -485,7 +500,8 @@ declare class JsonService<T extends IEntity = IEntity> implements IQuerable<T> {
     create<B extends T = T>(payload: Omit<B, 'id'>): Promise<B>;
     update<B extends T = T>(payload: Partial<B>): Promise<B>;
     delete<B extends T = T>(id: IEquatable): Promise<B | undefined>;
-    protected decorator_<B extends T = T>(item: B, params?: QueryParams): B;
+    protected decorateOne_<B extends T = T>(item: B, params?: QueryParams): Promise<B>;
+    protected decorateMany_<B extends T = T>(items: B[], params?: QueryParams): Promise<B[]>;
     protected newUUID_(): number;
     protected evaluateValue_(value: unknown): unknown;
     protected existsClause_(value: unknown, exists?: boolean): boolean;
@@ -505,13 +521,12 @@ declare function isLocalizedString(value: any): value is ILocalizedString;
 declare function localizedToString(json: ILocalizedString, locale?: string, defaultLocale?: string): string;
 declare function localize(value: ILocalizable, locale?: string, defaultLocale?: string): string;
 declare function localizeValue(value: any, locale?: string, defaultLocale?: string): any;
-declare function localizeItem(item: any, locale?: string, defaultLocale?: string): any;
+declare function localizeItem<T = any>(item: T, locale?: string, defaultLocale?: string): T;
 
 declare function qsSerialize(queryParams?: QueryParams): string;
-declare function asEquatable(value: string): IEquatable;
-declare function deserializeValue(value: string): string | boolean | number;
-declare function deserializeKey(value: string): string | number;
+declare function qsSerializeRaw(queryParams?: {}): string;
 declare function qsDeserialize(query?: string, deserializedParams?: {}): QueryParams;
+declare function qsDeserializeRaw(query?: string, deserializedParams?: {}): {};
 
 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;
@@ -525,6 +540,8 @@ declare function getRouteHref(segments: ICategory[], market: IMarket, locale: IL
 
 declare function textToSlug(title: string): string;
 
+declare function asEquatable(value: string): IEquatable;
+
 /**
  * PascalCase
  * camelCase
@@ -543,6 +560,8 @@ declare function toCharCase(unknownCase: string, char?: string): string;
 declare function toKebabCase(unknownCase: string): string;
 declare function toSnakeCase(unknownCase: string): string;
 
+declare function cloneItem<T = unknown>(item: T): T;
+
 type ListItem<T> = {
     [K in keyof T]: {
         readonly key: string;
@@ -556,6 +575,17 @@ type ListItem<T> = {
 */
 declare function enumToList<T extends Record<string, number | string>>(enumeration: T, separatorRegex?: RegExp): ListItem<T>[];
 
+declare function isArray<T = unknown>(item: unknown): item is Array<T>;
+declare function isObject<T = Record<string, unknown>>(item: unknown): item is T;
+declare function isNotNullString(item: unknown): item is string;
+declare function isEquatable(item: unknown): item is IEquatable;
+declare function isEntity(item: unknown): item is IEntity;
+declare function isUnresolvedRelation(item: unknown): item is IPageUnresolvedRelation;
+declare function isRelation(item: unknown): item is IPageRelation;
+declare function isUndecoratedMenuItem(item: unknown): item is IUndecoratedMenuItem;
+declare function isUndecoratedNav<T>(item: unknown): item is IUndecoratedNav<T>;
+declare function isUndecoratedMenuPage(item: unknown): item is IUndecoratedMenuPage;
+
 declare function getIsDevelopment(): boolean;
 declare function getIsProduction(): boolean;
 declare const isDevelopment: boolean;
@@ -568,4 +598,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, IAnchor, ICategorized, ICategory, ICategoryItem, IClassName, IClassNameCollection, IClassNameValue, ICollectionDescription, IConfig, IContextBaseParams, IContextParams, IEntity, IEquatable, ILabel, ILayout, ILocale, ILocalizable, ILocalized, ILocalizedString, IMarket, IMedia, IMediaType, IMemoryStore, IMenu, IMenuBase, IMenuCategory, IMenuCustom, IMenuGroup, IMenuItem, IMenuLink, IMenuPage, IMenuRoute, INamedEntity, IOption, IOverride, IPackages, IPage, IPageRelation, IPageRelationResult, IPageResult, IPartial, IPrettify, IQuerable, IRedirect, IRoute, IRouteCanonical, IRouteLink, IRouteParams, ISchema, ISerializedCollection, ISerializedStore, IServerSideContext, IServerSideSplatContext, IStaticContext, IStore, ITemplate, ITitledEntity, IUndecoratedMenu, IUndecoratedMenuBase, IUndecoratedMenuCategory, IUndecoratedMenuCustom, IUndecoratedMenuGroup, IUndecoratedMenuItem, IUndecoratedMenuLink, IUndecoratedMenuPage, Json, JsonService, LiteralUnion, NextApiRequestCookies, Operator, PageProps, Pagination, PreviewData, QueryParams, RedirectReason, RouteStrategy, SchemaType, ServerSidePropsContext, StateValue, StaticPropsContext, ValueOf, Where, WhereAndOr, WhereBase, WhereField, asCategoryId, asEquatable, asServerProps, awaitAll, camelToSnakeCase, collectRoutes, consoleWarn, deserializeKey, deserializeValue, eachCategorized, eachMarketLocale, enumToList, getCategorySegments, getCategorySegmentsByCategory, getClassNames, getCollectionDescription, getEnv, getIsDevelopment, getIsProduction, getParentCategoriesById, getRootCategory, getRouteHref, httpDelete, httpFetch, httpGet, httpPatch, httpPost, httpPut, isBrowser, isCategory, isDevelopment, isLocalizedString, isProduction, isStage, isValidCollectionDescription, localize, localizeItem, localizeValue, localizedToString, merge, pascalCaseToCamelCase, pascalCaseToCharCase, pascalCaseToKebabCase, pascalCaseToSnakeCase, qsDeserialize, qsSerialize, textToSlug, toCamelCase, toCharCase, toDisplayName, toFindParams, toKebabCase, toPascalCase, toPluralName, toSnakeCase, toTitleCase, toValidCollectionName, unknownCaseToPascalCase, withSchema };
+export { FetchError, FetchRequestOptions, FetchService, FindParams, FindWhereParams, IAnchor, ICategorized, ICategory, ICategoryItem, IClassName, IClassNameCollection, IClassNameValue, ICollectionDescription, IConfig, IContextBaseParams, IContextParams, IDecoratedNav, IEntity, IEquatable, ILabel, ILayout, ILocale, ILocalizable, ILocalized, ILocalizedString, IMarket, IMedia, IMediaType, IMemoryStore, IMenu, IMenuBase, IMenuCategory, IMenuCustom, IMenuGroup, IMenuItem, IMenuLink, IMenuPage, IMenuRoute, INamedEntity, IOption, IOverride, IPackages, IPage, IPageRelation, IPageRelationResult, IPageResult, IPageUnresolvedRelation, IPartial, 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, NextApiRequestCookies, Operator, PageProps, Pagination, PreviewData, QueryParams, RedirectReason, RouteStrategy, SchemaType, ServerSidePropsContext, StateValue, StaticPropsContext, ValueOf, Where, WhereAndOr, WhereBase, WhereField, asCategoryId, asEquatable, asServerProps, awaitAll, camelToSnakeCase, cloneItem, collectRoutes, consoleWarn, 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, isNotNullString, isObject, isProduction, isRelation, isStage, isUndecoratedMenuItem, isUndecoratedMenuPage, isUndecoratedNav, isUnresolvedRelation, isValidCollectionDescription, localize, localizeItem, localizeValue, localizedToString, merge, pascalCaseToCamelCase, pascalCaseToCharCase, pascalCaseToKebabCase, pascalCaseToSnakeCase, qsDeserialize, qsDeserializeRaw, qsSerialize, qsSerializeRaw, textToSlug, toCamelCase, toCharCase, toDisplayName, toFindParams, toKebabCase, toPascalCase, toPluralName, toSnakeCase, toTitleCase, toValidCollectionName, unknownCaseToPascalCase, withSchema };

package/dist/index.js

@@ -38,10 +38,9 @@ __export(src_exports, {
   asServerProps: () => asServerProps,
   awaitAll: () => awaitAll,
   camelToSnakeCase: () => camelToSnakeCase,
+  cloneItem: () => cloneItem,
   collectRoutes: () => collectRoutes,
   consoleWarn: () => consoleWarn,
-  deserializeKey: () => deserializeKey,
-  deserializeValue: () => deserializeValue,
   eachCategorized: () => eachCategorized,
   eachMarketLocale: () => eachMarketLocale,
   enumToList: () => enumToList,
@@ -61,12 +60,22 @@ __export(src_exports, {
   httpPatch: () => httpPatch,
   httpPost: () => httpPost,
   httpPut: () => httpPut,
+  isArray: () => isArray,
   isBrowser: () => isBrowser,
   isCategory: () => isCategory,
   isDevelopment: () => isDevelopment,
+  isEntity: () => isEntity,
+  isEquatable: () => isEquatable,
   isLocalizedString: () => isLocalizedString,
+  isNotNullString: () => isNotNullString,
+  isObject: () => isObject,
   isProduction: () => isProduction,
+  isRelation: () => isRelation,
   isStage: () => isStage,
+  isUndecoratedMenuItem: () => isUndecoratedMenuItem,
+  isUndecoratedMenuPage: () => isUndecoratedMenuPage,
+  isUndecoratedNav: () => isUndecoratedNav,
+  isUnresolvedRelation: () => isUnresolvedRelation,
   isValidCollectionDescription: () => isValidCollectionDescription,
   localize: () => localize,
   localizeItem: () => localizeItem,
@@ -78,7 +87,9 @@ __export(src_exports, {
   pascalCaseToKebabCase: () => pascalCaseToKebabCase,
   pascalCaseToSnakeCase: () => pascalCaseToSnakeCase,
   qsDeserialize: () => qsDeserialize,
+  qsDeserializeRaw: () => qsDeserializeRaw,
   qsSerialize: () => qsSerialize,
+  qsSerializeRaw: () => qsSerializeRaw,
   textToSlug: () => textToSlug,
   toCamelCase: () => toCamelCase,
   toCharCase: () => toCharCase,
@@ -261,6 +272,14 @@ function consoleWarn(message, component) {
   console.warn(log);
 }
 
+// src/utils/asEquatable.ts
+function asEquatable(value) {
+  if (String(parseInt(value)) === value) {
+    return Number(value);
+  }
+  return value;
+}
+
 // src/utils/babelCase.ts
 function unknownCaseToPascalCase(unknownCase) {
   const pascalCase = unknownCase.replace(
@@ -311,6 +330,52 @@ function toSnakeCase(unknownCase) {
   return snakeCase;
 }
 
+// src/utils/typeGuards.ts
+function isArray(item) {
+  return Array.isArray(item);
+}
+function isObject(item) {
+  return item != null && typeof item === "object" && !isArray(item);
+}
+function isNotNullString(item) {
+  return typeof item === "string" && Boolean(item);
+}
+function isEquatable(item) {
+  return typeof item === "number" || isNotNullString(item);
+}
+function isEntity(item) {
+  return isObject(item) && isEquatable(item.id);
+}
+function isUnresolvedRelation(item) {
+  return isObject(item) && isNotNullString(item.relationTo) && (isEquatable(item.value) || isArray(item.value));
+}
+function isRelation(item) {
+  return isObject(item) && isNotNullString(item.relationTo) && isEntity(item.value);
+}
+function isUndecoratedMenuItem(item) {
+  return isObject(item) && (item.type === "category" && isEquatable(item.category) || item.type === "page" && isEquatable(item.page.value));
+}
+function isUndecoratedNav(item) {
+  return isObject(item) && isUndecoratedMenuPage(item.nav);
+}
+function isUndecoratedMenuPage(item) {
+  return isObject(item) && item.type === "page" && isNotNullString(item.page.relationTo) && isEquatable(item.page.value);
+}
+
+// src/utils/cloneItem.ts
+function cloneItem(item) {
+  if (isArray(item)) {
+    item = item.map((x) => cloneItem(x));
+  } else if (isObject(item)) {
+    item = { ...item };
+    const object = item;
+    Object.keys(object).forEach((key) => {
+      object[key] = cloneItem(object[key]);
+    });
+  }
+  return item;
+}
+
 // src/utils/enumToList.ts
 function enumToList(enumeration, separatorRegex = /_/g) {
   const array = Object.keys(enumeration);
@@ -435,7 +500,7 @@ var JsonService = class {
     params.where.id = params.where.id || { equals: id };
     items = this.whereItems_(items, params.where);
     if (items.length > 0) {
-      return this.decorator_(items[0], params);
+      return await this.decorateOne_(items[0], params);
     } else {
       console.log("JsonService.findOne.notfound", id, params);
       return void 0;
@@ -450,7 +515,7 @@ var JsonService = class {
     if (params.sort) {
       items = this.sortCollection_(items, params.sort);
     }
-    return items.map((x) => this.decorator_(x, params));
+    return await this.decorateMany_(items, params);
   }
   async findPaged(params = {}) {
     params.pagination = true;
@@ -462,7 +527,7 @@ var JsonService = class {
       items = this.sortCollection_(items, params.sort);
     }
     const pagination = this.paginatedItems_(items, params.page, params.limit);
-    pagination.docs = pagination.docs.map((x) => this.decorator_(x, params));
+    pagination.docs = await this.decorateMany_(pagination.docs, params);
     return pagination;
   }
   async create(payload) {
@@ -499,9 +564,12 @@ var JsonService = class {
     }
     return void 0;
   }
-  decorator_(item, params = {}) {
+  async decorateOne_(item, params = {}) {
     return item;
   }
+  async decorateMany_(items, params = {}) {
+    return items;
+  }
   newUUID_() {
     return (/* @__PURE__ */ new Date()).getTime();
   }
@@ -543,24 +611,6 @@ var JsonService = class {
     }
     return true;
   }
-  // old where
-  /*
-  protected where_(items: any[], params: FindParams): any[] {
-    const where = params.where;
-    if (where) {
-      const keys = Object.keys(where);
-      items = items.filter(x => {
-        return keys.reduce<boolean>((p, c) => {
-          const whereValue = where[c];
-          const shouldMatch = Array.isArray(whereValue) ? whereValue : [whereValue];
-          // console.log('key', c, 'value', x[c], 'shouldMatch', shouldMatch);
-          return p && (shouldMatch.indexOf(x[c]) !== -1);
-        }, true);
-      });
-    }
-    return items;
-  }
-  */
   whereItem_(item, where) {
     let has = true;
     if (typeof where === "object") {
@@ -688,60 +738,62 @@ function localizeValue(value, locale = "en", defaultLocale = "en") {
   }
 }
 function localizeItem(item, locale = "en", defaultLocale = "en") {
-  if (Array.isArray(item)) {
+  if (isArray(item)) {
     item = item.map((x) => localizeValue(x, locale, defaultLocale));
-  } else if (typeof item === "object") {
+  } else if (isObject(item)) {
     item = { ...item };
-    Object.keys(item).forEach((key) => {
-      item[key] = localizeValue(item[key], locale, defaultLocale);
+    const object = item;
+    Object.keys(object).forEach((key) => {
+      object[key] = localizeValue(object[key], locale, defaultLocale);
     });
   }
   return item;
 }
 
 // src/qs/qs.ts
-function serializeKey(key, parentKey = "") {
+function qsSerializeKey(key, parentKey = "") {
   return parentKey ? `${parentKey}[${key}]` : String(key);
 }
-function serializeParam(key, value, serializedParams = [], parentKey = "") {
+function qsSerializeParam(key, value, serializedParams = [], parentKey = "") {
   if (value != null) {
     if (typeof value === "object") {
-      serializedParams = serializeParams(value, serializedParams, serializeKey(key, parentKey));
+      serializedParams = qsSerializeParams(value, serializedParams, qsSerializeKey(key, parentKey));
     } else {
       serializedParams.push({
-        key: serializeKey(key, parentKey),
+        key: qsSerializeKey(key, parentKey),
         value
       });
     }
   }
   return serializedParams;
 }
-function serializeParams(params, serializedParams = [], parentKey = "") {
+function qsSerializeParams(params, serializedParams = [], parentKey = "") {
   if (Array.isArray(params)) {
     params.forEach((value, key) => {
-      serializedParams = serializeParam(key, value, serializedParams, parentKey);
+      serializedParams = qsSerializeParam(key, value, serializedParams, parentKey);
     });
   } else {
     Object.entries(params).forEach(([key, value]) => {
-      serializedParams = serializeParam(key, value, serializedParams, parentKey);
+      serializedParams = qsSerializeParam(key, value, serializedParams, parentKey);
     });
   }
   return serializedParams;
 }
 function qsSerialize(queryParams = {}) {
-  const params = serializeParams(queryParams);
+  const params = qsSerializeParams(queryParams);
   if (params.length) {
     return params.map((x) => `${x.key}=${x.value}`).join("&");
   }
   return "";
 }
-function asEquatable(value) {
-  if (String(parseInt(value)) === value) {
-    return Number(value);
+function qsSerializeRaw(queryParams = {}) {
+  const params = qsSerializeParams(queryParams);
+  if (params.length) {
+    return params.map((x) => `${x.key}=${x.value}`).join("&");
   }
-  return value;
+  return "";
 }
-function deserializeValue(value) {
+function qsDeserializeValue(value) {
   if (String(parseInt(value)) === value) {
     return Number(value);
   } else if (String(value) === "true") {
@@ -751,14 +803,14 @@ function deserializeValue(value) {
   }
   return value;
 }
-function deserializeKey(value) {
+function qsDeserializeKey(value) {
   if (String(parseInt(value)) === value) {
     return Number(value);
   }
   return value;
 }
-function deserializeKeys(key) {
-  const keys = key.replace(/[\]]/g, "").split("[").map((x) => deserializeKey(x));
+function qsDeserializeKeys(key) {
+  const keys = key.replace(/[\]]/g, "").split("[").map((x) => qsDeserializeKey(x));
   return keys;
 }
 function getNextKeyItem(key) {
@@ -768,13 +820,13 @@ function getNextKeyItem(key) {
     return {};
   }
 }
-function deserializeParam(key, value, deserializedParams = {}) {
-  const keys = deserializeKeys(key);
+function qsDeserializeParam(key, value, deserializedParams = {}) {
+  const keys = qsDeserializeKeys(key);
   let target = deserializedParams;
   while (keys.length) {
     const key2 = keys.shift();
     if (keys.length === 0) {
-      target[key2] = deserializeValue(value);
+      target[key2] = qsDeserializeValue(value);
     } else {
       const next = target[key2] ? target[key2] : target[key2] = getNextKeyItem(keys[0]);
       target = next;
@@ -782,8 +834,8 @@ function deserializeParam(key, value, deserializedParams = {}) {
   }
   return deserializedParams;
 }
-function deserializeParams(params, deserializedParams = {}) {
-  params.forEach((x) => deserializeParam(x[0], x[1], deserializedParams));
+function qsDeserializeParams(params, deserializedParams = {}) {
+  params.forEach((x) => qsDeserializeParam(x[0], x[1], deserializedParams));
   return deserializedParams;
 }
 function qsDeserialize(query = "", deserializedParams = {}) {
@@ -793,7 +845,19 @@ function qsDeserialize(query = "", deserializedParams = {}) {
   if (query !== "") {
     const params = query.split("&").map((x) => x.split("="));
     if (params.length) {
-      return deserializeParams(params, deserializedParams);
+      return qsDeserializeParams(params, deserializedParams);
+    }
+  }
+  return deserializedParams;
+}
+function qsDeserializeRaw(query = "", deserializedParams = {}) {
+  if (query.indexOf("?") === 0) {
+    query = query.substring(1);
+  }
+  if (query !== "") {
+    const params = query.split("&").map((x) => x.split("="));
+    if (params.length) {
+      return qsDeserializeParams(params, deserializedParams);
     }
   }
   return deserializedParams;
@@ -811,18 +875,19 @@ function collectRoutes(store, categories, markets, locales) {
           const title = localize(item.title, locale.id);
           const id = getRouteHref(segments, market, locale, markets2, locales2);
           const route = {
+            category: item.category,
             id,
-            market: market.id,
+            isDefault: item.isDefault,
             locale: locale.id,
-            category: item.category,
+            market: market.id,
+            media: item.media,
+            order: item.order,
             page: item.id,
             schema: key,
             template: item.template,
             title,
-            isDefault: item.isDefault,
-            order: item.order,
-            useSplat: item.useSplat,
-            updatedAt: item.updatedAt
+            updatedAt: item.updatedAt,
+            useSplat: item.useSplat
           };
           routes.push(route);
         }
@@ -948,10 +1013,9 @@ var RedirectReason = /* @__PURE__ */ ((RedirectReason2) => {
   asServerProps,
   awaitAll,
   camelToSnakeCase,
+  cloneItem,
   collectRoutes,
   consoleWarn,
-  deserializeKey,
-  deserializeValue,
   eachCategorized,
   eachMarketLocale,
   enumToList,
@@ -971,12 +1035,22 @@ var RedirectReason = /* @__PURE__ */ ((RedirectReason2) => {
   httpPatch,
   httpPost,
   httpPut,
+  isArray,
   isBrowser,
   isCategory,
   isDevelopment,
+  isEntity,
+  isEquatable,
   isLocalizedString,
+  isNotNullString,
+  isObject,
   isProduction,
+  isRelation,
   isStage,
+  isUndecoratedMenuItem,
+  isUndecoratedMenuPage,
+  isUndecoratedNav,
+  isUnresolvedRelation,
   isValidCollectionDescription,
   localize,
   localizeItem,
@@ -988,7 +1062,9 @@ var RedirectReason = /* @__PURE__ */ ((RedirectReason2) => {
   pascalCaseToKebabCase,
   pascalCaseToSnakeCase,
   qsDeserialize,
+  qsDeserializeRaw,
   qsSerialize,
+  qsSerializeRaw,
   textToSlug,
   toCamelCase,
   toCharCase,

package/dist/index.mjs

@@ -164,6 +164,14 @@ function consoleWarn(message, component) {
   console.warn(log);
 }
 
+// src/utils/asEquatable.ts
+function asEquatable(value) {
+  if (String(parseInt(value)) === value) {
+    return Number(value);
+  }
+  return value;
+}
+
 // src/utils/babelCase.ts
 function unknownCaseToPascalCase(unknownCase) {
   const pascalCase = unknownCase.replace(
@@ -214,6 +222,52 @@ function toSnakeCase(unknownCase) {
   return snakeCase;
 }
 
+// src/utils/typeGuards.ts
+function isArray(item) {
+  return Array.isArray(item);
+}
+function isObject(item) {
+  return item != null && typeof item === "object" && !isArray(item);
+}
+function isNotNullString(item) {
+  return typeof item === "string" && Boolean(item);
+}
+function isEquatable(item) {
+  return typeof item === "number" || isNotNullString(item);
+}
+function isEntity(item) {
+  return isObject(item) && isEquatable(item.id);
+}
+function isUnresolvedRelation(item) {
+  return isObject(item) && isNotNullString(item.relationTo) && (isEquatable(item.value) || isArray(item.value));
+}
+function isRelation(item) {
+  return isObject(item) && isNotNullString(item.relationTo) && isEntity(item.value);
+}
+function isUndecoratedMenuItem(item) {
+  return isObject(item) && (item.type === "category" && isEquatable(item.category) || item.type === "page" && isEquatable(item.page.value));
+}
+function isUndecoratedNav(item) {
+  return isObject(item) && isUndecoratedMenuPage(item.nav);
+}
+function isUndecoratedMenuPage(item) {
+  return isObject(item) && item.type === "page" && isNotNullString(item.page.relationTo) && isEquatable(item.page.value);
+}
+
+// src/utils/cloneItem.ts
+function cloneItem(item) {
+  if (isArray(item)) {
+    item = item.map((x) => cloneItem(x));
+  } else if (isObject(item)) {
+    item = { ...item };
+    const object = item;
+    Object.keys(object).forEach((key) => {
+      object[key] = cloneItem(object[key]);
+    });
+  }
+  return item;
+}
+
 // src/utils/enumToList.ts
 function enumToList(enumeration, separatorRegex = /_/g) {
   const array = Object.keys(enumeration);
@@ -338,7 +392,7 @@ var JsonService = class {
     params.where.id = params.where.id || { equals: id };
     items = this.whereItems_(items, params.where);
     if (items.length > 0) {
-      return this.decorator_(items[0], params);
+      return await this.decorateOne_(items[0], params);
     } else {
       console.log("JsonService.findOne.notfound", id, params);
       return void 0;
@@ -353,7 +407,7 @@ var JsonService = class {
     if (params.sort) {
       items = this.sortCollection_(items, params.sort);
     }
-    return items.map((x) => this.decorator_(x, params));
+    return await this.decorateMany_(items, params);
   }
   async findPaged(params = {}) {
     params.pagination = true;
@@ -365,7 +419,7 @@ var JsonService = class {
       items = this.sortCollection_(items, params.sort);
     }
     const pagination = this.paginatedItems_(items, params.page, params.limit);
-    pagination.docs = pagination.docs.map((x) => this.decorator_(x, params));
+    pagination.docs = await this.decorateMany_(pagination.docs, params);
     return pagination;
   }
   async create(payload) {
@@ -402,9 +456,12 @@ var JsonService = class {
     }
     return void 0;
   }
-  decorator_(item, params = {}) {
+  async decorateOne_(item, params = {}) {
     return item;
   }
+  async decorateMany_(items, params = {}) {
+    return items;
+  }
   newUUID_() {
     return (/* @__PURE__ */ new Date()).getTime();
   }
@@ -446,24 +503,6 @@ var JsonService = class {
     }
     return true;
   }
-  // old where
-  /*
-  protected where_(items: any[], params: FindParams): any[] {
-    const where = params.where;
-    if (where) {
-      const keys = Object.keys(where);
-      items = items.filter(x => {
-        return keys.reduce<boolean>((p, c) => {
-          const whereValue = where[c];
-          const shouldMatch = Array.isArray(whereValue) ? whereValue : [whereValue];
-          // console.log('key', c, 'value', x[c], 'shouldMatch', shouldMatch);
-          return p && (shouldMatch.indexOf(x[c]) !== -1);
-        }, true);
-      });
-    }
-    return items;
-  }
-  */
   whereItem_(item, where) {
     let has = true;
     if (typeof where === "object") {
@@ -591,60 +630,62 @@ function localizeValue(value, locale = "en", defaultLocale = "en") {
   }
 }
 function localizeItem(item, locale = "en", defaultLocale = "en") {
-  if (Array.isArray(item)) {
+  if (isArray(item)) {
     item = item.map((x) => localizeValue(x, locale, defaultLocale));
-  } else if (typeof item === "object") {
+  } else if (isObject(item)) {
     item = { ...item };
-    Object.keys(item).forEach((key) => {
-      item[key] = localizeValue(item[key], locale, defaultLocale);
+    const object = item;
+    Object.keys(object).forEach((key) => {
+      object[key] = localizeValue(object[key], locale, defaultLocale);
     });
   }
   return item;
 }
 
 // src/qs/qs.ts
-function serializeKey(key, parentKey = "") {
+function qsSerializeKey(key, parentKey = "") {
   return parentKey ? `${parentKey}[${key}]` : String(key);
 }
-function serializeParam(key, value, serializedParams = [], parentKey = "") {
+function qsSerializeParam(key, value, serializedParams = [], parentKey = "") {
   if (value != null) {
     if (typeof value === "object") {
-      serializedParams = serializeParams(value, serializedParams, serializeKey(key, parentKey));
+      serializedParams = qsSerializeParams(value, serializedParams, qsSerializeKey(key, parentKey));
     } else {
       serializedParams.push({
-        key: serializeKey(key, parentKey),
+        key: qsSerializeKey(key, parentKey),
         value
       });
     }
   }
   return serializedParams;
 }
-function serializeParams(params, serializedParams = [], parentKey = "") {
+function qsSerializeParams(params, serializedParams = [], parentKey = "") {
   if (Array.isArray(params)) {
     params.forEach((value, key) => {
-      serializedParams = serializeParam(key, value, serializedParams, parentKey);
+      serializedParams = qsSerializeParam(key, value, serializedParams, parentKey);
     });
   } else {
     Object.entries(params).forEach(([key, value]) => {
-      serializedParams = serializeParam(key, value, serializedParams, parentKey);
+      serializedParams = qsSerializeParam(key, value, serializedParams, parentKey);
     });
   }
   return serializedParams;
 }
 function qsSerialize(queryParams = {}) {
-  const params = serializeParams(queryParams);
+  const params = qsSerializeParams(queryParams);
   if (params.length) {
     return params.map((x) => `${x.key}=${x.value}`).join("&");
   }
   return "";
 }
-function asEquatable(value) {
-  if (String(parseInt(value)) === value) {
-    return Number(value);
+function qsSerializeRaw(queryParams = {}) {
+  const params = qsSerializeParams(queryParams);
+  if (params.length) {
+    return params.map((x) => `${x.key}=${x.value}`).join("&");
   }
-  return value;
+  return "";
 }
-function deserializeValue(value) {
+function qsDeserializeValue(value) {
   if (String(parseInt(value)) === value) {
     return Number(value);
   } else if (String(value) === "true") {
@@ -654,14 +695,14 @@ function deserializeValue(value) {
   }
   return value;
 }
-function deserializeKey(value) {
+function qsDeserializeKey(value) {
   if (String(parseInt(value)) === value) {
     return Number(value);
   }
   return value;
 }
-function deserializeKeys(key) {
-  const keys = key.replace(/[\]]/g, "").split("[").map((x) => deserializeKey(x));
+function qsDeserializeKeys(key) {
+  const keys = key.replace(/[\]]/g, "").split("[").map((x) => qsDeserializeKey(x));
   return keys;
 }
 function getNextKeyItem(key) {
@@ -671,13 +712,13 @@ function getNextKeyItem(key) {
     return {};
   }
 }
-function deserializeParam(key, value, deserializedParams = {}) {
-  const keys = deserializeKeys(key);
+function qsDeserializeParam(key, value, deserializedParams = {}) {
+  const keys = qsDeserializeKeys(key);
   let target = deserializedParams;
   while (keys.length) {
     const key2 = keys.shift();
     if (keys.length === 0) {
-      target[key2] = deserializeValue(value);
+      target[key2] = qsDeserializeValue(value);
     } else {
       const next = target[key2] ? target[key2] : target[key2] = getNextKeyItem(keys[0]);
       target = next;
@@ -685,8 +726,8 @@ function deserializeParam(key, value, deserializedParams = {}) {
   }
   return deserializedParams;
 }
-function deserializeParams(params, deserializedParams = {}) {
-  params.forEach((x) => deserializeParam(x[0], x[1], deserializedParams));
+function qsDeserializeParams(params, deserializedParams = {}) {
+  params.forEach((x) => qsDeserializeParam(x[0], x[1], deserializedParams));
   return deserializedParams;
 }
 function qsDeserialize(query = "", deserializedParams = {}) {
@@ -696,7 +737,19 @@ function qsDeserialize(query = "", deserializedParams = {}) {
   if (query !== "") {
     const params = query.split("&").map((x) => x.split("="));
     if (params.length) {
-      return deserializeParams(params, deserializedParams);
+      return qsDeserializeParams(params, deserializedParams);
+    }
+  }
+  return deserializedParams;
+}
+function qsDeserializeRaw(query = "", deserializedParams = {}) {
+  if (query.indexOf("?") === 0) {
+    query = query.substring(1);
+  }
+  if (query !== "") {
+    const params = query.split("&").map((x) => x.split("="));
+    if (params.length) {
+      return qsDeserializeParams(params, deserializedParams);
     }
   }
   return deserializedParams;
@@ -714,18 +767,19 @@ function collectRoutes(store, categories, markets, locales) {
           const title = localize(item.title, locale.id);
           const id = getRouteHref(segments, market, locale, markets2, locales2);
           const route = {
+            category: item.category,
             id,
-            market: market.id,
+            isDefault: item.isDefault,
             locale: locale.id,
-            category: item.category,
+            market: market.id,
+            media: item.media,
+            order: item.order,
             page: item.id,
             schema: key,
             template: item.template,
             title,
-            isDefault: item.isDefault,
-            order: item.order,
-            useSplat: item.useSplat,
-            updatedAt: item.updatedAt
+            updatedAt: item.updatedAt,
+            useSplat: item.useSplat
           };
           routes.push(route);
         }
@@ -850,10 +904,9 @@ export {
   asServerProps,
   awaitAll,
   camelToSnakeCase,
+  cloneItem,
   collectRoutes,
   consoleWarn,
-  deserializeKey,
-  deserializeValue,
   eachCategorized,
   eachMarketLocale,
   enumToList,
@@ -873,12 +926,22 @@ export {
   httpPatch,
   httpPost,
   httpPut,
+  isArray,
   isBrowser,
   isCategory,
   isDevelopment,
+  isEntity,
+  isEquatable,
   isLocalizedString,
+  isNotNullString,
+  isObject,
   isProduction,
+  isRelation,
   isStage,
+  isUndecoratedMenuItem,
+  isUndecoratedMenuPage,
+  isUndecoratedNav,
+  isUnresolvedRelation,
   isValidCollectionDescription,
   localize,
   localizeItem,
@@ -890,7 +953,9 @@ export {
   pascalCaseToKebabCase,
   pascalCaseToSnakeCase,
   qsDeserialize,
+  qsDeserializeRaw,
   qsSerialize,
+  qsSerializeRaw,
   textToSlug,
   toCamelCase,
   toCharCase,

package/package.json

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