@tinacms/graphql 1.3.2 → 1.3.4

package/dist/resolver/filter-utils.d.ts

@@ -1,13 +1,13 @@
 /**
 
 */
-import type { ReferenceTypeInner, TinaFieldInner } from '@tinacms/schema-tools';
+import type { ReferenceType, TinaField } from '@tinacms/schema-tools';
 import { FilterCondition } from '../database/datalayer';
-export declare type ReferenceResolver = (filter: Record<string, object>, fieldDefinition: ReferenceTypeInner) => Promise<{
+export declare type ReferenceResolver = (filter: Record<string, object>, fieldDefinition: ReferenceType) => Promise<{
     edges: {
         node: any;
     }[];
     values: any[];
 }>;
-export declare const resolveReferences: (filter: any, fields: TinaFieldInner<false>[], resolver: ReferenceResolver) => Promise<void>;
-export declare const collectConditionsForField: (fieldName: string, field: TinaFieldInner<false>, filterNode: Record<string, object>, pathExpression: string, collectCondition: (condition: FilterCondition) => void) => void;
+export declare const resolveReferences: (filter: any, fields: TinaField[], resolver: ReferenceResolver) => Promise<void>;
+export declare const collectConditionsForField: (fieldName: string, field: TinaField, filterNode: Record<string, object>, pathExpression: string, collectCondition: (condition: FilterCondition) => void) => void;

package/dist/resolver/index.d.ts

@@ -2,7 +2,7 @@
 
 */
 import { Database } from '../database';
-import type { Collectable, ReferenceTypeWithNamespace, TinaCloudCollection, TinaFieldInner, TinaSchema } from '@tinacms/schema-tools';
+import type { Collectable, Collection, TinaField, Template, TinaSchema } from '@tinacms/schema-tools';
 import type { GraphQLConfig } from '../types';
 interface ResolverConfig {
     config?: GraphQLConfig;
@@ -23,47 +23,49 @@ export declare class Resolver {
     isAudit: boolean;
     constructor(init: ResolverConfig);
     resolveCollection: (args: any, collectionName: string, hasDocuments?: boolean) => Promise<{
-        fields: TinaFieldInner<true>[];
+        fields: TinaField<true>[];
         templates?: undefined;
-        references?: ReferenceTypeWithNamespace[];
-        namespace: string[];
         label?: string;
         name: string;
         path: string;
+        indexes?: {
+            name: string;
+            fields: {
+                name: string;
+            }[];
+        }[];
+        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "yml" | "toml";
+        ui?: import("@tinacms/schema-tools").UICollection;
         defaultItem?: import("@tinacms/schema-tools").DefaultItem<Record<string, any>>;
-        indexes?: import("@tinacms/schema-tools").TinaIndex[];
-        format?: "json" | "md" | "markdown" | "mdx";
         frontmatterFormat?: "json" | "yaml" | "toml";
         frontmatterDelimiters?: string | [string, string];
-        ui?: import("@tinacms/schema-tools").UICollection;
         match?: string;
+        namespace: string[];
         documents: {
-            collection: TinaCloudCollection<true>;
+            collection: Collection<true>;
             hasDocuments: boolean;
         };
     } | {
-        templates: (string | {
-            label: string;
-            name: string;
-            ui?: import("@tinacms/schema-tools").UICollection;
-            fields: TinaFieldInner<true>[];
-            namespace: string[];
-        })[];
+        templates: Template<true>[];
         fields?: undefined;
-        references?: ReferenceTypeWithNamespace[];
-        namespace: string[];
         label?: string;
         name: string;
         path: string;
+        indexes?: {
+            name: string;
+            fields: {
+                name: string;
+            }[];
+        }[];
+        format?: "json" | "md" | "markdown" | "mdx" | "yaml" | "yml" | "toml";
+        ui?: import("@tinacms/schema-tools").UICollection;
         defaultItem?: import("@tinacms/schema-tools").DefaultItem<Record<string, any>>;
-        indexes?: import("@tinacms/schema-tools").TinaIndex[];
-        format?: "json" | "md" | "markdown" | "mdx";
         frontmatterFormat?: "json" | "yaml" | "toml";
         frontmatterDelimiters?: string | [string, string];
-        ui?: import("@tinacms/schema-tools").UICollection;
         match?: string;
+        namespace: string[];
         documents: {
-            collection: TinaCloudCollection<true>;
+            collection: Collection<true>;
             hasDocuments: boolean;
         };
     }>;
@@ -76,7 +78,7 @@ export declare class Resolver {
             path: string;
             relativePath: string;
             breadcrumbs: string[];
-            collection: TinaCloudCollection<true>;
+            collection: Collection<true>;
             template: string | number;
         };
         _values: {
@@ -99,7 +101,7 @@ export declare class Resolver {
         [key: string]: unknown;
     }[];
     createResolveDocument: ({ collection, realPath, args, isAddPendingDocument, }: {
-        collection: TinaCloudCollection<true>;
+        collection: Collection<true>;
         realPath: string;
         args: unknown;
         isAddPendingDocument: boolean;
@@ -112,7 +114,7 @@ export declare class Resolver {
             path: string;
             relativePath: string;
             breadcrumbs: string[];
-            collection: TinaCloudCollection<true>;
+            collection: Collection<true>;
             template: string | number;
         };
         _values: {
@@ -129,7 +131,7 @@ export declare class Resolver {
         id: string;
     }>;
     updateResolveDocument: ({ collection, realPath, args, isAddPendingDocument, isCollectionSpecific, }: {
-        collection: TinaCloudCollection<true>;
+        collection: Collection<true>;
         realPath: string;
         args: unknown;
         isAddPendingDocument: boolean;
@@ -143,7 +145,7 @@ export declare class Resolver {
             path: string;
             relativePath: string;
             breadcrumbs: string[];
-            collection: TinaCloudCollection<true>;
+            collection: Collection<true>;
             template: string | number;
         };
         _values: {
@@ -177,7 +179,7 @@ export declare class Resolver {
             path: string;
             relativePath: string;
             breadcrumbs: string[];
-            collection: TinaCloudCollection<true>;
+            collection: Collection<true>;
             template: string | number;
         };
         _values: {
@@ -207,7 +209,7 @@ export declare class Resolver {
                     path: string;
                     relativePath: string;
                     breadcrumbs: string[];
-                    collection: TinaCloudCollection<true>;
+                    collection: Collection<true>;
                     template: string | number;
                 };
                 _values: {
@@ -229,7 +231,7 @@ export declare class Resolver {
     private resolveFilterConditions;
     resolveCollectionConnection: ({ args, collection, hydrator, }: {
         args: Record<string, Record<string, object> | string | number>;
-        collection: TinaCloudCollection<true>;
+        collection: Collection<true>;
         hydrator?: (string: any) => any;
     }) => Promise<{
         totalCount: number;

package/dist/resolver/media-utils.d.ts

@@ -2,7 +2,7 @@
 
 */
 import type { GraphQLConfig } from '../types';
-import type { TinaCloudSchemaEnriched } from '@tinacms/schema-tools';
+import type { Schema } from '@tinacms/schema-tools';
 /**
  * Strips away the Tina Cloud Asset URL from an `image` value
  *
@@ -10,7 +10,7 @@ import type { TinaCloudSchemaEnriched } from '@tinacms/schema-tools';
  * @param {GraphQLConfig} config
  * @returns {string}
  */
-export declare const resolveMediaCloudToRelative: (value: string, config: GraphQLConfig, schema: TinaCloudSchemaEnriched) => string;
+export declare const resolveMediaCloudToRelative: (value: string, config: GraphQLConfig, schema: Schema<true>) => string;
 /**
  * Adds Tina Cloud Asset URL to an `image` value
  *
@@ -18,4 +18,4 @@ export declare const resolveMediaCloudToRelative: (value: string, config: GraphQ
  * @param {GraphQLConfig} config
  * @returns {string}
  */
-export declare const resolveMediaRelativeToCloud: (value: string, config: GraphQLConfig, schema: TinaCloudSchemaEnriched) => string;
+export declare const resolveMediaRelativeToCloud: (value: string, config: GraphQLConfig, schema: Schema<true>) => string;

package/dist/schema/createSchema.d.ts

@@ -1,8 +1,8 @@
 /**
 
 */
-import { TinaSchema, TinaCloudSchemaBase } from '@tinacms/schema-tools';
+import { TinaSchema, Schema } from '@tinacms/schema-tools';
 export declare const createSchema: ({ schema, flags, }: {
-    schema: TinaCloudSchemaBase;
+    schema: Schema;
     flags?: string[];
 }) => Promise<TinaSchema>;

package/dist/schema/validate.d.ts

@@ -1,5 +1,11 @@
 /**
 
 */
-import { TinaCloudSchemaBase } from '@tinacms/schema-tools';
-export declare const validateSchema: (schema: TinaCloudSchemaBase) => Promise<TinaCloudSchemaBase>;
+import { Schema, Collection } from '@tinacms/schema-tools';
+export declare const validateSchema: (schema: Schema) => Promise<{
+    collections: Collection<true>[];
+    config: import("@tinacms/schema-tools").Config<undefined, undefined, undefined, undefined>;
+} | {
+    collections: Collection<true>[];
+    config?: undefined;
+}>;

package/dist/spec/setup.d.ts

@@ -1,10 +1,10 @@
 /**
 
 */
-import type { TinaCloudSchema } from '@tinacms/schema-tools';
+import type { Schema } from '@tinacms/schema-tools';
 import { Database } from '../database';
 import { Level } from '../database/level';
-export declare const setup: (rootPath: string, schema: TinaCloudSchema<false>, level: Level) => Promise<{
+export declare const setup: (rootPath: string, schema: Schema, level: Level) => Promise<{
     database: Database;
 }>;
 export declare const print: (fixture: Fixture) => string;
@@ -22,11 +22,11 @@ export declare type Fixture = {
     message?: string;
     expectError?: boolean;
 };
-export declare const setupFixture: (rootPath: string, schema: TinaCloudSchema<false>, level: Level, fixture: Fixture, suffix?: string, queryName?: string, folder?: string) => Promise<{
+export declare const setupFixture: (rootPath: string, schema: Schema, level: Level, fixture: Fixture, suffix?: string, queryName?: string, folder?: string) => Promise<{
     responses: string[];
     expectedResponsePaths: string[];
 }>;
-export declare const setupFixture2: (rootPath: string, schema: TinaCloudSchema<false>, level: Level, fixture: Fixture, suffix?: string, queryName?: string, folder?: string) => Promise<{
+export declare const setupFixture2: (rootPath: string, schema: Schema, level: Level, fixture: Fixture, suffix?: string, queryName?: string, folder?: string) => Promise<{
     responses: string[];
     expectedResponsePaths: string[];
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
   "typings": "dist/index.d.ts",
@@ -25,15 +25,15 @@
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
     "@iarna/toml": "^2.2.5",
-    "@tinacms/mdx": "1.3.1",
-    "@tinacms/schema-tools": "1.3.2",
+    "@tinacms/mdx": "1.3.3",
+    "@tinacms/schema-tools": "1.3.3",
     "abstract-level": "^1.0.3",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
     "dataloader": "^2.0.0",
     "date-fns": "^2.21.1",
     "encoding-down": "^7.1.0",
-    "esbuild": "^0.12.25",
+    "esbuild": "^0.15.5",
     "esbuild-jest": "^0.5.0",
     "estree-walker": "^3.0.0",
     "fast-glob": "^3.2.5",
@@ -82,8 +82,8 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/schema-tools": "1.3.2",
-    "@tinacms/scripts": "1.0.2",
+    "@tinacms/schema-tools": "1.3.3",
+    "@tinacms/scripts": "1.0.4",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
     "@types/express": "^4.17.8",

package/dist/mdx/parse.d.ts

@@ -1,220 +0,0 @@
-/**
-
-
-
-*/
-import type { RichTypeInner } from '@tinacms/schema-tools';
-import type { GraphQLConfig } from '../types';
-import type { TinaCloudSchemaEnriched } from '@tinacms/schema-tools';
-import type { Content } from 'mdast';
-export declare const parseMDX: (value: string, field: RichTypeInner, graphQLconfig: GraphQLConfig, schema: TinaCloudSchemaEnriched) => {
-    type: string;
-    children: any;
-};
-/**
- * ### Convert the MDXAST into an API-friendly format
- *
- * When we parse with Remark + MDX we get an AST which has a ton of JS capabilities, meaning
- * we could pass this back into a JS runtime and evaluate it. Ex.
- *
- * ```mdx
- * ## Hello world! The time and date is: {(new Date().toLocaleString())}
- * ```
- *
- * However, as an intentional constraint we don't want this information as part of our API, as
- * we don't intend to support the true JS runtime properties of MDX. Rather, we're using MDX for
- * it's expressive syntax and it's advanced tooling with how it parses JSX inside Markdown.
- *
- * Parsing here does 2 things:
- *
- * #### Remove non-literal uses of JSX
- * Things like <MyComponent myProp={() => alert("HI")} /> are not supported and will be ignored
- *
- * #### Convert remark nodes to slate-compatible nodes
- *
- * A remark node might look like this:
- * ```js
- * {
- *   type: "heading",
- *   depth: 1
- *   children: [{type: 'text', value: 'Hello'}]
- * }
- * ```
- * A slate-compatible node would be:
- * ```js
- * {
- *   type: "heading_one",
- *   children: [{type: 'text', text: 'Hello'}]
- * }
- * ```
- * It's not a huge difference, but in general slate does better with less layers of indirection.
- *
- * While it may be desirable to ultimately serve a remark AST shape as part of the API response,
- * it's currently much easier to only support the shape that works with Slate. This is ok for now for 2
- * reasons.
- *
- * 1. Us providing the `TinaMarkdown` component on the frontend abstracts away an work the developer
- * would need to do, so it doesn't really matter what shape the response is as long as the external API
- * doesn't change
- *
- * 2. We don't need to do any client-side parsing. Since TinaMarkdown and the slate editor work with the same
- * format we can just allow Tina to do it's thing and update the form valuse with no additional work.
- */
-export declare const parseMDXInner: (tree: any, field: RichTypeInner, graphQLconfig: GraphQLConfig, schema: TinaCloudSchemaEnriched) => {
-    type: string;
-    children: any;
-};
-export interface NodeTypes {
-    paragraph: string;
-    block_quote: string;
-    code_block: string;
-    link: string;
-    image: string;
-    ul_list: string;
-    ol_list: string;
-    listItem: string;
-    heading: {
-        1: string;
-        2: string;
-        3: string;
-        4: string;
-        5: string;
-        6: string;
-    };
-    emphasis_mark: string;
-    strong_mark: string;
-    delete_mark: string;
-    inline_code_mark: string;
-    thematic_break: string;
-    break: string;
-}
-export declare type SlateNodeType = {
-    type: 'heading_one';
-    children: SlateNodeType[];
-} | {
-    type: 'heading_two';
-    children: SlateNodeType[];
-} | {
-    type: 'heading_three';
-    children: SlateNodeType[];
-} | {
-    type: 'heading_four';
-    children: SlateNodeType[];
-} | {
-    type: 'heading_five';
-    children: SlateNodeType[];
-} | {
-    type: 'heading_six';
-    children: SlateNodeType[];
-} | {
-    type: 'paragraph';
-    children: SlateNodeType[];
-} | {
-    children: SlateNodeType[];
-    link: string;
-    type: 'link';
-} | {
-    type: 'block_quote';
-    children: SlateNodeType[];
-} | {
-    type: 'text';
-    text: string;
-} | {
-    type: 'mdxJsxTextElement';
-    props: object;
-    children: SlateNodeType[];
-    name: string;
-} | {
-    type: 'mdxJsxFlowElement';
-    props: object;
-    children: SlateNodeType[];
-    name: string;
-} | {
-    type: 'block_quote';
-    children: SlateNodeType[];
-} | {
-    type: 'code_block';
-    language: string;
-    value: string;
-} | {
-    type: 'image';
-    link: string;
-    caption: string;
-} | {
-    type: 'thematic_break';
-};
-declare type RecursivePartial<T> = {
-    [P in keyof T]?: RecursivePartial<T[P]>;
-};
-export interface OptionType {
-    nodeTypes?: RecursivePartial<NodeTypes>;
-    linkDestinationKey?: string;
-    imageSourceKey?: string;
-    imageCaptionKey?: string;
-}
-export interface MdastNode {
-    type?: string;
-    ordered?: boolean;
-    value?: string;
-    text?: string;
-    children?: Array<MdastNode>;
-    depth?: 1 | 2 | 3 | 4 | 5 | 6;
-    url?: string;
-    alt?: string;
-    lang?: string;
-    position?: any;
-    spread?: any;
-    checked?: any;
-    indent?: any;
-}
-declare type MdxJsxFlowElement = {
-    type: 'mdxJsxFlowElement';
-    name: string;
-    attributes: object;
-    children: MdxAstNode[];
-};
-declare type MdxJsxTextElement = {
-    type: 'mdxJsxTextElement';
-    name: string;
-    attributes: object;
-    children: MdxAstNode[];
-};
-declare type MdxAstNode = Content | MdxJsxFlowElement | MdxJsxTextElement;
-export declare const plateElements: {
-    ELEMENT_H1: string;
-    ELEMENT_H2: string;
-    ELEMENT_H3: string;
-    ELEMENT_H4: string;
-    ELEMENT_H5: string;
-    ELEMENT_H6: string;
-    ELEMENT_HR: string;
-    ELEMENT_ALIGN_CENTER: string;
-    ELEMENT_ALIGN_JUSTIFY: string;
-    ELEMENT_ALIGN_LEFT: string;
-    ELEMENT_ALIGN_RIGHT: string;
-    ELEMENT_BLOCKQUOTE: string;
-    ELEMENT_CODE_BLOCK: string;
-    ELEMENT_CODE_LINE: string;
-    ELEMENT_DEFAULT: string;
-    ELEMENT_IMAGE: string;
-    ELEMENT_LI: string;
-    ELEMENT_LIC: string;
-    ELEMENT_LINK: string;
-    ELEMENT_MEDIA_EMBED: string;
-    ELEMENT_MENTION: string;
-    ELEMENT_OL: string;
-    ELEMENT_PARAGRAPH: string;
-    ELEMENT_TABLE: string;
-    ELEMENT_TD: string;
-    ELEMENT_TH: string;
-    ELEMENT_TODO_LI: string;
-    ELEMENT_TR: string;
-    ELEMENT_UL: string;
-    MARK_ITALIC: string;
-    MARK_BOLD: string;
-    MARK_STRIKETHROUGH: string;
-    MARK_UNDERLINE: string;
-};
-export declare const defaultNodeTypes: NodeTypes;
-export default function remarkToSlate(node: MdxAstNode, graphQLconfig: GraphQLConfig, schema: TinaCloudSchemaEnriched): any;
-export {};

package/dist/mdx/stringify.d.ts

@@ -1,13 +0,0 @@
-/**
-
-
-
-*/
-import type { GraphQLConfig } from '../types';
-import type { TinaCloudSchemaEnriched } from '@tinacms/schema-tools';
-import { plateElements } from './parse';
-import type { Content } from 'mdast';
-export declare const stringifyMDX: (value: unknown, field: any, graphQLconfig: GraphQLConfig, schema: TinaCloudSchemaEnriched) => string;
-export declare const stringify: (node: {
-    type: typeof plateElements;
-}, field: any, graphQLconfig: GraphQLConfig, schema: TinaCloudSchemaEnriched) => Content;