@griddo/core 10.3.7 → 10.3.8

package/dist/types/api-response-fields/index.d.ts

@@ -1,6 +1,11 @@
 import { ImagePosition } from "../core";
 import { FilterItemFromFilterEndPoint, HTMLHeadingTag } from "../global";
-import { ContentTypeNameOfUnion } from "../utilities";
+export type ContentTypeName<T> = T extends {
+    __contentTypeName: string;
+} ? T["__contentTypeName"] : string;
+export type RelatedContentTypeNames<T> = T extends {
+    __relatedContentTypeNames: string[];
+} ? T["__relatedContentTypeNames"][number] : string;
 export type FieldsDivider = string;
 export type ArrayFieldGroup<Fields> = Array<Fields>;
 export type AsyncSelect<Relations, FromList, RelatedContentType, FromDistributor> = FromList extends true ? Relations extends true ? {
@@ -166,18 +171,12 @@ export interface Reference<ContentType> {
     mode?: "auto" | "manual" | "navigation";
     order?: string;
     fixed?: Array<number>;
-    source?: Array<ContentTypeNameOfUnion<ContentType>>;
-    /** 0 means all */
+    sources?: Array<Source<ContentType>>;
     quantity?: number;
-    filter?: ContentType extends {
-        __contentTypeName: string;
-    } ? Array<{
-        id: number;
-        label: string;
-        source: ContentType["__contentTypeName"];
-    } | number> : never;
     fullRelations?: boolean;
+    /** Indicates if we should limit results to one language */
     allLanguages?: boolean;
+    /** Indicates if we should first return elements with same language as the page */
     preferenceLanguage?: boolean;
     referenceId?: number;
     related?: ContentType extends {
@@ -185,13 +184,20 @@ export interface Reference<ContentType> {
     } ? number | Array<number> | Array<{
         id: number;
         label: string;
-        source: ContentType["__contentTypeName"];
-    }> | Record<ContentType["__contentTypeName"], FilterItemFromFilterEndPoint> : never;
-    filterOperator?: "and" | "or" | "AND" | "OR";
-    globalOperator?: "and" | "or" | "AND" | "OR";
+        source: RelatedContentTypeNames<ContentType>;
+    }> | Record<RelatedContentTypeNames<ContentType>, FilterItemFromFilterEndPoint> : never;
     lang?: number;
     site?: number;
 }
+export interface Source<ContentType> {
+    structuredData: ContentTypeName<ContentType>;
+    filters?: Array<{
+        id: number;
+        label: string;
+    }> | Record<string, FilterItemFromFilterEndPoint> | Array<number>;
+    filterOperator?: "and" | "or" | "AND" | "OR";
+    globalOperator?: "and" | "or" | "AND" | "OR";
+}
 export interface ReferenceNavigation {
     order?: string;
     quantity?: number;

package/dist/types/global.d.ts

@@ -21,9 +21,6 @@ export interface SetQueryProps<ContentType> {
         url: string;
     }>, "__relatedContentTypeNames" | "__contentTypeKind" | "__contentTypeName">>;
     /** Array of filterIds or Object of arrays of content type ids to filter the query */
-    filterIds?: ContentType extends {
-        __contentTypeName: string;
-    } ? Array<number> | Record<ContentType["__contentTypeName"], FilterItemFromFilterEndPoint> : never;
     /** String as HASH to cache the query (Mostly interal use)  */
     cached?: string | number | undefined;
     /** Search string, the spaces will be removed */
@@ -31,19 +28,13 @@ export interface SetQueryProps<ContentType> {
     /** Operator OR | AND */
     operator?: "and" | "or" | "AND" | "OR";
     /** Operator OR | AND */
-    filterOperator?: "and" | "or" | "AND" | "OR";
     /** Operator OR | AND */
-    globalOperator?: "and" | "or" | "AND" | "OR";
     /** Array of content types ids to exclude from the query */
     exclude?: Array<number>;
     /** Indicates if the data queried include a list with all the available relationship options, for example to make search filters. */
     relations?: boolean | "off" | "simple" | "full";
     /** Indicates if the query includes pending publish data */
     includePending?: boolean;
-    /** Indicates if we should limit results to one language */
-    allLanguages?: boolean;
-    /** Indicates if we should first return elements with same language as the page */
-    preferenceLanguage?: boolean;
     /** The id of a ContentType */
     referenceId?: number;
 }
@@ -88,12 +79,13 @@ export type Hideable<T> = T | null;
 export type Pretty<T> = {
     [K in keyof T]: T[K];
 } & {};
-export interface FilterItemFromFilterEndPoint {
-    label: string;
-    items: Array<{
+interface RawFilterItemFromFilterEndPoint {
+    label?: string;
+    items?: Array<{
         id: number;
         label: string;
         language: number;
     }>;
 }
+export type FilterItemFromFilterEndPoint = Pretty<RawFilterItemFromFilterEndPoint>;
 export {};

package/dist/types/schema-fields/props.d.ts

@@ -1,4 +1,5 @@
 import __AT__ from "@autoTypes";
+import { Source } from "../api-response-fields";
 export type WithAuxText = {
     /** Sets a label text to show besides the toggle field control */
     auxText?: string;
@@ -87,9 +88,13 @@ export type WithSlugTo = {
     slugTo?: string;
 };
 export type WithSource = {
-    /** Structured data type from which you have to load the options. */
+    /** Structured data from which the options must be loaded. */
     source: __AT__.PageContentTypes | __AT__.SimpleContentTypes | __AT__.TaxonomyContentTypes;
 };
+export type WithSources<ContentType = unknown> = {
+    /** Structured data object from which the options must be loaded. */
+    sources: Array<Source<ContentType>>;
+};
 export type ThemeColors = {
     theme: __AT__.Subthemes;
     options: Array<`#${string}`>;
@@ -140,5 +145,5 @@ export type WithRelations_AutoTypes = {
 };
 export type WithDataSources = {
     /** Array with the structured data types that the field has to load. */
-    source: Array<__AT__.PageContentTypes | __AT__.SimpleContentTypes | __AT__.TaxonomyContentTypes>;
+    source: Array<Source<__AT__.PageContentTypes | __AT__.SimpleContentTypes | __AT__.TaxonomyContentTypes>>;
 };

package/dist/types/schemas/UI.d.ts

@@ -1,6 +1,7 @@
 import { BaseUI } from "./base";
 import { ConfigTabs, Dimension } from "./props";
 import { Fields } from "../..";
+import { Source } from "../api-response-fields";
 import { UIFields } from "../schema-fields/ui-fields";
 export interface ComponentAndModuleBase extends BaseUI {
     /** Type of schema. */
@@ -54,12 +55,12 @@ export interface ContentTypeModule<ContentTypeModuleProps = unknown> extends Com
         component: Capitalize<string>;
         /** Required prop as `true` for ContentType Modules */
         hasDistributorData: true;
-        /** `data` prop requierd for ContentType modules */
-        data: ContentTypeModuleProps extends {
+        /** `data` prop for ContentType modules */
+        data?: ContentTypeModuleProps extends {
             data?: any;
-        } ? ContentTypeModuleProps["data"] : Omit<Fields.Reference<unknown>, "source" | "mode"> & {
+        } ? ContentTypeModuleProps["data"] : Omit<Fields.Reference<unknown>, "sources" | "mode"> & {
             mode: "auto" | "manual";
-            source?: Array<string>;
+            sources?: Array<Source<unknown>>;
         };
         [key: string]: any;
     } & ContentTypeModuleProps;

package/package.json

@@ -2,7 +2,7 @@
 	"name": "@griddo/core",
 	"description": "Reload version of Griddo Core",
 	"license": "UNLICENSED",
-	"version": "10.3.7",
+	"version": "10.3.8",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -81,5 +81,5 @@
 	"resolutions": {
 		"colors": "1.4.0"
 	},
-	"gitHead": "5052758b2c3b8837eb2cc70506ed58026254ae18"
+	"gitHead": "7e355ae2bd1b87bc210353cb2c891bd6aecb123c"
 }