@tinacms/graphql 1.4.0 → 1.4.2

package/dist/index.es.js

@@ -2220,11 +2220,11 @@ Visit https://tina.io/docs/errors/ui-not-supported/ for more information
       switch (field.type) {
         case "boolean":
         case "datetime":
-        case "image":
         case "number":
           if (field.list) {
             console.warn(listWarningMsg);
           }
+        case "image":
         case "string":
           return astBuilder.FieldDefinition({
             name: field.name,
@@ -2491,7 +2491,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.0",
+  version: "1.4.2",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -4497,6 +4497,10 @@ var parseFile = (content, format, yupSchema, markdownParseConfig) => {
 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];
+      }
       return _replaceNameOverrides(
         getTemplateForData(template, item).fields,
         item
@@ -4506,6 +4510,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 +4523,33 @@ 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]
       );
     }
+    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 applyNameOverrides = (template, obj) => {
   if (template.list) {
     return obj.map((item) => {
-      return _applyNameOverrides(
+      const result = _applyNameOverrides(
         getTemplateForData(template, item).fields,
         item
       );
+      if (isBlockField(template) && template.templateKey) {
+        result[template.templateKey] = result._template;
+        delete result._template;
+      }
+      return result;
     });
   } else {
     return _applyNameOverrides(getTemplateForData(template, obj).fields, obj);
@@ -5372,11 +5376,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,
@@ -5443,13 +5451,17 @@ var getTemplateForFile = (templateInfo, data) => {
   }
   if (templateInfo.type === "union") {
     if (hasOwnProperty(data, "_template")) {
-      return templateInfo.templates.find(
+      const template = templateInfo.templates.find(
         (t) => lastItem(t.namespace) === data._template
       );
+      if (!template) {
+        throw new Error(
+          `Unable to find template "${data._template}". Possible templates are: ${templateInfo.templates.map((template2) => `"${template2.name}"`).join(", ")}.`
+        );
+      }
+      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`);
@@ -5460,14 +5472,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

@@ -2269,11 +2269,11 @@ Visit https://tina.io/docs/errors/ui-not-supported/ for more information
       switch (field.type) {
         case "boolean":
         case "datetime":
-        case "image":
         case "number":
           if (field.list) {
             console.warn(listWarningMsg);
           }
+        case "image":
         case "string":
           return astBuilder.FieldDefinition({
             name: field.name,
@@ -2542,7 +2542,7 @@ var validateField = async (field) => {
 // package.json
 var package_default = {
   name: "@tinacms/graphql",
-  version: "1.4.0",
+  version: "1.4.2",
   main: "dist/index.js",
   module: "dist/index.es.js",
   typings: "dist/index.d.ts",
@@ -4548,6 +4548,10 @@ var parseFile = (content, format, yupSchema, markdownParseConfig) => {
 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];
+      }
       return _replaceNameOverrides(
         getTemplateForData(template, item).fields,
         item
@@ -4557,6 +4561,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 +4575,34 @@ 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]
       );
     }
+    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 applyNameOverrides = (template, obj) => {
   if (template.list) {
     return obj.map((item) => {
-      return _applyNameOverrides(
+      const result = _applyNameOverrides(
         getTemplateForData(template, item).fields,
         item
       );
+      if (isBlockField(template) && template.templateKey) {
+        result[template.templateKey] = result._template;
+        delete result._template;
+      }
+      return result;
     });
   } else {
     return _applyNameOverrides(getTemplateForData(template, obj).fields, obj);
@@ -5430,11 +5434,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,
@@ -5501,13 +5509,17 @@ var getTemplateForFile = (templateInfo, data) => {
   }
   if (templateInfo.type === "union") {
     if (hasOwnProperty(data, "_template")) {
-      return templateInfo.templates.find(
+      const template = templateInfo.templates.find(
         (t) => lastItem(t.namespace) === data._template
       );
+      if (!template) {
+        throw new Error(
+          `Unable to find template "${data._template}". Possible templates are: ${templateInfo.templates.map((template2) => `"${template2.name}"`).join(", ")}.`
+        );
+      }
+      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`);
@@ -5518,14 +5530,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.0",
+  "version": "1.4.2",
   "main": "dist/index.js",
   "module": "dist/index.es.js",
   "typings": "dist/index.d.ts",
@@ -25,8 +25,8 @@
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
     "@iarna/toml": "^2.2.5",
-    "@tinacms/mdx": "1.3.5",
-    "@tinacms/schema-tools": "1.4.0",
+    "@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",
@@ -83,7 +83,7 @@
     "directory": "packages/tina-graphql"
   },
   "devDependencies": {
-    "@tinacms/schema-tools": "1.4.0",
+    "@tinacms/schema-tools": "1.4.2",
     "@tinacms/scripts": "1.1.0",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",