tinacms 2.2.8 → 2.2.9

package/dist/client.js

@@ -26,7 +26,7 @@
         return;
       }
       try {
-        if (this.cacheDir && window === void 0 && typeof require !== "undefined") {
+        if (this.cacheDir && typeof window === "undefined" && typeof require !== "undefined") {
           const { NodeCache: NodeCache2 } = await Promise.resolve().then(() => nodeCache);
           this.cache = await NodeCache2(this.cacheDir);
         }

package/dist/client.mjs

@@ -23,7 +23,7 @@ class TinaClient {
       return;
     }
     try {
-      if (this.cacheDir && window === void 0 && typeof require !== "undefined") {
+      if (this.cacheDir && typeof window === "undefined" && typeof require !== "undefined") {
         const { NodeCache } = await import("./node-cache-7fa2452c.mjs");
         this.cache = await NodeCache(this.cacheDir);
       }

package/dist/index.js

@@ -4549,19 +4549,32 @@ var __publicField = (obj, key, value) => {
     }
   )));
   PopoverContent.displayName = PopoverPrimitive__namespace.Content.displayName;
-  const useGetOptionSets = (cms, collections) => {
+  const filterQueryBuilder = (fieldFilterConfig, collection) => {
+    return {
+      [collection]: Object.entries(fieldFilterConfig).reduce(
+        (acc, [key, value]) => {
+          acc[key] = { in: value };
+          return acc;
+        },
+        {}
+      )
+    };
+  };
+  const useGetOptionSets = (cms, collections, collectionFilter) => {
     const [optionSets, setOptionSets] = React__namespace.useState([]);
     const [loading, setLoading] = React__namespace.useState(true);
     React__namespace.useEffect(() => {
       const fetchOptionSets = async () => {
+        const filters = typeof collectionFilter === "function" ? collectionFilter() : collectionFilter;
         const optionSets2 = await Promise.all(
           collections.map(async (collection) => {
             try {
+              const filter = (filters == null ? void 0 : filters[collection]) ? filterQueryBuilder(filters[collection], collection) : {};
               const response = await cms.api.tina.request(
                 `#graphql
-            query ($collection: String!){
+            query ($collection: String!, $filter: DocumentFilter) {
               collection(collection: $collection) {
-                documents(first: -1) {
+                documents(first: -1, filter: $filter) {
                   edges {
                     node {
                       ...on Node {
@@ -4580,13 +4593,22 @@ var __publicField = (obj, key, value) => {
               }
             }
             `,
-                { variables: { collection } }
+                {
+                  variables: {
+                    collection,
+                    filter
+                  }
+                }
               );
               return {
                 collection,
                 edges: response.collection.documents.edges
               };
             } catch (e) {
+              console.error(
+                "Exception thrown while building and running GraphQL query: ",
+                e
+              );
               return {
                 collection,
                 edges: []
@@ -4620,7 +4642,11 @@ var __publicField = (obj, key, value) => {
     const [open2, setOpen] = React__namespace.useState(false);
     const [value, setValue] = React__namespace.useState(input.value);
     const [displayText, setDisplayText] = React__namespace.useState(null);
-    const { optionSets, loading } = useGetOptionSets(cms, field.collections);
+    const { optionSets, loading } = useGetOptionSets(
+      cms,
+      field.collections,
+      field.collectionFilter
+    );
     const [filteredOptionsList, setFilteredOptionsList] = React__namespace.useState(optionSets);
     React__namespace.useEffect(() => {
       setDisplayText(getFilename(optionSets, value));
@@ -9674,7 +9700,7 @@ var __publicField = (obj, key, value) => {
       "Event Log"
     ));
   };
-  const version = "2.2.8";
+  const version = "2.2.9";
   const Nav = ({
     isLocalMode,
     className = "",

package/dist/index.mjs

@@ -4572,19 +4572,32 @@ const PopoverContent = React.forwardRef(({ className, align = "center", sideOffs
   }
 )));
 PopoverContent.displayName = PopoverPrimitive.Content.displayName;
-const useGetOptionSets = (cms, collections) => {
+const filterQueryBuilder = (fieldFilterConfig, collection) => {
+  return {
+    [collection]: Object.entries(fieldFilterConfig).reduce(
+      (acc, [key, value]) => {
+        acc[key] = { in: value };
+        return acc;
+      },
+      {}
+    )
+  };
+};
+const useGetOptionSets = (cms, collections, collectionFilter) => {
   const [optionSets, setOptionSets] = React.useState([]);
   const [loading, setLoading] = React.useState(true);
   React.useEffect(() => {
     const fetchOptionSets = async () => {
+      const filters = typeof collectionFilter === "function" ? collectionFilter() : collectionFilter;
       const optionSets2 = await Promise.all(
         collections.map(async (collection) => {
           try {
+            const filter = (filters == null ? void 0 : filters[collection]) ? filterQueryBuilder(filters[collection], collection) : {};
             const response = await cms.api.tina.request(
               `#graphql
-            query ($collection: String!){
+            query ($collection: String!, $filter: DocumentFilter) {
               collection(collection: $collection) {
-                documents(first: -1) {
+                documents(first: -1, filter: $filter) {
                   edges {
                     node {
                       ...on Node {
@@ -4603,13 +4616,22 @@ const useGetOptionSets = (cms, collections) => {
               }
             }
             `,
-              { variables: { collection } }
+              {
+                variables: {
+                  collection,
+                  filter
+                }
+              }
             );
             return {
               collection,
               edges: response.collection.documents.edges
             };
           } catch (e) {
+            console.error(
+              "Exception thrown while building and running GraphQL query: ",
+              e
+            );
             return {
               collection,
               edges: []
@@ -4643,7 +4665,11 @@ const ComboboxDemo = ({
   const [open2, setOpen] = React.useState(false);
   const [value, setValue] = React.useState(input.value);
   const [displayText, setDisplayText] = React.useState(null);
-  const { optionSets, loading } = useGetOptionSets(cms, field.collections);
+  const { optionSets, loading } = useGetOptionSets(
+    cms,
+    field.collections,
+    field.collectionFilter
+  );
   const [filteredOptionsList, setFilteredOptionsList] = React.useState(optionSets);
   React.useEffect(() => {
     setDisplayText(getFilename(optionSets, value));
@@ -9697,7 +9723,7 @@ const SyncStatus = ({ cms, setEventsOpen }) => {
     "Event Log"
   ));
 };
-const version = "2.2.8";
+const version = "2.2.9";
 const Nav = ({
   isLocalMode,
   className = "",

package/dist/toolkit/fields/components/reference/index.d.ts

@@ -1,30 +1,3 @@
 import * as React from 'react';
-type Option = {
-    value: string;
-    label: string;
-};
-type ReferenceFieldOptions = {
-    optionComponent?: OptionComponent;
-    experimental___filter?: (list: Array<any>, searchQuery: string) => Array<any>;
-};
-type OptionComponent = (props: unknown, _sys: InternalSys) => React.ReactElement | string;
-export interface InternalSys {
-    filename: string;
-    path: string;
-}
-export interface ReferenceFieldProps extends ReferenceFieldOptions {
-    label?: string;
-    name: string;
-    component: string;
-    collections: string[];
-    options: (Option | string)[];
-}
-export interface ReferenceProps {
-    name: string;
-    input: any;
-    field: ReferenceFieldProps;
-    disabled?: boolean;
-    options?: (Option | string)[];
-}
+import { ReferenceProps } from './model/reference-props';
 export declare const Reference: React.FC<ReferenceProps>;
-export {};

package/dist/toolkit/fields/components/reference/model/reference-field-props.d.ts

@@ -1,3 +1,4 @@
+import { CollectionFilters } from '../utils/fetch-options-query-builder';
 export type Option = {
     value: string;
     label: string;
@@ -10,6 +11,7 @@ export interface InternalSys {
 type ReferenceFieldOptions = {
     optionComponent?: OptionComponent;
     experimental___filter?: (list: Array<any>, searchQuery: string) => Array<any>;
+    collectionFilter?: CollectionFilters;
 };
 export interface ReferenceFieldProps extends ReferenceFieldOptions {
     label?: string;

package/dist/toolkit/fields/components/reference/utils/fetch-options-query-builder.d.ts

@@ -0,0 +1,5 @@
+export type FilterValue = string[] | string;
+export type CollectionFilters = Record<string, FilterValue> | (() => Record<string, FilterValue>);
+export declare const filterQueryBuilder: (fieldFilterConfig: FilterValue, collection: string) => {
+    [x: string]: Record<string, Record<string, FilterValue>>;
+};

package/dist/toolkit/fields/plugins/reference-field-plugin.d.ts

@@ -1,8 +1,8 @@
-export declare const ReferenceField: (props: import("./wrap-field-with-meta").InputFieldType<import("../components/reference").ReferenceProps, {}>) => import("react").JSX.Element;
+export declare const ReferenceField: (props: import("./wrap-field-with-meta").InputFieldType<import("../components/reference/model/reference-props").ReferenceProps, {}>) => import("react").JSX.Element;
 export declare const ReferenceFieldPlugin: {
     name: string;
     type: string;
-    Component: (props: import("./wrap-field-with-meta").InputFieldType<import("../components/reference").ReferenceProps, {}>) => import("react").JSX.Element;
+    Component: (props: import("./wrap-field-with-meta").InputFieldType<import("../components/reference/model/reference-props").ReferenceProps, {}>) => import("react").JSX.Element;
     parse: (value?: string) => string;
     validate(value: any, values: any, meta: any, field: any): string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tinacms",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {
@@ -127,9 +127,9 @@
     "webfontloader": "1.6.28",
     "yup": "^1.4.0",
     "zod": "^3.23.8",
-    "@tinacms/mdx": "1.4.4",
-    "@tinacms/schema-tools": "1.6.4",
-    "@tinacms/search": "1.0.31"
+    "@tinacms/mdx": "1.4.5",
+    "@tinacms/search": "1.0.32",
+    "@tinacms/schema-tools": "1.6.5"
   },
   "devDependencies": {
     "@graphql-tools/utils": "^10.5.4",