@tinacms/schema-tools 0.0.0-20225819341 → 0.0.0-202261192534

package/CHANGELOG.md

@@ -1,10 +1,22 @@
 # @tinacms/schema-tools
 
-## 0.0.0-20225819341
+## 0.0.0-202261192534
 
 ### Patch Changes
 
-- d9782ce8b: WIP
+- ae23e9ad6: Remove unused deps from monorepo
+
+## 0.0.6
+
+### Patch Changes
+
+- fb73fb355: Renames syncFolder to a mediaRoot when configuring Repo-Based Media
+
+## 0.0.5
+
+### Patch Changes
+
+- f6cb634c2: Added an optional config key to the schema that will be used for tina cloud media store
 
 ## 0.0.4
 

package/dist/index.es.js

@@ -30,7 +30,7 @@ var __objRest = (source, exclude) => {
   return target;
 };
 import * as yup from "yup";
-import { z, ZodError } from "zod";
+import z$1, { z, ZodError } from "zod";
 function addNamespaceToSchema(maybeNode, namespace = []) {
   if (typeof maybeNode === "string") {
     return maybeNode;
@@ -416,7 +416,7 @@ const resolveForm = ({
   };
 };
 const parseZodError = ({ zodError }) => {
-  var _a;
+  var _a, _b;
   const errors = zodError.flatten((issue) => {
     const moreInfo = [];
     if (issue.code === "invalid_union") {
@@ -432,7 +432,7 @@ const parseZodError = ({ zodError }) => {
   });
   const formErrors = errors.formErrors.flatMap((x) => x.errors);
   const parsedErrors = [
-    ...((_a = errors.fieldErrors) == null ? void 0 : _a.collections.flatMap((x) => x.errors)) || [],
+    ...((_b = (_a = errors.fieldErrors) == null ? void 0 : _a.collections) == null ? void 0 : _b.flatMap((x) => x.errors)) || [],
     ...formErrors
   ];
   return parsedErrors;
@@ -606,6 +606,19 @@ const TinaFieldZod = z.lazy(() => {
     return true;
   });
 });
+const tinaConfigKey = z$1.object({
+  publicFolder: z$1.string(),
+  mediaRoot: z$1.string()
+}).strict().optional();
+const tinaConfigZod = z$1.object({
+  media: z$1.object({
+    tina: tinaConfigKey
+  }).optional()
+});
+const validateTinaCloudSchemaConfig = (config) => {
+  const newConfig = tinaConfigZod.parse(config);
+  return newConfig;
+};
 const FORMATS = ["json", "md", "markdown", "mdx"];
 const Template = z.object({
   label: z.string({
@@ -647,7 +660,8 @@ const TinaCloudCollection = TinaCloudCollectionBase.extend({
   }
 }, { message: "Must provide one of templates or fields in your collection" });
 const TinaCloudSchemaZod = z.object({
-  collections: z.array(TinaCloudCollection)
+  collections: z.array(TinaCloudCollection),
+  config: tinaConfigZod.optional()
 }).refine((val) => !hasDuplicates(val.collections.map((x) => x.name)), {
   message: "can not have two collections with the same name"
 });
@@ -671,4 +685,4 @@ const validateSchema = ({
     }
   }
 };
-export { TinaSchema, TinaSchemaValidationError, addNamespaceToSchema, resolveField, resolveForm, validateSchema };
+export { TinaSchema, TinaSchemaValidationError, addNamespaceToSchema, resolveField, resolveForm, validateSchema, validateTinaCloudSchemaConfig };

package/dist/index.js

@@ -31,8 +31,11 @@ var __objRest = (source, exclude) => {
 };
 (function(global, factory) {
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("yup"), require("zod")) : typeof define === "function" && define.amd ? define(["exports", "yup", "zod"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["@tinacms/schema-tools"] = {}, global.NOOP, global.NOOP));
-})(this, function(exports2, yup, zod) {
+})(this, function(exports2, yup, z) {
   "use strict";
+  function _interopDefaultLegacy(e) {
+    return e && typeof e === "object" && "default" in e ? e : { "default": e };
+  }
   function _interopNamespace(e) {
     if (e && e.__esModule)
       return e;
@@ -54,6 +57,7 @@ var __objRest = (source, exclude) => {
     return Object.freeze(n);
   }
   var yup__namespace = /* @__PURE__ */ _interopNamespace(yup);
+  var z__default = /* @__PURE__ */ _interopDefaultLegacy(z);
   function addNamespaceToSchema(maybeNode, namespace = []) {
     if (typeof maybeNode === "string") {
       return maybeNode;
@@ -439,7 +443,7 @@ var __objRest = (source, exclude) => {
     };
   };
   const parseZodError = ({ zodError }) => {
-    var _a;
+    var _a, _b;
     const errors = zodError.flatten((issue) => {
       const moreInfo = [];
       if (issue.code === "invalid_union") {
@@ -455,12 +459,12 @@ var __objRest = (source, exclude) => {
     });
     const formErrors = errors.formErrors.flatMap((x) => x.errors);
     const parsedErrors = [
-      ...((_a = errors.fieldErrors) == null ? void 0 : _a.collections.flatMap((x) => x.errors)) || [],
+      ...((_b = (_a = errors.fieldErrors) == null ? void 0 : _a.collections) == null ? void 0 : _b.flatMap((x) => x.errors)) || [],
       ...formErrors
     ];
     return parsedErrors;
   };
-  const name = zod.z.string({
+  const name = z.z.string({
     required_error: "Name is required but not provided",
     invalid_type_error: "Name must be a string"
   });
@@ -476,71 +480,71 @@ var __objRest = (source, exclude) => {
   ];
   const typeTypeError = `type must be one of ${TypeName.join(", ")}`;
   const typeRequiredError = `type is required and must be one of ${TypeName.join(", ")}`;
-  const nameProp = zod.z.string({
+  const nameProp = z.z.string({
     required_error: "name must be provided",
     invalid_type_error: "name must be a sting"
   });
-  const Option = zod.z.union([zod.z.string(), zod.z.object({ label: zod.z.string(), value: zod.z.string() })], {
+  const Option = z.z.union([z.z.string(), z.z.object({ label: z.z.string(), value: z.z.string() })], {
     errorMap: () => {
       return {
         message: "Invalid option array. Must be a string[] or {label: string, value: string}[]"
       };
     }
   });
-  const TinaField = zod.z.object({
+  const TinaField = z.z.object({
     name: nameProp,
-    label: zod.z.string().optional(),
-    description: zod.z.string().optional(),
-    required: zod.z.boolean().optional()
+    label: z.z.string().optional(),
+    description: z.z.string().optional(),
+    required: z.z.boolean().optional()
   });
-  const FieldWithList = TinaField.extend({ list: zod.z.boolean().optional() });
+  const FieldWithList = TinaField.extend({ list: z.z.boolean().optional() });
   const TinaScalerBase = FieldWithList.extend({
-    options: zod.z.array(Option).optional()
+    options: z.z.array(Option).optional()
   });
   const StringField = TinaScalerBase.extend({
-    type: zod.z.literal("string", {
+    type: z.z.literal("string", {
       invalid_type_error: typeTypeError,
       required_error: typeRequiredError
     }),
-    isTitle: zod.z.boolean().optional()
+    isTitle: z.z.boolean().optional()
   });
   const BooleanField = TinaScalerBase.extend({
-    type: zod.z.literal("boolean", {
+    type: z.z.literal("boolean", {
       invalid_type_error: typeTypeError,
       required_error: typeRequiredError
     })
   });
   const NumberField = TinaScalerBase.extend({
-    type: zod.z.literal("number", {
+    type: z.z.literal("number", {
       invalid_type_error: typeTypeError,
       required_error: typeRequiredError
     })
   });
   const ImageField = TinaScalerBase.extend({
-    type: zod.z.literal("image", {
+    type: z.z.literal("image", {
       invalid_type_error: typeTypeError,
       required_error: typeRequiredError
     })
   });
   const DateTimeField = TinaScalerBase.extend({
-    type: zod.z.literal("datetime", {
+    type: z.z.literal("datetime", {
       invalid_type_error: typeTypeError,
       required_error: typeRequiredError
     }),
-    dateFormat: zod.z.string().optional(),
-    timeFormat: zod.z.string().optional()
+    dateFormat: z.z.string().optional(),
+    timeFormat: z.z.string().optional()
   });
   const ReferenceField = FieldWithList.extend({
-    type: zod.z.literal("reference", {
+    type: z.z.literal("reference", {
       invalid_type_error: typeTypeError,
       required_error: typeRequiredError
     })
   });
-  const TinaFieldZod = zod.z.lazy(() => {
-    const TemplateTemp = zod.z.object({
-      label: zod.z.string(),
+  const TinaFieldZod = z.z.lazy(() => {
+    const TemplateTemp = z.z.object({
+      label: z.z.string(),
       name: nameProp,
-      fields: zod.z.array(TinaFieldZod)
+      fields: z.z.array(TinaFieldZod)
     }).refine((val) => {
       var _a;
       return !hasDuplicates((_a = val.fields) == null ? void 0 : _a.map((x) => x.name));
@@ -548,27 +552,27 @@ var __objRest = (source, exclude) => {
       message: "Fields must have a unique name"
     });
     const ObjectField = FieldWithList.extend({
-      type: zod.z.literal("object", {
+      type: z.z.literal("object", {
         invalid_type_error: typeTypeError,
         required_error: typeRequiredError
       }),
-      fields: zod.z.array(TinaFieldZod).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
+      fields: z.z.array(TinaFieldZod).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
         message: "Fields must have a unique name"
       }),
-      templates: zod.z.array(TemplateTemp).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
+      templates: z.z.array(TemplateTemp).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
         message: "Templates must have a unique name"
       })
     });
     const RichTextField = FieldWithList.extend({
-      type: zod.z.literal("rich-text", {
+      type: z.z.literal("rich-text", {
         invalid_type_error: typeTypeError,
         required_error: typeRequiredError
       }),
-      templates: zod.z.array(TemplateTemp).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
+      templates: z.z.array(TemplateTemp).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
         message: "Templates must have a unique name"
       })
     });
-    return zod.z.discriminatedUnion("type", [
+    return z.z.discriminatedUnion("type", [
       StringField,
       BooleanField,
       NumberField,
@@ -594,13 +598,13 @@ var __objRest = (source, exclude) => {
         if (val.isTitle) {
           if (val.list) {
             ctx.addIssue({
-              code: zod.z.ZodIssueCode.custom,
+              code: z.z.ZodIssueCode.custom,
               message: "You can not have `list: true` when using `isTitle`"
             });
           }
           if (!val.required) {
             ctx.addIssue({
-              code: zod.z.ZodIssueCode.custom,
+              code: z.z.ZodIssueCode.custom,
               message: "You must have { required: true } when using `isTitle`"
             });
           }
@@ -611,7 +615,7 @@ var __objRest = (source, exclude) => {
         let isValid = Boolean(val == null ? void 0 : val.templates) || Boolean(val == null ? void 0 : val.fields);
         if (!isValid) {
           ctx.addIssue({
-            code: zod.z.ZodIssueCode.custom,
+            code: z.z.ZodIssueCode.custom,
             message
           });
           return false;
@@ -619,7 +623,7 @@ var __objRest = (source, exclude) => {
           isValid = !((val == null ? void 0 : val.templates) && (val == null ? void 0 : val.fields));
           if (!isValid) {
             ctx.addIssue({
-              code: zod.z.ZodIssueCode.custom,
+              code: z.z.ZodIssueCode.custom,
               message
             });
           }
@@ -629,27 +633,40 @@ var __objRest = (source, exclude) => {
       return true;
     });
   });
+  const tinaConfigKey = z__default["default"].object({
+    publicFolder: z__default["default"].string(),
+    mediaRoot: z__default["default"].string()
+  }).strict().optional();
+  const tinaConfigZod = z__default["default"].object({
+    media: z__default["default"].object({
+      tina: tinaConfigKey
+    }).optional()
+  });
+  const validateTinaCloudSchemaConfig = (config) => {
+    const newConfig = tinaConfigZod.parse(config);
+    return newConfig;
+  };
   const FORMATS = ["json", "md", "markdown", "mdx"];
-  const Template = zod.z.object({
-    label: zod.z.string({
+  const Template = z.z.object({
+    label: z.z.string({
       invalid_type_error: "label must be a string",
       required_error: "label was not provided but is required"
     }),
     name,
-    fields: zod.z.array(TinaFieldZod)
+    fields: z.z.array(TinaFieldZod)
   }).refine((val) => {
     var _a;
     return !hasDuplicates((_a = val.fields) == null ? void 0 : _a.map((x) => x.name));
   }, {
     message: "Fields must have a unique name"
   });
-  const TinaCloudCollectionBase = zod.z.object({
-    label: zod.z.string().optional(),
+  const TinaCloudCollectionBase = z.z.object({
+    label: z.z.string().optional(),
     name,
-    format: zod.z.enum(FORMATS).optional()
+    format: z.z.enum(FORMATS).optional()
   });
   const TinaCloudCollection = TinaCloudCollectionBase.extend({
-    fields: zod.z.array(TinaFieldZod).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
+    fields: z.z.array(TinaFieldZod).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
       message: "Fields must have a unique name"
     }).refine((val) => {
       const arr = (val == null ? void 0 : val.filter((x) => x.type === "string" && x.isTitle)) || [];
@@ -657,7 +674,7 @@ var __objRest = (source, exclude) => {
     }, {
       message: "Fields can only have one use of `isTitle`"
     }),
-    templates: zod.z.array(Template).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
+    templates: z.z.array(Template).min(1).optional().refine((val) => !hasDuplicates(val == null ? void 0 : val.map((x) => x.name)), {
       message: "Templates must have a unique name"
     })
   }).refine((val) => {
@@ -669,8 +686,9 @@ var __objRest = (source, exclude) => {
       return isValid;
     }
   }, { message: "Must provide one of templates or fields in your collection" });
-  const TinaCloudSchemaZod = zod.z.object({
-    collections: zod.z.array(TinaCloudCollection)
+  const TinaCloudSchemaZod = z.z.object({
+    collections: z.z.array(TinaCloudCollection),
+    config: tinaConfigZod.optional()
   }).refine((val) => !hasDuplicates(val.collections.map((x) => x.name)), {
     message: "can not have two collections with the same name"
   });
@@ -686,7 +704,7 @@ var __objRest = (source, exclude) => {
     try {
       TinaCloudSchemaZod.parse(config);
     } catch (e) {
-      if (e instanceof zod.ZodError) {
+      if (e instanceof z.ZodError) {
         const errors = parseZodError({ zodError: e });
         throw new TinaSchemaValidationError(errors.join(", \n"));
       } else {
@@ -700,6 +718,7 @@ var __objRest = (source, exclude) => {
   exports2.resolveField = resolveField;
   exports2.resolveForm = resolveForm;
   exports2.validateSchema = validateSchema;
+  exports2.validateTinaCloudSchemaConfig = validateTinaCloudSchemaConfig;
   Object.defineProperty(exports2, "__esModule", { value: true });
   exports2[Symbol.toStringTag] = "Module";
 });

package/dist/types/SchemaTypes.d.ts

@@ -21,9 +21,18 @@ export declare type UIField<F extends UIField = any, Shape = any> = {
     validate?(value: Shape, allValues: any, meta: any, field: UIField<F, Shape>): string | object | undefined | void;
     defaultValue?: Shape;
 };
+export interface TinaCloudSchemaConfig {
+    media?: {
+        tina?: {
+            publicFolder: string;
+            mediaRoot: string;
+        };
+    };
+}
 export interface TinaCloudSchema<WithNamespace extends boolean> {
     templates?: GlobalTemplate<WithNamespace>[];
     collections: TinaCloudCollection<WithNamespace>[];
+    config?: TinaCloudSchemaConfig;
 }
 export declare type TinaCloudSchemaBase = TinaCloudSchema<false>;
 export declare type TinaCloudSchemaEnriched = TinaCloudSchema<true>;
@@ -35,6 +44,7 @@ export declare type TinaCloudSchemaEnriched = TinaCloudSchema<true>;
 export interface TinaCloudSchemaWithNamespace {
     templates?: GlobalTemplate<true>[];
     collections: TinaCloudCollection<true>[];
+    config?: TinaCloudSchemaConfig;
     namespace: string[];
 }
 export declare type TinaCloudCollection<WithNamespace extends boolean> = CollectionFields<WithNamespace> | CollectionTemplates<WithNamespace>;

package/dist/validate/index.d.ts

@@ -11,6 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import { TinaCloudSchema } from '../types';
+export { validateTinaCloudSchemaConfig } from './tinaCloudSchemaConfig';
 export declare class TinaSchemaValidationError extends Error {
     constructor(message: any);
 }

package/dist/validate/schema.d.ts

@@ -88,6 +88,44 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         format?: "json" | "md" | "markdown" | "mdx";
         label?: string;
     }>, "many">;
+    config: z.ZodOptional<z.ZodObject<{
+        media: z.ZodOptional<z.ZodObject<{
+            tina: z.ZodOptional<z.ZodObject<{
+                publicFolder: z.ZodString;
+                mediaRoot: z.ZodString;
+            }, "strict", z.ZodTypeAny, {
+                publicFolder?: string;
+                mediaRoot?: string;
+            }, {
+                publicFolder?: string;
+                mediaRoot?: string;
+            }>>;
+        }, "strip", z.ZodTypeAny, {
+            tina?: {
+                publicFolder?: string;
+                mediaRoot?: string;
+            };
+        }, {
+            tina?: {
+                publicFolder?: string;
+                mediaRoot?: string;
+            };
+        }>>;
+    }, "strip", z.ZodTypeAny, {
+        media?: {
+            tina?: {
+                publicFolder?: string;
+                mediaRoot?: string;
+            };
+        };
+    }, {
+        media?: {
+            tina?: {
+                publicFolder?: string;
+                mediaRoot?: string;
+            };
+        };
+    }>>;
 }, "strip", z.ZodTypeAny, {
     collections?: {
         name?: string;
@@ -100,6 +138,14 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         format?: "json" | "md" | "markdown" | "mdx";
         label?: string;
     }[];
+    config?: {
+        media?: {
+            tina?: {
+                publicFolder?: string;
+                mediaRoot?: string;
+            };
+        };
+    };
 }, {
     collections?: {
         name?: string;
@@ -112,6 +158,14 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         format?: "json" | "md" | "markdown" | "mdx";
         label?: string;
     }[];
+    config?: {
+        media?: {
+            tina?: {
+                publicFolder?: string;
+                mediaRoot?: string;
+            };
+        };
+    };
 }>, {
     collections?: {
         name?: string;
@@ -124,6 +178,14 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         format?: "json" | "md" | "markdown" | "mdx";
         label?: string;
     }[];
+    config?: {
+        media?: {
+            tina?: {
+                publicFolder?: string;
+                mediaRoot?: string;
+            };
+        };
+    };
 }, {
     collections?: {
         name?: string;
@@ -136,4 +198,12 @@ export declare const TinaCloudSchemaZod: z.ZodEffects<z.ZodObject<{
         format?: "json" | "md" | "markdown" | "mdx";
         label?: string;
     }[];
+    config?: {
+        media?: {
+            tina?: {
+                publicFolder?: string;
+                mediaRoot?: string;
+            };
+        };
+    };
 }>;

package/dist/validate/tinaCloudSchemaConfig.d.ts

@@ -0,0 +1,53 @@
+/**
+Copyright 2021 Forestry.io Holdings, Inc.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+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.
+*/
+import { TinaCloudSchemaConfig } from '../types';
+import z from 'zod';
+export declare const tinaConfigZod: z.ZodObject<{
+    media: z.ZodOptional<z.ZodObject<{
+        tina: z.ZodOptional<z.ZodObject<{
+            publicFolder: z.ZodString;
+            mediaRoot: z.ZodString;
+        }, "strict", z.ZodTypeAny, {
+            publicFolder?: string;
+            mediaRoot?: string;
+        }, {
+            publicFolder?: string;
+            mediaRoot?: string;
+        }>>;
+    }, "strip", z.ZodTypeAny, {
+        tina?: {
+            publicFolder?: string;
+            mediaRoot?: string;
+        };
+    }, {
+        tina?: {
+            publicFolder?: string;
+            mediaRoot?: string;
+        };
+    }>>;
+}, "strip", z.ZodTypeAny, {
+    media?: {
+        tina?: {
+            publicFolder?: string;
+            mediaRoot?: string;
+        };
+    };
+}, {
+    media?: {
+        tina?: {
+            publicFolder?: string;
+            mediaRoot?: string;
+        };
+    };
+}>;
+export declare const validateTinaCloudSchemaConfig: (config: unknown) => TinaCloudSchemaConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/schema-tools",
-  "version": "0.0.0-20225819341",
+  "version": "0.0.0-202261192534",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -15,7 +15,7 @@
     ]
   },
   "devDependencies": {
-    "@tinacms/scripts": "0.0.0-20225819341",
+    "@tinacms/scripts": "0.50.9",
     "@types/yup": "^0.29.10",
     "jest": "^27.0.6",
     "react": "17.0.2",