@tinacms/graphql 1.4.2 → 1.4.3

package/dist/database/index.d.ts

@@ -63,6 +63,7 @@ export declare class Database {
         template: {
             label?: string | boolean;
             name: string;
+            nameOverride?: string;
             ui?: {
                 itemProps?(item: Record<string, any>): {
                     key?: string;

package/dist/index.es.js

@@ -2491,7 +2491,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.2",
+  version: "1.4.3",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -4494,12 +4494,29 @@ var parseFile = (content, format, yupSchema, markdownParseConfig) => {
 };
 
 // src/database/alias-utils.ts
+var replaceBlockAliases = (template, item) => {
+  const output = { ...item };
+  const templateKey = template.templateKey || "_template";
+  const templateName = output[templateKey];
+  const matchingTemplate = template.templates.find(
+    (t) => t.nameOverride == templateName || t.name == templateName
+  );
+  if (!matchingTemplate) {
+    throw new Error(
+      `Block template "${templateName}" is not defined for field "${template.name}"`
+    );
+  }
+  output._template = matchingTemplate.name;
+  if (templateKey != "_template") {
+    delete output[templateKey];
+  }
+  return output;
+};
 var replaceNameOverrides = (template, obj) => {
   if (template.list) {
     return obj.map((item) => {
-      if (isBlockField(template) && template.templateKey) {
-        item._template = item[template.templateKey];
-        delete item[template.templateKey];
+      if (isBlockField(template)) {
+        item = replaceBlockAliases(template, item);
       }
       return _replaceNameOverrides(
         getTemplateForData(template, item).fields,
@@ -4527,27 +4544,50 @@ var getTemplateForData = (field, data) => {
   if (field.templates?.length) {
     const templateKey = "_template";
     if (data[templateKey]) {
-      return field.templates.find(
-        (template) => template.name === data[templateKey]
+      const result = field.templates.find(
+        (template) => template.nameOverride === data[templateKey] || template.name === data[templateKey]
+      );
+      if (result) {
+        return result;
+      }
+      throw new Error(
+        `Template "${data[templateKey]}" is not defined for field "${field.name}"`
       );
     }
     throw new Error(
-      `Missing required key "${templateKey}" on field ${field.name}`
+      `Missing required key "${templateKey}" on field "${field.name}"`
     );
   } else {
     return field;
   }
 };
+var applyBlockAliases = (template, item) => {
+  const output = { ...item };
+  const templateKey = template.templateKey || "_template";
+  const templateName = output._template;
+  const matchingTemplate = template.templates.find(
+    (t) => t.nameOverride == templateName || t.name == templateName
+  );
+  if (!matchingTemplate) {
+    throw new Error(
+      `Block template "${templateName}" is not defined for field "${template.name}"`
+    );
+  }
+  output[templateKey] = matchingTemplate.nameOverride || matchingTemplate.name;
+  if (templateKey != "_template") {
+    delete output._template;
+  }
+  return output;
+};
 var applyNameOverrides = (template, obj) => {
   if (template.list) {
     return obj.map((item) => {
-      const result = _applyNameOverrides(
+      let result = _applyNameOverrides(
         getTemplateForData(template, item).fields,
         item
       );
-      if (isBlockField(template) && template.templateKey) {
-        result[template.templateKey] = result._template;
-        delete result._template;
+      if (isBlockField(template)) {
+        result = applyBlockAliases(template, result);
       }
       return result;
     });
@@ -5222,7 +5262,7 @@ var Database = class {
             `"${path4}" Found in multiple collections: ${filesSeen.get(path4).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.
+This will be an error in the future. See https://tina.io/docs/errors/file-in-mutpliple-collections/
 `
           );
         });

package/dist/index.js

@@ -2542,7 +2542,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.2",
+  version: "1.4.3",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -4545,12 +4545,29 @@ var parseFile = (content, format, yupSchema, markdownParseConfig) => {
 };
 
 // src/database/alias-utils.ts
+var replaceBlockAliases = (template, item) => {
+  const output = { ...item };
+  const templateKey = template.templateKey || "_template";
+  const templateName = output[templateKey];
+  const matchingTemplate = template.templates.find(
+    (t) => t.nameOverride == templateName || t.name == templateName
+  );
+  if (!matchingTemplate) {
+    throw new Error(
+      `Block template "${templateName}" is not defined for field "${template.name}"`
+    );
+  }
+  output._template = matchingTemplate.name;
+  if (templateKey != "_template") {
+    delete output[templateKey];
+  }
+  return output;
+};
 var replaceNameOverrides = (template, obj) => {
   if (template.list) {
     return obj.map((item) => {
-      if (isBlockField(template) && template.templateKey) {
-        item._template = item[template.templateKey];
-        delete item[template.templateKey];
+      if (isBlockField(template)) {
+        item = replaceBlockAliases(template, item);
       }
       return _replaceNameOverrides(
         getTemplateForData(template, item).fields,
@@ -4580,27 +4597,50 @@ var getTemplateForData = (field, data) => {
   if ((_a = field.templates) == null ? void 0 : _a.length) {
     const templateKey = "_template";
     if (data[templateKey]) {
-      return field.templates.find(
-        (template) => template.name === data[templateKey]
+      const result = field.templates.find(
+        (template) => template.nameOverride === data[templateKey] || template.name === data[templateKey]
+      );
+      if (result) {
+        return result;
+      }
+      throw new Error(
+        `Template "${data[templateKey]}" is not defined for field "${field.name}"`
       );
     }
     throw new Error(
-      `Missing required key "${templateKey}" on field ${field.name}`
+      `Missing required key "${templateKey}" on field "${field.name}"`
     );
   } else {
     return field;
   }
 };
+var applyBlockAliases = (template, item) => {
+  const output = { ...item };
+  const templateKey = template.templateKey || "_template";
+  const templateName = output._template;
+  const matchingTemplate = template.templates.find(
+    (t) => t.nameOverride == templateName || t.name == templateName
+  );
+  if (!matchingTemplate) {
+    throw new Error(
+      `Block template "${templateName}" is not defined for field "${template.name}"`
+    );
+  }
+  output[templateKey] = matchingTemplate.nameOverride || matchingTemplate.name;
+  if (templateKey != "_template") {
+    delete output._template;
+  }
+  return output;
+};
 var applyNameOverrides = (template, obj) => {
   if (template.list) {
     return obj.map((item) => {
-      const result = _applyNameOverrides(
+      let result = _applyNameOverrides(
         getTemplateForData(template, item).fields,
         item
       );
-      if (isBlockField(template) && template.templateKey) {
-        result[template.templateKey] = result._template;
-        delete result._template;
+      if (isBlockField(template)) {
+        result = applyBlockAliases(template, result);
       }
       return result;
     });
@@ -5280,7 +5320,7 @@ var Database = class {
             `"${path4}" Found in multiple collections: ${filesSeen.get(path4).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.
+This will be an error in the future. See https://tina.io/docs/errors/file-in-mutpliple-collections/
 `
           );
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
   "typings": "dist/index.d.ts",
@@ -25,8 +25,6 @@
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
     "@iarna/toml": "^2.2.5",
-    "@tinacms/mdx": "1.3.7",
-    "@tinacms/schema-tools": "1.4.2",
     "abstract-level": "^1.0.3",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
@@ -73,7 +71,9 @@
     "unist-util-visit": "^4.0.0",
     "vfile": "^4.2.0",
     "ws": "^7.3.1",
-    "yup": "^0.32.9"
+    "yup": "^0.32.9",
+    "@tinacms/mdx": "1.3.7",
+    "@tinacms/schema-tools": "1.4.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -83,8 +83,6 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/schema-tools": "1.4.2",
-    "@tinacms/scripts": "1.1.0",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
     "@types/express": "^4.17.8",
@@ -107,7 +105,9 @@
     "jest-matcher-utils": "27.0.6",
     "memory-level": "^1.0.0",
     "nodemon": "2.0.19",
-    "typescript": "4.3.5"
+    "typescript": "4.3.5",
+    "@tinacms/schema-tools": "1.4.2",
+    "@tinacms/scripts": "1.1.0"
   },
   "scripts": {
     "types": "pnpm tsc",