@tinacms/graphql 1.4.1 → 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.1",
+  version: "1.4.3",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -4494,9 +4494,30 @@ 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)) {
+        item = replaceBlockAliases(template, item);
+      }
       return _replaceNameOverrides(
         getTemplateForData(template, item).fields,
         item
@@ -4506,6 +4527,9 @@ var replaceNameOverrides = (template, obj) => {
     return _replaceNameOverrides(getTemplateForData(template, obj).fields, obj);
   }
 };
+function isBlockField(field) {
+  return field && field.type === "object" && field.templates?.length > 0;
+}
 var _replaceNameOverrides = (fields, obj) => {
   const output = {};
   Object.keys(obj).forEach((key) => {
@@ -4516,36 +4540,56 @@ var _replaceNameOverrides = (fields, obj) => {
   });
   return output;
 };
-var getTemplateKey = (field) => {
-  const DEFAULT_TEMPLATE_KEY = "_template";
-  if (field.templates?.length) {
-    const templateField = field.templates[0]?.fields?.find(
-      (field2) => field2.name === DEFAULT_TEMPLATE_KEY
-    );
-    return templateField?.alias || DEFAULT_TEMPLATE_KEY;
-  }
-  return DEFAULT_TEMPLATE_KEY;
-};
 var getTemplateForData = (field, data) => {
   if (field.templates?.length) {
-    const templateKey = getTemplateKey(field);
+    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}"`
+    );
   } else {
     return field;
   }
-  throw new Error("No template found for field " + field.name);
+};
+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) => {
-      return _applyNameOverrides(
+      let result = _applyNameOverrides(
         getTemplateForData(template, item).fields,
         item
       );
+      if (isBlockField(template)) {
+        result = applyBlockAliases(template, result);
+      }
+      return result;
     });
   } else {
     return _applyNameOverrides(getTemplateForData(template, obj).fields, obj);
@@ -5218,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/
 `
           );
         });
@@ -5372,11 +5416,15 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
           frontmatterFormat: collection?.frontmatterFormat
         }
       );
+      const template = getTemplateForFile(templateInfo, data);
+      if (!template) {
+        console.warn(
+          `Document: ${filepath} has an ambiguous template, skipping from indexing`
+        );
+        return;
+      }
       const normalizedPath = normalizePath(filepath);
-      const aliasedData = templateInfo ? replaceNameOverrides(
-        getTemplateForFile(templateInfo, data),
-        data
-      ) : data;
+      const aliasedData = templateInfo ? replaceNameOverrides(template, data) : data;
       await enqueueOps([
         ...makeIndexOpsForDocument(
           normalizedPath,
@@ -5453,9 +5501,7 @@ var getTemplateForFile = (templateInfo, data) => {
       }
       return template;
     } else {
-      throw new Error(
-        `Expected _template to be provided for document in an ambiguous collection`
-      );
+      return void 0;
     }
   }
   throw new Error(`Unable to determine template`);
@@ -5466,14 +5512,15 @@ import { ManyLevelGuest } from "many-level";
 import { pipeline } from "readable-stream";
 import { connect } from "net";
 var TinaLevelClient = class extends ManyLevelGuest {
-  constructor() {
-    super(...arguments);
+  constructor(port) {
+    super();
     this._connected = false;
+    this.port = port || 9e3;
   }
   openConnection() {
     if (this._connected)
       return;
-    const socket = connect(9e3);
+    const socket = connect(this.port);
     pipeline(socket, this.createRpcStream(), socket, () => {
       this._connected = false;
     });

package/dist/index.js

@@ -2542,7 +2542,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.1",
+  version: "1.4.3",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -4545,9 +4545,30 @@ 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)) {
+        item = replaceBlockAliases(template, item);
+      }
       return _replaceNameOverrides(
         getTemplateForData(template, item).fields,
         item
@@ -4557,6 +4578,10 @@ var replaceNameOverrides = (template, obj) => {
     return _replaceNameOverrides(getTemplateForData(template, obj).fields, obj);
   }
 };
+function isBlockField(field) {
+  var _a;
+  return field && field.type === "object" && ((_a = field.templates) == null ? void 0 : _a.length) > 0;
+}
 var _replaceNameOverrides = (fields, obj) => {
   const output = {};
   Object.keys(obj).forEach((key) => {
@@ -4567,38 +4592,57 @@ var _replaceNameOverrides = (fields, obj) => {
   });
   return output;
 };
-var getTemplateKey = (field) => {
-  var _a, _b, _c;
-  const DEFAULT_TEMPLATE_KEY = "_template";
-  if ((_a = field.templates) == null ? void 0 : _a.length) {
-    const templateField = (_c = (_b = field.templates[0]) == null ? void 0 : _b.fields) == null ? void 0 : _c.find(
-      (field2) => field2.name === DEFAULT_TEMPLATE_KEY
-    );
-    return (templateField == null ? void 0 : templateField.alias) || DEFAULT_TEMPLATE_KEY;
-  }
-  return DEFAULT_TEMPLATE_KEY;
-};
 var getTemplateForData = (field, data) => {
   var _a;
   if ((_a = field.templates) == null ? void 0 : _a.length) {
-    const templateKey = getTemplateKey(field);
+    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}"`
+    );
   } else {
     return field;
   }
