@tinacms/graphql 0.63.3 → 0.63.6

package/dist/build.d.ts

@@ -13,17 +13,7 @@ limitations under the License.
 import { DocumentNode } from 'graphql';
 import type { TinaSchema } from './schema';
 import { Database } from './database';
-/**
- *
- * This will build the files (_schema.json, _lookup.json, _graphQL.json)
- */
-export declare const indexDB: (args: {
-    database: Database;
-    config: TinaSchema['config'];
-    flags?: string[];
-    buildSDK?: boolean;
-}) => Promise<void>;
-export declare const buildFiles: ({ database, config, flags, buildSDK, }: {
+export declare const buildDotTinaFiles: ({ database, config, flags, buildSDK, }: {
     database: Database;
     config: TinaSchema['config'];
     flags?: string[];

package/dist/index.d.ts

@@ -10,7 +10,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-export { indexDB } from './build';
 export { resolve } from './resolve';
 export * from './resolver/error';
 export { createDatabase } from './database';
@@ -22,7 +21,11 @@ export type { Bridge } from './database/bridge';
 export { sequential, assertShape } from './util';
 export { stringifyFile, parseFile } from './database/util';
 export declare type DummyType = unknown;
-export declare const buildSchema: (rootPath: string, database: Database, flags?: string[], skipIndexing?: boolean) => Promise<import("graphql").GraphQLSchema>;
+export declare const buildSchema: (rootPath: string, database: Database, flags?: string[]) => Promise<{
+    graphQLSchema: import("graphql").DocumentNode;
+    tinaSchema: import("./schema").TinaSchema;
+}>;
+export declare const getASTSchema: (database: Database) => 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

@@ -60,8 +60,8 @@ __export(exports, {
   assertShape: () => assertShape,
   buildSchema: () => buildSchema,
   createDatabase: () => createDatabase,
+  getASTSchema: () => getASTSchema,
   handleFetchErrorError: () => handleFetchErrorError,
-  indexDB: () => indexDB,
   parseFile: () => parseFile,
   resolve: () => resolve,
   sequential: () => sequential,
@@ -69,7 +69,7 @@ __export(exports, {
 });
 var import_fs_extra2 = __toModule(require("fs-extra"));
 var import_path4 = __toModule(require("path"));
-var import_graphql5 = __toModule(require("graphql"));
+var import_graphql6 = __toModule(require("graphql"));
 
 // src/build.ts
 var import_lodash3 = __toModule(require("lodash"));
@@ -2437,7 +2437,7 @@ var validateField = async (field) => {
 
 // package.json
 var name = "@tinacms/graphql";
-var version = "0.63.3";
+var version = "0.63.6";
 var main = "dist/index.js";
 var typings = "dist/index.d.ts";
 var files = [
@@ -2578,17 +2578,18 @@ var TinaFetchError = class extends Error {
 };
 var TinaQueryError = class extends TinaFetchError {
   constructor(args) {
-    super(`Error querying file ${args.file} collection ${args.collection}. Please run "tinacms audit" or add the --verbose option for more info`, args);
+    super(`Error querying file ${args.file} from collection ${args.collection}. ${auditMessage(args.includeAuditMessage)}`, args);
   }
 };
 var TinaParseDocumentError = class extends TinaFetchError {
   constructor(args) {
-    super(`Error Parsing file ${args.file} collection ${args.collection}. Please run "tinacms audit" or add the --verbose option  for more info`, args);
+    super(`Error Parsing file ${args.file} from collection ${args.collection}. ${auditMessage(args.includeAuditMessage)}`, args);
   }
   toString() {
     return super.toString() + "\n OriginalError: \n" + this.originalError.toString();
   }
 };
+var auditMessage = (includeAuditMessage = true) => includeAuditMessage ? `Please run "tinacms audit" or add the --verbose option  for more info` : "";
 var handleFetchErrorError = (e, verbose) => {
   if (e instanceof Error) {
     if (e instanceof TinaFetchError) {
@@ -2667,9 +2668,9 @@ var TinaSchema = class {
       }
       return globalTemplate;
     };
-    this.getCollectionByFullPath = async (filepath) => {
+    this.getCollectionByFullPath = (filepath) => {
       const collection = this.getCollections().find((collection2) => {
-        return filepath.replace("\\", "/").startsWith(collection2.path);
+        return filepath.replace("\\", "/").startsWith(collection2.path.replace(/\/?$/, "/"));
       });
       if (!collection) {
         throw new Error(`Unable to find collection for file at ${filepath}`);
@@ -2678,12 +2679,7 @@ var TinaSchema = class {
     };
     this.getCollectionAndTemplateByFullPath = (filepath, templateName) => {
       let template;
-      const collection = this.getCollections().find((collection2) => {
-        return filepath.replace("\\", "/").startsWith(collection2.path);
-      });
-      if (!collection) {
-        throw new Error(`Unable to find collection for file at ${filepath}`);
-      }
+      const collection = this.getCollectionByFullPath(filepath);
       const templates = this.getTemplatesForCollectable(collection);
       if (templates.type === "union") {
         if (templateName) {
@@ -2775,11 +2771,7 @@ var TinaSchema = class {
 
 // src/build.ts
 var import_path = __toModule(require("path"));
-var indexDB = async (args) => {
-  const { graphQLSchema, tinaSchema } = await buildFiles(args);
-  await args.database.indexContent({ graphQLSchema, tinaSchema });
-};
-var buildFiles = async ({
+var buildDotTinaFiles = async ({
   database,
   config,
   flags = [],
@@ -2904,7 +2896,7 @@ var _buildSchema = async (builder, tinaSchema) => {
 };
 
 // src/resolve.ts
-var import_graphql3 = __toModule(require("graphql"));
+var import_graphql4 = __toModule(require("graphql"));
 
 // src/resolver/index.ts
 var import_path2 = __toModule(require("path"));
@@ -3059,6 +3051,7 @@ var hasTinaMediaConfig = (schema) => {
 };
 
 // src/resolver/index.ts
+var import_graphql3 = __toModule(require("graphql"));
 var createResolver = (args) => {
   return new Resolver(args);
 };
@@ -3102,6 +3095,7 @@ var Resolver = class {
           throw new TinaParseDocumentError({
             originalError: e,
             collection: collection.name,
+            includeAuditMessage: !this.isAudit,
             file: relativePath,
             stack: e.stack
           });
@@ -3435,6 +3429,7 @@ var Resolver = class {
     };
     this.resolveFieldData = async (_a, rawData, accumulator) => {
       var _b = _a, { namespace } = _b, field = __objRest(_b, ["namespace"]);
+      var _a2;
       if (!rawData) {
         return void 0;
       }
@@ -3459,6 +3454,12 @@ var Resolver = class {
           break;
         case "rich-text":
           const tree = (0, import_mdx.parseMDX)(value, field, (value2) => resolveMediaRelativeToCloud(value2, this.config, this.tinaSchema.schema));
+          if (((_a2 = tree == null ? void 0 : tree.children[0]) == null ? void 0 : _a2.type) === "invalid_markdown") {
+            if (this.isAudit) {
+              const invalidNode = tree == null ? void 0 : tree.children[0];
+              throw new import_graphql3.GraphQLError(`${invalidNode == null ? void 0 : invalidNode.message}${invalidNode.position ? ` at line ${invalidNode.position.start.line}, column ${invalidNode.position.start.column}` : ""}`);
+            }
+          }
           accumulator[field.name] = tree;
           break;
         case "object":
@@ -3525,6 +3526,7 @@ var Resolver = class {
     this.config = init.config;
     this.database = init.database;
     this.tinaSchema = init.tinaSchema;
+    this.isAudit = init.isAudit;
   }
   async resolveFilterConditions(filter, fields, collectionName) {
     const conditions = [];
@@ -3564,20 +3566,26 @@ var resolve = async ({
   variables,
   database,
   silenceErrors,
-  verbose
+  verbose,
+  isAudit
 }) => {
   var _a;
   try {
     const verboseValue = verbose != null ? verbose : true;
     const graphQLSchemaAst = await database.getGraphQLSchema();
-    const graphQLSchema = (0, import_graphql3.buildASTSchema)(graphQLSchemaAst);
+    const graphQLSchema = (0, import_graphql4.buildASTSchema)(graphQLSchemaAst);
     const tinaConfig = await database.getTinaSchema();
     const tinaSchema = await createSchema({
       schema: tinaConfig,
       flags: (_a = tinaConfig == null ? void 0 : tinaConfig.meta) == null ? void 0 : _a.flags
     });
-    const resolver = await createResolver({ config, database, tinaSchema });
-    const res = await (0, import_graphql3.graphql)({
+    const resolver = await createResolver({
+      config,
+      database,
+      tinaSchema,
+      isAudit: isAudit || false
+    });
+    const res = await (0, import_graphql4.graphql)({
       schema: graphQLSchema,
       source: query,
       variableValues: variables,
@@ -3587,7 +3595,7 @@ var resolve = async ({
       typeResolver: async (source, _args, info) => {
         if (source.__typename)
           return source.__typename;
-        const namedType = (0, import_graphql3.getNamedType)(info.returnType).toString();
+        const namedType = (0, import_graphql4.getNamedType)(info.returnType).toString();
         const lookup = await database.getLookup(namedType);
         if (lookup.resolveType === "unionData") {
           return lookup.typeMap[source._template];
@@ -3598,7 +3606,7 @@ var resolve = async ({
       fieldResolver: async (source = {}, _args = {}, _context, info) => {
         try {
           const args = JSON.parse(JSON.stringify(_args));
-          const returnType = (0, import_graphql3.getNamedType)(info.returnType).toString();
+          const returnType = (0, import_graphql4.getNamedType)(info.returnType).toString();
           const lookup = await database.getLookup(returnType);
           const isMutation = info.parentType.toString() === "Mutation";
           const value = source[info.fieldName];
@@ -3625,12 +3633,12 @@ var resolve = async ({
           }
           if (info.fieldName === "getOptimizedQuery") {
             try {
-              const [optimizedQuery] = (0, import_relay_operation_optimizer.optimizeDocuments)(info.schema, [(0, import_graphql3.parse)(args.queryString)], {
+              const [optimizedQuery] = (0, import_relay_operation_optimizer.optimizeDocuments)(info.schema, [(0, import_graphql4.parse)(args.queryString)], {
                 assumeValid: true,
                 includeFragments: false,
                 noLocation: true
               });
-              return (0, import_graphql3.print)(optimizedQuery);
+              return (0, import_graphql4.print)(optimizedQuery);
             } catch (e) {
               throw new Error(`Invalid query provided, Error message: ${e.message}`);
             }
@@ -3749,7 +3757,7 @@ var resolve = async ({
     if (!silenceErrors) {
       console.error(e);
     }
-    if (e instanceof import_graphql3.GraphQLError) {
+    if (e instanceof import_graphql4.GraphQLError) {
       return {
         errors: [e]
       };
@@ -3761,7 +3769,7 @@ var resolve = async ({
 
 // src/database/index.ts
 var import_path3 = __toModule(require("path"));
-var import_graphql4 = __toModule(require("graphql"));
+var import_graphql5 = __toModule(require("graphql"));
 
 // src/database/util.ts
 var import_gray_matter = __toModule(require("gray-matter"));
@@ -3836,7 +3844,7 @@ var Database = class {
     this.config = config;
     this.collectionForPath = async (filepath) => {
       const tinaSchema = await this.getSchema();
-      const collection = await tinaSchema.getCollectionByFullPath(filepath);
+      const collection = tinaSchema.getCollectionByFullPath(filepath);
       return collection;
     };
     this.get = async (filepath) => {
@@ -3847,7 +3855,7 @@ var Database = class {
         const extension = import_path3.default.extname(filepath);
         const contentObject = await this.store.get(normalizePath(filepath));
         if (!contentObject) {
-          throw new import_graphql4.GraphQLError(`Unable to find record ${filepath}`);
+          throw new import_graphql5.GraphQLError(`Unable to find record ${filepath}`);
         }
         const templateName = hasOwnProperty(contentObject, "_template") && typeof contentObject._template === "string" ? contentObject._template : void 0;
         const { collection, template } = tinaSchema.getCollectionAndTemplateByFullPath(filepath, templateName);
@@ -3928,7 +3936,7 @@ var Database = class {
         throw new Error(`Unexpected put for config file ${filepath}`);
       } else {
         const tinaSchema = await this.getSchema();
-        const collection = await tinaSchema.getCollectionByFullPath(filepath);
+        const collection = tinaSchema.getCollectionByFullPath(filepath);
         const templateInfo = await tinaSchema.getTemplatesForCollectable(collection);
         let template;
         if (templateInfo.type === "object") {
@@ -4296,17 +4304,20 @@ var _deleteIndexContent = async (database, documentPaths, collection) => {
 };
 
 // src/index.ts
-var buildSchema = async (rootPath, database, flags, skipIndexing) => {
+var buildSchema = async (rootPath, database, flags) => {
   const tempConfig = import_path4.default.join(rootPath, ".tina", "__generated__", "config");
   const config = await import_fs_extra2.default.readFileSync(import_path4.default.join(tempConfig, "schema.json")).toString();
   await import_fs_extra2.default.rm(tempConfig, { recursive: true });
-  if (skipIndexing != null ? skipIndexing : false) {
-    await buildFiles({ database, config: JSON.parse(config), flags });
-  } else {
-    await indexDB({ database, config: JSON.parse(config), flags });
-  }
+  const { graphQLSchema, tinaSchema } = await buildDotTinaFiles({
+    database,
+    config: JSON.parse(config),
+    flags
+  });
+  return { graphQLSchema, tinaSchema };
+};
+var getASTSchema = async (database) => {
   const gqlAst = await database.getGraphQLSchemaFromBridge();
-  return (0, import_graphql5.buildASTSchema)(gqlAst);
+  return (0, import_graphql6.buildASTSchema)(gqlAst);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -4317,8 +4328,8 @@ var buildSchema = async (rootPath, database, flags, skipIndexing) => {
   assertShape,
   buildSchema,
   createDatabase,
+  getASTSchema,
   handleFetchErrorError,
-  indexDB,
   parseFile,
   resolve,
   sequential,

package/dist/resolve.d.ts

@@ -12,13 +12,14 @@ limitations under the License.
 */
 import type { Database } from './database';
 import type { GraphQLConfig } from './types';
-export declare const resolve: ({ config, query, variables, database, silenceErrors, verbose, }: {
+export declare const resolve: ({ config, query, variables, database, silenceErrors, verbose, isAudit, }: {
     config?: GraphQLConfig;
     query: string;
     variables: object;
     database: Database;
     silenceErrors?: boolean;
     verbose?: boolean;
+    isAudit?: boolean;
 }) => Promise<import("graphql").ExecutionResult<{
     [key: string]: any;
 }, {

package/dist/resolver/error.d.ts

@@ -26,6 +26,7 @@ export declare class TinaGraphQLError extends Error implements GraphQLError {
 export declare type TypeFetchErrorArgs = {
     stack?: string;
     file?: string;
+    includeAuditMessage?: boolean;
     originalError: Error;
     collection?: string;
 };

package/dist/resolver/index.d.ts

@@ -17,6 +17,7 @@ interface ResolverConfig {
     config?: GraphQLConfig;
     database: Database;
     tinaSchema: TinaSchema;
+    isAudit: boolean;
 }
 export declare const createResolver: (args: ResolverConfig) => Resolver;
 /**
@@ -28,6 +29,7 @@ export declare class Resolver {
     config: GraphQLConfig;
     database: Database;
     tinaSchema: TinaSchema;
+    isAudit: boolean;
     constructor(init: ResolverConfig);
     resolveCollection: (args: any, collectionName: string, hasDocuments?: boolean) => Promise<{
         fields: TinaFieldInner<true>[];
@@ -38,6 +40,27 @@ export declare class Resolver {
         name: string;
         path: string;
         format?: "json" | "md" | "markdown" | "mdx";
+        ui?: {
+            global?: boolean | {
+                icon?: any;
+                layout: "fullscreen" | "popup";
+            };
+            router?: (args: {
+                document: {
+                    _sys: {
+                        title?: string;
+                        template: string;
+                        breadcrumbs: string[];
+                        path: string;
+                        basename: string;
+                        relativePath: string;
+                        filename: string;
+                        extension: string;
+                    };
+                };
+                collection: TinaCloudCollection<true>;
+            }) => string;
+        };
         match?: string;
         documents: {
             collection: TinaCloudCollection<true>;
@@ -64,6 +87,27 @@ export declare class Resolver {
         name: string;
         path: string;
         format?: "json" | "md" | "markdown" | "mdx";
+        ui?: {
+            global?: boolean | {
+                icon?: any;
+                layout: "fullscreen" | "popup";
+            };
+            router?: (args: {
+                document: {
+                    _sys: {
+                        title?: string;
+                        template: string;
+                        breadcrumbs: string[];
+                        path: string;
+                        basename: string;
+                        relativePath: string;
+                        filename: string;
+                        extension: string;
+                    };
+                };
+                collection: TinaCloudCollection<true>;
+            }) => string;
+        };
         match?: string;
         documents: {
             collection: TinaCloudCollection<true>;

package/dist/schema/index.d.ts

@@ -52,7 +52,7 @@ export declare class TinaSchema {
         fields: import("../types").TinaFieldInner<true>[];
         namespace: string[];
     };
-    getCollectionByFullPath: (filepath: string) => Promise<TinaCloudCollection<true>>;
+    getCollectionByFullPath: (filepath: string) => TinaCloudCollection<true>;
     getCollectionAndTemplateByFullPath: (filepath: string, templateName?: string) => {
         collection: TinaCloudCollection<true>;
         template: Templateable;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.63.3",
+  "version": "0.63.6",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -19,9 +19,9 @@
   },
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
-    "@tinacms/datalayer": "0.2.2",
-    "@tinacms/schema-tools": "0.1.0",
-    "@tinacms/mdx": "0.61.3",
+    "@tinacms/datalayer": "0.2.3",
+    "@tinacms/schema-tools": "0.1.1",
+    "@tinacms/mdx": "0.61.5",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
     "dataloader": "^2.0.0",
@@ -71,8 +71,8 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/datalayer": "0.2.2",
-    "@tinacms/schema-tools": "0.1.0",
+    "@tinacms/datalayer": "0.2.3",
+    "@tinacms/schema-tools": "0.1.1",
     "@tinacms/scripts": "0.51.1",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",