@tinacms/graphql 2.4.11 → 3.0.0

package/dist/ast-builder/index.d.ts

@@ -130,6 +130,7 @@ export declare const astBuilder: {
         SystemInfo: string;
         Boolean: string;
         JSON: string;
+        RichText: string;
         Node: string;
         PageInfo: string;
         Connection: string;

package/dist/index.js

@@ -505,6 +505,7 @@ var astBuilder = {
     SystemInfo: "SystemInfo",
     Boolean: "Boolean",
     JSON: "JSON",
+    RichText: "RichText",
     Node: "Node",
     PageInfo: "PageInfo",
     Connection: "Connection",
@@ -1173,6 +1174,10 @@ var scalarDefinitions = [
     description: "References another document, used as a foreign key"
   }),
   astBuilder.ScalarTypeDefinition({ name: "JSON" }),
+  astBuilder.ScalarTypeDefinition({
+    name: "RichText",
+    description: "A rich-text document, renderable by TinaMarkdown"
+  }),
   astBuilder.ObjectTypeDefinition({
     name: "SystemInfo",
     fields: [
@@ -2550,7 +2555,7 @@ var Builder = class {
         return astBuilder.InputValueDefinition({
           name: field.name,
           list: field.list,
-          type: astBuilder.TYPES.JSON
+          type: astBuilder.TYPES.RichText
         });
       case "reference":
         return astBuilder.InputValueDefinition({
@@ -2799,7 +2804,7 @@ Visit https://tina.io/docs/r/content-fields/#list-fields/ for more information
           name: field.name,
           list: field.list,
           required: field.required,
-          type: astBuilder.TYPES.JSON
+          type: astBuilder.TYPES.RichText
         });
       case "reference":
         const name = NAMER.documentTypeName(field.namespace);
@@ -3053,7 +3058,7 @@ var assertCheckboxGroupIsList = (field) => {
 var package_default = {
   name: "@tinacms/graphql",
   type: "module",
-  version: "2.4.11",
+  version: "3.0.0",
   main: "dist/index.js",
   module: "./dist/index.js",
   files: [
@@ -3351,7 +3356,11 @@ import { JSONPath as JSONPath2 } from "jsonpath-plus";
 import { parseMDX, serializeMDX } from "@tinacms/mdx";
 
 // src/resolver/index.ts
-import { ERR_ALREADY_EXISTS, RELATIVE_PATH_REGEX } from "@tinacms/schema-tools";
+import {
+  ERR_ALREADY_EXISTS,
+  RELATIVE_PATH_REGEX,
+  normalizePath as normalizePath2
+} from "@tinacms/schema-tools";
 import { GraphQLError as GraphQLError2 } from "graphql";
 
 // src/database/datalayer.ts
@@ -4884,6 +4893,7 @@ var resolveFieldData = async ({ namespace, ...field }, rawData, accumulator, tin
 };
 var transformDocumentIntoPayload = async (fullPath, rawData, tinaSchema, config, isAudit, hasReferences) => {
   const collection = tinaSchema.getCollection(rawData._collection);
+  const normalizedPath = normalizePath2(fullPath);
   try {
     const template = tinaSchema.getTemplateForData({
       data: rawData,
@@ -4893,8 +4903,8 @@ var transformDocumentIntoPayload = async (fullPath, rawData, tinaSchema, config,
       base: basename,
       ext: extension,
       name: filename
-    } = path3.parse(fullPath);
-    const relativePath = fullPath.replace(/\\/g, "/").replace(collection.path, "").replace(/^\/|\/$/g, "");
+    } = path3.parse(normalizedPath);
+    const relativePath = normalizedPath.replace(collection.path, "").replace(/^\/|\/$/g, "");
     const breadcrumbs = relativePath.replace(extension, "").split("/");
     const data = {
       _collection: rawData._collection,
@@ -4928,7 +4938,7 @@ var transformDocumentIntoPayload = async (fullPath, rawData, tinaSchema, config,
     const title = data[titleFieldName || " "] || null;
     return {
       __typename: collection.fields ? NAMER.documentTypeName(collection.namespace) : NAMER.documentTypeName(template.namespace),
-      id: fullPath,
+      id: normalizedPath,
       ...data,
       _sys: {
         title: title || "",
@@ -4936,7 +4946,7 @@ var transformDocumentIntoPayload = async (fullPath, rawData, tinaSchema, config,
         filename,
         extension,
         hasReferences,
-        path: fullPath,
+        path: normalizedPath,
         relativePath,
         breadcrumbs,
         collection,
@@ -5315,7 +5325,9 @@ var Resolver = class _Resolver {
    * @param collectionName - Name of the collection
    * @param relativePath - Relative path within the collection
    * @param options - Optional configuration
-   * @returns Object containing the collection and validated real path
+   * @returns Object containing the collection and the validated real path,
+   * normalized to POSIX separators so it matches the document identities and
+   * reference values stored in content files on every platform
    */
   getValidatedPath = (collectionName, relativePath, options) => {
     _Resolver.validateRelativePath(relativePath);
@@ -5325,7 +5337,7 @@ var Resolver = class _Resolver {
     if (options?.extraSegments) {
       pathSegments.push(...options.extraSegments.map(_Resolver.sanitizePath));
     }
-    const realPath = path3.join(...pathSegments);
+    const realPath = normalizePath2(path3.join(...pathSegments));
     const shouldValidateExtension = options?.validateExtension !== false;
     this.validatePath(
       realPath,
@@ -5893,7 +5905,7 @@ var Resolver = class _Resolver {
               filterExpression: {
                 _type: "string",
                 _list: false,
-                eq: id
+                eq: normalizePath2(id)
               }
             }
           ]
@@ -5928,7 +5940,7 @@ var Resolver = class _Resolver {
               filterExpression: {
                 _type: "string",
                 _list: false,
-                eq: id
+                eq: normalizePath2(id)
               }
             }
           ]

package/dist/resolver/index.d.ts

@@ -256,7 +256,9 @@ export declare class Resolver {
      * @param collectionName - Name of the collection
      * @param relativePath - Relative path within the collection
      * @param options - Optional configuration
-     * @returns Object containing the collection and validated real path
+     * @returns Object containing the collection and the validated real path,
+     * normalized to POSIX separators so it matches the document identities and
+     * reference values stored in content files on every platform
      */
     private getValidatedPath;
     resolveRetrievedDocument: ({ collectionName, relativePath, }: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tinacms/graphql",
   "type": "module",
-  "version": "2.4.11",
+  "version": "3.0.0",
   "main": "dist/index.js",
   "module": "./dist/index.js",
   "files": [
@@ -43,7 +43,7 @@
     "normalize-path": "^3.0.0",
     "readable-stream": "^4.7.0",
     "yup": "^1.6.1",
-    "@tinacms/mdx": "^2.2.2",
+    "@tinacms/mdx": "^2.2.3",
     "@tinacms/schema-tools": "^2.10.0"
   },
   "publishConfig": {