@tinacms/graphql 0.60.2 → 0.60.5

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # tina-graphql
 
+## 0.60.5
+
+### Patch Changes
+
+- 57f09bdd7: Always use the query function when the dataLayer in enabled
+
+## 0.60.4
+
+### Patch Changes
+
+- d103b27ad: Fix issue where new collections would not be added when CLI restarts
+
+## 0.60.3
+
+### Patch Changes
+
+- 79d112d79: Update cli to accept tinaCloudMediaStore flag and add to metadata during schema compilation
+- 3f46c6706: Fixed issue where generated SDK would not work with templates
+- db9168578: Adds support for an `assetsHost` when resolving `image` fields with `useRelativeMedia`
+- 91d6e6758: Fix issues with experimentalData on windows related to path separator inconsistency and interference with the .tina/**generated** folder
+
 ## 0.60.2
 
 ### Patch Changes

package/dist/build.d.ts

@@ -12,8 +12,9 @@ limitations under the License.
 */
 import type { TinaSchema } from './schema';
 import { Database } from './database';
-export declare const indexDB: ({ database, config, buildSDK, }: {
+export declare const indexDB: ({ database, config, flags, buildSDK, }: {
     database: Database;
     config: TinaSchema['config'];
+    flags?: string[];
     buildSDK?: boolean;
 }) => Promise<void>;

package/dist/database/index.d.ts

@@ -44,8 +44,6 @@ export declare class Database {
     private tinaSchema;
     private collectionIndexDefinitions;
     private _lookup;
-    private _graphql;
-    private _tinaSchema;
     constructor(config: CreateDatabase);
     private collectionForPath;
     private partitionPathsByCollection;
@@ -65,6 +63,10 @@ export declare class Database {
         };
         keepTemplateKey: boolean;
     }>;
+    /**
+     * Clears the internal cache of the tinaSchema and the lookup file. This allows the state to be reset
+     */
+    clearCache(): void;
     flush: (filepath: string) => Promise<string>;
     getLookup: (returnType: string) => Promise<LookupMapType>;
     getGraphQLSchema: () => Promise<DocumentNode>;

package/dist/database/util.d.ts

@@ -14,3 +14,4 @@ import * as yup from 'yup';
 export declare const stringifyFile: (content: object, format: FormatType | string, keepTemplateKey: boolean) => string;
 export declare const parseFile: <T extends object>(content: string, format: FormatType | string, yupSchema: (args: typeof yup) => yup.ObjectSchema<any>) => T;
 export declare type FormatType = 'json' | 'md' | 'mdx' | 'markdown';
+export declare const normalizePath: (filepath: string) => string;

package/dist/index.d.ts

@@ -20,7 +20,7 @@ export type { Store } from '@tinacms/datalayer';
 export type { Bridge } from './database/bridge';
 export { sequential, assertShape } from './util';
 export { stringifyFile, parseFile } from './database/util';
-export declare const buildSchema: (rootPath: string, database: Database) => Promise<import("graphql").GraphQLSchema>;
+export declare const buildSchema: (rootPath: string, database: Database, flags?: string[]) => Promise<import("graphql").GraphQLSchema>;
 import type { TinaCloudSchema as TinaCloudSchemaBase, TinaCloudCollection as TinaCloudCollectionBase, TinaCloudTemplateBase as TinaTemplate, TinaFieldBase } from './types';
 export declare type TinaCloudSchema = TinaCloudSchemaBase<false>;
 export declare type TinaSchema = TinaCloudSchema;

package/dist/index.js

@@ -10911,15 +10911,31 @@ var astBuilder = {
             selectionSet: {
               kind: "SelectionSet",
               selections: [
-                SysFieldDefinition,
                 {
-                  kind: "Field",
-                  name: {
-                    kind: "Name",
-                    value: "id"
+                  kind: "InlineFragment",
+                  typeCondition: {
+                    kind: "NamedType",
+                    name: {
+                      kind: "Name",
+                      value: "Document"
+                    }
                   },
-                  arguments: [],
-                  directives: []
+                  directives: [],
+                  selectionSet: {
+                    kind: "SelectionSet",
+                    selections: [
+                      SysFieldDefinition,
+                      {
+                        kind: "Field",
+                        name: {
+                          kind: "Name",
+                          value: "id"
+                        },
+                        arguments: [],
+                        directives: []
+                      }
+                    ]
+                  }
                 },
                 {
                   kind: "FragmentSpread",
@@ -10995,15 +11011,31 @@ var astBuilder = {
                           kind: "SelectionSet",
                           selections: [
                             {
-                              kind: "Field",
-                              name: {
-                                kind: "Name",
-                                value: "id"
+                              kind: "InlineFragment",
+                              typeCondition: {
+                                kind: "NamedType",
+                                name: {
+                                  kind: "Name",
+                                  value: "Document"
+                                }
                               },
-                              arguments: [],
-                              directives: []
+                              directives: [],
+                              selectionSet: {
+                                kind: "SelectionSet",
+                                selections: [
+                                  SysFieldDefinition,
+                                  {
+                                    kind: "Field",
+                                    name: {
+                                      kind: "Name",
+                                      value: "id"
+                                    },
+                                    arguments: [],
+                                    directives: []
+                                  }
+                                ]
+                              }
                             },
-                            SysFieldDefinition,
                             {
                               kind: "FragmentSpread",
                               name: {
@@ -12448,7 +12480,7 @@ var validateField = async (field) => {
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/package.json
 var name = "@tinacms/graphql";
-var version = "0.60.2";
+var version = "0.60.5";
 var main = "dist/index.js";
 var typings = "dist/index.d.ts";
 var files = [
@@ -12490,7 +12522,8 @@ var scripts = {
   build: 'echo "Run `yarn build` from the root of the repository instead"',
   docs: "yarn typedoc",
   serve: "yarn nodemon dist/server.js",
-  test: "jest"
+  test: "jest",
+  "test-watch": "jest --watch"
 };
 var dependencies = {
   "@graphql-tools/relay-operation-optimizer": "^6.4.1",
@@ -12773,11 +12806,13 @@ var import_path = __toModule(require("path"));
 var indexDB = async ({
   database,
   config,
+  flags = [],
   buildSDK = true
 }) => {
-  const flags = [];
   if (database.store.supportsIndexing()) {
-    flags.push("experimentalData");
+    if (flags.indexOf("experimentalData") === -1) {
+      flags.push("experimentalData");
+    }
   }
   const tinaSchema = await createSchema({ schema: config, flags });
   const builder = await createBuilder({
@@ -22716,10 +22751,6 @@ var Resolver = class {
         })
       };
     };
-    this.getDocumentsForCollection = async (collectionName) => {
-      const collection = this.tinaSchema.getCollection(collectionName);
-      return this.database.store.glob(collection.path, this.getDocument);
-    };
     this.referenceResolver = async (filter, fieldDefinition) => {
       const referencedCollection = this.tinaSchema.getCollection(fieldDefinition.collections[0]);
       if (!referencedCollection) {
@@ -22744,9 +22775,11 @@ var Resolver = class {
       collection,
       hydrator
     }) => {
+      var _a, _b, _c, _d;
       let edges;
       let pageInfo;
-      if (args.filter || args.sort) {
+      const useDataLayer = Boolean((_d = (_c = (_b = (_a = this.tinaSchema) == null ? void 0 : _a.config) == null ? void 0 : _b.meta) == null ? void 0 : _c.flags) == null ? void 0 : _d.find((x) => x === "experimentalData"));
+      if (useDataLayer) {
         let conditions;
         if (args.filter) {
           if (collection.fields) {
@@ -22856,7 +22889,7 @@ var Resolver = class {
             if (this.config.useRelativeMedia === true) {
               accumulator[field.name] = value;
             } else {
-              accumulator[field.name] = `https://assets.tina.io/${this.config.clientId}/${value}`;
+              accumulator[field.name] = `https://${this.config.assetsHost}/${this.config.clientId}/${value}`;
             }
           } else {
             accumulator[field.name] = value;
@@ -22970,12 +23003,14 @@ var resolve = async ({
   database,
   silenceErrors
 }) => {
+  var _a;
   try {
     const graphQLSchemaAst = await database.getGraphQLSchema();
     const graphQLSchema = (0, import_graphql3.buildASTSchema)(graphQLSchemaAst);
     const tinaConfig = await database.getTinaSchema();
     const tinaSchema = await createSchema({
-      schema: tinaConfig
+      schema: tinaConfig,
+      flags: (_a = tinaConfig == null ? void 0 : tinaConfig.meta) == null ? void 0 : _a.flags
     });
     const resolver2 = await createResolver2({ config, database, tinaSchema });
     const res = await (0, import_graphql3.graphql)({
@@ -23009,8 +23044,8 @@ var resolve = async ({
           if (info.fieldName === "collections") {
             const collectionNode2 = info.fieldNodes.find((x) => x.name.value === "collections");
             const hasDocuments2 = collectionNode2.selectionSet.selections.find((x) => {
-              var _a;
-              return ((_a = x == null ? void 0 : x.name) == null ? void 0 : _a.value) === "documents";
+              var _a2;
+              return ((_a2 = x == null ? void 0 : x.name) == null ? void 0 : _a2.value) === "documents";
             });
             return tinaSchema.getCollections().map((collection) => {
               return resolver2.resolveCollection(args, collection.name, Boolean(hasDocuments2));
@@ -23018,8 +23053,8 @@ var resolve = async ({
           }
           const collectionNode = info.fieldNodes.find((x) => x.name.value === "collection");
           const hasDocuments = collectionNode.selectionSet.selections.find((x) => {
-            var _a;
-            return ((_a = x == null ? void 0 : x.name) == null ? void 0 : _a.value) === "documents";
+            var _a2;
+            return ((_a2 = x == null ? void 0 : x.name) == null ? void 0 : _a2.value) === "documents";
           });
           return resolver2.resolveCollection(args, args.collection, Boolean(hasDocuments));
         }
@@ -23208,6 +23243,7 @@ var parseFile = (content3, format, yupSchema) => {
       throw new Error(`Must specify a valid format, got ${format}`);
   }
 };
+var normalizePath = (filepath) => filepath.replace(/\\/g, "/");
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/database/index.ts
 var import_datalayer2 = __toModule(require("@tinacms/datalayer"));
@@ -23234,7 +23270,7 @@ var Database = class {
       } else {
         const tinaSchema = await this.getSchema();
         const extension2 = import_path4.default.extname(filepath);
-        const contentObject = await this.store.get(filepath);
+        const contentObject = await this.store.get(normalizePath(filepath));
         if (!contentObject) {
           throw new import_graphql4.GraphQLError(`Unable to find record ${filepath}`);
         }
@@ -23274,9 +23310,9 @@ var Database = class {
         collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
       }
       if (this.store.supportsSeeding()) {
-        await this.bridge.put(filepath, stringifiedFile);
+        await this.bridge.put(normalizePath(filepath), stringifiedFile);
       }
-      await this.store.put(filepath, payload, {
+      await this.store.put(normalizePath(filepath), payload, {
         keepTemplateKey,
         collection: collection == null ? void 0 : collection.name,
         indexDefinitions: collectionIndexDefinitions
@@ -23293,9 +23329,9 @@ var Database = class {
         }
         const { stringifiedFile, payload, keepTemplateKey } = await this.stringifyFile(filepath, data);
         if (this.store.supportsSeeding()) {
-          await this.bridge.put(filepath, stringifiedFile);
+          await this.bridge.put(normalizePath(filepath), stringifiedFile);
         }
-        await this.store.put(filepath, payload, {
+        await this.store.put(normalizePath(filepath), payload, {
           keepTemplateKey,
           collection,
           indexDefinitions: collectionIndexDefinitions
@@ -23360,23 +23396,23 @@ var Database = class {
     this.getLookup = async (returnType) => {
       const lookupPath = import_path4.default.join(GENERATED_FOLDER, `_lookup.json`);
       if (!this._lookup) {
-        const _lookup = await this.store.get(lookupPath);
+        const _lookup = await this.store.get(normalizePath(lookupPath));
         this._lookup = _lookup;
       }
       return this._lookup[returnType];
     };
     this.getGraphQLSchema = async () => {
       const graphqlPath = import_path4.default.join(GENERATED_FOLDER, `_graphql.json`);
-      return this.store.get(graphqlPath);
+      return this.store.get(normalizePath(graphqlPath));
     };
     this.getGraphQLSchemaFromBridge = async () => {
       const graphqlPath = import_path4.default.join(GENERATED_FOLDER, `_graphql.json`);
-      const _graphql = await this.bridge.get(graphqlPath);
+      const _graphql = await this.bridge.get(normalizePath(graphqlPath));
       return JSON.parse(_graphql);
     };
     this.getTinaSchema = async () => {
       const schemaPath = import_path4.default.join(GENERATED_FOLDER, `_schema.json`);
-      return this.store.get(schemaPath);
+      return this.store.get(normalizePath(schemaPath));
     };
     this.getSchema = async () => {
       if (this.tinaSchema) {
@@ -23496,8 +23532,8 @@ var Database = class {
       tinaSchema
     }) => {
       if (this.bridge.supportsBuilding()) {
-        await this.bridge.putConfig(import_path4.default.join(GENERATED_FOLDER, `_graphql.json`), JSON.stringify(graphQLSchema));
-        await this.bridge.putConfig(import_path4.default.join(GENERATED_FOLDER, `_schema.json`), JSON.stringify(tinaSchema.schema));
+        await this.bridge.putConfig(normalizePath(import_path4.default.join(GENERATED_FOLDER, `_graphql.json`)), JSON.stringify(graphQLSchema));
+        await this.bridge.putConfig(normalizePath(import_path4.default.join(GENERATED_FOLDER, `_schema.json`)), JSON.stringify(tinaSchema.schema));
       }
     };
     this.indexContent = async ({
@@ -23505,12 +23541,12 @@ var Database = class {
       tinaSchema
     }) => {
       await this.indexStatusCallbackWrapper(async () => {
-        const lookup = JSON.parse(await this.bridge.get(import_path4.default.join(GENERATED_FOLDER, "_lookup.json")));
+        const lookup = JSON.parse(await this.bridge.get(normalizePath(import_path4.default.join(GENERATED_FOLDER, "_lookup.json"))));
         if (this.store.supportsSeeding()) {
           await this.store.clear();
-          await this.store.seed(import_path4.default.join(GENERATED_FOLDER, "_graphql.json"), graphQLSchema);
-          await this.store.seed(import_path4.default.join(GENERATED_FOLDER, "_schema.json"), tinaSchema.schema);
-          await this.store.seed(import_path4.default.join(GENERATED_FOLDER, "_lookup.json"), lookup);
+          await this.store.seed(normalizePath(import_path4.default.join(GENERATED_FOLDER, "_graphql.json")), graphQLSchema);
+          await this.store.seed(normalizePath(import_path4.default.join(GENERATED_FOLDER, "_schema.json")), tinaSchema.schema);
+          await this.store.seed(normalizePath(import_path4.default.join(GENERATED_FOLDER, "_lookup.json")), lookup);
           await this._indexAllContent();
         } else {
           if (this.store.supportsIndexing()) {
@@ -23544,16 +23580,16 @@ var Database = class {
         const indexDefinitions = await this.getIndexDefinitions();
         collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
       }
-      await this.store.delete(filepath, {
+      await this.store.delete(normalizePath(filepath), {
         collection: collection.name,
         indexDefinitions: collectionIndexDefinitions
       });
-      await this.bridge.delete(filepath);
+      await this.bridge.delete(normalizePath(filepath));
     };
     this._indexAllContent = async () => {
       const tinaSchema = await this.getSchema();
       await sequential(tinaSchema.getCollections(), async (collection) => {
-        const documentPaths = await this.bridge.glob(collection.path);
+        const documentPaths = await this.bridge.glob(normalizePath(collection.path));
         await _indexContent(this, documentPaths, collection);
       });
     };
@@ -23561,14 +23597,14 @@ var Database = class {
       const lookupPath = import_path4.default.join(GENERATED_FOLDER, `_lookup.json`);
       let lookupMap;
       try {
-        lookupMap = JSON.parse(await this.bridge.get(lookupPath));
+        lookupMap = JSON.parse(await this.bridge.get(normalizePath(lookupPath)));
       } catch (e) {
         lookupMap = {};
       }
       const updatedLookup = __spreadProps(__spreadValues({}, lookupMap), {
         [lookup.type]: lookup
       });
-      await this.bridge.putConfig(lookupPath, JSON.stringify(updatedLookup));
+      await this.bridge.putConfig(normalizePath(lookupPath), JSON.stringify(updatedLookup));
     };
     this.bridge = config.bridge;
     this.store = config.store;
@@ -23592,6 +23628,10 @@ var Database = class {
     }
     return { pathsByCollection, nonCollectionPaths, collections };
   }
+  clearCache() {
+    this.tinaSchema = null;
+    this._lookup = null;
+  }
   async indexStatusCallbackWrapper(fn) {
     await this.indexStatusCallback({ status: "inprogress" });
     try {
@@ -23624,10 +23664,10 @@ var _indexContent = async (database, documentPaths, collection) => {
     };
   }
   await sequential(documentPaths, async (filepath) => {
-    const dataString = await database.bridge.get(filepath);
+    const dataString = await database.bridge.get(normalizePath(filepath));
     const data = parseFile(dataString, import_path4.default.extname(filepath), (yup3) => yup3.object({}));
     if (database.store.supportsSeeding()) {
-      await database.store.seed(filepath, data, seedOptions);
+      await database.store.seed(normalizePath(filepath), data, seedOptions);
     }
   });
 };
@@ -23650,11 +23690,11 @@ var _deleteIndexContent = async (database, documentPaths, collection) => {
 };
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/index.ts
-var buildSchema = async (rootPath, database) => {
+var buildSchema = async (rootPath, database, flags) => {
   const tempConfig = import_path5.default.join(rootPath, ".tina", "__generated__", "config");
   const config = await import_fs_extra2.default.readFileSync(import_path5.default.join(tempConfig, "schema.json")).toString();
   await import_fs_extra2.default.rmdir(tempConfig, { recursive: true });
-  await indexDB({ database, config: JSON.parse(config) });
+  await indexDB({ database, config: JSON.parse(config), flags });
   const gqlAst = await database.getGraphQLSchemaFromBridge();
   return (0, import_graphql5.buildASTSchema)(gqlAst);
 };

package/dist/resolver/index.d.ts

@@ -203,7 +203,6 @@ export declare class Resolver {
             };
         }[];
     }>;
-    getDocumentsForCollection: (collectionName: string) => Promise<string[]>;
     private referenceResolver;
     private resolveFilterConditions;
     resolveCollectionConnection: ({ args, collection, hydrator, }: {

package/dist/types.d.ts

@@ -268,5 +268,6 @@ export declare type GraphQLConfig = {
 } | {
     useRelativeMedia: false;
     clientId: string;
+    assetsHost: string;
 };
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.60.2",
+  "version": "0.60.5",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -42,7 +42,8 @@
     "build": "echo \"Run `yarn build` from the root of the repository instead\"",
     "docs": "yarn typedoc",
     "serve": "yarn nodemon dist/server.js",
-    "test": "jest"
+    "test": "jest",
+    "test-watch": "jest --watch"
   },
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",