@tinacms/graphql 0.57.1 → 0.57.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # tina-graphql
 
+## 0.57.2
+
+### Patch Changes
+
+- edb2f4011: Trim path property on collections during compilation
+
 ## 0.57.1
 
 ### Patch Changes

package/dist/index.js

@@ -6395,15 +6395,15 @@ var require_acorn_jsx = __commonJS({
       }
       return acornJsx;
     }
-    function getQualifiedJSXName(object) {
-      if (!object)
-        return object;
-      if (object.type === "JSXIdentifier")
-        return object.name;
-      if (object.type === "JSXNamespacedName")
-        return object.namespace.name + ":" + object.name.name;
-      if (object.type === "JSXMemberExpression")
-        return getQualifiedJSXName(object.object) + "." + getQualifiedJSXName(object.property);
+    function getQualifiedJSXName(object2) {
+      if (!object2)
+        return object2;
+      if (object2.type === "JSXIdentifier")
+        return object2.name;
+      if (object2.type === "JSXNamespacedName")
+        return object2.namespace.name + ":" + object2.name.name;
+      if (object2.type === "JSXMemberExpression")
+        return getQualifiedJSXName(object2.object) + "." + getQualifiedJSXName(object2.property);
     }
     module2.exports = function(options) {
       options = options || {};
@@ -6946,8 +6946,8 @@ var require_micromark_extension_mdxjs = __commonJS({
 var require_min_indent = __commonJS({
   "pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/min-indent-npm-1.0.1-77031f50e1-c3aeea46bc.zip/node_modules/min-indent/index.js"(exports, module2) {
     "use strict";
-    module2.exports = (string3) => {
-      const match = string3.match(/^[ \t]*(?=\S)/gm);
+    module2.exports = (string4) => {
+      const match = string4.match(/^[ \t]*(?=\S)/gm);
       if (!match) {
         return 0;
       }
@@ -6961,13 +6961,13 @@ var require_strip_indent = __commonJS({
   "pnp:/home/runner/work/tinacms/tinacms/.yarn/cache/strip-indent-npm-3.0.0-519e75a28d-4a7860e943.zip/node_modules/strip-indent/index.js"(exports, module2) {
     "use strict";
     var minIndent = require_min_indent();
-    module2.exports = (string3) => {
-      const indent2 = minIndent(string3);
+    module2.exports = (string4) => {
+      const indent2 = minIndent(string4);
       if (indent2 === 0) {
-        return string3;
+        return string4;
       }
       const regex = new RegExp(`^[ \\t]{${indent2}}`, "gm");
-      return string3.replace(regex, "");
+      return string4.replace(regex, "");
     };
   }
 });
@@ -11168,6 +11168,9 @@ function addNamespaceToSchema(maybeNode, namespace = []) {
     const key2 = keys2[index2];
     if (Array.isArray(m)) {
       newNode[key2] = m.map((element) => {
+        if (!element) {
+          return;
+        }
         if (!element.hasOwnProperty("name")) {
           return element;
         }
@@ -11175,6 +11178,9 @@ function addNamespaceToSchema(maybeNode, namespace = []) {
         return addNamespaceToSchema(element, [...namespace, value]);
       });
     } else {
+      if (!m) {
+        return;
+      }
       if (!m.hasOwnProperty("name")) {
         newNode[key2] = m;
       } else {
@@ -12120,8 +12126,77 @@ var filterSelections = (arr) => {
   return arr.filter(Boolean);
 };
 
-// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/primitives/schema/index.ts
+// pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/primitives/schema/validate.ts
 var import_lodash3 = __toModule(require("lodash"));
+var yup2 = __toModule(require("yup"));
+var FIELD_TYPES = [
+  "string",
+  "number",
+  "boolean",
+  "datetime",
+  "image",
+  "reference",
+  "object",
+  "rich-text"
+];
+var validateSchema = async (schema) => {
+  const schema2 = addNamespaceToSchema(import_lodash3.default.cloneDeep(schema));
+  const collections = await sequential(schema2.collections, async (collection) => validateCollection(collection));
+  return {
+    collections
+  };
+};
+var validateCollection = async (collection) => {
+  let templates = [];
+  let fields = [];
+  const messageName = collection.namespace.join(".");
+  const collectionSchema = yup2.object({
+    name: yup2.string().matches(/^[a-zA-Z0-9_]*$/, {
+      message: (obj) => `Collection's "name" must match ${obj.regex} at ${messageName}`
+    }).required(),
+    label: yup2.string().required(),
+    path: yup2.string().required().transform((value) => {
+      return value.replace(/^\/|\/$/g, "");
+    })
+  });
+  await collectionSchema.validate(collection);
+  const validCollection = await collectionSchema.cast(collection);
+  if (validCollection.templates) {
+    templates = await sequential(validCollection.templates, async (template) => {
+      if (typeof template === "string") {
+        throw new Error(`Global templates are not yet supported`);
+      }
+      const fields2 = await sequential(template.fields, async (field) => {
+        return validateField(field);
+      });
+      return __spreadValues(__spreadValues({}, validCollection), fields2);
+    });
+  }
+  if (validCollection.fields) {
+    if (typeof validCollection.fields === "string") {
+      throw new Error(`Global templates are not yet supported`);
+    }
+    fields = await sequential(validCollection.fields, async (field) => {
+      return validateField(field);
+    });
+    return __spreadProps(__spreadValues({}, validCollection), {
+      fields
+    });
+  }
+  return collection;
+};
+var validateField = async (field) => {
+  const messageName = field.namespace.join(".");
+  const schema = yup2.object({
+    name: yup2.string().matches(/^[a-zA-Z0-9_]*$/, {
+      message: (obj) => `Field's 'name' must match ${obj.regex} at ${messageName}`
+    }).required(),
+    label: yup2.string().required(),
+    type: yup2.string().oneOf(FIELD_TYPES, (obj) => `'type' must be one of: ${obj.values}, but got '${obj.value}' at ${messageName}`)
+  });
+  await schema.validate(field);
+  return field;
+};
 
 // pnp:/home/runner/work/tinacms/tinacms/packages/@tinacms/graphql/src/primitives/resolver/error.ts
 var TinaError = class extends Error {
@@ -12138,7 +12213,8 @@ var TinaError = class extends Error {
 var createSchema = async ({
   schema
 }) => {
-  return new TinaSchema(schema);
+  const validSchema = await validateSchema(schema);
+  return new TinaSchema(validSchema);
 };
 var TinaSchema = class {
   constructor(config) {
@@ -12223,7 +12299,7 @@ var TinaSchema = class {
         case "object":
           return templateInfo.template;
         case "union":
-          assertShape(data, (yup2) => yup2.object({ _template: yup2.string().required() }));
+          assertShape(data, (yup3) => yup3.object({ _template: yup3.string().required() }));
           const template = templateInfo.templates.find((template2) => template2.namespace[template2.namespace.length - 1] === data._template);
           if (!template) {
             throw new TinaError(`Expected to find template named '${data._template}' for collection '${lastItem(collection.namespace)}'`, {
@@ -12280,7 +12356,7 @@ var TinaSchema = class {
         }
       }
     };
-    this.schema = addNamespaceToSchema(import_lodash3.default.cloneDeep(config));
+    this.schema = config;
   }
 };
 
@@ -18220,7 +18296,7 @@ function initializeFlow(effects) {
 var resolver = {
   resolveAll: createResolver()
 };
-var string = initializeFactory("string");
+var string2 = initializeFactory("string");
 var text = initializeFactory("text");
 function initializeFactory(field) {
   return {
@@ -18645,7 +18721,7 @@ __export(constructs_exports, {
   flow: () => flow2,
   flowInitial: () => flowInitial,
   insideSpan: () => insideSpan,
-  string: () => string2,
+  string: () => string3,
   text: () => text2
 });
 var document2 = {
@@ -18682,7 +18758,7 @@ var flow2 = {
   [96]: codeFenced,
   [126]: codeFenced
 };
-var string2 = {
+var string3 = {
   [38]: characterReference,
   [92]: characterEscape
 };
@@ -18720,7 +18796,7 @@ function parse(options = {}) {
     content: create(content),
     document: create(document),
     flow: create(flow),
-    string: create(string),
+    string: create(string2),
     text: create(text)
   };
   return parser;
@@ -19313,9 +19389,9 @@ function compiler(options = {}) {
   }
   function onexitlabeltext(token) {
     const ancestor = this.stack[this.stack.length - 2];
-    const string3 = this.sliceSerialize(token);
-    ancestor.label = decodeString(string3);
-    ancestor.identifier = normalizeIdentifier(string3).toLowerCase();
+    const string4 = this.sliceSerialize(token);
+    ancestor.label = decodeString(string4);
+    ancestor.identifier = normalizeIdentifier(string4).toLowerCase();
   }
   function onexitlabel() {
     const fragment = this.stack[this.stack.length - 1];
@@ -22047,10 +22123,10 @@ var Resolver = class {
         collectionLookup = Object.keys(args.params)[0];
       }
       const collectionNames = this.tinaSchema.getCollections().map((item) => item.name);
-      assertShape(collectionLookup, (yup2) => {
-        return yup2.mixed().oneOf(collectionNames);
+      assertShape(collectionLookup, (yup3) => {
+        return yup3.mixed().oneOf(collectionNames);
       }, `"collection" must be one of: [${collectionNames.join(", ")}] but got ${collectionLookup}`);
-      assertShape(args, (yup2) => yup2.object({ relativePath: yup2.string().required() }));
+      assertShape(args, (yup3) => yup3.object({ relativePath: yup3.string().required() }));
       const collection = await this.tinaSchema.getCollection(collectionLookup);
       const realPath = import_path4.default.join(collection == null ? void 0 : collection.path, args.relativePath);
       const alreadyExists = await this.database.documentExists(realPath);
@@ -22149,7 +22225,7 @@ var Resolver = class {
       if (!rawData) {
         return void 0;
       }
-      assertShape(rawData, (yup2) => yup2.object());
+      assertShape(rawData, (yup3) => yup3.object());
       const value = rawData[field.name];
       switch (field.type) {
         case "string":
@@ -22173,7 +22249,7 @@ var Resolver = class {
             if (!value) {
               return;
             }
-            assertShape(value, (yup2) => yup2.array().of(yup2.object().required()));
+            assertShape(value, (yup3) => yup3.array().of(yup3.object().required()));
             accumulator[field.name] = await sequential(value, async (item) => {
               const template = await this.tinaSchema.getTemplateForData({
                 data: item,
@@ -22217,15 +22293,15 @@ var Resolver = class {
     };
     this.buildParams = (args) => {
       try {
-        assertShape(args, (yup2) => yup2.object({
-          collection: yup2.string().required(),
-          params: yup2.object().required()
+        assertShape(args, (yup3) => yup3.object({
+          collection: yup3.string().required(),
+          params: yup3.object().required()
         }));
         return args.params[args.collection];
       } catch (e) {
       }
-      assertShape(args, (yup2) => yup2.object({
-        params: yup2.object().required()
+      assertShape(args, (yup3) => yup3.object({
+        params: yup3.object().required()
       }));
       return args.params;
     };
@@ -22462,7 +22538,7 @@ var resolve = async ({
         const isCreation = lookup[info.fieldName] === "create";
         switch (lookup.resolveType) {
           case "nodeDocument":
-            assertShape(args, (yup2) => yup2.object({ id: yup2.string().required() }));
+            assertShape(args, (yup3) => yup3.object({ id: yup3.string().required() }));
             return resolver2.getDocument(args.id);
           case "multiCollectionDocument":
             if (typeof value === "string") {
@@ -22498,7 +22574,7 @@ var resolve = async ({
             }
             return value;
           case "multiCollectionDocumentList":
-            assertShape(value, (yup2) => yup2.array().of(yup2.string()));
+            assertShape(value, (yup3) => yup3.array().of(yup3.string()));
             return resolver2.resolveCollectionConnections({
               ids: value || []
             });
@@ -22826,7 +22902,7 @@ var Database = class {
         const tinaSchema = await this.getSchema();
         const extension2 = import_path6.default.extname(filepath);
         const contentString = await this.bridge.get(filepath);
-        const contentObject = this.parseFile(contentString, extension2, (yup2) => yup2.object({}));
+        const contentObject = this.parseFile(contentString, extension2, (yup3) => yup3.object({}));
         const templateName = hasOwnProperty2(contentObject, "_template") && typeof contentObject._template === "string" ? contentObject._template : void 0;
         const { collection, template } = await tinaSchema.getCollectionAndTemplateByFullPath(filepath, templateName);
         const field = template.fields.find((field2) => {

package/dist/primitives/schema/validate.d.ts

@@ -0,0 +1,14 @@
+/**
+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 type { TinaCloudSchemaBase } from '../types';
+export declare const validateSchema: (schema: TinaCloudSchemaBase) => Promise<TinaCloudSchemaBase>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "0.57.1",
+  "version": "0.57.2",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [