@tinacms/graphql 0.0.0-202241918385 → 0.0.0-20224201864

package/CHANGELOG.md

@@ -1,11 +1,12 @@
 # tina-graphql
 
-## 0.0.0-202241918385
+## 0.0.0-20224201864
 
 ### Patch Changes
 
 - 79d112d79: Update cli to accept tinaCloudMediaStore flag and add to metadata during schema compilation
-- c80bcf27d: Fix issues with experimentalData on windows
+- 3f46c6706: Fixed issue where generated SDK would not work with templates
+- 91d6e6758: Fix issues with experimentalData on windows related to path separator inconsistency and interference with the .tina/**generated** folder
 
 ## 0.60.2
 

package/dist/database/index.d.ts

@@ -47,7 +47,6 @@ export declare class Database {
     private _graphql;
     private _tinaSchema;
     constructor(config: CreateDatabase);
-    private normalizePath;
     private collectionForPath;
     private partitionPathsByCollection;
     get: <T extends object>(filepath: string) => Promise<T>;

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.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: {
@@ -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",
@@ -22672,7 +22705,6 @@ var Resolver = class {
       assertShape(args, (yup3) => yup3.object({ relativePath: yup3.string().required() }));
       const collection = await this.tinaSchema.getCollection(collectionLookup);
       const realPath = import_path3.default.join(collection == null ? void 0 : collection.path, args.relativePath);
-      console.log(collection == null ? void 0 : collection.path, args.relativePath, realPath);
       const alreadyExists = await this.database.documentExists(realPath);
       if (isMutation) {
         if (isCreation) {
@@ -23005,7 +23037,6 @@ var resolve = async ({
         const lookup = await database.getLookup(returnType);
         const isMutation = info.parentType.toString() === "Mutation";
         const value = source[info.fieldName];
-        console.log(returnType);
         if (returnType === "Collection") {
           if (value) {
             return value;
@@ -23043,18 +23074,15 @@ var resolve = async ({
           return value;
         }
         const isCreation = lookup[info.fieldName] === "create";
-        console.log("h", lookup.resolveType);
         switch (lookup.resolveType) {
           case "nodeDocument":
             assertShape(args, (yup3) => yup3.object({ id: yup3.string().required() }));
             return resolver2.getDocument(args.id);
           case "multiCollectionDocument":
             if (typeof value === "string") {
-              console.log("a - calling getDocument");
               return resolver2.getDocument(value);
             }
             if (args && args.collection && info.fieldName === "addPendingDocument") {
-              console.log("b - calling resolveDocument");
               return resolver2.resolveDocument({
                 args: __spreadProps(__spreadValues({}, args), { params: {} }),
                 collection: args.collection,
@@ -23069,7 +23097,6 @@ var resolve = async ({
               "updateDocument",
               "deleteDocument"
             ].includes(info.fieldName)) {
-              console.log("c - calling resolveDocument", args);
               const result2 = await resolver2.resolveDocument({
                 args,
                 collection: args.collection,
@@ -23216,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"));
@@ -23231,7 +23259,6 @@ var defaultStatusCallback = () => Promise.resolve();
 var Database = class {
   constructor(config) {
     this.config = config;
-    this.normalizePath = (filepath) => filepath.replace("\\", "/");
     this.collectionForPath = async (filepath) => {
       const tinaSchema = await this.getSchema();
       const collection = await tinaSchema.getCollectionByFullPath(filepath);
@@ -23243,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(this.normalizePath(filepath));
+        const contentObject = await this.store.get(normalizePath(filepath));
         if (!contentObject) {
           throw new import_graphql4.GraphQLError(`Unable to find record ${filepath}`);
         }
@@ -23283,9 +23310,9 @@ var Database = class {
         collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
       }
       if (this.store.supportsSeeding()) {
-        await this.bridge.put(this.normalizePath(filepath), stringifiedFile);
+        await this.bridge.put(normalizePath(filepath), stringifiedFile);
       }
-      await this.store.put(this.normalizePath(filepath), payload, {
+      await this.store.put(normalizePath(filepath), payload, {
         keepTemplateKey,
         collection: collection == null ? void 0 : collection.name,
         indexDefinitions: collectionIndexDefinitions
@@ -23302,9 +23329,9 @@ var Database = class {
         }
         const { stringifiedFile, payload, keepTemplateKey } = await this.stringifyFile(filepath, data);
         if (this.store.supportsSeeding()) {
-          await this.bridge.put(this.normalizePath(filepath), stringifiedFile);
+          await this.bridge.put(normalizePath(filepath), stringifiedFile);
         }
-        await this.store.put(this.normalizePath(filepath), payload, {
+        await this.store.put(normalizePath(filepath), payload, {
           keepTemplateKey,
           collection,
           indexDefinitions: collectionIndexDefinitions
@@ -23369,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(this.normalizePath(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(this.normalizePath(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(this.normalizePath(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(this.normalizePath(schemaPath));
+      return this.store.get(normalizePath(schemaPath));
     };
     this.getSchema = async () => {
       if (this.tinaSchema) {
@@ -23505,8 +23532,8 @@ var Database = class {
       tinaSchema
     }) => {
       if (this.bridge.supportsBuilding()) {
-        await this.bridge.putConfig(this.normalizePath(import_path4.default.join(GENERATED_FOLDER, `_graphql.json`)), JSON.stringify(graphQLSchema));
-        await this.bridge.putConfig(this.normalizePath(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 ({
@@ -23514,12 +23541,12 @@ var Database = class {
       tinaSchema
     }) => {
       await this.indexStatusCallbackWrapper(async () => {
-        const lookup = JSON.parse(await this.bridge.get(this.normalizePath(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(this.normalizePath(import_path4.default.join(GENERATED_FOLDER, "_graphql.json")), graphQLSchema);
-          await this.store.seed(this.normalizePath(import_path4.default.join(GENERATED_FOLDER, "_schema.json")), tinaSchema.schema);
-          await this.store.seed(this.normalizePath(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()) {
@@ -23553,16 +23580,16 @@ var Database = class {
         const indexDefinitions = await this.getIndexDefinitions();
         collectionIndexDefinitions = indexDefinitions == null ? void 0 : indexDefinitions[collection.name];
       }
-      await this.store.delete(this.normalizePath(filepath), {
+      await this.store.delete(normalizePath(filepath), {
         collection: collection.name,
         indexDefinitions: collectionIndexDefinitions
       });
-      await this.bridge.delete(this.normalizePath(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(this.normalizePath(collection.path));
+        const documentPaths = await this.bridge.glob(normalizePath(collection.path));
         await _indexContent(this, documentPaths, collection);
       });
     };
@@ -23570,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(this.normalizePath(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(this.normalizePath(lookupPath), JSON.stringify(updatedLookup));
+      await this.bridge.putConfig(normalizePath(lookupPath), JSON.stringify(updatedLookup));
     };
     this.bridge = config.bridge;
     this.store = config.store;
@@ -23633,11 +23660,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()) {
-      console.log("seeding ", filepath);
-      await database.store.seed(filepath, data, seedOptions);
+      await database.store.seed(normalizePath(filepath), data, seedOptions);
     }
   });
 };
@@ -23663,7 +23689,6 @@ var _deleteIndexContent = async (database, documentPaths, collection) => {
 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();
-  console.log("buildSchema - calling rmdir on " + tempConfig);
   await import_fs_extra2.default.rmdir(tempConfig, { recursive: true });
   await indexDB({ database, config: JSON.parse(config), flags });
   const gqlAst = await database.getGraphQLSchemaFromBridge();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.0.0-202241918385",
+  "version": "0.0.0-20224201864",
   "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",