@tinacms/graphql 0.60.1 → 0.60.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # tina-graphql
 
+## 0.60.2
+
+### Patch Changes
+
+- 08cdb672a: Adds `useRelativeMedia` support to local graphql client
+- fdbfe9a16: Fixes issue where on windows documents could not be deleted localy
+- 6e2ed31a2: Added `isTitle` property to the schema that allows the title to be displayed in the CMS
+
 ## 0.60.1
 
 ### Patch Changes

package/dist/index.js

@@ -11264,6 +11264,11 @@ var scalarDefinitions = [
         required: true,
         type: astBuilder.TYPES.String
       }),
+      astBuilder.FieldDefinition({
+        name: "title",
+        required: false,
+        type: astBuilder.TYPES.String
+      }),
       astBuilder.FieldDefinition({
         name: "basename",
         required: true,
@@ -12443,7 +12448,7 @@ var validateField = async (field) => {
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/package.json
 var name = "@tinacms/graphql";
-var version = "0.60.1";
+var version = "0.60.2";
 var main = "dist/index.js";
 var typings = "dist/index.d.ts";
 var files = [
@@ -12540,6 +12545,7 @@ var repository = {
 };
 var devDependencies = {
   "@tinacms/datalayer": "workspace:*",
+  "@tinacms/schema-tools": "workspace:*",
   "@tinacms/scripts": "workspace:*",
   "@types/cors": "^2.8.7",
   "@types/estree": "^0.0.50",
@@ -12563,6 +12569,9 @@ var devDependencies = {
   nodemon: "^2.0.4",
   typescript: "^4.3.5"
 };
+var peerDependencies = {
+  "@tinacms/schema-tools": "*"
+};
 var package_default = {
   name,
   version,
@@ -12575,7 +12584,8 @@ var package_default = {
   dependencies,
   publishConfig,
   repository,
-  devDependencies
+  devDependencies,
+  peerDependencies
 };
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/resolver/error.ts
@@ -22452,15 +22462,11 @@ var createResolver2 = (args) => {
 var Resolver = class {
   constructor(init) {
     this.init = init;
-    this.resolveCollection = async (collectionName, hasDocuments) => {
+    this.resolveCollection = async (args, collectionName, hasDocuments) => {
       const collection = this.tinaSchema.getCollection(collectionName);
       const extraFields = {};
-      let documents = {};
-      if (hasDocuments) {
-        documents = await this.getDocumentsForCollection(collectionName);
-      }
       return __spreadValues(__spreadValues({
-        documents
+        documents: { collection, hasDocuments }
       }, collection), extraFields);
     };
     this.getDocument = async (fullPath) => {
@@ -22486,11 +22492,19 @@ var Resolver = class {
           _template: rawData._template
         };
         await sequential(template.fields, async (field) => this.resolveFieldData(field, rawData, data));
+        const titleField = template.fields.find((x) => {
+          if (x.type === "string" && (x == null ? void 0 : x.isTitle)) {
+            return true;
+          }
+        });
+        const titleFieldName = titleField == null ? void 0 : titleField.name;
+        const title = data[titleFieldName || " "] || null;
         return __spreadProps(__spreadValues({
           __typename: collection.fields ? NAMER.documentTypeName(collection.namespace) : NAMER.documentTypeName(template.namespace),
           id: fullPath
         }, data), {
           _sys: {
+            title,
             basename,
             filename,
             extension: extension2,
@@ -22835,9 +22849,19 @@ var Resolver = class {
         case "boolean":
         case "number":
         case "reference":
-        case "image":
           accumulator[field.name] = value;
           break;
+        case "image":
+          if (this.config) {
+            if (this.config.useRelativeMedia === true) {
+              accumulator[field.name] = value;
+            } else {
+              accumulator[field.name] = `https://assets.tina.io/${this.config.clientId}/${value}`;
+            }
+          } else {
+            accumulator[field.name] = value;
+          }
+          break;
         case "rich-text":
           const tree = parseMDX(value, field);
           accumulator[field.name] = tree;
@@ -22903,6 +22927,7 @@ var Resolver = class {
       }));
       return args.params;
     };
+    this.config = init.config;
     this.database = init.database;
     this.tinaSchema = init.tinaSchema;
   }
@@ -22939,6 +22964,7 @@ var resolveDateInput = (value) => {
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/resolve.ts
 var import_relay_operation_optimizer = __toModule(require("@graphql-tools/relay-operation-optimizer"));
 var resolve = async ({
+  config,
   query,
   variables,
   database,
@@ -22947,9 +22973,11 @@ var resolve = async ({
   try {
     const graphQLSchemaAst = await database.getGraphQLSchema();
     const graphQLSchema = (0, import_graphql3.buildASTSchema)(graphQLSchemaAst);
-    const config = await database.getTinaSchema();
-    const tinaSchema = await createSchema({ schema: config });
-    const resolver2 = await createResolver2({ database, tinaSchema });
+    const tinaConfig = await database.getTinaSchema();
+    const tinaSchema = await createSchema({
+      schema: tinaConfig
+    });
+    const resolver2 = await createResolver2({ config, database, tinaSchema });
     const res = await (0, import_graphql3.graphql)({
       schema: graphQLSchema,
       source: query,
@@ -22985,7 +23013,7 @@ var resolve = async ({
               return ((_a = x == null ? void 0 : x.name) == null ? void 0 : _a.value) === "documents";
             });
             return tinaSchema.getCollections().map((collection) => {
-              return resolver2.resolveCollection(collection.name, Boolean(hasDocuments2));
+              return resolver2.resolveCollection(args, collection.name, Boolean(hasDocuments2));
             });
           }
           const collectionNode = info.fieldNodes.find((x) => x.name.value === "collection");
@@ -22993,7 +23021,7 @@ var resolve = async ({
             var _a;
             return ((_a = x == null ? void 0 : x.name) == null ? void 0 : _a.value) === "documents";
           });
-          return resolver2.resolveCollection(args.collection, Boolean(hasDocuments));
+          return resolver2.resolveCollection(args, args.collection, Boolean(hasDocuments));
         }
         if (info.fieldName === "getOptimizedQuery") {
           try {
@@ -23054,6 +23082,11 @@ var resolve = async ({
                   return { node: document3 };
                 })
               };
+            } else if (info.fieldName === "documents" && (value == null ? void 0 : value.collection) && (value == null ? void 0 : value.hasDocuments)) {
+              return resolver2.resolveCollectionConnection({
+                args,
+                collection: value.collection
+              });
             } else {
               throw new Error(`Expected an array for result of ${info.fieldName} at ${info.path}`);
             }
@@ -23192,7 +23225,7 @@ var Database = class {
     this.config = config;
     this.collectionForPath = async (filepath) => {
       const tinaSchema = await this.getSchema();
-      const collection = tinaSchema.schema.collections.find((collection2) => filepath.startsWith(collection2.path));
+      const collection = await tinaSchema.getCollectionByFullPath(filepath);
       return collection;
     };
     this.get = async (filepath) => {
@@ -23505,8 +23538,7 @@ var Database = class {
       });
     };
     this.delete = async (filepath) => {
-      const tinaSchema = await this.getSchema();
-      const collection = tinaSchema.schema.collections.find((collection2) => filepath.startsWith(collection2.path));
+      const collection = await this.collectionForPath(filepath);
       let collectionIndexDefinitions;
       if (collection) {
         const indexDefinitions = await this.getIndexDefinitions();

package/dist/resolve.d.ts

@@ -11,7 +11,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import type { Database } from './database';
-export declare const resolve: ({ query, variables, database, silenceErrors, }: {
+import type { GraphQLConfig } from './types';
+export declare const resolve: ({ config, query, variables, database, silenceErrors, }: {
+    config?: GraphQLConfig;
     query: string;
     variables: object;
     database: Database;

package/dist/resolver/index.d.ts

@@ -11,10 +11,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import { Database } from '../database';
-import { TinaSchema } from '../schema';
-import type { Collectable, ReferenceTypeWithNamespace, TinaCloudCollection } from '../types';
-import { TinaFieldInner } from '../types';
+import type { Collectable, ReferenceTypeWithNamespace, TinaCloudCollection, TinaFieldInner, TinaSchema } from '@tinacms/schema-tools';
+import type { GraphQLConfig } from '../types';
 interface ResolverConfig {
+    config?: GraphQLConfig;
     database: Database;
     tinaSchema: TinaSchema;
 }
@@ -25,11 +25,12 @@ export declare const createResolver: (args: ResolverConfig) => Resolver;
  */
 export declare class Resolver {
     init: ResolverConfig;
+    config: GraphQLConfig;
     database: Database;
     tinaSchema: TinaSchema;
     constructor(init: ResolverConfig);
-    resolveCollection: (collectionName: string, hasDocuments?: boolean) => Promise<{
-        fields: string | TinaFieldInner<true>[];
+    resolveCollection: (args: any, collectionName: string, hasDocuments?: boolean) => Promise<{
+        fields: TinaFieldInner<true>[];
         templates?: undefined;
         references?: ReferenceTypeWithNamespace[];
         namespace: string[];
@@ -38,14 +39,18 @@ export declare class Resolver {
         path: string;
         format?: "json" | "md" | "markdown" | "mdx";
         match?: string;
-        indexes?: import("../types").TinaIndex[];
-        documents: {};
+        documents: {
+            collection: TinaCloudCollection<true>;
+            hasDocuments: boolean;
+        };
     } | {
         templates: (string | {
             label: string;
             name: string;
             fields: TinaFieldInner<true>[];
-            ui?: object;
+            ui?: object | (import("@tinacms/schema-tools").UIField<any, any> & {
+                previewSrc: string;
+            });
             namespace: string[];
         })[];
         fields?: undefined;
@@ -56,11 +61,14 @@ export declare class Resolver {
         path: string;
         format?: "json" | "md" | "markdown" | "mdx";
         match?: string;
-        indexes?: import("../types").TinaIndex[];
-        documents: {};
+        documents: {
+            collection: TinaCloudCollection<true>;
+            hasDocuments: boolean;
+        };
     }>;
     getDocument: (fullPath: unknown) => Promise<{
         _sys: {
+            title: any;
             basename: string;
             filename: string;
             extension: string;
@@ -92,6 +100,7 @@ export declare class Resolver {
         isAddPendingDocument: boolean;
     }) => Promise<{
         _sys: {
+            title: any;
             basename: string;
             filename: string;
             extension: string;
@@ -118,6 +127,7 @@ export declare class Resolver {
         isCollectionSpecific: boolean;
     }) => Promise<{
         _sys: {
+            title: any;
             basename: string;
             filename: string;
             extension: string;
@@ -146,6 +156,7 @@ export declare class Resolver {
         isCollectionSpecific?: boolean;
     }) => Promise<{
         _sys: {
+            title: any;
             basename: string;
             filename: string;
             extension: string;
@@ -171,6 +182,7 @@ export declare class Resolver {
         edges: {
             node: {
                 _sys: {
+                    title: any;
                     basename: string;
                     filename: string;
                     extension: string;

package/dist/types.d.ts

@@ -263,4 +263,10 @@ export declare type Templateable = {
     fields: TinaFieldEnriched[];
     ui?: object;
 };
+export declare type GraphQLConfig = {
+    useRelativeMedia: true;
+} | {
+    useRelativeMedia: false;
+    clientId: string;
+};
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.60.1",
+  "version": "0.60.2",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -97,6 +97,7 @@
   },
   "devDependencies": {
     "@tinacms/datalayer": "0.1.1",
+    "@tinacms/schema-tools": "0.0.4",
     "@tinacms/scripts": "0.50.7",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
@@ -119,5 +120,8 @@
     "jest-matcher-utils": "27.0.6",
     "nodemon": "^2.0.4",
     "typescript": "^4.3.5"
+  },
+  "peerDependencies": {
+    "@tinacms/schema-tools": "*"
   }
 }