-  throw new Error("No template found for field " + field.name);
+};
+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) => {
-      return _applyNameOverrides(
+      let result = _applyNameOverrides(
         getTemplateForData(template, item).fields,
         item
       );
+      if (isBlockField(template)) {
+        result = applyBlockAliases(template, result);
+      }
+      return result;
     });
   } else {
     return _applyNameOverrides(getTemplateForData(template, obj).fields, obj);
@@ -5276,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/
 `
           );
         });
@@ -5430,11 +5474,15 @@ var _indexContent = async (database, level, documentPaths, enqueueOps, collectio
           frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat
         }
       );
+      const template = getTemplateForFile(templateInfo, data);
+      if (!template) {
+        console.warn(
+          `Document: ${filepath} has an ambiguous template, skipping from indexing`
+        );
+        return;
+      }
       const normalizedPath = (0, import_schema_tools3.normalizePath)(filepath);
-      const aliasedData = templateInfo ? replaceNameOverrides(
-        getTemplateForFile(templateInfo, data),
-        data
-      ) : data;
+      const aliasedData = templateInfo ? replaceNameOverrides(template, data) : data;
       await enqueueOps([
         ...makeIndexOpsForDocument(
           normalizedPath,
@@ -5511,9 +5559,7 @@ var getTemplateForFile = (templateInfo, data) => {
       }
       return template;
     } else {
-      throw new Error(
-        `Expected _template to be provided for document in an ambiguous collection`
-      );
+      return void 0;
     }
   }
   throw new Error(`Unable to determine template`);
@@ -5524,14 +5570,15 @@ var import_many_level = require("many-level");
 var import_readable_stream = require("readable-stream");
 var import_net = require("net");
 var TinaLevelClient = class extends import_many_level.ManyLevelGuest {
-  constructor() {
-    super(...arguments);
+  constructor(port) {
+    super();
     this._connected = false;
+    this.port = port || 9e3;
   }
   openConnection() {
     if (this._connected)
       return;
-    const socket = (0, import_net.connect)(9e3);
+    const socket = (0, import_net.connect)(this.port);
     (0, import_readable_stream.pipeline)(socket, this.createRpcStream(), socket, () => {
       this._connected = false;
     });

package/dist/level/tinaLevel.d.ts

@@ -3,7 +3,9 @@
 */
 import { ManyLevelGuest } from 'many-level';
 export declare class TinaLevelClient extends ManyLevelGuest<string, Record<string, any>> {
+    private port;
     private _connected;
+    constructor(port?: number);
     openConnection(): void;
 }
 export interface Bridge {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.4.1",
+  "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.6",
-    "@tinacms/schema-tools": "1.4.1",
     "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.1",
-    "@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",