@tinacms/graphql 1.0.4 → 1.0.5

package/dist/database/util.d.ts

@@ -11,7 +11,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import * as yup from 'yup';
-export declare const stringifyFile: (content: object, format: FormatType | string, keepTemplateKey: boolean) => string;
-export declare const parseFile: <T extends object>(content: string, format: FormatType | string, yupSchema: (args: typeof yup) => yup.ObjectSchema<any>) => T;
+export declare const stringifyFile: (content: object, format: FormatType | string, keepTemplateKey: boolean, markdownParseConfig?: {
+    frontmatterFormat?: 'toml' | 'yaml' | 'json';
+    frontmatterDelimiters?: [string, string] | string;
+}) => string;
+export declare const parseFile: <T extends object>(content: string, format: FormatType | string, yupSchema: (args: typeof yup) => yup.ObjectSchema<any>, markdownParseConfig?: {
+    frontmatterFormat?: 'toml' | 'yaml' | 'json';
+    frontmatterDelimiters?: [string, string] | string;
+}) => T;
 export declare type FormatType = 'json' | 'md' | 'mdx' | 'markdown';
 export declare const normalizePath: (filepath: string) => string;

package/dist/index.js

@@ -2454,7 +2454,7 @@ var validateField = async (field) => {
 
 // package.json
 var name = "@tinacms/graphql";
-var version = "1.0.4";
+var version = "1.0.5";
 var main = "dist/index.js";
 var typings = "dist/index.d.ts";
 var files = [
@@ -2481,9 +2481,10 @@ var scripts = {
 };
 var dependencies = {
   "@graphql-tools/relay-operation-optimizer": "^6.4.1",
+  "@iarna/toml": "^2.2.5",
   "@tinacms/datalayer": "workspace:*",
-  "@tinacms/schema-tools": "workspace:*",
   "@tinacms/mdx": "workspace:*",
+  "@tinacms/schema-tools": "workspace:*",
   "body-parser": "^1.19.0",
   cors: "^2.8.5",
   dataloader: "^2.0.0",
@@ -2498,7 +2499,7 @@ var dependencies = {
   graphql: "15.8.0",
   "graphql-type-json": "^0.3.2",
   "gray-matter": "^4.0.2",
-  "js-yaml": "^3.14.0",
+  "js-yaml": "^3.14.1",
   leveldown: "^6.1.0",
   lodash: "^4.17.20",
   mdast: "^3.0.0",
@@ -3650,46 +3651,67 @@ var import_path3 = __toModule(require("path"));
 var import_graphql5 = __toModule(require("graphql"));
 
 // src/database/util.ts
+var import_toml = __toModule(require("@iarna/toml"));
+var import_js_yaml = __toModule(require("js-yaml"));
 var import_gray_matter = __toModule(require("gray-matter"));
-var stringifyFile = (content, format, keepTemplateKey) => {
+var matterEngines = {
+  toml: {
+    parse: (val) => import_toml.default.parse(val),
+    stringify: (val) => import_toml.default.stringify(val)
+  }
+};
+var stringifyFile = (content, format, keepTemplateKey, markdownParseConfig) => {
+  const _a = content, {
+    _relativePath,
+    _keepTemplateKey,
+    _id,
+    _template,
+    _collection,
+    $_body
+  } = _a, rest = __objRest(_a, [
+    "_relativePath",
+    "_keepTemplateKey",
+    "_id",
+    "_template",
+    "_collection",
+    "$_body"
+  ]);
+  const extra = {};
+  if (keepTemplateKey) {
+    extra["_template"] = _template;
+  }
+  const strippedContent = __spreadValues(__spreadValues({}, rest), extra);
   switch (format) {
     case ".markdown":
     case ".mdx":
     case ".md":
-      const _a = content, {
-        _relativePath,
-        _keepTemplateKey,
-        _id,
-        _template,
-        _collection,
-        $_body
-      } = _a, rest = __objRest(_a, [
-        "_relativePath",
-        "_keepTemplateKey",
-        "_id",
-        "_template",
-        "_collection",
-        "$_body"
-      ]);
-      const extra = {};
-      if (keepTemplateKey) {
-        extra["_template"] = _template;
-      }
       const ok = import_gray_matter.default.stringify(typeof $_body === "undefined" ? "" : `
-${$_body}`, __spreadValues(__spreadValues({}, rest), extra));
+${$_body}`, strippedContent, {
+        language: (markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterFormat) || "yaml",
+        engines: matterEngines,
+        delimiters: (markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterDelimiters) || "---"
+      });
       return ok;
     case ".json":
-      return JSON.stringify(content, null, 2);
+      return JSON.stringify(strippedContent, null, 2);
+    case ".yaml":
+      return import_js_yaml.default.safeDump(strippedContent);
+    case ".toml":
+      return import_toml.default.stringify(strippedContent);
     default:
       throw new Error(`Must specify a valid format, got ${format}`);
   }
 };
-var parseFile = (content, format, yupSchema) => {
+var parseFile = (content, format, yupSchema, markdownParseConfig) => {
   switch (format) {
     case ".markdown":
     case ".mdx":
     case ".md":
-      const contentJSON = (0, import_gray_matter.default)(content || "");
+      const contentJSON = (0, import_gray_matter.default)(content || "", {
+        language: (markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterFormat) || "yaml",
+        delimiters: (markdownParseConfig == null ? void 0 : markdownParseConfig.frontmatterDelimiters) || "---",
+        engines: matterEngines
+      });
       const markdownData = __spreadProps(__spreadValues({}, contentJSON.data), {
         $_body: contentJSON.content
       });
@@ -3700,6 +3722,16 @@ var parseFile = (content, format, yupSchema) => {
         return {};
       }
       return JSON.parse(content);
+    case ".toml":
+      if (!content) {
+        return {};
+      }
+      return import_toml.default.parse(content);
+    case ".yaml":
+      if (!content) {
+        return {};
+      }
+      return import_js_yaml.default.safeLoad(content);
     default:
       throw new Error(`Must specify a valid format, got ${format}`);
   }
@@ -3850,7 +3882,10 @@ var Database = class {
           payload = data;
         }
         const extension = import_path3.default.extname(filepath);
-        const stringifiedFile = stringifyFile(payload, extension, templateInfo.type === "union");
+        const stringifiedFile = stringifyFile(payload, extension, templateInfo.type === "union", {
+          frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat,
+          frontmatterDelimiters: collection == null ? void 0 : collection.frontmatterDelimiters
+        });
         return {
           stringifiedFile,
           payload,
@@ -4149,7 +4184,10 @@ var _indexContent = async (database, documentPaths, collection) => {
   await sequential(documentPaths, async (filepath) => {
     try {
       const dataString = await database.bridge.get(normalizePath(filepath));
-      const data = parseFile(dataString, import_path3.default.extname(filepath), (yup3) => yup3.object({}));
+      const data = parseFile(dataString, import_path3.default.extname(filepath), (yup3) => yup3.object({}), {
+        frontmatterDelimiters: collection == null ? void 0 : collection.frontmatterDelimiters,
+        frontmatterFormat: collection == null ? void 0 : collection.frontmatterFormat
+      });
       if (database.store.supportsSeeding()) {
         await database.store.seed(normalizePath(filepath), data, seedOptions);
       }

package/dist/resolver/index.d.ts

@@ -42,6 +42,8 @@ export declare class Resolver {
         defaultItem?: import("@tinacms/schema-tools").DefaultItem<Record<string, any>>;
         indexes?: import("@tinacms/schema-tools").TinaIndex[];
         format?: "json" | "md" | "markdown" | "mdx";
+        frontmatterFormat?: "json" | "yaml" | "toml";
+        frontmatterDelimiters?: string | [string, string];
         ui?: import("@tinacms/schema-tools").UICollection;
         match?: string;
         documents: {
@@ -65,6 +67,8 @@ export declare class Resolver {
         defaultItem?: import("@tinacms/schema-tools").DefaultItem<Record<string, any>>;
         indexes?: import("@tinacms/schema-tools").TinaIndex[];
         format?: "json" | "md" | "markdown" | "mdx";
+        frontmatterFormat?: "json" | "yaml" | "toml";
+        frontmatterDelimiters?: string | [string, string];
         ui?: import("@tinacms/schema-tools").UICollection;
         match?: string;
         documents: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/graphql",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -19,9 +19,10 @@
   },
   "dependencies": {
     "@graphql-tools/relay-operation-optimizer": "^6.4.1",
+    "@iarna/toml": "^2.2.5",
     "@tinacms/datalayer": "1.0.0",
-    "@tinacms/schema-tools": "1.1.0",
-    "@tinacms/mdx": "1.0.4",
+    "@tinacms/mdx": "1.1.0",
+    "@tinacms/schema-tools": "1.2.0",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
     "dataloader": "^2.0.0",
@@ -36,7 +37,7 @@
     "graphql": "15.8.0",
     "graphql-type-json": "^0.3.2",
     "gray-matter": "^4.0.2",
-    "js-yaml": "^3.14.0",
+    "js-yaml": "^3.14.1",
     "leveldown": "^6.1.0",
     "lodash": "^4.17.20",
     "mdast": "^3.0.0",
@@ -72,8 +73,8 @@
   },
   "devDependencies": {
     "@tinacms/datalayer": "1.0.0",
-    "@tinacms/schema-tools": "1.1.0",
-    "@tinacms/scripts": "1.0.0",
+    "@tinacms/schema-tools": "1.2.0",
+    "@tinacms/scripts": "1.0.1",
     "@types/cors": "^2.8.7",
     "@types/estree": "^0.0.50",
     "@types/express": "^4.17.8",