@tinacms/graphql 2.2.3 → 2.2.5

package/dist/database/index.d.ts

@@ -106,7 +106,7 @@ export declare class Database {
                 defaultItem?: import("@tinacms/schema-tools").DefaultItem<Record<string, any>>;
                 previewSrc?: string;
             };
-            fields: ((import("@tinacms/schema-tools").StringField | import("@tinacms/schema-tools").NumberField | import("@tinacms/schema-tools").BooleanField | import("@tinacms/schema-tools").DateTimeField | import("@tinacms/schema-tools").ImageField | import("@tinacms/schema-tools").ReferenceField | import("@tinacms/schema-tools").PasswordField | import("@tinacms/schema-tools").RichTextField<false> | import("@tinacms/schema-tools").ObjectField<false>) & {})[];
+            fields: ((import("@tinacms/schema-tools").StringField | import("@tinacms/schema-tools").NumberField | import("@tinacms/schema-tools").BooleanField | import("@tinacms/schema-tools").DateTimeField | import("@tinacms/schema-tools").ImageField | import("@tinacms/schema-tools").ReferenceField | import("@tinacms/schema-tools").PasswordField | import("@tinacms/schema-tools").DisplayOnlyField | import("@tinacms/schema-tools").RichTextField<false> | import("@tinacms/schema-tools").ObjectField<false>) & {})[];
         };
         info: CollectionTemplateable;
     }>;

package/dist/database/util.d.ts

@@ -16,8 +16,6 @@ yupSchema: (args: typeof yup) => yup.ObjectSchema<any>, markdownParseConfig?: {
     lineWidth?: number;
     frontmatterDelimiters?: [string, string] | string;
 }) => T;
-export declare const atob: (b64Encoded: string) => string;
-export declare const btoa: (string: string) => string;
 export declare const scanAllContent: (tinaSchema: TinaSchema, bridge: Bridge, callback: (collection: Collection<true>, contentPaths: string[]) => Promise<void>) => Promise<string[]>;
 export declare const scanContentByPaths: (tinaSchema: TinaSchema, documentPaths: string[], callback: (collection: Collection<true> | undefined, documentPaths: string[]) => Promise<void>) => Promise<void>;
 export declare const partitionPathsByCollection: (tinaSchema: TinaSchema, documentPaths: string[]) => Promise<{

package/dist/index.js

@@ -1909,6 +1909,8 @@ var Builder = class {
   };
   _buildFieldNodeForFragments = async (field, depth) => {
     switch (field.type) {
+      case "displayOnly":
+        return false;
       case "string":
       case "image":
       case "datetime":
@@ -2350,6 +2352,8 @@ var Builder = class {
   };
   _buildFieldFilter = async (field) => {
     switch (field.type) {
+      case "displayOnly":
+        return void 0;
       case "boolean":
         return astBuilder.InputValueDefinition({
           name: field.name,
@@ -2511,6 +2515,8 @@ var Builder = class {
   };
   _buildFieldMutation = async (field) => {
     switch (field.type) {
+      case "displayOnly":
+        return void 0;
       case "boolean":
         return astBuilder.InputValueDefinition({
           name: field.name,
@@ -2739,6 +2745,8 @@ Visit https://tina.io/docs/r/content-fields/#list-fields/ for more information
 
 `;
     switch (field.type) {
+      case "displayOnly":
+        return void 0;
       case "boolean":
       case "datetime":
       case "number":
@@ -2884,7 +2892,8 @@ var FIELD_TYPES = [
   "reference",
   "object",
   "rich-text",
-  "password"
+  "password",
+  "displayOnly"
 ];
 var validateSchema = async (schema) => {
   const schema2 = addNamespaceToSchema(
@@ -3026,7 +3035,7 @@ var validateField = async (field) => {
 var package_default = {
   name: "@tinacms/graphql",
   type: "module",
-  version: "2.2.3",
+  version: "2.2.5",
   main: "dist/index.js",
   module: "./dist/index.js",
   files: [
@@ -3676,7 +3685,7 @@ var scanAllContent = async (tinaSchema, bridge, callback) => {
         `"${path9}" Found in multiple collections: ${filesSeen.get(path9).map((collection2) => `"${collection2}"`).join(
           ", "
         )}. This can cause unexpected behavior. We recommend updating the \`match\` property of those collections so that each file is in only one collection.
-This will be an error in the future. See https://tina.io/docs/errors/file-in-mutpliple-collections/
+This will be an error in the future. See https://tina.io/docs/r/content-modelling-collections#path-matching
 `
       );
     });
@@ -3783,7 +3792,7 @@ var loadAndParseWithAliases = async (bridge, filepath, collection, templateInfo)
   const template = getTemplateForFile(templateInfo, data);
   if (!template) {
     console.warn(
-      `Document: ${filepath} has an ambiguous template, skipping from indexing. See https://tina.io/docs/errors/ambiguous-template/ for more info.`
+      `Document: ${filepath} has an ambiguous template, skipping from indexing. See https://tina.io/docs/r/ambiguous-template for more info.`
     );
     return;
   }
@@ -4701,6 +4710,8 @@ var resolveFieldData = async ({ namespace, ...field }, rawData, accumulator, tin
   assertShape(rawData, (yup3) => yup3.object());
   const value = rawData[field.name];
   switch (field.type) {
+    case "displayOnly":
+      break;
     case "datetime":
       if (value instanceof Date) {
         accumulator[field.name] = value.toISOString();
@@ -5194,6 +5205,26 @@ var Resolver = class _Resolver {
     }
     return input.replace(/\\/g, "/");
   }
+  /**
+   * Validates that relativePath is non-empty and contains only allowed
+   * characters: a-z, A-Z, 0-9, hyphens, underscores, periods, and
+   * forward slashes.
+   */
+  static validateRelativePath(relativePath) {
+    if (!relativePath.trim()) {
+      throw new Error(
+        "Invalid path: relativePath cannot be empty or whitespace"
+      );
+    }
+    if (relativePath !== relativePath.trim()) {
+      throw new Error(
+        "Invalid path: relativePath cannot have leading or trailing whitespace"
+      );
+    }
+    if (!/^[a-zA-Z0-9\-_./]+$/.test(relativePath)) {
+      throw new Error("Invalid path: relativePath contains invalid characters");
+    }
+  }
   validatePath = (fullPath, collection, relativePath) => {
     if (fullPath.includes("\0")) {
       throw new Error("Invalid path: null bytes are not allowed");
@@ -5208,6 +5239,7 @@ var Resolver = class _Resolver {
       throw new Error(`Invalid path: absolute paths are not allowed`);
     }
     if (relativePath) {
+      _Resolver.validateRelativePath(relativePath);
       const collectionFormat = collection.format || "md";
       const fileExtension = path3.extname(relativePath).toLowerCase().slice(1);
       if (fileExtension !== collectionFormat) {
@@ -5228,6 +5260,7 @@ var Resolver = class _Resolver {
    * @returns Object containing the collection and validated real path
    */
   getValidatedPath = (collectionName, relativePath, options) => {
+    _Resolver.validateRelativePath(relativePath);
     const collection = this.getCollectionWithName(collectionName);
     const sanitizedRelativePath = _Resolver.sanitizePath(relativePath);
     const pathSegments = [collection.path, sanitizedRelativePath];
@@ -5267,6 +5300,7 @@ var Resolver = class _Resolver {
     relativePath
   }) => {
     const collection = this.getCollectionWithName(collectionName);
+    _Resolver.validateRelativePath(relativePath);
     const realPath = path3.join(
       collection.path,
       relativePath,
@@ -5873,6 +5907,8 @@ var Resolver = class _Resolver {
         throw new Error(`Expected to find field by name ${fieldName}`);
       }
       switch (field.type) {
+        case "displayOnly":
+          break;
         case "datetime":
           accum[fieldName] = resolveDateInput(fieldValue, field);
           break;

package/dist/resolver/index.d.ts

@@ -236,6 +236,12 @@ export declare class Resolver {
      * outside of the intended collection.
      */
     private static sanitizePath;
+    /**
+     * Validates that relativePath is non-empty and contains only allowed
+     * characters: a-z, A-Z, 0-9, hyphens, underscores, periods, and
+     * forward slashes.
+     */
+    private static validateRelativePath;
     private validatePath;
     /**
      * Helper method to get collection and construct validated path.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tinacms/graphql",
   "type": "module",
-  "version": "2.2.3",
+  "version": "2.2.5",
   "main": "dist/index.js",
   "module": "./dist/index.js",
   "files": [
@@ -43,8 +43,8 @@
     "normalize-path": "^3.0.0",
     "readable-stream": "^4.7.0",
     "yup": "^1.6.1",
-    "@tinacms/mdx": "2.1.1",
-    "@tinacms/schema-tools": "2.7.1"
+    "@tinacms/mdx": "2.1.2",
+    "@tinacms/schema-tools": "2.7.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -72,8 +72,8 @@
     "vite": "^4.5.9",
     "vitest": "^0.32.4",
     "zod": "^3.24.2",
-    "@tinacms/schema-tools": "2.7.1",
-    "@tinacms/scripts": "1.6.0"
+    "@tinacms/scripts": "1.6.0",
+    "@tinacms/schema-tools": "2.7.2"
   },
   "scripts": {
     "types": "pnpm tsc",